From 181a2f7451e3f55c743f33b65f854b22b9b63419 Mon Sep 17 00:00:00 2001
From: jakubs <jakubs>
Date: Thu, 28 Jun 2012 12:41:17 +0000
Subject: [PATCH] SP-136 BIS-21 refactor registration context
SVN: 25936
---
.../registrator/testcase-registration-context.py | 10 +++++-----
.../cisd/etlserver/registrator/v2-retry-process.py | 8 ++++----
.../registrator/v2-testcase-registration-context.py | 10 +++++-----
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/testcase-registration-context.py b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/testcase-registration-context.py
index 0665af67810..e80f0f6049d 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/testcase-registration-context.py
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/testcase-registration-context.py
@@ -4,7 +4,7 @@ jythonHookTestTool = JythonHookTestTool.createInTest()
execfile("sourceTest/java/ch/systemsx/cisd/etlserver/registrator/simple-transaction.py")
-transaction.getRegistrationContext().put("body","1")
+transaction.getRegistrationContext().getPersistentMap().put("body","1")
def rollback_transaction(service, transaction, algorithmRunner, throwable):
jythonHookTestTool.log("rollback_transaction")
@@ -15,7 +15,7 @@ def pre_metadata_registration(context):
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")
+ context.getPersistentMap().put("pre_metadata_registration", "2")
jythonHookTestTool.log("pre_metadata_registration")
def post_metadata_registration(context):
@@ -24,7 +24,7 @@ def post_metadata_registration(context):
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")
+ context.getPersistentMap().put("post_metadata_registration", "3")
jythonHookTestTool.log("post_metadata_registration")
def post_storage(context):
@@ -33,11 +33,11 @@ def post_storage(context):
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")
+ context.getPersistentMap().put("post_storage", "4")
jythonHookTestTool.log("post_storage")
def assert_context_content(context, caller, name, expected):
- value = context.get(name)
+ value = context.getPersistentMap().get(name)
if (value != expected):
if (value != None and expected != None and type(value) != type(expected)):
value = "%s:%s" % (type(value), value)
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/v2-retry-process.py b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/v2-retry-process.py
index 4f1c72c98a4..27cb34b0a11 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/v2-retry-process.py
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/v2-retry-process.py
@@ -1,16 +1,16 @@
execfile("sourceTest/java/ch/systemsx/cisd/etlserver/registrator/all-hooks.py")
-def should_retry_processing(map, error):
- lastResult = map.get("RETRY_COUNT")
+def should_retry_processing(context, error):
+ lastResult = context.getPersistentMap().get("RETRY_COUNT")
if (lastResult == None):
lastResult = 0
- map.put("RETRY_COUNT", lastResult + 1)
+ context.getPersistentMap().put("RETRY_COUNT", lastResult + 1)
print "RETRY TRANSACTION PUTS THE SCORE %d" % (lastResult + 1)
return True
def process(transaction):
incoming = transaction.getIncoming()
- key = transaction.getRegistrationContext().get("RETRY_COUNT");
+ key = transaction.getRegistrationContext().getPersistentMap().get("RETRY_COUNT");
if (key == None):
key = 1
dataSet = transaction.createNewDataSet()
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/v2-testcase-registration-context.py b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/v2-testcase-registration-context.py
index 9f5d0917ce8..e81c6db67dc 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/v2-testcase-registration-context.py
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/v2-testcase-registration-context.py
@@ -7,7 +7,7 @@ def process(transaction):
transaction.moveFile(transaction.getIncoming().getPath() + '/sub_data_set_1', dataSet)
dataSet.setDataSetType('O1')
dataSet.setExperiment(transaction.getExperiment('/SPACE/PROJECT/EXP'))
- transaction.getRegistrationContext().put("body","1")
+ transaction.getRegistrationContext().getPersistentMap().put("body","1")
def rollback_transaction(service, transaction, algorithmRunner, throwable):
jythonHookTestTool.log("rollback_transaction")
@@ -18,7 +18,7 @@ def pre_metadata_registration(context):
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")
+ context.getPersistentMap().put("pre_metadata_registration", "2")
jythonHookTestTool.log("pre_metadata_registration")
def post_metadata_registration(context):
@@ -27,7 +27,7 @@ def post_metadata_registration(context):
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")
+ context.getPersistentMap().put("post_metadata_registration", "3")
jythonHookTestTool.log("post_metadata_registration")
def post_storage(context):
@@ -36,11 +36,11 @@ def post_storage(context):
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")
+ context.getPersistentMap().put("post_storage", "4")
jythonHookTestTool.log("post_storage")
def assert_context_content(context, caller, name, expected):
- value = context.get(name)
+ value = context.getPersistentMap().get(name)
if (value != expected):
if (value != None and expected != None and type(value) != type(expected)):
value = "%s:%s" % (type(value), value)
--
GitLab