LMS-2436 Implemented test

SVN: 22927

datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/AbstractJythonDataSetHandlerTest.java

@@ -50,6 +50,7 @@ import ch.systemsx.cisd.etlserver.ITypeExtractor;
 import ch.systemsx.cisd.etlserver.ThreadParameters;
 import ch.systemsx.cisd.etlserver.TopLevelDataSetRegistratorGlobalState;
 import ch.systemsx.cisd.etlserver.registrator.JythonTopLevelDataSetHandler.JythonDataSetRegistrationService;
+import ch.systemsx.cisd.etlserver.registrator.api.v1.SecondaryTransactionFailure;
 import ch.systemsx.cisd.etlserver.registrator.api.v1.impl.DataSetRegistrationTransaction;
 import ch.systemsx.cisd.etlserver.validation.IDataSetValidator;
 import ch.systemsx.cisd.openbis.dss.generic.shared.IEncapsulatedOpenBISService;
@@ -347,6 +348,8 @@ public abstract class AbstractJythonDataSetHandlerTest extends AbstractFileSyste
 
         protected boolean didCommitTransactionFunctionRunHappen = false;
 
+        protected boolean didSecondaryTransactionErrorNotificationHappen = false;
+
         public TestingDataSetHandler(TopLevelDataSetRegistratorGlobalState globalState,
                 boolean shouldRegistrationFail, boolean shouldReThrowRollbackException)
         {
@@ -459,6 +462,22 @@ public abstract class AbstractJythonDataSetHandlerTest extends AbstractFileSyste
                     interpreter.get("didTransactionCommitHappen", Boolean.class);
         }
 
+        @Override
+        public void didEncounterSecondaryTransactionErrors(
+                DataSetRegistrationService<DataSetInformation> service,
+                DataSetRegistrationTransaction<DataSetInformation> transaction,
+                List<SecondaryTransactionFailure> secondaryErrors)
+        {
+            super.didEncounterSecondaryTransactionErrors(service, transaction, secondaryErrors);
+
+            PythonInterpreter interpreter =
+                    ((JythonDataSetRegistrationService<DataSetInformation>) service)
+                            .getInterpreter();
+            didSecondaryTransactionErrorNotificationHappen =
+                    interpreter
+                            .get("didSecondaryTransactionErrorNotificationHappen", Boolean.class);
+        }
+
         @Override
         protected JythonDataSetRegistrationService<DataSetInformation> createJythonDataSetRegistrationService(
                 File aDataSetFile, DataSetInformation userProvidedDataSetInformationOrNull,

datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetRegistratorTest.java

@@ -796,6 +796,7 @@ public class JythonTopLevelDataSetRegistratorTest extends AbstractJythonDataSetH
         TestingDataSetHandler theHandler = (TestingDataSetHandler) handler;
         assertFalse(didServiceRollbackHappen);
         assertFalse(theHandler.didTransactionRollbackHappen);
+        assertTrue(theHandler.didSecondaryTransactionErrorNotificationHappen);
         context.assertIsSatisfied();
     }
 

datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/dynamic-query-failure-test.py

 import sys
 
+def did_encounter_secondary_transaction_errors(service, transaction, errors):
+    global didSecondaryTransactionErrorNotificationHappen
+    didSecondaryTransactionErrorNotificationHappen = True
+
 # Execute a query
 tr = service.transaction()
 query = tr.getDatabaseQuery("path-info-db")