From bfd35d4c94089db48b5aa9e107637bca225ac3b6 Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Mon, 13 Aug 2012 09:41:24 +0000
Subject: [PATCH] Fix unit tests which need the displaySettingsProvider field
of AbstractServer.
SVN: 26350
---
.../cisd/openbis/generic/server/AbstractServer.java | 6 ++++++
.../cisd/openbis/generic/server/CommonServerTest.java | 1 +
2 files changed, 7 insertions(+)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java
index 134ca1302d1..5a8eac1d2d1 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java
@@ -184,6 +184,12 @@ public abstract class AbstractServer<T> extends AbstractServiceWithLogger<T> imp
this.dataSetTypeSlaveServerPlugin = dataSetTypeSlaveServerPlugin;
}
+ // For unit tests - in production Spring will inject this object.
+ public void setDisplaySettingsProvider(DisplaySettingsProvider displaySettingsProvider)
+ {
+ this.displaySettingsProvider = displaySettingsProvider;
+ }
+
protected IPropertiesBatchManager getPropertiesBatchManager()
{
if (propertiesBatchManager == null)
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/CommonServerTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/CommonServerTest.java
index 7f46a000149..e06ddf2d1ec 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/CommonServerTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/CommonServerTest.java
@@ -128,6 +128,7 @@ public final class CommonServerTest extends AbstractServerTestCase
server.setSampleTypeSlaveServerPlugin(sampleTypeSlaveServerPlugin);
server.setDataSetTypeSlaveServerPlugin(dataSetTypeSlaveServerPlugin);
server.setBaseIndexURL(SESSION_TOKEN, BASE_INDEX_URL);
+ server.setDisplaySettingsProvider(new DisplaySettingsProvider());
return server;
}
--
GitLab