Skip to content

Commit c796e28

Browse files
committed
Skip specimen import if specimen module isn't present
1 parent a584a02 commit c796e28

5 files changed

Lines changed: 5 additions & 10 deletions

File tree

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import org.labkey.test.Locator;
2222
import org.labkey.test.Locators;
2323
import org.labkey.test.TestTimeoutException;
24-
import org.labkey.test.categories.Daily;
2524
import org.labkey.test.categories.Specimen;
2625
import org.labkey.test.components.html.BootstrapMenu;
2726
import org.labkey.test.components.html.OptionSelect;
@@ -32,7 +31,7 @@
3231

3332
import java.io.File;
3433

35-
@Category({Daily.class, Specimen.class})
34+
@Category({Specimen.class})
3635
@BaseWebDriverTest.ClassTimeout(minutes = 8)
3736
public class AliquotTest extends SpecimenBaseTest
3837
{

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.labkey.test.BaseWebDriverTest;
2121
import org.labkey.test.Locator;
2222
import org.labkey.test.TestFileUtils;
23-
import org.labkey.test.categories.Daily;
2423
import org.labkey.test.categories.Specimen;
2524
import org.labkey.test.components.CustomizeView;
2625
import org.labkey.test.components.DomainDesignerPage;
@@ -38,7 +37,7 @@
3837
import java.util.Arrays;
3938
import java.util.List;
4039

41-
@Category({Daily.class, Specimen.class})
40+
@Category({Specimen.class})
4241
@BaseWebDriverTest.ClassTimeout(minutes = 7)
4342
public class SpecimenCustomizeTest extends SpecimenBaseTest
4443
{

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.labkey.test.Locator;
2121
import org.labkey.test.TestFileUtils;
2222
import org.labkey.test.TestTimeoutException;
23-
import org.labkey.test.categories.Daily;
2423
import org.labkey.test.categories.Specimen;
2524
import org.labkey.test.util.FileBrowserHelper;
2625
import org.labkey.test.util.LogMethod;
@@ -30,7 +29,7 @@
3029

3130
import static org.junit.Assert.assertTrue;
3231

33-
@Category({Daily.class, Specimen.class})
32+
@Category({Specimen.class})
3433
@BaseWebDriverTest.ClassTimeout(minutes = 6)
3534
public class SpecimenExportTest extends SpecimenBaseTest
3635
{

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,13 @@
1919
import org.junit.experimental.categories.Category;
2020
import org.labkey.test.BaseWebDriverTest;
2121
import org.labkey.test.Locator;
22-
import org.labkey.test.categories.Daily;
2322
import org.labkey.test.categories.Specimen;
2423
import org.labkey.test.util.LogMethod;
2524
import org.labkey.test.util.StudyHelper;
2625

2726
import java.io.File;
2827

29-
@Category({Daily.class, Specimen.class})
28+
@Category({Specimen.class})
3029
@BaseWebDriverTest.ClassTimeout(minutes = 6)
3130
public class SpecimenMultipleImportTest extends StudyBaseTest
3231
{

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.labkey.test.Locators;
2525
import org.labkey.test.TestTimeoutException;
2626
import org.labkey.test.WebTestHelper;
27-
import org.labkey.test.categories.Daily;
2827
import org.labkey.test.categories.Specimen;
2928
import org.labkey.test.components.CustomizeView;
3029
import org.labkey.test.components.dumbster.EmailRecordTable;
@@ -59,7 +58,7 @@
5958
import static org.labkey.test.pages.study.specimen.ManageNotificationsPage.SpecimensAttachment;
6059
import static org.labkey.test.util.DataRegionTable.DataRegion;
6160

62-
@Category({Daily.class, Specimen.class})
61+
@Category({Specimen.class})
6362
@BaseWebDriverTest.ClassTimeout(minutes = 20)
6463
public class SpecimenTest extends SpecimenBaseTest
6564
{

0 commit comments

Comments
 (0)