Skip to content
Snippets Groups Projects
Commit d03bb0df authored by buczekp's avatar buczekp
Browse files

[LMS-1924] fixed DSS tests

SVN: 19053
parent 187c002e
No related branches found
No related tags found
No related merge requests found
...@@ -56,6 +56,7 @@ import ch.systemsx.cisd.openbis.dss.generic.shared.api.v1.FileInfoDssBuilder; ...@@ -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.FileInfoDssDTO;
import ch.systemsx.cisd.openbis.dss.generic.shared.api.v1.IDssServiceRpcGeneric; 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.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.IETLLIMSService;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataStore; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataStore;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalData; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalData;
...@@ -82,8 +83,11 @@ public class DssComponentTest extends AbstractFileSystemTestCase ...@@ -82,8 +83,11 @@ public class DssComponentTest extends AbstractFileSystemTestCase
private static final String DUMMY_SESSSION_TOKEN = "DummySessionToken"; 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 private static final String DUMMY_DSS_URL = DataStoreApiUrlUtilities
.getDataStoreUrlFromServerUrl("http://localhost/"); .getDataStoreUrlFromServerUrl(DUMMY_DSS_DOWNLOAD_URL);
private IDssServiceRpcGeneric dssServiceV1_0; private IDssServiceRpcGeneric dssServiceV1_0;
...@@ -329,7 +333,8 @@ public class DssComponentTest extends AbstractFileSystemTestCase ...@@ -329,7 +333,8 @@ public class DssComponentTest extends AbstractFileSystemTestCase
final SessionContextDTO session = getDummySession(); final SessionContextDTO session = getDummySession();
final ExternalData dataSetExternalData = new ExternalData(); final ExternalData dataSetExternalData = new ExternalData();
DataStore dataStore = new DataStore(); DataStore dataStore = new DataStore();
dataStore.setDownloadUrl(DUMMY_DSS_URL); dataStore.setDownloadUrl(DUMMY_DSS_DOWNLOAD_URL);
dataStore.setHostUrl(DUMMY_DSS_URL);
dataSetExternalData.setDataStore(dataStore); dataSetExternalData.setDataStore(dataStore);
ArrayList<FileInfoDssDTO> list = new ArrayList<FileInfoDssDTO>(); ArrayList<FileInfoDssDTO> list = new ArrayList<FileInfoDssDTO>();
...@@ -438,8 +443,8 @@ public class DssComponentTest extends AbstractFileSystemTestCase ...@@ -438,8 +443,8 @@ public class DssComponentTest extends AbstractFileSystemTestCase
return workingDirectory; return workingDirectory;
} }
private static class MockDssServiceRpcV1_0 extends AbstractDssServiceRpc<IDssServiceRpcGeneric> implements private static class MockDssServiceRpcV1_0 extends AbstractDssServiceRpc<IDssServiceRpcGeneric>
IDssServiceRpcGenericInternal implements IDssServiceRpcGenericInternal
{ {
private final FileInfoDssDTO[] fileInfos; private final FileInfoDssDTO[] fileInfos;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment