From 02b371f55f92a89e9edf5920f02fb59ecfaef2c3 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Mon, 8 Aug 2016 08:35:24 +0000
Subject: [PATCH] SSDM-3989 : Ugly fix that works, several services are being
initialized using "${download-url}" when the property is missing since they
are created using spring. These have been tracked down and fixed one by one.
SVN: 36878
---
.../cisd/etlserver/TransferredDataSetHandlerTest.java | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/TransferredDataSetHandlerTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/TransferredDataSetHandlerTest.java
index 0c767af6e1b..6e59a3bb9b7 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/TransferredDataSetHandlerTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/TransferredDataSetHandlerTest.java
@@ -85,8 +85,7 @@ import ch.systemsx.cisd.openbis.util.LogRecordingUtils;
*
* @author Franz-Josef Elmer
*/
-@Friend(toClasses =
-{ TransferredDataSetHandler.class, DataSetRegistrationHelper.class,
+@Friend(toClasses = { TransferredDataSetHandler.class, DataSetRegistrationHelper.class,
IdentifiedDataStrategy.class, PluginTaskInfoProvider.class,
DssPropertyParametersUtil.class })
public final class TransferredDataSetHandlerTest extends AbstractFileSystemTestCase
@@ -281,7 +280,7 @@ public final class TransferredDataSetHandlerTest extends AbstractFileSystemTestC
OpenBISSessionHolder sessionHolder = new OpenBISSessionHolder();
sessionHolder.setSessionToken(SESSION_TOKEN);
authorizedLimsService =
- new EncapsulatedOpenBISService(limsService, sessionHolder, "", shareIdManager);
+ new EncapsulatedOpenBISService(limsService, sessionHolder, shareIdManager);
dataSetValidator = context.mock(IDataSetValidator.class);
Properties threadProperties = new Properties();
@@ -487,8 +486,7 @@ public final class TransferredDataSetHandlerTest extends AbstractFileSystemTestC
final DataSetInformation dataSet, final String dataSetCode, final String recipient)
{
SampleIdentifier sampleIdentifier = dataSet.getSampleIdentifier();
- String code = sampleIdentifier != null ? sampleIdentifier.getSampleCode() :
- dataSet.getExperimentIdentifier().getExperimentCode();
+ String code = sampleIdentifier != null ? sampleIdentifier.getSampleCode() : dataSet.getExperimentIdentifier().getExperimentCode();
expectations.one(mailClient).sendMessage(
String.format(DataSetRegistrationHelper.EMAIL_SUBJECT_TEMPLATE, code),
getNotificationEmailContent(dataSet, dataSetCode), null, null, recipient);
@@ -873,7 +871,8 @@ public final class TransferredDataSetHandlerTest extends AbstractFileSystemTestC
LogMonitoringAppender
.addAppender(
LogCategory.OPERATION,
- Pattern.compile("P[0-9]+-\\{test-script.sh\\} had command line: \\[sourceTest/java/ch/systemsx/cisd/etlserver/utils/test-script.sh, 4711-42, .*/datastore_server/targets/unit-test-wd/ch.systemsx.cisd.etlserver.TransferredDataSetHandlerTest/data1\\]"),
+ Pattern.compile(
+ "P[0-9]+-\\{test-script.sh\\} had command line: \\[sourceTest/java/ch/systemsx/cisd/etlserver/utils/test-script.sh, 4711-42, .*/datastore_server/targets/unit-test-wd/ch.systemsx.cisd.etlserver.TransferredDataSetHandlerTest/data1\\]"),
Pattern.compile("P[0-9]+-\\{test-script.sh\\} process returned with exit value 1."));
handler.handle(isFinishedData1);
--
GitLab