Skip to content
Snippets Groups Projects
Commit 51b57f4d authored by jakubs's avatar jakubs
Browse files

BIS-172 add testcase to check that service conversation doesnt die with long validation process

SVN: 26569
parent 21e2b471
No related branches found
No related tags found
No related merge requests found
...@@ -40,8 +40,8 @@ def create_experiment_if_needed(transaction): ...@@ -40,8 +40,8 @@ def create_experiment_if_needed(transaction):
return exp return exp
def createMaterials(transaction): def createMaterials(transaction):
for x in range(0,100): for x in range(0,60):
mat = transaction.createNewMaterial("RM_%d" % x, "GENE") mat = transaction.createNewMaterial("RM_%d" % x, "SLOW_GENE")
mat.setPropertyValue("GENE_SYMBOL", "RM_%d_S" %x) mat.setPropertyValue("GENE_SYMBOL", "RM_%d_S" %x)
def createSamples(transaction): def createSamples(transaction):
......
...@@ -49,6 +49,12 @@ public class FeatureRichDataSetImportSystemTest extends SystemTestCase ...@@ -49,6 +49,12 @@ public class FeatureRichDataSetImportSystemTest extends SystemTestCase
return new File(rootDir, "incoming-rich-test"); return new File(rootDir, "incoming-rich-test");
} }
@Override
protected int dataSetImportWaitDurationInSeconds()
{
return 280;
}
@Test @Test
public void testRichImport() throws Exception public void testRichImport() throws Exception
{ {
...@@ -66,7 +72,7 @@ public class FeatureRichDataSetImportSystemTest extends SystemTestCase ...@@ -66,7 +72,7 @@ public class FeatureRichDataSetImportSystemTest extends SystemTestCase
assertLinkedDataSetImported(openBISService); assertLinkedDataSetImported(openBISService);
assert100MaterialsCreated(openBISService); assertMaterialsCreated(openBISService);
assertEmailHasBeenSentFromHook(); assertEmailHasBeenSentFromHook();
...@@ -130,20 +136,21 @@ public class FeatureRichDataSetImportSystemTest extends SystemTestCase ...@@ -130,20 +136,21 @@ public class FeatureRichDataSetImportSystemTest extends SystemTestCase
assertEquals("RICH_EXPERIMENT", experiment.getCode()); assertEquals("RICH_EXPERIMENT", experiment.getCode());
} }
private void assert100MaterialsCreated(IEncapsulatedOpenBISService openBISService) private void assertMaterialsCreated(IEncapsulatedOpenBISService openBISService)
{ {
LinkedList<MaterialIdentifier> ids = new LinkedList<MaterialIdentifier>(); 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); ids.add(ident);
} }
ListMaterialCriteria criteria = ListMaterialCriteria.createFromMaterialIdentifiers(ids); ListMaterialCriteria criteria = ListMaterialCriteria.createFromMaterialIdentifiers(ids);
List<Material> materials = openBISService.listMaterials(criteria, true); List<Material> materials = openBISService.listMaterials(criteria, true);
assertEquals(100, materials.size()); assertEquals(N, materials.size());
for (Material m : materials) for (Material m : materials)
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment