From 4c7f15e9f9c7dfad7ee7d303778f13cde85cf140 Mon Sep 17 00:00:00 2001
From: felmer <franz-josef.elmer@id.ethz.ch>
Date: Thu, 22 Mar 2018 08:04:28 +0100
Subject: [PATCH] SSDM-2366: tests fixed.
---
.../server/plugins/demo/DemoProcessingPlugin.java | 11 +++++++----
.../cisd/openbis/systemtest/CommonServerTest.java | 2 +-
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/demo/DemoProcessingPlugin.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/demo/DemoProcessingPlugin.java
index 8a7ae2ec574..d43929f9d3f 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/demo/DemoProcessingPlugin.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/demo/DemoProcessingPlugin.java
@@ -57,12 +57,15 @@ public class DemoProcessingPlugin implements IProcessingPluginTask
DataSetProcessingContext context)
{
operationLog.info("Processing of the following datasets has been requested: " + datasets);
- Map<String, String> parameterBindings = context.getParameterBindings();
- if (parameterBindings.isEmpty() == false)
+ if (context != null)
{
- for (Entry<String, String> entry : parameterBindings.entrySet())
+ Map<String, String> parameterBindings = context.getParameterBindings();
+ if (parameterBindings != null && parameterBindings.isEmpty() == false)
{
- operationLog.info("Parameter: " + entry);
+ for (Entry<String, String> entry : parameterBindings.entrySet())
+ {
+ operationLog.info("Parameter: " + entry);
+ }
}
}
IHierarchicalContentProvider contentProvider =
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/CommonServerTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/CommonServerTest.java
index 7b5e16a3bf7..2c81d317054 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/CommonServerTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/CommonServerTest.java
@@ -2107,7 +2107,7 @@ public class CommonServerTest extends SystemTestCase
commonServer.createReportFromDatasets(session.getSessionToken(), serviceKey, Arrays.asList(dataSetCode));
} catch (Exception e)
{
- assertEquals(e.getMessage(), "Data store 'STANDARD' does not have '" + serviceKey + "' report configured.");
+ assertEquals(e.getMessage(), "Data store 'STANDARD' does not have '" + serviceKey + "' reporting plugin configured.");
}
} else
{
--
GitLab