SP-45, BIS-21 split v1 and v2 scripts

SVN: 25290

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

@@ -103,9 +103,16 @@ public class JythonTopLevelDataSetRegistratorTest extends AbstractJythonDataSetH
         params.dontCallOldApiJythonHooks = true;
         params.title += " - V2";
         params.shouldUseAutoRecovery = true;
+        params.dropboxScriptPath = scriptPathV2(other.dropboxScriptPath);
         return params;
     }
 
+    private static String scriptPathV2(String scriptPath)
+    {
+        File script = new File(scriptPath);
+        return new File(script.getParentFile(), "v2-" + script.getName()).getPath();
+    }
+
     @DataProvider(name = "simpleTransactionTestCaseProvider")
     public Object[][] simpleTransactionCases()
     {

datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/file-not-found.py

 execfile("sourceTest/java/ch/systemsx/cisd/etlserver/registrator/all-hooks.py")
 
-# this check is to make the script compatible with V1 and V2
-if transaction is None:
-  transaction = service.transaction(incoming, factory)
 dataSet = transaction.createNewDataSet()
 transaction.moveFile('/non/existent/path', dataSet)
 dataSet.setDataSetType('O1')

datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/v2-dying-script.py

+import ch.systemsx.cisd.openbis.generic.shared.dto.identifier as identifier
+import java.io as io
+import ch.systemsx.cisd.openbis.generic.shared.basic.dto as dto
+
+execfile("sourceTest/java/ch/systemsx/cisd/etlserver/registrator/all-hooks.py")
+
+def process():
+  # Create the Experiment Identifier
+  identifier = identifier.ExperimentIdentifierFactory("/SPACE/PROJECT/EXP-CODE").createIdentifier()
+  
+  # Register data set 1
+  registrationDetails = factory.createRegistrationDetails()
+  dataSetInformation = registrationDetails.getDataSetInformation()
+  dataSetInformation.setExperimentIdentifier(identifier)
+      registrationDetails.setDataSetType(dto.DataSetType("O1"));
+  None.non_existant_function()

datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/v2-file-not-found.py

+execfile("sourceTest/java/ch/systemsx/cisd/etlserver/registrator/all-hooks.py")
+process():
+  dataSet = transaction.createNewDataSet()
+  transaction.moveFile('/non/existent/path', dataSet)
+  dataSet.setDataSetType('O1')
+  dataSet.setExperiment(transaction.getExperiment('/SPACE/PROJECT/EXP'))

datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/v2-rollback-dying-script.py

+import ch.systemsx.cisd.openbis.generic.shared.dto.identifier as identifier
+import java.io as io
+import ch.systemsx.cisd.openbis.generic.shared.basic.dto as dto
+
+execfile("sourceTest/java/ch/systemsx/cisd/etlserver/registrator/all-hooks.py")
+def process():
+    # Create the Experiment Identifier
+    identifier = identifier.ExperimentIdentifierFactory("/SPACE/PROJECT/EXP-CODE").createIdentifier()
+    
+    # Register data set 1
+    registrationDetails = factory.createRegistrationDetails()
+    dataSetInformation = registrationDetails.getDataSetInformation()
+    dataSetInformation.setExperimentIdentifier(identifier)
+    registrationDetails.setDataSetType(dto.DataSetType("O1"));
+    
+    None.non_existant_function()

datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/v2-simple-testcase.py

+execfile("sourceTest/java/ch/systemsx/cisd/etlserver/registrator/all-hooks.py")
+def process():
+    execfile("sourceTest/java/ch/systemsx/cisd/etlserver/registrator/simple-transaction.py")
\ No newline at end of file

datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/v2-testcase-double-transaction.py

+execfile("sourceTest/java/ch/systemsx/cisd/etlserver/registrator/all-hooks.py")
+def process():
+  transaction = service.transaction(incoming, factory)
+  transaction1 = service.transaction(incoming, factory)
+  
+  dataSet = transaction.createNewDataSet()
+  dataSet1 = transaction1.createNewDataSet()
+  
+  transaction.moveFile(incoming.getPath() + '/sub_data_set_1', dataSet)
+  transaction1.moveFile(incoming.getPath() + '/sub_data_set_2', dataSet1)
+  
+  dataSet.setDataSetType('O1')
+  dataSet1.setDataSetType('O1')
+  
+  dataSet.setExperiment(transaction.getExperiment('/SPACE/PROJECT/EXP'))
+  dataSet1.setExperiment(transaction1.getExperiment('/SPACE/PROJECT/EXP'))
+

datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/v2-testcase-postregistration-hook-failed.py

+from java.lang import IllegalArgumentException
+
+execfile("sourceTest/java/ch/systemsx/cisd/etlserver/registrator/all-hooks.py")
+
+def post_metadata_registration(context):
+    global didPostRegistrationFunctionRunHappen
+    didPostRegistrationFunctionRunHappen = True
+    raise IllegalArgumentException("Fail at post_metadata_registration to cancel registration")
+
+process():
+  execfile("sourceTest/java/ch/systemsx/cisd/etlserver/registrator/simple-transaction.py")
+

datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/v2-testcase-postregistration-hook-wrong-signature.py

+execfile("sourceTest/java/ch/systemsx/cisd/etlserver/registrator/all-hooks.py")
+
+def post_metadata_registration(context, unnecessary_argument):
+    global didPostRegistrationFunctionRunHappen
+    didPostRegistrationFunctionRunHappen = True
+def process():
+  execfile("sourceTest/java/ch/systemsx/cisd/etlserver/registrator/simple-transaction.py")
+

datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/v2-testcase-preregistration-hook-failed.py

+from java.lang import IllegalArgumentException
+
+execfile("sourceTest/java/ch/systemsx/cisd/etlserver/registrator/all-hooks.py")
+
+def pre_metadata_registration(context):
+    global didPreRegistrationFunctionRunHappen
+    didPreRegistrationFunctionRunHappen = True
+    raise IllegalArgumentException("Fail at pre_metadata_registration to cancel registration")
+
+process():
+    execfile("sourceTest/java/ch/systemsx/cisd/etlserver/registrator/simple-transaction.py"):
+

datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/v2-testcase-registration-context.py

+def process():
+  execfile("sourceTest/java/ch/systemsx/cisd/etlserver/registrator/simple-transaction.py")
+  transaction.getTransactionPersistentMap().put("body","1")
+
+global contextTestFailed
+contextTestFailed = None
+
+def rollback_transaction(service, transaction, algorithmRunner, throwable):
+    global didTransactionRollbackHappen
+    didTransactionRollbackHappen = True
+
+def pre_metadata_registration(context):
+    
+    assert_context_content(context, "pre_metadata_registration", "body", "1");
+    assert_context_content(context, "pre_metadata_registration", "pre_metadata_registration", None);
+    assert_context_content(context, "pre_metadata_registration", "post_storage", None);
+
+    context.put("pre_metadata_registration", "2")
+    global didPreRegistrationFunctionRunHappen
+    didPreRegistrationFunctionRunHappen = True
+
+def post_metadata_registration(context):
+
+    assert_context_content(context, "post_metadata_registration", "body", "1");
+    assert_context_content(context, "post_metadata_registration", "pre_metadata_registration", "2");
+    assert_context_content(context, "post_metadata_registration", "post_storage", None);
+
+    context.put("post_metadata_registration", "3")
+    global didPostRegistrationFunctionRunHappen
+    didPostRegistrationFunctionRunHappen = True
+
+def post_storage(context):
+
+    assert_context_content(context, "post_storage", "body", "1");
+    assert_context_content(context, "post_storage", "pre_metadata_registration", "2");
+    assert_context_content(context, "post_storage", "post_metadata_registration", "3");
+
+    context.put("post_storage", "4")
+    global didPostStorageFunctionRunHappen
+    didPostStorageFunctionRunHappen = True
+    
+def assert_context_content(context, caller, name, expected):
+    value = context.get(name)
+    if (value != expected):
+        global contextTestFailed
+        if (value != None and expected != None and type(value) != type(expected)):
+            value = "%s:%s" % (type(value), value)
+            expected = "%s:%s" % (type(expected), expected)
+        contextTestFailed = "in %s the value of %s should have been '%s', but was '%s'" % (caller, name, expected, value) 

datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/v2-testcase-rollback.py

+execfile("sourceTest/java/ch/systemsx/cisd/etlserver/registrator/all-hooks.py")
+def process():
+  execfile("sourceTest/java/ch/systemsx/cisd/etlserver/registrator/simple-transaction.py"):
+  transaction.rollback()

datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/v2-testcase-without-post-storage.py

+execfile("sourceTest/java/ch/systemsx/cisd/etlserver/registrator/all-hooks-without-post-storage.py")
+process():
+  execfile("sourceTest/java/ch/systemsx/cisd/etlserver/registrator/simple-transaction.py")
+