Skip to content

Constants for many commonly used role names in tests #572

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 #572

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
10 changes: 5 additions & 5 deletions SkylineToolsStore/test_disabled/src/org.labkey.test.tests/ToolStoreRatingsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
10 changes: 5 additions & 5 deletions SkylineToolsStore/test_disabled/src/org.labkey.test.tests/ToolStoreTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
5 changes: 3 additions & 2 deletions panoramapublic/test/src/org/labkey/test/tests/panoramapublic/PanoramaPublicBaseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down Expand Up @@ -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);
}
}

Expand Down Expand Up @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion ...amapublic/test/src/org/labkey/test/tests/panoramapublic/PanoramaPublicMakePublicTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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();
}
Expand Down
3 changes: 2 additions & 1 deletion ...amapublic/test/src/org/labkey/test/tests/panoramapublic/PanoramaPublicMyDataViewTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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");
Expand Down
8 changes: 5 additions & 3 deletions panoramapublic/test/src/org/labkey/test/tests/panoramapublic/PanoramaPublicTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
}
}

Expand Down
4 changes: 3 additions & 1 deletion ...ramapublic/test/src/org/labkey/test/tests/panoramapublic/PanoramaWebPublicSearchTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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");
Expand Down
3 changes: 2 additions & 1 deletion panoramapublic/test/src/org/labkey/test/tests/panoramapublic/PrivateDataReminderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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();
Expand Down