Skip to content

Constants for many commonly used role names in tests #1115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-jeckels merged 1 commit into from
Sep 24, 2025
Merged

Constants for many commonly used role names in tests #1115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion test/src/org/labkey/test/tests/panoramapremium/TargetedMSQCPremiumTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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);
}

Expand Down
3 changes: 2 additions & 1 deletion test/src/org/labkey/test/tests/targetedms/TargetedMSCalibrationCurveTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
10 changes: 6 additions & 4 deletions test/src/org/labkey/test/tests/targetedms/TargetedMSInstrumentNicknameTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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();
Expand Down
3 changes: 2 additions & 1 deletion test/src/org/labkey/test/tests/targetedms/TargetedMSLibraryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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);
Expand Down
9 changes: 5 additions & 4 deletions test/src/org/labkey/test/tests/targetedms/TargetedMSQCSummaryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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();
Expand Down
3 changes: 2 additions & 1 deletion test/src/org/labkey/test/tests/targetedms/TargetedMSQCTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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();
}
Expand Down
4 changes: 3 additions & 1 deletion test/src/org/labkey/test/tests/targetedms/TargetedMSUtilizationCalendarTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -89,7 +91,7 @@ public void testUtilizationCalendarActions()
public void testReaderRoleAccessibility()
{
goToProjectHome();
impersonateRole("Reader");
impersonateRole(READER_ROLE);
UtilizationCalendarWebPart utilizationCalendar = new PanoramaDashboard(this)
.getQcSummaryWebPart()
.gotoUtilizationCalendar();
Expand Down
4 changes: 3 additions & 1 deletion test/src/org/labkey/test/tests/targetedms/passport/PassportTestPart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@

import java.nio.file.Paths;

import static org.labkey.test.util.PermissionsHelper.READER_ROLE;


public abstract class PassportTestPart extends BaseWebDriverTest
{
Expand All @@ -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().
Expand Down