From 0d9de56ac8e45e23de967ca3f55b4d78a2e091eb Mon Sep 17 00:00:00 2001
From: anttil <anttil>
Date: Tue, 19 Mar 2013 11:19:54 +0000
Subject: [PATCH] BIS-350 / SP-561: Fix test
SVN: 28643
---
.../generic/server/DatasetDownloadServletTest.java | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServletTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServletTest.java
index a99cfe04620..4d9eebae6c6 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServletTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServletTest.java
@@ -63,13 +63,13 @@ import ch.systemsx.cisd.openbis.dss.generic.shared.IHierarchicalContentProvider;
import ch.systemsx.cisd.openbis.dss.generic.shared.IShareIdManager;
import ch.systemsx.cisd.openbis.dss.generic.shared.utils.DatasetLocationUtil;
import ch.systemsx.cisd.openbis.generic.shared.IServiceForDataStoreServer;
-import ch.systemsx.cisd.openbis.generic.shared.basic.dto.PhysicalDataSet;
+import ch.systemsx.cisd.openbis.generic.shared.basic.dto.AbstractExternalData;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataStore;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Experiment;
-import ch.systemsx.cisd.openbis.generic.shared.basic.dto.AbstractExternalData;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalDataLocationNode;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.FileFormatType;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.LocatorType;
+import ch.systemsx.cisd.openbis.generic.shared.basic.dto.PhysicalDataSet;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Project;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Space;
import ch.systemsx.cisd.openbis.generic.shared.dto.ExternalDataPE;
@@ -279,7 +279,7 @@ public class DatasetDownloadServletTest
}
});
}
-
+
private void prepareCheckSession()
{
context.checking(new Expectations()
@@ -562,6 +562,8 @@ public class DatasetDownloadServletTest
one(response).getWriter();
will(returnValue(new PrintWriter(writer)));
+
+ allowing(response).setContentType(with(any(String.class)));
}
});
@@ -618,7 +620,8 @@ public class DatasetDownloadServletTest
one(httpSession).getAttribute(
AbstractDatasetDownloadServlet.DATA_SET_SESSION_KEY);
- Map<String, AbstractExternalData> map = new HashMap<String, AbstractExternalData>();
+ Map<String, AbstractExternalData> map =
+ new HashMap<String, AbstractExternalData>();
map.put(externalData.getCode(), externalData);
will(Expectations.returnValue(map));
--
GitLab