master: Fix organizationID at ExecutionDaemonTest #TASK-5663

opencb · Feb 16, 2024 · 2011121 · 2011121
1 parent 51f1bbd
commit 2011121
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/opencga-catalog/src/test/java/org/opencb/opencga/catalog/managers/AbstractManagerTest.java b/opencga-catalog/src/test/java/org/opencb/opencga/catalog/managers/AbstractManagerTest.java
@@ -75,23 +75,23 @@ public class  AbstractManagerTest extends GenericTest {
     public static Path mongoDumpFolder;
 
     protected CatalogManager catalogManager;
-    protected String organizationId = "test";
+    protected final static String organizationId = "test";
     protected String opencgaToken;
-    protected String orgOwnerUserId = "owner";
+    protected final static String orgOwnerUserId = "owner";
     protected String ownerToken;
-    protected String orgAdminUserId1 = "orgAdminUser1";
+    protected final static String orgAdminUserId1 = "orgAdminUser1";
     protected String orgAdminToken1;
-    protected String orgAdminUserId2 = "orgAdminUser2";
+    protected final static String orgAdminUserId2 = "orgAdminUser2";
     protected String orgAdminToken2;
-    protected String studyAdminUserId1 = "studyAdminUser1";
+    protected final static String studyAdminUserId1 = "studyAdminUser1";
     protected String studyAdminToken1;
-    protected String normalUserId1 = "normalUser1";
+    protected final static String normalUserId1 = "normalUser1";
     protected String normalToken1;
-    protected String normalUserId2 = "normalUser2";
+    protected final static String normalUserId2 = "normalUser2";
     protected String normalToken2;
-    protected String normalUserId3 = "normalUser3";
+    protected final static String normalUserId3 = "normalUser3";
     protected String normalToken3;
-    protected String noAccessUserId1 = "noAccessUserId1";
+    protected final static String noAccessUserId1 = "noAccessUserId1";
     protected String noAccessToken1;
 
     protected String restrictedGroup = "@restrictedGroup"; // normalUserId2, normalUserId3

diff --git a/...a-master/src/test/java/org/opencb/opencga/master/monitor/daemons/ExecutionDaemonTest.java b/...a-master/src/test/java/org/opencb/opencga/master/monitor/daemons/ExecutionDaemonTest.java
@@ -82,11 +82,11 @@ public void setUp() throws Exception {
         super.setUp();
 
         String expiringToken = this.catalogManager.getUserManager().loginAsAdmin(TestParamConstants.ADMIN_PASSWORD).getToken();
-        String nonExpiringToken = this.catalogManager.getUserManager().getNonExpiringToken(organizationId, "opencga", Collections.emptyMap(), expiringToken);
+        String nonExpiringToken = this.catalogManager.getUserManager().getNonExpiringToken(ParamConstants.ADMIN_ORGANIZATION, ParamConstants.OPENCGA_USER_ID, Collections.emptyMap(), expiringToken);
         catalogManager.getConfiguration().getAnalysis().getExecution().getMaxConcurrentJobs().put(VariantIndexOperationTool.ID, 1);
 
         daemon = new ExecutionDaemon(1000, nonExpiringToken, catalogManager,
-                new StorageConfiguration().setMode(StorageConfiguration.Mode.READ_WRITE), "/tmp");
+                new StorageConfiguration().setMode(StorageConfiguration.Mode.READ_WRITE), catalogManagerResource.getOpencgaHome().toString());
         executor = new DummyBatchExecutor();
         daemon.batchExecutor = executor;