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 1ade8a85e99429cbe048800952c4d87225b10439..b5fc33a37fb0eb56b91af13d48a26ea3531c07ce 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("PROTEIN_QUANTIFICATIONS"); + private static final DataSetType DATA_SET_TYPE = new DataSetType("METABOLITE_INTENSITIES"); @Test public void testSimpleTransaction() throws IOException @@ -42,7 +42,7 @@ public class MetabolomicsDataSetRegistratorTest extends AbstractBaSynthecDataSet setUpHomeDataBaseExpectations(); Properties properties = createThreadProperties(); createHandler(properties, false, true); - createData("Proteomics-Example.xlsx"); + createData("Metabolomics-Example.xlsx"); final RecordingMatcher<ch.systemsx.cisd.openbis.generic.shared.dto.AtomicEntityOperationDetails> atomicOperationDetails = setUpDataSetRegistrationExpectations(DATA_SET_TYPE, TSV_DATA_SET_TYPE); @@ -52,9 +52,9 @@ public class MetabolomicsDataSetRegistratorTest extends AbstractBaSynthecDataSet assertEquals(3, atomicOperationDetails.recordedObject().getDataSetRegistrations().size()); checkDataTypeProperty(atomicOperationDetails.recordedObject().getDataSetRegistrations() - .get(1), "PROTEIN_QUANTIFICATIONS"); + .get(1), "METABOLITE_INTENSITIES"); checkDataTypeProperty(atomicOperationDetails.recordedObject().getDataSetRegistrations() - .get(2), "PROTEIN_QUANTIFICATIONS"); + .get(2), "METABOLITE_INTENSITIES"); NewExternalData dataSet = atomicOperationDetails.recordedObject().getDataSetRegistrations().get(0); @@ -68,13 +68,13 @@ public class MetabolomicsDataSetRegistratorTest extends AbstractBaSynthecDataSet assertNotNull(strainProperty); assert null != strainProperty; - assertEquals("JJS-MGP90", strainProperty.getValue()); + assertEquals("CHASSIS 1", strainProperty.getValue()); context.assertIsSatisfied(); } @Override protected String getRegistrationScriptsFolderPath() { - return "dist/etc/proteomics/"; + return "dist/etc/metabolomics/"; } } 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 38e476a75416f6398f1ec372630eb30e9d3d6f87..764063449f68b59b29efcfa7cd087258aeb3f1d0 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 @@ -34,7 +34,8 @@ import eu.basynthec.cisd.dss.AbstractBaSynthecDataSetRegistratorTest; */ public class ProteomicsDataSetRegistratorTest extends AbstractBaSynthecDataSetRegistratorTest { - private static final DataSetType DATA_SET_TYPE = new DataSetType("METABOLITE_INTENSITIES"); + + private static final DataSetType DATA_SET_TYPE = new DataSetType("PROTEIN_QUANTIFICATIONS"); @Test public void testSimpleTransaction() throws IOException @@ -42,7 +43,7 @@ public class ProteomicsDataSetRegistratorTest extends AbstractBaSynthecDataSetRe setUpHomeDataBaseExpectations(); Properties properties = createThreadProperties(); createHandler(properties, false, true); - createData("Metabolomics-Example.xlsx"); + createData("Proteomics-Example.xlsx"); final RecordingMatcher<ch.systemsx.cisd.openbis.generic.shared.dto.AtomicEntityOperationDetails> atomicOperationDetails = setUpDataSetRegistrationExpectations(DATA_SET_TYPE, TSV_DATA_SET_TYPE); @@ -52,9 +53,9 @@ public class ProteomicsDataSetRegistratorTest extends AbstractBaSynthecDataSetRe assertEquals(3, atomicOperationDetails.recordedObject().getDataSetRegistrations().size()); checkDataTypeProperty(atomicOperationDetails.recordedObject().getDataSetRegistrations() - .get(1), "METABOLITE_INTENSITIES"); + .get(1), "PROTEIN_QUANTIFICATIONS"); checkDataTypeProperty(atomicOperationDetails.recordedObject().getDataSetRegistrations() - .get(2), "METABOLITE_INTENSITIES"); + .get(2), "PROTEIN_QUANTIFICATIONS"); NewExternalData dataSet = atomicOperationDetails.recordedObject().getDataSetRegistrations().get(0); @@ -68,13 +69,13 @@ public class ProteomicsDataSetRegistratorTest extends AbstractBaSynthecDataSetRe assertNotNull(strainProperty); assert null != strainProperty; - assertEquals("CHASSIS 1", strainProperty.getValue()); + assertEquals("JJS-MGP90", strainProperty.getValue()); context.assertIsSatisfied(); } @Override protected String getRegistrationScriptsFolderPath() { - return "dist/etc/metabolomics/"; + return "dist/etc/proteomics/"; } }