From 51b57f4d7e38f4f0095c88ec3a2a37a49a880ecc Mon Sep 17 00:00:00 2001
From: jakubs <jakubs>
Date: Mon, 10 Sep 2012 12:47:19 +0000
Subject: [PATCH] BIS-172 add testcase to check that service conversation
doesnt die with long validation process
SVN: 26569
---
.../drop-boxes/rich-test/data-set-handler.py | 4 ++--
.../FeatureRichDataSetImportSystemTest.java | 17 ++++++++++++-----
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/datastore_server/sourceTest/core-plugins/generic-test/1/dss/drop-boxes/rich-test/data-set-handler.py b/datastore_server/sourceTest/core-plugins/generic-test/1/dss/drop-boxes/rich-test/data-set-handler.py
index 45742fe10a3..2bdfdd46e3b 100644
--- a/datastore_server/sourceTest/core-plugins/generic-test/1/dss/drop-boxes/rich-test/data-set-handler.py
+++ b/datastore_server/sourceTest/core-plugins/generic-test/1/dss/drop-boxes/rich-test/data-set-handler.py
@@ -40,8 +40,8 @@ def create_experiment_if_needed(transaction):
return exp
def createMaterials(transaction):
- for x in range(0,100):
- mat = transaction.createNewMaterial("RM_%d" % x, "GENE")
+ for x in range(0,60):
+ mat = transaction.createNewMaterial("RM_%d" % x, "SLOW_GENE")
mat.setPropertyValue("GENE_SYMBOL", "RM_%d_S" %x)
def createSamples(transaction):
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/FeatureRichDataSetImportSystemTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/FeatureRichDataSetImportSystemTest.java
index 9f477b42763..87e87f85eae 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/FeatureRichDataSetImportSystemTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/FeatureRichDataSetImportSystemTest.java
@@ -49,6 +49,12 @@ public class FeatureRichDataSetImportSystemTest extends SystemTestCase
return new File(rootDir, "incoming-rich-test");
}
+ @Override
+ protected int dataSetImportWaitDurationInSeconds()
+ {
+ return 280;
+ }
+
@Test
public void testRichImport() throws Exception
{
@@ -66,7 +72,7 @@ public class FeatureRichDataSetImportSystemTest extends SystemTestCase
assertLinkedDataSetImported(openBISService);
- assert100MaterialsCreated(openBISService);
+ assertMaterialsCreated(openBISService);
assertEmailHasBeenSentFromHook();
@@ -130,20 +136,21 @@ public class FeatureRichDataSetImportSystemTest extends SystemTestCase
assertEquals("RICH_EXPERIMENT", experiment.getCode());
}
- private void assert100MaterialsCreated(IEncapsulatedOpenBISService openBISService)
+ private void assertMaterialsCreated(IEncapsulatedOpenBISService openBISService)
{
LinkedList<MaterialIdentifier> ids = new LinkedList<MaterialIdentifier>();
- for (int i = 0; i < 100; i++)
+ int N = 60;
+ for (int i = 0; i < N; i++)
{
- MaterialIdentifier ident = MaterialIdentifier.tryParseIdentifier("RM_" + i + " (GENE)");
+ MaterialIdentifier ident = new MaterialIdentifier("RM_" + i, "SLOW_GENE");
ids.add(ident);
}
ListMaterialCriteria criteria = ListMaterialCriteria.createFromMaterialIdentifiers(ids);
List<Material> materials = openBISService.listMaterials(criteria, true);
- assertEquals(100, materials.size());
+ assertEquals(N, materials.size());
for (Material m : materials)
{
--
GitLab