From c933af096bc0fc89c4db1a38ab46af3f9f3fea85 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Tue, 24 Feb 2009 12:16:15 +0000
Subject: [PATCH] LMS-761 Bug in ETLServiceTest fixed
SVN: 9946
---
.../generic/server/ETLServiceTest.java | 21 +++++++++++--------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceTest.java
index 3c0964ad1a2..b7e4af6d338 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceTest.java
@@ -403,24 +403,27 @@ public class ETLServiceTest extends AbstractServerTestCase
public void testRegisterDataSetForExistingProcedure()
{
final SampleIdentifier sampleIdentifier =
- new SampleIdentifier(new DatabaseInstanceIdentifier("db"), "s1");
+ new SampleIdentifier(new DatabaseInstanceIdentifier("db"), "s1");
final ExperimentPE experiment = createExperiment("TYPE", "EXP1", "G1");
String procedureTypeCode = DATA_ACQUISITION.getCode();
- prepareTryToLoadSample(sampleIdentifier, createSampleWithExperiment(procedureTypeCode, experiment));
- final ProcedurePE procedure = new ProcedurePE();
+ SamplePE sample = createSampleWithExperiment(procedureTypeCode, experiment);
+ prepareTryToLoadSample(sampleIdentifier, sample);
final ExternalData externalData = new ExternalData();
externalData.setCode("dc");
- prepareRegisterDataSet(sampleIdentifier, procedure, SourceType.MEASUREMENT, externalData);
-
- createService().registerDataSet(SESSION_TOKEN, sampleIdentifier, procedureTypeCode, externalData);
-
+ prepareRegisterDataSet(sampleIdentifier, sample.getValidProcedure(),
+ SourceType.MEASUREMENT, externalData);
+
+ createService().registerDataSet(SESSION_TOKEN, sampleIdentifier, procedureTypeCode,
+ externalData);
+
context.assertIsSatisfied();
}
-
+
+ @Test
public void testRegisterDataSetAndCreatingProcedureOnTheFly()
{
final SampleIdentifier sampleIdentifier =
- new SampleIdentifier(new DatabaseInstanceIdentifier("db"), "s1");
+ new SampleIdentifier(new DatabaseInstanceIdentifier("db"), "s1");
final ExperimentPE experiment = createExperiment("TYPE", "EXP1", "G1");
prepareTryToLoadSample(sampleIdentifier, createSampleWithExperiment("PTYPE", experiment));
final String newProcedureType = "unknown";
--
GitLab