From a7f651a89edf01be187d65a9ac99ecde6e2b2a71 Mon Sep 17 00:00:00 2001
From: jakubs <jakubs>
Date: Tue, 15 May 2012 16:07:58 +0000
Subject: [PATCH] SP-45, BIS-21 refactor jython dropboxes tests
SVN: 25267
---
eu_basynthec/.project | 11 +++++++++++
.../dss/AbstractBaSynthecDataSetRegistratorTest.java | 4 ----
.../growthprofiles/OD600DataSetRegistratorTest.java | 6 +++---
.../MetabolomicsDataSetRegistrator2Test.java | 6 +++---
.../MetabolomicsDataSetRegistratorTest.java | 6 +++---
.../proteomics/ProteomicsDataSetRegistratorTest.java | 6 +++---
.../TranscriptomicsDataSetRegistratorTest.java | 6 +++---
7 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/eu_basynthec/.project b/eu_basynthec/.project
index 8b12995c364..5c1634e8166 100644
--- a/eu_basynthec/.project
+++ b/eu_basynthec/.project
@@ -20,4 +20,15 @@
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.python.pydev.pythonNature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1332321366607</id>
+ <name></name>
+ <type>26</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-name-matches-true-false-.git</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/eu_basynthec/sourceTest/java/eu/basynthec/cisd/dss/AbstractBaSynthecDataSetRegistratorTest.java b/eu_basynthec/sourceTest/java/eu/basynthec/cisd/dss/AbstractBaSynthecDataSetRegistratorTest.java
index cd653d36dfb..da82af7c287 100644
--- a/eu_basynthec/sourceTest/java/eu/basynthec/cisd/dss/AbstractBaSynthecDataSetRegistratorTest.java
+++ b/eu_basynthec/sourceTest/java/eu/basynthec/cisd/dss/AbstractBaSynthecDataSetRegistratorTest.java
@@ -48,10 +48,6 @@ public abstract class AbstractBaSynthecDataSetRegistratorTest extends
protected static final String STRAIN_NAMES_PROP = "STRAIN_NAMES";
- protected static final String DATA_SET_CODE = "data-set-code";
-
- private static final String EXPERIMENT_IDENTIFIER = "/TEST/TEST/TEST";
-
protected static final DataSetType TSV_MULTISTRAIN_EXPORT_DATA_SET_TYPE = new DataSetType(
"TSV_MULTISTRAIN_EXPORT");
diff --git a/eu_basynthec/sourceTest/java/eu/basynthec/cisd/dss/growthprofiles/OD600DataSetRegistratorTest.java b/eu_basynthec/sourceTest/java/eu/basynthec/cisd/dss/growthprofiles/OD600DataSetRegistratorTest.java
index 362cfa53240..45d64939911 100644
--- a/eu_basynthec/sourceTest/java/eu/basynthec/cisd/dss/growthprofiles/OD600DataSetRegistratorTest.java
+++ b/eu_basynthec/sourceTest/java/eu/basynthec/cisd/dss/growthprofiles/OD600DataSetRegistratorTest.java
@@ -37,7 +37,7 @@ import eu.basynthec.cisd.dss.AbstractBaSynthecDataSetRegistratorTest;
*/
public class OD600DataSetRegistratorTest extends AbstractBaSynthecDataSetRegistratorTest
{
- private static final DataSetType DATA_SET_TYPE = new DataSetType("OD600");
+ private static final DataSetType OD600 = new DataSetType("OD600");
@Test
public void testSimpleTransaction() throws IOException
@@ -48,7 +48,7 @@ public class OD600DataSetRegistratorTest extends AbstractBaSynthecDataSetRegistr
createData("OD600-Example.xlsx");
final RecordingMatcher<ch.systemsx.cisd.openbis.generic.shared.dto.AtomicEntityOperationDetails> atomicOperationDetails =
- setUpDataSetRegistrationExpectations(DATA_SET_TYPE,
+ setUpDataSetRegistrationExpectations(OD600,
TSV_MULTISTRAIN_EXPORT_DATA_SET_TYPE);
handler.handle(markerFile);
@@ -66,7 +66,7 @@ public class OD600DataSetRegistratorTest extends AbstractBaSynthecDataSetRegistr
atomicOperationDetails.recordedObject().getDataSetRegistrations().get(0);
assertEquals(DATA_SET_CODE, dataSet.getCode());
- assertEquals(DATA_SET_TYPE, dataSet.getDataSetType());
+ assertEquals(OD600, dataSet.getDataSetType());
HashMap<String, NewProperty> propertyMap =
getDataSetPropertiesMap(dataSet.getDataSetProperties());
diff --git a/eu_basynthec/sourceTest/java/eu/basynthec/cisd/dss/metabolomics/MetabolomicsDataSetRegistrator2Test.java b/eu_basynthec/sourceTest/java/eu/basynthec/cisd/dss/metabolomics/MetabolomicsDataSetRegistrator2Test.java
index 0a97ab76ddd..7fbdaf8a3a8 100644
--- a/eu_basynthec/sourceTest/java/eu/basynthec/cisd/dss/metabolomics/MetabolomicsDataSetRegistrator2Test.java
+++ b/eu_basynthec/sourceTest/java/eu/basynthec/cisd/dss/metabolomics/MetabolomicsDataSetRegistrator2Test.java
@@ -34,7 +34,7 @@ import eu.basynthec.cisd.dss.AbstractBaSynthecDataSetRegistratorTest;
*/
public class MetabolomicsDataSetRegistrator2Test extends AbstractBaSynthecDataSetRegistratorTest
{
- private static final DataSetType DATA_SET_TYPE = new DataSetType(
+ private static final DataSetType METABOLITE_INTENSITIES_GROUPED = new DataSetType(
"METABOLITE_INTENSITIES_GROUPED");
@Test
@@ -46,7 +46,7 @@ public class MetabolomicsDataSetRegistrator2Test extends AbstractBaSynthecDataSe
createData("Metabolomics-Example.xlsx");
final RecordingMatcher<ch.systemsx.cisd.openbis.generic.shared.dto.AtomicEntityOperationDetails> atomicOperationDetails =
- setUpDataSetRegistrationExpectations(DATA_SET_TYPE, TSV_DATA_SET_TYPE);
+ setUpDataSetRegistrationExpectations(METABOLITE_INTENSITIES_GROUPED, TSV_DATA_SET_TYPE);
handler.handle(markerFile);
@@ -61,7 +61,7 @@ public class MetabolomicsDataSetRegistrator2Test extends AbstractBaSynthecDataSe
atomicOperationDetails.recordedObject().getDataSetRegistrations().get(0);
assertEquals(DATA_SET_CODE, dataSet.getCode());
- assertEquals(DATA_SET_TYPE, dataSet.getDataSetType());
+ assertEquals(METABOLITE_INTENSITIES_GROUPED, dataSet.getDataSetType());
HashMap<String, NewProperty> propertyMap =
getDataSetPropertiesMap(dataSet.getDataSetProperties());
diff --git a/eu_basynthec/sourceTest/java/eu/basynthec/cisd/dss/metabolomics/MetabolomicsDataSetRegistratorTest.java b/eu_basynthec/sourceTest/java/eu/basynthec/cisd/dss/metabolomics/MetabolomicsDataSetRegistratorTest.java
index d4920ee63f4..b6eb0eeaee6 100644
--- a/eu_basynthec/sourceTest/java/eu/basynthec/cisd/dss/metabolomics/MetabolomicsDataSetRegistratorTest.java
+++ b/eu_basynthec/sourceTest/java/eu/basynthec/cisd/dss/metabolomics/MetabolomicsDataSetRegistratorTest.java
@@ -34,7 +34,7 @@ import eu.basynthec.cisd.dss.AbstractBaSynthecDataSetRegistratorTest;
*/
public class MetabolomicsDataSetRegistratorTest extends AbstractBaSynthecDataSetRegistratorTest
{
- private static final DataSetType DATA_SET_TYPE = new DataSetType("METABOLITE_INTENSITIES");
+ private static final DataSetType METABOLITE_INTENSITIES = new DataSetType("METABOLITE_INTENSITIES");
@Test
public void testSimpleTransaction() throws IOException
@@ -45,7 +45,7 @@ public class MetabolomicsDataSetRegistratorTest extends AbstractBaSynthecDataSet
createData("Metabolomics1-Example.xlsx");
final RecordingMatcher<ch.systemsx.cisd.openbis.generic.shared.dto.AtomicEntityOperationDetails> atomicOperationDetails =
- setUpDataSetRegistrationExpectations(DATA_SET_TYPE, TSV_DATA_SET_TYPE);
+ setUpDataSetRegistrationExpectations(METABOLITE_INTENSITIES, TSV_DATA_SET_TYPE);
handler.handle(markerFile);
@@ -60,7 +60,7 @@ public class MetabolomicsDataSetRegistratorTest extends AbstractBaSynthecDataSet
atomicOperationDetails.recordedObject().getDataSetRegistrations().get(0);
assertEquals(DATA_SET_CODE, dataSet.getCode());
- assertEquals(DATA_SET_TYPE, dataSet.getDataSetType());
+ assertEquals(METABOLITE_INTENSITIES, dataSet.getDataSetType());
HashMap<String, NewProperty> propertyMap =
getDataSetPropertiesMap(dataSet.getDataSetProperties());
diff --git a/eu_basynthec/sourceTest/java/eu/basynthec/cisd/dss/proteomics/ProteomicsDataSetRegistratorTest.java b/eu_basynthec/sourceTest/java/eu/basynthec/cisd/dss/proteomics/ProteomicsDataSetRegistratorTest.java
index 764063449f6..db27cbc2a09 100644
--- a/eu_basynthec/sourceTest/java/eu/basynthec/cisd/dss/proteomics/ProteomicsDataSetRegistratorTest.java
+++ b/eu_basynthec/sourceTest/java/eu/basynthec/cisd/dss/proteomics/ProteomicsDataSetRegistratorTest.java
@@ -35,7 +35,7 @@ import eu.basynthec.cisd.dss.AbstractBaSynthecDataSetRegistratorTest;
public class ProteomicsDataSetRegistratorTest extends AbstractBaSynthecDataSetRegistratorTest
{
- private static final DataSetType DATA_SET_TYPE = new DataSetType("PROTEIN_QUANTIFICATIONS");
+ private static final DataSetType PROTEIN_QUANTIFICATIONS = new DataSetType("PROTEIN_QUANTIFICATIONS");
@Test
public void testSimpleTransaction() throws IOException
@@ -46,7 +46,7 @@ public class ProteomicsDataSetRegistratorTest extends AbstractBaSynthecDataSetRe
createData("Proteomics-Example.xlsx");
final RecordingMatcher<ch.systemsx.cisd.openbis.generic.shared.dto.AtomicEntityOperationDetails> atomicOperationDetails =
- setUpDataSetRegistrationExpectations(DATA_SET_TYPE, TSV_DATA_SET_TYPE);
+ setUpDataSetRegistrationExpectations(PROTEIN_QUANTIFICATIONS, TSV_DATA_SET_TYPE);
handler.handle(markerFile);
@@ -61,7 +61,7 @@ public class ProteomicsDataSetRegistratorTest extends AbstractBaSynthecDataSetRe
atomicOperationDetails.recordedObject().getDataSetRegistrations().get(0);
assertEquals(DATA_SET_CODE, dataSet.getCode());
- assertEquals(DATA_SET_TYPE, dataSet.getDataSetType());
+ assertEquals(PROTEIN_QUANTIFICATIONS, dataSet.getDataSetType());
HashMap<String, NewProperty> propertyMap =
getDataSetPropertiesMap(dataSet.getDataSetProperties());
diff --git a/eu_basynthec/sourceTest/java/eu/basynthec/cisd/dss/transcriptomics/TranscriptomicsDataSetRegistratorTest.java b/eu_basynthec/sourceTest/java/eu/basynthec/cisd/dss/transcriptomics/TranscriptomicsDataSetRegistratorTest.java
index e1019cba5e5..ed6b8f3ff3a 100644
--- a/eu_basynthec/sourceTest/java/eu/basynthec/cisd/dss/transcriptomics/TranscriptomicsDataSetRegistratorTest.java
+++ b/eu_basynthec/sourceTest/java/eu/basynthec/cisd/dss/transcriptomics/TranscriptomicsDataSetRegistratorTest.java
@@ -37,7 +37,7 @@ import eu.basynthec.cisd.dss.AbstractBaSynthecDataSetRegistratorTest;
*/
public class TranscriptomicsDataSetRegistratorTest extends AbstractBaSynthecDataSetRegistratorTest
{
- private static final DataSetType DATA_SET_TYPE = new DataSetType("TRANSCRIPTOMICS");
+ private static final DataSetType TRANSCRIPTOMICS = new DataSetType("TRANSCRIPTOMICS");
@Test
public void testSimpleTransaction() throws IOException
@@ -48,7 +48,7 @@ public class TranscriptomicsDataSetRegistratorTest extends AbstractBaSynthecData
createData("Transcriptomics-Example.xlsx");
final RecordingMatcher<ch.systemsx.cisd.openbis.generic.shared.dto.AtomicEntityOperationDetails> atomicOperationDetails =
- setUpDataSetRegistrationExpectations(DATA_SET_TYPE,
+ setUpDataSetRegistrationExpectations(TRANSCRIPTOMICS,
TSV_MULTISTRAIN_EXPORT_DATA_SET_TYPE);
handler.handle(markerFile);
@@ -66,7 +66,7 @@ public class TranscriptomicsDataSetRegistratorTest extends AbstractBaSynthecData
atomicOperationDetails.recordedObject().getDataSetRegistrations().get(0);
assertEquals(DATA_SET_CODE, dataSet.getCode());
- assertEquals(DATA_SET_TYPE, dataSet.getDataSetType());
+ assertEquals(TRANSCRIPTOMICS, dataSet.getDataSetType());
HashMap<String, NewProperty> propertyMap =
getDataSetPropertiesMap(dataSet.getDataSetProperties());
--
GitLab