From af57a022a692c44bc31870d24f5925cda87f69f7 Mon Sep 17 00:00:00 2001
From: cramakri <cramakri>
Date: Tue, 10 Apr 2012 13:04:05 +0000
Subject: [PATCH] LMS-2857 Infrastructure to support new screening system test
SVN: 24848
---
.../systemtests/SystemTestCase.java | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/SystemTestCase.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/SystemTestCase.java
index 7ec43bdeb95..55df4bc064c 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/SystemTestCase.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/SystemTestCase.java
@@ -55,6 +55,8 @@ import ch.systemsx.cisd.openbis.generic.server.util.TestInitializer;
*/
public abstract class SystemTestCase extends AssertJUnit
{
+ public static final int SYSTEM_TEST_CASE_SERVER_PORT = 8888;
+
private static final String UNIT_TEST_WORKING_DIRECTORY = "unit-test-wd";
private static final String TARGETS_DIRECTORY = "targets";
@@ -111,7 +113,7 @@ public abstract class SystemTestCase extends AssertJUnit
setUpDatabaseProperties();
Server server = new Server();
Connector connector = new SelectChannelConnector();
- connector.setPort(8888);
+ connector.setPort(SYSTEM_TEST_CASE_SERVER_PORT);
server.addConnector(connector);
DispatcherServlet dispatcherServlet = new DispatcherServlet()
{
@@ -234,7 +236,7 @@ public abstract class SystemTestCase extends AssertJUnit
{
boolean dataSetImported = false;
String logContent = "";
- final int maxLoops = 20;
+ final int maxLoops = dataSetImportWaitDurationInSeconds();
for (int loops = 0; loops < maxLoops && dataSetImported == false; loops++)
{
Thread.sleep(1000);
@@ -255,6 +257,14 @@ public abstract class SystemTestCase extends AssertJUnit
}
+ /**
+ * Time to wait to determine if a data set has been registered or not. Subclasses may override.
+ */
+ protected int dataSetImportWaitDurationInSeconds()
+ {
+ return 20;
+ }
+
protected void moveFileToIncoming(File exampleDataSet) throws IOException
{
FileUtils.moveDirectoryToDirectory(exampleDataSet, getIncomingDirectory(), false);
--
GitLab