From 98fc287352c4c81d1a7f5ca651b64532c2218951 Mon Sep 17 00:00:00 2001
From: pkupczyk <pkupczyk>
Date: Wed, 25 May 2016 05:25:22 +0000
Subject: [PATCH] Make DatasetDownloadServletTest more robust
SVN: 36570
---
.../dss/generic/server/DatasetDownloadServletTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 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 eeddbc75154..cb2b770eeb5 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
@@ -365,11 +365,11 @@ public class DatasetDownloadServletTest
DatasetDownloadServlet servlet = createServlet();
servlet.doGet(request, response);
- assertContains("<html><body><h1>Error</h1>" + OSUtilities.LINE_SEPARATOR
+ AssertionUtil.assertContainsLines("<html><body><h1>Error</h1>" + OSUtilities.LINE_SEPARATOR
+ "Unknown data set: 1234-1" + OSUtilities.LINE_SEPARATOR + "</body></html>"
+ OSUtilities.LINE_SEPARATOR, writer.toString());
String logContent = logRecorder.getLogContent();
- assertContains(getSessionCreationLogMessage() + OSUtilities.LINE_SEPARATOR
+ AssertionUtil.assertContainsLines(getSessionCreationLogMessage() + OSUtilities.LINE_SEPARATOR
+ CONTENT_PROVIDER_LOG_ERROR + "Data set '1234-1' not found in openBIS server."
+ OSUtilities.LINE_SEPARATOR + LOG_ERROR + "Unknown data set: 1234-1",
logContent);
--
GitLab