Constants for many commonly used role names in tests

labkey-jeckels · labkey-jeckels · commit 1e1eb2d2878b · 2025-09-23T16:38:42.000-07:00
diff --git a/SkylineToolsStore/test_disabled/src/org.labkey.test.tests/ToolStoreRatingsTest.java b/SkylineToolsStore/test_disabled/src/org.labkey.test.tests/ToolStoreRatingsTest.java
@@ -49,18 +49,18 @@ protected void doTestSteps() throws Exception
         uncheckCheckbox(Locator.name("sendEmail"));
         clickButton("Update Group Membership");
         enterPermissionsUI();
-        setUserPermissions("SkylineToolStoreGroup", "Editor");
-        _securityHelper.setSiteGroupPermissions("All Site Users", "Reader");
-        _securityHelper.setSiteGroupPermissions("Guests", "Reader");
+        setUserPermissions("SkylineToolStoreGroup", EDITOR_ROLE);
+        _securityHelper.setSiteGroupPermissions("All Site Users", READER_ROLE);
+        _securityHelper.setSiteGroupPermissions("Guests", READER_ROLE);
         int fileNumber = 0;
         while(fileNumber < filesToUpload.length)
         {
             uploadTools(filesToUpload[fileNumber]);
             fileNumber++;
         }
         //toolName is the directory name in LabKey
-        setupUserPermissions(users[0], "_tool_Population Variation Updated_1.2.16269", "Editor", "panoramaPermissions");
-        setupUserPermissions(users[1], "_tool_MSstats_1.0", "Editor", "panoramaPermissions");
+        setupUserPermissions(users[0], "_tool_Population Variation Updated_1.2.16269", EDITOR_ROLE, "panoramaPermissions");
+        setupUserPermissions(users[1], "_tool_MSstats_1.0", EDITOR_ROLE, "panoramaPermissions");
         testAsGuest();
         testAsUser1();
         testAsUser2();
diff --git a/SkylineToolsStore/test_disabled/src/org.labkey.test.tests/ToolStoreTest.java b/SkylineToolsStore/test_disabled/src/org.labkey.test.tests/ToolStoreTest.java
@@ -49,18 +49,18 @@ protected void doTestSteps() throws Exception
         uncheckCheckbox(Locator.name("sendEmail"));
         clickButton("Update Group Membership");
         enterPermissionsUI();
-        setUserPermissions("SkylineToolStoreGroup", "Editor");
-        _securityHelper.setSiteGroupPermissions("All Site Users", "Reader");
-        _securityHelper.setSiteGroupPermissions("Guests", "Reader");
+        setUserPermissions("SkylineToolStoreGroup", EDITOR_ROLE);
+        _securityHelper.setSiteGroupPermissions("All Site Users", READER_ROLE);
+        _securityHelper.setSiteGroupPermissions("Guests", READER_ROLE);
         int fileNumber = 0;
         while(fileNumber < filesToUpload.length)
         {
             uploadTools(filesToUpload[fileNumber]);
             fileNumber++;
         }
         //toolName is the directory name in LabKey
-        setupUserPermissions(users[0], "_tool_Population Variation Updated_1.2.16269", "Editor", "panoramaPermissions");
-        setupUserPermissions(users[1], "_tool_MSstats_1.0", "Editor", "panoramaPermissions");
+        setupUserPermissions(users[0], "_tool_Population Variation Updated_1.2.16269", EDITOR_ROLE, "panoramaPermissions");
+        setupUserPermissions(users[1], "_tool_MSstats_1.0", EDITOR_ROLE, "panoramaPermissions");
         testAsSuperAdmin();
         testAsGuest();
         testAsUser1(0);
diff --git a/panoramapublic/test/src/org/labkey/test/tests/panoramapublic/PanoramaPublicBaseTest.java b/panoramapublic/test/src/org/labkey/test/tests/panoramapublic/PanoramaPublicBaseTest.java
@@ -44,6 +44,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.labkey.test.util.PermissionsHelper.FOLDER_ADMIN_ROLE;
 
 public class PanoramaPublicBaseTest extends TargetedMSTest implements PostgresOnlyTest
 {
@@ -211,7 +212,7 @@ private void updatePermissions(String projectName, String folderName, String[] a
         _userHelper.ensureUsersExist(List.of(adminUsers));
         for(String user: adminUsers)
         {
-            permissionsHelper.addMemberToRole(user, "Folder Administrator", PermissionsHelper.MemberType.user, projectName + "/" + folderName);
+            permissionsHelper.addMemberToRole(user, FOLDER_ADMIN_ROLE, PermissionsHelper.MemberType.user, projectName + "/" + folderName);
         }
     }
 
@@ -523,7 +524,7 @@ private void createFolderAdmin(String projectName, String folderName, String use
     {
         _userHelper.ensureUsersExist(Collections.singletonList(user));
         ApiPermissionsHelper permissionsHelper = new ApiPermissionsHelper(this);
-        permissionsHelper.addMemberToRole(user, "Folder Administrator", PermissionsHelper.MemberType.user, projectName + "/" + folderName);
+        permissionsHelper.addMemberToRole(user, FOLDER_ADMIN_ROLE, PermissionsHelper.MemberType.user, projectName + "/" + folderName);
     }
 
     protected void makeDataPublic(boolean unpublishedData)
diff --git a/panoramapublic/test/src/org/labkey/test/tests/panoramapublic/PanoramaPublicMakePublicTest.java b/panoramapublic/test/src/org/labkey/test/tests/panoramapublic/PanoramaPublicMakePublicTest.java
@@ -24,6 +24,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.labkey.test.util.PermissionsHelper.READER_ROLE;
 
 @Category({External.class, MacCossLabModules.class})
 @BaseWebDriverTest.ClassTimeout(minutes = 5)
@@ -116,7 +117,7 @@ private void verifyPermissionsForCatalogEntry(String projectName, String folderN
         impersonate(SUBMITTER);
         verifyCatalogEntryWebpart(projectName ,folderName, true);
         stopImpersonating();
-        impersonateRole("Reader");
+        impersonateRole(READER_ROLE);
         verifyCatalogEntryWebpart(projectName ,folderName, false);
         stopImpersonating();
     }
diff --git a/panoramapublic/test/src/org/labkey/test/tests/panoramapublic/PanoramaPublicMyDataViewTest.java b/panoramapublic/test/src/org/labkey/test/tests/panoramapublic/PanoramaPublicMyDataViewTest.java
@@ -19,6 +19,7 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertTrue;
+import static org.labkey.test.util.PermissionsHelper.READER_ROLE;
 
 @Category({External.class, MacCossLabModules.class})
 @BaseWebDriverTest.ClassTimeout(minutes = 5)
@@ -42,7 +43,7 @@ private void init()
     {
         goToProjectHome(PANORAMA_PUBLIC);
         ApiPermissionsHelper permissionsHelper = new ApiPermissionsHelper(this);
-        permissionsHelper.setSiteGroupPermissions("Guests", "Reader");
+        permissionsHelper.setSiteGroupPermissions("Guests", READER_ROLE);
         portalHelper.removeAllWebParts();
         portalHelper.addBodyWebPart("Panorama Public Search");
         portalHelper.addBodyWebPart("Targeted MS Experiment List");
diff --git a/panoramapublic/test/src/org/labkey/test/tests/panoramapublic/PanoramaPublicTest.java b/panoramapublic/test/src/org/labkey/test/tests/panoramapublic/PanoramaPublicTest.java
@@ -25,6 +25,8 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertTrue;
+import static org.labkey.test.util.PermissionsHelper.FOLDER_ADMIN_ROLE;
+import static org.labkey.test.util.PermissionsHelper.READER_ROLE;
 
 @Category({External.class, MacCossLabModules.class})
 @BaseWebDriverTest.ClassTimeout(minutes = 7)
@@ -262,8 +264,8 @@ public void testCopyExperimentWithSubfolder()
         // in all subfolders are required for submitting an experiment.
         goToProjectFolder(projectName, sourceFolder + "/" + subfolder_mam);
         ApiPermissionsHelper permissionsHelper = new ApiPermissionsHelper(this);
-        permissionsHelper.removeUserRoleAssignment(SUBMITTER_2, "Folder Administrator", projectName + "/" + sourceFolder + "/" + subfolder_mam);
-        permissionsHelper.assertNoPermission(SUBMITTER_2, "Reader");
+        permissionsHelper.removeUserRoleAssignment(SUBMITTER_2, FOLDER_ADMIN_ROLE, projectName + "/" + sourceFolder + "/" + subfolder_mam);
+        permissionsHelper.assertNoPermission(SUBMITTER_2, READER_ROLE);
 
         goToProjectFolder(projectName, sourceFolder);
         impersonate(SUBMITTER_2);
@@ -296,7 +298,7 @@ protected void setupSourceFolder(String projectName, String folderName, String .
         {
             _userHelper.deleteUser(user);
             _userHelper.createUser(user);
-            permissionsHelper.addMemberToRole(user, "Folder Administrator", PermissionsHelper.MemberType.user, projectName + "/" + folderName);
+            permissionsHelper.addMemberToRole(user, FOLDER_ADMIN_ROLE, PermissionsHelper.MemberType.user, projectName + "/" + folderName);
         }
     }
 
diff --git a/panoramapublic/test/src/org/labkey/test/tests/panoramapublic/PanoramaWebPublicSearchTest.java b/panoramapublic/test/src/org/labkey/test/tests/panoramapublic/PanoramaWebPublicSearchTest.java
@@ -19,6 +19,8 @@
 import java.util.Arrays;
 import java.util.Set;
 
+import static org.labkey.test.util.PermissionsHelper.FOLDER_ADMIN_ROLE;
+
 @Category({External.class, MacCossLabModules.class})
 @BaseWebDriverTest.ClassTimeout(minutes = 5)
 public class PanoramaWebPublicSearchTest extends PanoramaPublicBaseTest
@@ -69,7 +71,7 @@ private void initialSetupHelper()
         createExperimentCompleteMetadata("Experiment for small molecule search");
 
         _userHelper.createUser(SUBMITTER);
-        permissionsHelper.addMemberToRole(SUBMITTER, "Folder Administrator", PermissionsHelper.MemberType.user, getProjectName() + "/" + SUBFOLDER_2);
+        permissionsHelper.addMemberToRole(SUBMITTER, FOLDER_ADMIN_ROLE, PermissionsHelper.MemberType.user, getProjectName() + "/" + SUBFOLDER_2);
         impersonate(SUBMITTER);
         updateSubmitterAccountInfo(AUTHOR_FIRST_NAME, AUTHOR_LAST_NAME, SUBFOLDER_2);
         createExperimentCompleteMetadata("Submitter Experiment");
diff --git a/panoramapublic/test/src/org/labkey/test/tests/panoramapublic/PrivateDataReminderTest.java b/panoramapublic/test/src/org/labkey/test/tests/panoramapublic/PrivateDataReminderTest.java
@@ -14,6 +14,7 @@
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
+import static org.labkey.test.util.PermissionsHelper.READER_ROLE;
 
 @Category({External.class, MacCossLabModules.class})
 @BaseWebDriverTest.ClassTimeout(minutes = 7)
@@ -40,7 +41,7 @@ public void testPrivateDataReminder()
         String panoramaPublicProject = PANORAMA_PUBLIC;
         goToProjectHome(panoramaPublicProject);
         ApiPermissionsHelper permissionsHelper = new ApiPermissionsHelper(this);
-        permissionsHelper.setSiteGroupPermissions("Guests", "Reader");
+        permissionsHelper.setSiteGroupPermissions("Guests", READER_ROLE);
 
 
         String testProject = getProjectName();

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@`
`44`	`44`	`import static org.junit.Assert.assertEquals;`
`45`	`45`	`import static org.junit.Assert.assertNotNull;`
`46`	`46`	`import static org.junit.Assert.assertTrue;`
	`47`	`+import static org.labkey.test.util.PermissionsHelper.FOLDER_ADMIN_ROLE;`
`47`	`48`
`48`	`49`	`public class PanoramaPublicBaseTest extends TargetedMSTest implements PostgresOnlyTest`
`49`	`50`	`{`
`@@ -211,7 +212,7 @@ private void updatePermissions(String projectName, String folderName, String[] a`
`211`	`212`	`_userHelper.ensureUsersExist(List.of(adminUsers));`
`212`	`213`	`for(String user: adminUsers)`
`213`	`214`	`{`
`214`		`- permissionsHelper.addMemberToRole(user, "Folder Administrator", PermissionsHelper.MemberType.user, projectName + "/" + folderName);`
	`215`	`+ permissionsHelper.addMemberToRole(user, FOLDER_ADMIN_ROLE, PermissionsHelper.MemberType.user, projectName + "/" + folderName);`
`215`	`216`	`}`
`216`	`217`	`}`
`217`	`218`
`@@ -523,7 +524,7 @@ private void createFolderAdmin(String projectName, String folderName, String use`
`523`	`524`	`{`
`524`	`525`	`_userHelper.ensureUsersExist(Collections.singletonList(user));`
`525`	`526`	`ApiPermissionsHelper permissionsHelper = new ApiPermissionsHelper(this);`
`526`		`- permissionsHelper.addMemberToRole(user, "Folder Administrator", PermissionsHelper.MemberType.user, projectName + "/" + folderName);`
	`527`	`+ permissionsHelper.addMemberToRole(user, FOLDER_ADMIN_ROLE, PermissionsHelper.MemberType.user, projectName + "/" + folderName);`
`527`	`528`	`}`
`528`	`529`
`529`	`530`	`protected void makeDataPublic(boolean unpublishedData)`