diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListingQueryTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListingQueryTest.java
index 7e278b7a1a0bede968bcecd62820abe382d85542..f593bf42084a0d4b6ebe1887ad796df90bdda0a2 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListingQueryTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListingQueryTest.java
@@ -143,7 +143,7 @@ public class SampleListingQueryTest extends AbstractDAOTest
@Test
public void testSampleCount()
{
- assertEquals(698, query.getSampleCount(dbInstanceId)); // without deleted
+ assertEquals(699, query.getSampleCount(dbInstanceId)); // without deleted
}
@Test
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/EntityValidationTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/EntityValidationTest.java
index 6070999e45b44b1037136bfcc724f9284d6acb15..8702fda1f0a3500c56d07aad19a11ae29db8ccec 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/EntityValidationTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/EntityValidationTest.java
@@ -147,7 +147,6 @@ public class EntityValidationTest extends GenericSystemTestCase
@Test
public void testSampleUpdateTriggerValidationOfParentsChildren()
{
- updateTestScript(" for childRelation in entity.entityPE().getChildRelationships():\n requestValidation(childRelation.getChildSample()) ");
// setting the parent of this sample, forces the validation of parent (as it is aslo being
// changed)
// as the consequence validation of INVALID sample is forced - via the validation script of
@@ -176,24 +175,13 @@ public class EntityValidationTest extends GenericSystemTestCase
@Test
public void testSampleUpdateTriggerValidationOfParentsChildrenDoesNotHappen()
{
- updateTestScript(" pass");
-
Sample sample = getSampleFromSpaceAndType("TEST-SPACE", "WELL", "EV-NOT_INVALID");
- SampleUpdatesDTO update = createSampleUpdates(sample, "EV-PARENT");
+ SampleUpdatesDTO update = createSampleUpdates(sample, "EV-PARENT-NORMAL");
etlService.updateSample(systemSessionToken, update);
}
- // this updates the script that validates the EV-PARENT sample
- private void updateTestScript(String validationFunctionBody)
- {
- Script script = commonServer.getScriptInfo(systemSessionToken, new TechId(TEST_SCRIPT_ID));
-
- script.setScript("def validate(entity, isNew):\n" + validationFunctionBody + "\n");
- commonServer.updateScript(systemSessionToken, script);
- }
-
private SampleUpdatesDTO createSampleUpdates(Sample sample, String parentCode)
{
String[] modifiedParentCodesOrNull = new String[]
diff --git a/openbis/sourceTest/sql/postgresql/119/055=sample_types.tsv b/openbis/sourceTest/sql/postgresql/119/055=sample_types.tsv
index 072a330ba6dfe0dd9a8cecfab8f410afb06fcf4a..5e8129f7d382275aed1f7ed5467fc0f827c9aae4 100644
--- a/openbis/sourceTest/sql/postgresql/119/055=sample_types.tsv
+++ b/openbis/sourceTest/sql/postgresql/119/055=sample_types.tsv
@@ -7,4 +7,5 @@
7 DYNAMIC_PLATE Dynamic Plate 1 t 1 0 2009-03-23 15:34:44.462776+01 f S f f 5 f
8 IMPOSSIBLE Impossible to create 1 t 1 0 2009-03-23 15:34:44.462776+01 f S f f 6 f
9 IMPOSSIBLE_TO_UPDATE Impossible to update 1 t 1 0 2009-03-23 15:34:44.462776+01 f S f f 7 f
-10 TEST_VALIDATION Update validation script before validating 1 t 1 0 2009-03-23 15:34:44.462776+01 f S f f 8 f
\ No newline at end of file
+10 VALIDATE_CHILDREN Validate children on update 1 t 1 0 2009-03-23 15:34:44.462776+01 f S f f 8 f
+11 NORMAL just the normal 1 t 1 0 2009-03-23 15:34:44.462776+01 f S f f 5 f
\ No newline at end of file
diff --git a/openbis/sourceTest/sql/postgresql/119/056=samples_all.tsv b/openbis/sourceTest/sql/postgresql/119/056=samples_all.tsv
index c3460ed9c110fbe911e5089c84afbf83b657a3f1..8853579389e2494713c1c1abfb92b5acfb240f31 100644
--- a/openbis/sourceTest/sql/postgresql/119/056=samples_all.tsv
+++ b/openbis/sourceTest/sql/postgresql/119/056=samples_all.tsv
@@ -1027,3 +1027,4 @@
1056 EV-INVALID 9 2009-02-09 12:09:19.327518+01 2 \N \N 3 \N 2009-08-18 17:54:11.56+02 23 201206191219327-1056 \N
1057 EV-NOT_INVALID 6 2009-02-09 12:09:19.327518+01 2 \N \N 3 \N 2009-08-18 17:54:11.56+02 23 201206191219327-1057 \N
1058 EV-PARENT 10 2009-02-09 12:09:19.327518+01 2 \N \N 3 \N 2009-08-18 17:54:11.56+02 23 201206191219327-1058 \N
+1059 EV-PARENT-NORMAL 11 2009-02-09 12:09:19.327518+01 2 \N \N 3 \N 2009-08-18 17:54:11.56+02 23 201206191219327-1059 \N
diff --git a/openbis/sourceTest/sql/postgresql/119/057=scripts.tsv b/openbis/sourceTest/sql/postgresql/119/057=scripts.tsv
index d388e9e3212d71015ca4a8a8694062a4df7ee6a9..1ae95a485bb621f017dd4bcaf0f5f9a614997f7a 100644
--- a/openbis/sourceTest/sql/postgresql/119/057=scripts.tsv
+++ b/openbis/sourceTest/sql/postgresql/119/057=scripts.tsv
@@ -5,5 +5,5 @@
5 1 validateOK \N def validate(entity, isNew):\n pass\n 2010-10-27 15:16:48.994831+02 2 \N ENTITY_VALIDATION
6 1 validateFAIL \N def validate(entity, isNew):\n return "This check always fail"\n 2010-10-27 15:16:48.994831+02 2 \N ENTITY_VALIDATION
7 1 validateUpdateFAIL \N def validate(entity, isNew):\n if (not isNew):\n return "Cannot update this entity"\n 2010-10-27 15:16:48.994831+02 2 \N ENTITY_VALIDATION
-8 1 testScript \N def validate(entity, isNew):\n raise "Update this script before using"\n 2010-10-27 15:16:48.994831+02 2 \N ENTITY_VALIDATION
-9 1 code_date \N "%s %s" % (entity.code(), str(currentDate().getTime())) 2010-10-27 15:16:48.994831+02 2 \N DYNAMIC_PROPERTY
+8 1 validateChildren \N def validate(entity, isNew):\n for childRelation in entity.entityPE().getChildRelationships():\n requestValidation(childRelation.getChildSample()) 2010-10-27 15:16:48.994831+02 2 \N ENTITY_VALIDATION
+9 1 code_date \N "%s %s" % (entity.code(), str(currentDate().getTime())) 2010-10-27 15:16:48.994831+02 2 \N DYNAMIC_PROPERTY
\ No newline at end of file