From a9a220ee71429473ef6f2c7055743a04aca0634d Mon Sep 17 00:00:00 2001 From: tpylak <tpylak> Date: Tue, 16 Aug 2011 21:29:39 +0000 Subject: [PATCH] mark slow screening tests SVN: 22512 --- .../ConvertToolImageTransformerTest.java | 2 +- .../server/graph/TabularDataHeatmapTest.java | 40 ++++++++++------- .../graph/TabularDataHistogramTest.java | 44 ++++++++++--------- .../graph/TabularDataScatterplotTest.java | 1 + .../resultset/PlateMetadataProviderTest.java | 2 +- .../screening/server/ScreeningServerTest.java | 2 +- 6 files changed, 52 insertions(+), 39 deletions(-) diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformerTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformerTest.java index 0918cfb41e7..070d7de5ec8 100644 --- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformerTest.java +++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformerTest.java @@ -35,7 +35,7 @@ public class ConvertToolImageTransformerTest extends AssertJUnit private final String CONVERT_PARAMS = " -contrast-stretch 0 -edge 1 -threshold 1 -transparent black "; - @Test + @Test(groups = "slow") public void testTransformation() { BufferedImage templateImage = readImage("pond.png"); diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHeatmapTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHeatmapTest.java index d6f80a39038..d5ed6298cc9 100644 --- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHeatmapTest.java +++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHeatmapTest.java @@ -26,6 +26,7 @@ import ch.systemsx.cisd.openbis.dss.generic.shared.utils.CodeAndLabelUtil; /** * @author Chandrasekhar Ramakrishnan */ +@Test(groups = "slow") public class TabularDataHeatmapTest extends AbstractTabularDataGraphTest { @Test @@ -35,7 +36,8 @@ public class TabularDataHeatmapTest extends AbstractTabularDataGraphTest TabularDataHeatmapConfiguration config = new TabularDataHeatmapConfiguration("Infection Index", - CodeAndLabelUtil.create("WellName"), CodeAndLabelUtil.create("InfectionIndex"), 300, 200); + CodeAndLabelUtil.create("WellName"), + CodeAndLabelUtil.create("InfectionIndex"), 300, 200); AbstractTabularDataGraph<TabularDataHeatmapConfiguration> graph = new TabularDataHeatmap(config, getTestDatasetFileLines(), getOutputStream(outputFile)); @@ -52,7 +54,8 @@ public class TabularDataHeatmapTest extends AbstractTabularDataGraphTest File outputFile = getImageOutputFile(); TabularDataHeatmapConfiguration config = - new TabularDataHeatmapConfiguration("Small Numbers", CodeAndLabelUtil.create("WellName"), + new TabularDataHeatmapConfiguration("Small Numbers", + CodeAndLabelUtil.create("WellName"), CodeAndLabelUtil.create("SmallNumbers"), 300, 200); AbstractTabularDataGraph<TabularDataHeatmapConfiguration> graph = new TabularDataHeatmap(config, getTestDatasetFileLines(), @@ -64,14 +67,15 @@ public class TabularDataHeatmapTest extends AbstractTabularDataGraphTest assertTrue(outputFile.length() > 0); } - @Test(groups = "slow") + @Test public void testBigNumberHeatmap() throws IOException { File outputFile = getImageOutputFile(); TabularDataHeatmapConfiguration config = - new TabularDataHeatmapConfiguration("Big Number", CodeAndLabelUtil.create("WellName"), - CodeAndLabelUtil.create("BigNumber"), 300, 200); + new TabularDataHeatmapConfiguration("Big Number", + CodeAndLabelUtil.create("WellName"), CodeAndLabelUtil.create("BigNumber"), + 300, 200); AbstractTabularDataGraph<TabularDataHeatmapConfiguration> graph = new TabularDataHeatmap(config, getTestDatasetFileLines(), getOutputStream(outputFile)); @@ -107,8 +111,9 @@ public class TabularDataHeatmapTest extends AbstractTabularDataGraphTest File outputFile = getImageOutputFile(); TabularDataHeatmapConfiguration config = - new TabularDataHeatmapConfiguration("Just NaN", CodeAndLabelUtil.create("WellName"), - CodeAndLabelUtil.create("JustNaN"), 300, 200); + new TabularDataHeatmapConfiguration("Just NaN", + CodeAndLabelUtil.create("WellName"), CodeAndLabelUtil.create("JustNaN"), + 300, 200); AbstractTabularDataGraph<TabularDataHeatmapConfiguration> graph = new TabularDataHeatmap(config, getTestDatasetFileLines(), getOutputStream(outputFile)); @@ -125,8 +130,9 @@ public class TabularDataHeatmapTest extends AbstractTabularDataGraphTest File outputFile = getImageOutputFile(); TabularDataHeatmapConfiguration config = - new TabularDataHeatmapConfiguration("Some NaN", CodeAndLabelUtil.create("WellName"), - CodeAndLabelUtil.create("SomeNaN"), 300, 200); + new TabularDataHeatmapConfiguration("Some NaN", + CodeAndLabelUtil.create("WellName"), CodeAndLabelUtil.create("SomeNaN"), + 300, 200); AbstractTabularDataGraph<TabularDataHeatmapConfiguration> graph = new TabularDataHeatmap(config, getTestDatasetFileLines(), getOutputStream(outputFile)); @@ -143,8 +149,9 @@ public class TabularDataHeatmapTest extends AbstractTabularDataGraphTest File outputFile = getImageOutputFile(); TabularDataHeatmapConfiguration config = - new TabularDataHeatmapConfiguration("Just Inf", CodeAndLabelUtil.create("WellName"), - CodeAndLabelUtil.create("JustInf"), 300, 200); + new TabularDataHeatmapConfiguration("Just Inf", + CodeAndLabelUtil.create("WellName"), CodeAndLabelUtil.create("JustInf"), + 300, 200); AbstractTabularDataGraph<TabularDataHeatmapConfiguration> graph = new TabularDataHeatmap(config, getTestDatasetFileLines(), getOutputStream(outputFile)); @@ -161,8 +168,9 @@ public class TabularDataHeatmapTest extends AbstractTabularDataGraphTest File outputFile = getImageOutputFile(); TabularDataHeatmapConfiguration config = - new TabularDataHeatmapConfiguration("Some Inf", CodeAndLabelUtil.create("WellName"), - CodeAndLabelUtil.create("SomeInf"), 300, 200); + new TabularDataHeatmapConfiguration("Some Inf", + CodeAndLabelUtil.create("WellName"), CodeAndLabelUtil.create("SomeInf"), + 300, 200); AbstractTabularDataGraph<TabularDataHeatmapConfiguration> graph = new TabularDataHeatmap(config, getTestDatasetFileLines(), getOutputStream(outputFile)); @@ -180,7 +188,8 @@ public class TabularDataHeatmapTest extends AbstractTabularDataGraphTest TabularDataHeatmapConfiguration config = new TabularDataHeatmapConfiguration("Blanks", CodeAndLabelUtil.create("WellRow"), - CodeAndLabelUtil.create("WellCol"), CodeAndLabelUtil.create("Blanks"), 300, 200); + CodeAndLabelUtil.create("WellCol"), CodeAndLabelUtil.create("Blanks"), 300, + 200); AbstractTabularDataGraph<TabularDataHeatmapConfiguration> graph = new TabularDataHeatmap(config, getTestDatasetFileLines(), getOutputStream(outputFile)); @@ -198,7 +207,8 @@ public class TabularDataHeatmapTest extends AbstractTabularDataGraphTest File outputFile = getImageOutputFile(); TabularDataHeatmapConfiguration config = - new TabularDataHeatmapConfiguration("Non-Existant", CodeAndLabelUtil.create("WellName"), + new TabularDataHeatmapConfiguration("Non-Existant", + CodeAndLabelUtil.create("WellName"), CodeAndLabelUtil.create("Non-Existant"), 300, 200); AbstractTabularDataGraph<TabularDataHeatmapConfiguration> graph = new TabularDataHeatmap(config, getTestDatasetFileLines(), diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHistogramTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHistogramTest.java index fab88d53637..6a58af2c5d2 100644 --- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHistogramTest.java +++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHistogramTest.java @@ -26,6 +26,7 @@ import ch.systemsx.cisd.openbis.dss.generic.shared.utils.CodeAndLabelUtil; /** * @author Chandrasekhar Ramakrishnan */ +@Test(groups = "slow") public class TabularDataHistogramTest extends AbstractTabularDataGraphTest { @Test @@ -34,8 +35,8 @@ public class TabularDataHistogramTest extends AbstractTabularDataGraphTest File outputFile = getImageOutputFile(); TabularDataHistogramConfiguration config = - new TabularDataHistogramConfiguration("Infected Cells", CodeAndLabelUtil.create( - "InfectedCells"), 300, 200, 6); + new TabularDataHistogramConfiguration("Infected Cells", + CodeAndLabelUtil.create("InfectedCells"), 300, 200, 6); AbstractTabularDataGraph<TabularDataHistogramConfiguration> graph = new TabularDataHistogram(config, getTestDatasetFileLines(), getOutputStream(outputFile)); @@ -52,8 +53,8 @@ public class TabularDataHistogramTest extends AbstractTabularDataGraphTest File outputFile = getImageOutputFile(); TabularDataHistogramConfiguration config = - new TabularDataHistogramConfiguration("Small Numbers", CodeAndLabelUtil.create( - "SmallNumbers"), 300, 200, 6); + new TabularDataHistogramConfiguration("Small Numbers", + CodeAndLabelUtil.create("SmallNumbers"), 300, 200, 6); AbstractTabularDataGraph<TabularDataHistogramConfiguration> graph = new TabularDataHistogram(config, getTestDatasetFileLines(), getOutputStream(outputFile)); @@ -70,8 +71,8 @@ public class TabularDataHistogramTest extends AbstractTabularDataGraphTest File outputFile = getImageOutputFile(); TabularDataHistogramConfiguration config = - new TabularDataHistogramConfiguration("Big Number", CodeAndLabelUtil.create("BigNumber"), - 300, 200, 6); + new TabularDataHistogramConfiguration("Big Number", + CodeAndLabelUtil.create("BigNumber"), 300, 200, 6); AbstractTabularDataGraph<TabularDataHistogramConfiguration> graph = new TabularDataHistogram(config, getTestDatasetFileLines(), getOutputStream(outputFile)); @@ -88,7 +89,8 @@ public class TabularDataHistogramTest extends AbstractTabularDataGraphTest File outputFile = getImageOutputFile(); TabularDataHistogramConfiguration config = - new TabularDataHistogramConfiguration("Zero", CodeAndLabelUtil.create("Zero"), 300, 200, 6); + new TabularDataHistogramConfiguration("Zero", CodeAndLabelUtil.create("Zero"), 300, + 200, 6); AbstractTabularDataGraph<TabularDataHistogramConfiguration> graph = new TabularDataHistogram(config, getTestDatasetFileLines(), getOutputStream(outputFile)); @@ -105,8 +107,8 @@ public class TabularDataHistogramTest extends AbstractTabularDataGraphTest File outputFile = getImageOutputFile(); TabularDataHistogramConfiguration config = - new TabularDataHistogramConfiguration("Just NaN", CodeAndLabelUtil.create("JustNaN"), 300, - 200, 6); + new TabularDataHistogramConfiguration("Just NaN", + CodeAndLabelUtil.create("JustNaN"), 300, 200, 6); AbstractTabularDataGraph<TabularDataHistogramConfiguration> graph = new TabularDataHistogram(config, getTestDatasetFileLines(), getOutputStream(outputFile)); @@ -123,8 +125,8 @@ public class TabularDataHistogramTest extends AbstractTabularDataGraphTest File outputFile = getImageOutputFile(); TabularDataHistogramConfiguration config = - new TabularDataHistogramConfiguration("Some NaN", CodeAndLabelUtil.create("SomeNaN"), 300, - 200, 6); + new TabularDataHistogramConfiguration("Some NaN", + CodeAndLabelUtil.create("SomeNaN"), 300, 200, 6); AbstractTabularDataGraph<TabularDataHistogramConfiguration> graph = new TabularDataHistogram(config, getTestDatasetFileLines(), getOutputStream(outputFile)); @@ -141,8 +143,8 @@ public class TabularDataHistogramTest extends AbstractTabularDataGraphTest File outputFile = getImageOutputFile(); TabularDataHistogramConfiguration config = - new TabularDataHistogramConfiguration("Just Inf", CodeAndLabelUtil.create("JustInf"), 300, - 200, 6); + new TabularDataHistogramConfiguration("Just Inf", + CodeAndLabelUtil.create("JustInf"), 300, 200, 6); AbstractTabularDataGraph<TabularDataHistogramConfiguration> graph = new TabularDataHistogram(config, getTestDatasetFileLines(), getOutputStream(outputFile)); @@ -159,8 +161,8 @@ public class TabularDataHistogramTest extends AbstractTabularDataGraphTest File outputFile = getImageOutputFile(); TabularDataHistogramConfiguration config = - new TabularDataHistogramConfiguration("Some Inf", CodeAndLabelUtil.create("SomeInf"), 300, - 200, 6); + new TabularDataHistogramConfiguration("Some Inf", + CodeAndLabelUtil.create("SomeInf"), 300, 200, 6); AbstractTabularDataGraph<TabularDataHistogramConfiguration> graph = new TabularDataHistogram(config, getTestDatasetFileLines(), getOutputStream(outputFile)); @@ -171,14 +173,14 @@ public class TabularDataHistogramTest extends AbstractTabularDataGraphTest assertTrue(outputFile.length() > 0); } - @Test(groups = "slow") + @Test public void testLotsOfBlanksHistogram() throws IOException { File outputFile = getImageOutputFile(); TabularDataHistogramConfiguration config = - new TabularDataHistogramConfiguration("Blanks", CodeAndLabelUtil.create("Blanks"), 300, - 200, 6); + new TabularDataHistogramConfiguration("Blanks", CodeAndLabelUtil.create("Blanks"), + 300, 200, 6); AbstractTabularDataGraph<TabularDataHistogramConfiguration> graph = new TabularDataHistogram(config, getTestDatasetFileLines(), getOutputStream(outputFile)); @@ -189,14 +191,14 @@ public class TabularDataHistogramTest extends AbstractTabularDataGraphTest assertTrue(outputFile.length() > 0); } - @Test(groups = "slow") + @Test public void testIncorrectlyConfiguredHistogram() throws IOException { File outputFile = getImageOutputFile(); TabularDataHistogramConfiguration config = - new TabularDataHistogramConfiguration("Test", CodeAndLabelUtil.create("Non-Existant"), - 300, 200, 6); + new TabularDataHistogramConfiguration("Test", + CodeAndLabelUtil.create("Non-Existant"), 300, 200, 6); AbstractTabularDataGraph<TabularDataHistogramConfiguration> graph = new TabularDataHistogram(config, getTestDatasetFileLines(), getOutputStream(outputFile)); diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataScatterplotTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataScatterplotTest.java index 6f211afa12f..4b3d613f4fe 100644 --- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataScatterplotTest.java +++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataScatterplotTest.java @@ -28,6 +28,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.CodeAndLabel; /** * @author Chandrasekhar Ramakrishnan */ +@Test(groups = "slow") public class TabularDataScatterplotTest extends AbstractTabularDataGraphTest { @Test diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/server/resultset/PlateMetadataProviderTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/server/resultset/PlateMetadataProviderTest.java index 57c82aa6b62..6f635506db9 100644 --- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/server/resultset/PlateMetadataProviderTest.java +++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/server/resultset/PlateMetadataProviderTest.java @@ -64,7 +64,7 @@ public class PlateMetadataProviderTest extends AbstractServerTestCase provider = new PlateMetadataProvider(service, SESSION_TOKEN, plateId); } - @Test + @Test(groups = "slow") public void test() { final WellMetadata wellMetadata = new WellMetadata(); diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningServerTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningServerTest.java index 3803f3441b4..6477f787c8c 100644 --- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningServerTest.java +++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningServerTest.java @@ -122,7 +122,7 @@ public class ScreeningServerTest extends AbstractServerTestCase assertEquals("{A=hello}", sample.getProperties().toString()); } - @Test + @Test(groups = "slow") public void testGetPlateSampleViaAugmentedCode() { prepareGetSession(); -- GitLab