Constants for many commonly used role names in tests (#1115)

Author: labkey-jeckels

test/src/org/labkey/test/tests/panoramapremium/TargetedMSQCPremiumTest.java

@@ -35,6 +35,7 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.labkey.test.components.targetedms.QCPlotsWebPart.QCPlotType.CUSUMm;
+import static org.labkey.test.util.PermissionsHelper.READER_ROLE;
 
 @Category({})
 @BaseWebDriverTest.ClassTimeout(minutes = 6)
@@ -57,7 +58,7 @@ private void doInit()
     {
         setupFolder(FolderType.QC);
         _userHelper.createUser(USER);
-        new ApiPermissionsHelper(this).setUserPermissions(USER, "Reader");
+        new ApiPermissionsHelper(this).setUserPermissions(USER, READER_ROLE);
         importData(SProCoP_FILE);
     }
 

test/src/org/labkey/test/tests/targetedms/TargetedMSCalibrationCurveTest.java

@@ -32,6 +32,7 @@
 import java.util.Map;
 
 import static org.junit.Assert.assertEquals;
+import static org.labkey.test.util.PermissionsHelper.READER_ROLE;
 
 /**
  * Tests uploading Skyline documents that contain calibration curve settings. Makes sure that the calculated results
@@ -165,7 +166,7 @@ public void  testCalibrationPK()
 
         // impersonate a reader, who should be able to change the settings/inputs but those don't get persisted
         pushLocation();
-        impersonateRole("Reader");
+        impersonateRole(READER_ROLE);
         popLocation();
         pkReportPage = new PKReportPage(getDriver(), 10);
         // uncheck all the SB1 and SB2 time inputs

test/src/org/labkey/test/tests/targetedms/TargetedMSInstrumentNicknameTest.java

@@ -32,6 +32,8 @@
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
+import static org.labkey.test.util.PermissionsHelper.EDITOR_ROLE;
+import static org.labkey.test.util.PermissionsHelper.READER_ROLE;
 
 @Category({})
 public class TargetedMSInstrumentNicknameTest extends TargetedMSTest
@@ -105,8 +107,8 @@ private void setupProjectWithSubfolders()
 
         // give user reader permissions to all but FOLDER_1
         ApiPermissionsHelper permissionsHelper = new ApiPermissionsHelper(this);
-        permissionsHelper.addMemberToRole(USER, "Reader", PermissionsHelper.MemberType.user, getProjectName());
-        permissionsHelper.addMemberToRole(USER, "Editor", PermissionsHelper.MemberType.user, getProjectName() + "/" + NON_QC_SUB_FOLDER);
+        permissionsHelper.addMemberToRole(USER, READER_ROLE, PermissionsHelper.MemberType.user, getProjectName());
+        permissionsHelper.addMemberToRole(USER, EDITOR_ROLE, PermissionsHelper.MemberType.user, getProjectName() + "/" + NON_QC_SUB_FOLDER);
     }
 
     private void importInitialData()
@@ -182,7 +184,7 @@ public void testSubfolders()
         assertTextPresent(REPLICATE_NAME_WITH_SERIAL, FILE_PATH_WITH_SERIAL);
 
         String postImpersonationUrl = getDriver().getCurrentUrl();
-        impersonateRole("Reader");
+        impersonateRole(READER_ROLE);
         assertTextPresent(Q_EXACTIVE_SERIAL_ONLY, 1);  // Just the visible element, no form and hidden inputs for readers
         stopImpersonating();
         beginAt(postImpersonationUrl);
@@ -228,7 +230,7 @@ public void testNonSiteAdmin()
 
         String postImpersonationUrl = getDriver().getCurrentUrl();
         // Check we don't let readers save
-        impersonateRole("Reader");
+        impersonateRole(READER_ROLE);
         assertTextPresent("Currently saved in");
         assertElementNotPresent(Locator.lkButton("Save"));
         stopImpersonating();

test/src/org/labkey/test/tests/targetedms/TargetedMSLibraryTest.java

@@ -34,6 +34,7 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.labkey.test.util.PermissionsHelper.READER_ROLE;
 
 @Category({})
 @BaseWebDriverTest.ClassTimeout(minutes = 5)
@@ -308,7 +309,7 @@ private Locator getCheckBox(String proteinName, boolean oldProtein)
 
     private void verifyConflictsAsReadOnlyUser()
     {
-        impersonateRole("Reader");
+        impersonateRole(READER_ROLE);
         String[] conflictText = new String[] {"The chromatogram library in this folder is in a conflicted state and is awaiting action from a folder administrator to resolve the conflicts",
                 "The download link below is for the last stable version of the library."};
         assertTextPresent(conflictText);

test/src/org/labkey/test/tests/targetedms/TargetedMSQCSummaryTest.java

@@ -54,6 +54,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.labkey.test.util.PermissionsHelper.READER_ROLE;
 
 @Category({})
 @BaseWebDriverTest.ClassTimeout(minutes = 12)
@@ -147,10 +148,10 @@ public void testPermissions()
 
         // give user reader permissions to all but FOLDER_1
         ApiPermissionsHelper permissionsHelper = new ApiPermissionsHelper(this);
-        permissionsHelper.addMemberToRole(USER, "Reader", PermissionsHelper.MemberType.user, getProjectName());
-        permissionsHelper.addMemberToRole(USER, "Reader", PermissionsHelper.MemberType.user, getProjectName() + "/" + FOLDER_2);
-        permissionsHelper.addMemberToRole(USER, "Reader", PermissionsHelper.MemberType.user, getProjectName() + "/" + FOLDER_2 + "/" + FOLDER_2A);
-        permissionsHelper.addMemberToRole(USER, "Reader", PermissionsHelper.MemberType.user, getProjectName() + "/" + FOLDER_3);
+        permissionsHelper.addMemberToRole(USER, READER_ROLE, PermissionsHelper.MemberType.user, getProjectName());
+        permissionsHelper.addMemberToRole(USER, READER_ROLE, PermissionsHelper.MemberType.user, getProjectName() + "/" + FOLDER_2);
+        permissionsHelper.addMemberToRole(USER, READER_ROLE, PermissionsHelper.MemberType.user, getProjectName() + "/" + FOLDER_2 + "/" + FOLDER_2A);
+        permissionsHelper.addMemberToRole(USER, READER_ROLE, PermissionsHelper.MemberType.user, getProjectName() + "/" + FOLDER_3);
 
         // impersonate user and check that the project QC Summary doesn't include the FOLDER_1 details
         goToProjectHome();

test/src/org/labkey/test/tests/targetedms/TargetedMSQCTest.java

@@ -64,6 +64,7 @@
 import static org.labkey.test.components.targetedms.QCPlotsWebPart.QCPlotType.MovingRange;
 import static org.labkey.test.components.targetedms.QCPlotsWebPart.QCPlotType.TrailingCV;
 import static org.labkey.test.components.targetedms.QCPlotsWebPart.QCPlotType.TrailingMean;
+import static org.labkey.test.util.PermissionsHelper.READER_ROLE;
 
 @Category({})
 @BaseWebDriverTest.ClassTimeout(minutes = 35)
@@ -180,7 +181,7 @@ private void doInit()
     {
         setupFolder(FolderType.QC);
         _userHelper.createUser(USER);
-        new ApiPermissionsHelper(this).setUserPermissions(USER, "Reader");
+        new ApiPermissionsHelper(this).setUserPermissions(USER, READER_ROLE);
         importData(SProCoP_FILE);
         createAndInsertAnnotations();
     }

test/src/org/labkey/test/tests/targetedms/TargetedMSUtilizationCalendarTest.java

@@ -14,6 +14,8 @@
 import java.sql.Timestamp;
 import java.util.Arrays;
 
+import static org.labkey.test.util.PermissionsHelper.READER_ROLE;
+
 @Category({})
 @BaseWebDriverTest.ClassTimeout(minutes = 5)
 public class TargetedMSUtilizationCalendarTest extends TargetedMSTest
@@ -89,7 +91,7 @@ public void testUtilizationCalendarActions()
     public void testReaderRoleAccessibility()
     {
         goToProjectHome();
-        impersonateRole("Reader");
+        impersonateRole(READER_ROLE);
         UtilizationCalendarWebPart utilizationCalendar = new PanoramaDashboard(this)
                 .getQcSummaryWebPart()
                 .gotoUtilizationCalendar();

test/src/org/labkey/test/tests/targetedms/passport/PassportTestPart.java

@@ -29,6 +29,8 @@
 
 import java.nio.file.Paths;
 
+import static org.labkey.test.util.PermissionsHelper.READER_ROLE;
+
 
 public abstract class PassportTestPart extends BaseWebDriverTest
 {
@@ -45,7 +47,7 @@ protected void setupProject()
     {
         _containerHelper.createProject(getProjectName(), "Collaboration");
         ApiPermissionsHelper h = new ApiPermissionsHelper(this);
-        h.addMemberToRole(NORMAL_USER, "Reader", PermissionsHelper.MemberType.user);
+        h.addMemberToRole(NORMAL_USER, READER_ROLE, PermissionsHelper.MemberType.user);
 
         goToFolderManagement().
                 goToFolderTypeTab().