From 36d724214336300b25392735135ce1479106b29c Mon Sep 17 00:00:00 2001
From: labkey-danield <danield@labkey.com>
Date: Mon, 22 Jun 2026 09:53:02 -0700
Subject: [PATCH 1/3] Add the path.

---
 .../labkey/test/tests/SampleTypeFolderExportImportTest.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/org/labkey/test/tests/SampleTypeFolderExportImportTest.java b/src/org/labkey/test/tests/SampleTypeFolderExportImportTest.java
index f5db3b2f19..01200199e9 100644
--- a/src/org/labkey/test/tests/SampleTypeFolderExportImportTest.java
+++ b/src/org/labkey/test/tests/SampleTypeFolderExportImportTest.java
@@ -47,6 +47,7 @@
 import org.labkey.test.util.DataRegionTable;
 import org.labkey.test.util.EscapeUtil;
 import org.labkey.test.util.LogMethod;
+import org.labkey.test.util.OptionalFeatureHelper;
 import org.labkey.test.util.PortalHelper;
 import org.labkey.test.util.SampleTypeHelper;
 import org.labkey.test.util.TestDataGenerator;
@@ -119,6 +120,8 @@ private void doSetup()
         portalHelper.addWebPart("Sample Types");
         portalHelper.addWebPart("Experiment Runs");
 
+        OptionalFeatureHelper.setOptionalFeature(createDefaultConnection(), "deriveSamplesNotInApp", true);
+
     }
 
     protected boolean areDataListEqual(List<Map<String, String>> list01, List<Map<String, String>> list02)

From 74b61132418b379cbc9738d880dd22eadc17563f Mon Sep 17 00:00:00 2001
From: labkey-danield <danield@labkey.com>
Date: Mon, 22 Jun 2026 11:34:43 -0700
Subject: [PATCH 2/3] Make sure to reset the feature on exit.

---
 .../SampleTypeFolderExportImportTest.java     | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/org/labkey/test/tests/SampleTypeFolderExportImportTest.java b/src/org/labkey/test/tests/SampleTypeFolderExportImportTest.java
index 01200199e9..1dab0e6e9b 100644
--- a/src/org/labkey/test/tests/SampleTypeFolderExportImportTest.java
+++ b/src/org/labkey/test/tests/SampleTypeFolderExportImportTest.java
@@ -99,13 +99,28 @@ public BrowserType bestBrowser()
         return BrowserType.CHROME;
     }
 
-    @BeforeClass
-    public static void setupProject()
+    @Override
+    protected void doCleanup(boolean afterTest)
     {
-        SampleTypeFolderExportImportTest init = getCurrentTest();
-        init.doSetup();
+        super.doCleanup(afterTest);
+        if (afterTest)
+        {
+            OptionalFeatureHelper.resetOptionalFeature(createDefaultConnection(), "deriveSamplesNotInApp");
+        }
+        else {
+            OptionalFeatureHelper.setOptionalFeature(createDefaultConnection(), "deriveSamplesNotInApp", true);
+            SampleTypeFolderExportImportTest init = getCurrentTest();
+            init.doSetup();
+        }
     }
 
+//    @BeforeClass
+//    public static void setupProject()
+//    {
+//        SampleTypeFolderExportImportTest init = getCurrentTest();
+//        init.doSetup();
+//    }
+
     private void doSetup()
     {
         // Delete the import project if it exists.
@@ -120,8 +135,6 @@ private void doSetup()
         portalHelper.addWebPart("Sample Types");
         portalHelper.addWebPart("Experiment Runs");
 
-        OptionalFeatureHelper.setOptionalFeature(createDefaultConnection(), "deriveSamplesNotInApp", true);
-
     }
 
     protected boolean areDataListEqual(List<Map<String, String>> list01, List<Map<String, String>> list02)

From cb87bf644a29d9c67efcbef1d8c2c98f8b03ed69 Mon Sep 17 00:00:00 2001
From: labkey-danield <danield@labkey.com>
Date: Mon, 22 Jun 2026 11:38:48 -0700
Subject: [PATCH 3/3] Remove code that was commented out.

---
 .../test/tests/SampleTypeFolderExportImportTest.java       | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/org/labkey/test/tests/SampleTypeFolderExportImportTest.java b/src/org/labkey/test/tests/SampleTypeFolderExportImportTest.java
index 1dab0e6e9b..7ac1b49ff6 100644
--- a/src/org/labkey/test/tests/SampleTypeFolderExportImportTest.java
+++ b/src/org/labkey/test/tests/SampleTypeFolderExportImportTest.java
@@ -114,13 +114,6 @@ protected void doCleanup(boolean afterTest)
         }
     }
 
-//    @BeforeClass
-//    public static void setupProject()
-//    {
-//        SampleTypeFolderExportImportTest init = getCurrentTest();
-//        init.doSetup();
-//    }
-
     private void doSetup()
     {
         // Delete the import project if it exists.