From e81af1dcebc00ae42144f57eccbc271035573ddc Mon Sep 17 00:00:00 2001 From: Binal Patel Date: Tue, 4 Mar 2025 15:02:07 -0800 Subject: [PATCH 1/2] Move 'Advanced Import Options' behind 'Deprecated' flag --- src/org/labkey/test/tests/AdvancedImportOptionsTest.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/org/labkey/test/tests/AdvancedImportOptionsTest.java b/src/org/labkey/test/tests/AdvancedImportOptionsTest.java index 4cd9775b1a..6e9c8877b8 100644 --- a/src/org/labkey/test/tests/AdvancedImportOptionsTest.java +++ b/src/org/labkey/test/tests/AdvancedImportOptionsTest.java @@ -72,6 +72,7 @@ public class AdvancedImportOptionsTest extends BaseWebDriverTest implements Post 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 public List getAssociatedModules() @@ -96,6 +97,7 @@ public static void doSetup() { AdvancedImportOptionsTest test = getCurrentTest(); test._studyDesignPreviouslyEnabled = OptionalFeatureHelper.enableOptionalFeature(test.createDefaultConnection(), "studyDesignFlag"); + test._advancedImportOptionsEnabled = OptionalFeatureHelper.enableOptionalFeature(test.createDefaultConnection(), "advancedImportFlag"); } @Override @@ -109,6 +111,9 @@ public void doCleanup(boolean afterTest) throws TestTimeoutException if (_studyDesignPreviouslyEnabled != null) OptionalFeatureHelper.setOptionalFeature(createDefaultConnection(), "studyDesignFlag", _studyDesignPreviouslyEnabled); + if (_advancedImportOptionsEnabled != null) + OptionalFeatureHelper.setOptionalFeature(createDefaultConnection(), "advancedImportFlag", false); + _userHelper.deleteUser(LIMITED_USER); } From dc83eb04cf2e9cb1bfd2c4b22cddc95287e37426 Mon Sep 17 00:00:00 2001 From: Binal Patel Date: Thu, 6 Mar 2025 13:34:03 -0800 Subject: [PATCH 2/2] Code review update : use the initial state --- src/org/labkey/test/tests/AdvancedImportOptionsTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/labkey/test/tests/AdvancedImportOptionsTest.java b/src/org/labkey/test/tests/AdvancedImportOptionsTest.java index 6e9c8877b8..3da5e53f96 100644 --- a/src/org/labkey/test/tests/AdvancedImportOptionsTest.java +++ b/src/org/labkey/test/tests/AdvancedImportOptionsTest.java @@ -112,7 +112,7 @@ public void doCleanup(boolean afterTest) throws TestTimeoutException OptionalFeatureHelper.setOptionalFeature(createDefaultConnection(), "studyDesignFlag", _studyDesignPreviouslyEnabled); if (_advancedImportOptionsEnabled != null) - OptionalFeatureHelper.setOptionalFeature(createDefaultConnection(), "advancedImportFlag", false); + OptionalFeatureHelper.setOptionalFeature(createDefaultConnection(), "advancedImportFlag", _advancedImportOptionsEnabled); _userHelper.deleteUser(LIMITED_USER); }