From d03bb0dfbe38db18829dd5e621bfdd4f84047c77 Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Wed, 8 Dec 2010 12:42:43 +0000
Subject: [PATCH] [LMS-1924] fixed DSS tests
SVN: 19053
---
.../dss/client/api/v1/impl/DssComponentTest.java | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponentTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponentTest.java
index 952551db517..47723031670 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponentTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponentTest.java
@@ -56,6 +56,7 @@ import ch.systemsx.cisd.openbis.dss.generic.shared.api.v1.FileInfoDssBuilder;
import ch.systemsx.cisd.openbis.dss.generic.shared.api.v1.FileInfoDssDTO;
import ch.systemsx.cisd.openbis.dss.generic.shared.api.v1.IDssServiceRpcGeneric;
import ch.systemsx.cisd.openbis.dss.generic.shared.api.v1.NewDataSetDTO;
+import ch.systemsx.cisd.openbis.generic.shared.GenericSharedConstants;
import ch.systemsx.cisd.openbis.generic.shared.IETLLIMSService;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataStore;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalData;
@@ -82,8 +83,11 @@ public class DssComponentTest extends AbstractFileSystemTestCase
private static final String DUMMY_SESSSION_TOKEN = "DummySessionToken";
+ private static final String DUMMY_DSS_DOWNLOAD_URL = "http://localhost/"
+ + GenericSharedConstants.DATA_STORE_SERVER_WEB_APPLICATION_NAME;
+
private static final String DUMMY_DSS_URL = DataStoreApiUrlUtilities
- .getDataStoreUrlFromServerUrl("http://localhost/");
+ .getDataStoreUrlFromServerUrl(DUMMY_DSS_DOWNLOAD_URL);
private IDssServiceRpcGeneric dssServiceV1_0;
@@ -329,7 +333,8 @@ public class DssComponentTest extends AbstractFileSystemTestCase
final SessionContextDTO session = getDummySession();
final ExternalData dataSetExternalData = new ExternalData();
DataStore dataStore = new DataStore();
- dataStore.setDownloadUrl(DUMMY_DSS_URL);
+ dataStore.setDownloadUrl(DUMMY_DSS_DOWNLOAD_URL);
+ dataStore.setHostUrl(DUMMY_DSS_URL);
dataSetExternalData.setDataStore(dataStore);
ArrayList<FileInfoDssDTO> list = new ArrayList<FileInfoDssDTO>();
@@ -438,8 +443,8 @@ public class DssComponentTest extends AbstractFileSystemTestCase
return workingDirectory;
}
- private static class MockDssServiceRpcV1_0 extends AbstractDssServiceRpc<IDssServiceRpcGeneric> implements
- IDssServiceRpcGenericInternal
+ private static class MockDssServiceRpcV1_0 extends AbstractDssServiceRpc<IDssServiceRpcGeneric>
+ implements IDssServiceRpcGenericInternal
{
private final FileInfoDssDTO[] fileInfos;
--
GitLab