Skip specimen import if specimen module isn't present

Author: labkey-tchad

src/org/labkey/test/tests/StudyBaseTest.java

@@ -58,6 +58,8 @@
 public abstract class StudyBaseTest extends BaseWebDriverTest
 {
     protected static final File ARCHIVE_TEMP_DIR = StudyHelper.getStudyTempDir();
+    private static Boolean _specimenModulePresent;
+
     protected int datasetCount = getDatasetCount();
     protected int visitCount = 65;
 
@@ -74,6 +76,14 @@ protected void setupRequestStatuses()
         new SpecimenHelper(this).setupRequestStatuses();
     }
 
+    public boolean isSpecimenModulePresent()
+    {
+        if (null == _specimenModulePresent)
+            _specimenModulePresent = _containerHelper.getAllModules().contains("specimen");
+
+        return _specimenModulePresent;
+    }
+
     protected final AuditLogHelper _auditLogHelper = new AuditLogHelper(this);
 
     @Override
@@ -130,13 +140,19 @@ protected void startSpecimenImport(int completeJobsExpected)
 
     protected void startSpecimenImport(int completeJobsExpected, File specimenArchive)
     {
-        _specimenImporter = new SpecimenImporter(new File(StudyHelper.getStudySubfolderPath()), specimenArchive, ARCHIVE_TEMP_DIR, getFolderName(), completeJobsExpected);
-        _specimenImporter.startImport();
+        if (isSpecimenModulePresent())
+        {
+            _specimenImporter = new SpecimenImporter(new File(StudyHelper.getStudySubfolderPath()), specimenArchive, ARCHIVE_TEMP_DIR, getFolderName(), completeJobsExpected);
+            _specimenImporter.startImport();
+        }
     }
 
     protected void waitForSpecimenImport()
     {
-        _specimenImporter.waitForComplete();
+        if (isSpecimenModulePresent())
+        {
+            _specimenImporter.waitForComplete();
+        }
     }
 
     protected void setExpectSpecimenImportError(boolean expected)