From 22f4e69e1653681de41fcd8ef706cf4e9c497745 Mon Sep 17 00:00:00 2001
From: jakubs <jakubs>
Date: Thu, 26 Jul 2012 09:24:25 +0000
Subject: [PATCH] minor: fix the feature rich data set import system test
SVN: 26220
---
.../1/dss/drop-boxes/rich-test/data-set-handler.py | 4 ++--
.../systemtests/FeatureRichDataSetImportSystemTest.java | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/datastore_server/sourceTest/core-plugins/generic-test/1/dss/drop-boxes/rich-test/data-set-handler.py b/datastore_server/sourceTest/core-plugins/generic-test/1/dss/drop-boxes/rich-test/data-set-handler.py
index 5e0e34d417b..89f83f8c598 100644
--- a/datastore_server/sourceTest/core-plugins/generic-test/1/dss/drop-boxes/rich-test/data-set-handler.py
+++ b/datastore_server/sourceTest/core-plugins/generic-test/1/dss/drop-boxes/rich-test/data-set-handler.py
@@ -15,7 +15,7 @@ def sendMail(context, subject, message):
def post_metadata_registration(context):
content = "post_metadata_registration rich %s " % context.getPersistentMap().get("email_text")
- sendMail(context, "Subject", "post_metadata_registration rich")
+ sendMail(context, "Subject", content)
def create_space_if_needed(transaction):
space = transaction.getSpace(SPACE_CODE)
@@ -63,4 +63,4 @@ def process(transaction):
# register samples
createSamples(transaction)
- transaction.getRegistrationContext.getPersistentMap().put("email_text", "rich_email_text")
+ transaction.getRegistrationContext().getPersistentMap().put("email_text", "rich_email_text")
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/FeatureRichDataSetImportSystemTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/FeatureRichDataSetImportSystemTest.java
index 8aa5a8cc7e2..123e7afb4e6 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/FeatureRichDataSetImportSystemTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/FeatureRichDataSetImportSystemTest.java
@@ -48,7 +48,7 @@ public class FeatureRichDataSetImportSystemTest extends SystemTestCase
return new File(rootDir, "incoming-rich-test");
}
- @Test(groups = "broken")
+ @Test
public void testRichImport() throws Exception
{
@@ -79,7 +79,8 @@ public class FeatureRichDataSetImportSystemTest extends SystemTestCase
String content = FileUtilities.loadExactToString(f);
if (content.contains("post_metadata_registration rich"))
{
- assertTrue(content.contains("rich_email_text")); // check the content introduced
+ assertTrue(content, content.contains("rich_email_text")); // check the content
+ // introduced
// with the persistent map
return; // assert ok
}
--
GitLab