From ebccd2727bbdbf7bd32b014c0a98a5975b32a6d7 Mon Sep 17 00:00:00 2001 From: Lum Date: Tue, 20 May 2025 14:27:41 -0700 Subject: [PATCH] remove deprecated feature flag, update/fix tests --- .../test/tests/AdvancedImportOptionsTest.java | 4 ---- src/org/labkey/test/util/StudyHelper.java | 13 ++++++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/org/labkey/test/tests/AdvancedImportOptionsTest.java b/src/org/labkey/test/tests/AdvancedImportOptionsTest.java index 3da5e53f96..1e634a017f 100644 --- a/src/org/labkey/test/tests/AdvancedImportOptionsTest.java +++ b/src/org/labkey/test/tests/AdvancedImportOptionsTest.java @@ -71,7 +71,6 @@ public class AdvancedImportOptionsTest extends BaseWebDriverTest implements Post private static final boolean EXPECTED_IMPORT_ERRORS = false; private static final int EXPECTED_COMPLETED_IMPORT_JOBS = 1; private static final int EXPECTED_COMPLETED_MULTI_FOLDER_JOBS = 2; - private Boolean _studyDesignPreviouslyEnabled; private Boolean _advancedImportOptionsEnabled; @Override @@ -96,7 +95,6 @@ protected BrowserType bestBrowser() public static void doSetup() { AdvancedImportOptionsTest test = getCurrentTest(); - test._studyDesignPreviouslyEnabled = OptionalFeatureHelper.enableOptionalFeature(test.createDefaultConnection(), "studyDesignFlag"); test._advancedImportOptionsEnabled = OptionalFeatureHelper.enableOptionalFeature(test.createDefaultConnection(), "advancedImportFlag"); } @@ -108,8 +106,6 @@ public void doCleanup(boolean afterTest) throws TestTimeoutException _containerHelper.deleteProject(IMPORT_PROJECT_FILE02, false); _containerHelper.deleteProject(IMPORT_PROJECT_FILE03, false); _containerHelper.deleteProject(IMPORT_PROJECT_MULTI, false); - if (_studyDesignPreviouslyEnabled != null) - OptionalFeatureHelper.setOptionalFeature(createDefaultConnection(), "studyDesignFlag", _studyDesignPreviouslyEnabled); if (_advancedImportOptionsEnabled != null) OptionalFeatureHelper.setOptionalFeature(createDefaultConnection(), "advancedImportFlag", _advancedImportOptionsEnabled); diff --git a/src/org/labkey/test/util/StudyHelper.java b/src/org/labkey/test/util/StudyHelper.java index 82e25ee627..d6fd05a75f 100644 --- a/src/org/labkey/test/util/StudyHelper.java +++ b/src/org/labkey/test/util/StudyHelper.java @@ -561,15 +561,18 @@ public void setupRepositoryType(boolean advanced, boolean editable, boolean requ public boolean isSpecimenModulePresent() { if (null == _specimenModulePresent) - { - AbstractContainerHelper containerHelper = new APIContainerHelper(_test); - Set allModules = containerHelper.getAllModules(); - _specimenModulePresent = allModules.contains("specimen"); - } + _specimenModulePresent = isModulePresent("specimen"); return _specimenModulePresent; } + public boolean isModulePresent(String moduleName) + { + AbstractContainerHelper containerHelper = new APIContainerHelper(_test); + Set allModules = containerHelper.getAllModules(); + return allModules.contains(moduleName); + } + public boolean isSpecimenModuleActive() { if (!isSpecimenModulePresent())