Skip to content

Constants for many commonly used role names in tests #881

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

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
6 changes: 4 additions & 2 deletions WNPRC_EHR/test/src/org/labkey/test/tests/wnprc_ehr/WNPRC_EHRTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@
import static org.labkey.test.WebTestHelper.buildURL;
import static org.labkey.test.WebTestHelper.getRemoteApiConnection;
import static org.labkey.test.util.Ext4Helper.TextMatchTechnique.CONTAINS;
import static org.labkey.test.util.PermissionsHelper.EDITOR_ROLE;
import static org.labkey.test.util.PermissionsHelper.READER_ROLE;

/**
* This should contain tests designed to validate EHR data entry or associated business logic.
Expand Down Expand Up @@ -3467,8 +3469,8 @@ public void updateProgramIncomeAccountWithValidPermissions() throws UnhandledAle

//Navigates to various containers and sets corresponding permissions.
beginAt(buildURL("project", getProjectName(), "begin"));
_permissionsHelper.setPermissions(BASIC_SUBMITTER.getGroup(), "Reader");
_permissionsHelper.setPermissions(BASIC_SUBMITTER.getGroup(), "Editor");
_permissionsHelper.setPermissions(BASIC_SUBMITTER.getGroup(), READER_ROLE);
_permissionsHelper.setPermissions(BASIC_SUBMITTER.getGroup(), EDITOR_ROLE);
beginAt(buildURL("wnprc_billing", getContainerPath(), "updateProgramIncomeAccount"));
_permissionsHelper.setPermissions(BASIC_SUBMITTER.getGroup(), "EHR Finance Admin");

Expand Down
12 changes: 8 additions & 4 deletions WNPRC_Purchasing/test/src/org/labkey/test/tests/wnprc_purchasing/WNPRC_PurchasingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@
import static org.junit.Assert.assertEquals;
import static org.labkey.test.WebTestHelper.buildRelativeUrl;
import static org.labkey.test.WebTestHelper.getRemoteApiConnection;
import static org.labkey.test.util.PermissionsHelper.EDITOR_ROLE;
import static org.labkey.test.util.PermissionsHelper.PROJECT_ADMIN_ROLE;
import static org.labkey.test.util.PermissionsHelper.READER_ROLE;
import static org.labkey.test.util.PermissionsHelper.SUBMITTER_ROLE;

@Category({EHR.class, WNPRC_EHR.class})
@BaseWebDriverTest.ClassTimeout(minutes = 10)
Expand Down Expand Up @@ -216,10 +220,10 @@ private void addUsersToPurchasingFolder()
_permissionsHelper.addUserToProjGroup(REQUESTER_USER_1, getProjectName(), PURCHASE_REQUESTER_GROUP);
_permissionsHelper.addUserToProjGroup(REQUESTER_USER_2, getProjectName(), PURCHASE_REQUESTER_GROUP);

_permissionsHelper.setPermissions(PURCHASE_ADMIN_GROUP, "Project Administrator");
_permissionsHelper.setPermissions(PURCHASE_REQUESTER_GROUP, "Submitter");
_permissionsHelper.setPermissions(PURCHASE_REQUESTER_GROUP, "Reader");
_permissionsHelper.setPermissions(PURCHASE_RECEIVER_GROUP, "Editor");
_permissionsHelper.setPermissions(PURCHASE_ADMIN_GROUP, PROJECT_ADMIN_ROLE);
_permissionsHelper.setPermissions(PURCHASE_REQUESTER_GROUP, SUBMITTER_ROLE);
_permissionsHelper.setPermissions(PURCHASE_REQUESTER_GROUP, READER_ROLE);
_permissionsHelper.setPermissions(PURCHASE_RECEIVER_GROUP, EDITOR_ROLE);
_permissionsHelper.setUserPermissions(PURCHASE_DIRECTOR_USER, "WNPRC Purchasing Director");
}

Expand Down
9 changes: 6 additions & 3 deletions WNPRC_Virology/test/src/org/labkey/test/tests/wnprc_virology/WNPRC_VirologyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import org.labkey.test.util.DataRegionTable;
import org.labkey.test.util.Ext4Helper;
import org.labkey.test.util.PasswordUtil;
import org.labkey.test.util.PermissionsHelper;
import org.labkey.test.util.PortalHelper;
import org.labkey.test.util.RemoteConnectionHelper;
import org.labkey.test.util.SchemaHelper;
Expand All @@ -45,6 +46,8 @@
import java.util.Map;

import static org.labkey.test.WebTestHelper.buildRelativeUrl;
import static org.labkey.test.util.PermissionsHelper.FOLDER_ADMIN_ROLE;
import static org.labkey.test.util.PermissionsHelper.READER_ROLE;

@Category({WNPRC_EHR.class})
public class WNPRC_VirologyTest extends ViralLoadAssayTest
Expand Down Expand Up @@ -172,7 +175,7 @@ protected void createProjectAndFolders(String type) throws IOException, CommandE
_containerHelper.createProject(PROJECT_NAME_EHR, type);
_containerHelper.enableModules(Arrays.asList(MODULE_NAME, "Dumbster", "EHR_Billing", "DataIntegration"));
_userHelper.createUser(ADMIN_USER);
_apiPermissionsHelper.setUserPermissions(ADMIN_USER, "Folder Administrator");
_apiPermissionsHelper.setUserPermissions(ADMIN_USER, FOLDER_ADMIN_ROLE);
// Set up the module properties
List<ModulePropertyValue> properties = new ArrayList<>();
properties.add(new ModulePropertyValue(MODULE_NAME, "/", "virologyEHRVLSampleQueueFolderPath", PROJECT_NAME_EHR));
Expand Down Expand Up @@ -253,8 +256,8 @@ protected void createProjectAndFolders(String type) throws IOException, CommandE
_userHelper.createUser(TEST_USER);
_userHelper.createUser(TEST_USER_2);
_containerHelper.createSubfolder(getProjectNameRSEHR(), getProjectNameRSEHRPublic(), "Collaboration");
_apiPermissionsHelper.setUserPermissions(TEST_USER, "Reader");
_apiPermissionsHelper.setUserPermissions(TEST_USER_2, "Reader");
_apiPermissionsHelper.setUserPermissions(TEST_USER, READER_ROLE);
_apiPermissionsHelper.setUserPermissions(TEST_USER_2, READER_ROLE);
createWiki("Information", "Information");


Expand Down