From 2db220d54e0d3ce946bd86c993367d2e456d3acb Mon Sep 17 00:00:00 2001
From: jakubs <jakubs>
Date: Wed, 22 Jul 2015 09:22:29 +0000
Subject: [PATCH] SSDM-1939: Let jython recovery tests run also on jython 2.7
SVN: 34363
---
.../registrator/AbstractJythonDataSetHandlerTest.java | 5 ++---
.../etlserver/registrator/JythonDropboxRecoveryTest.java | 7 +++++++
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/AbstractJythonDataSetHandlerTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/AbstractJythonDataSetHandlerTest.java
index 4a9d1709c58..610ce26c040 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/AbstractJythonDataSetHandlerTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/AbstractJythonDataSetHandlerTest.java
@@ -293,8 +293,7 @@ public abstract class AbstractJythonDataSetHandlerTest extends AbstractFileSyste
}
/**
- * adds an extension to the Jython Path, so that all libraries in it will be visible to the
- * Jython environment.
+ * adds an extension to the Jython Path, so that all libraries in it will be visible to the Jython environment.
*/
protected void extendJythonLibPath(String pathExtension)
{
@@ -545,7 +544,7 @@ public abstract class AbstractJythonDataSetHandlerTest extends AbstractFileSyste
}
private static final String[] registrationDirectories =
- { "1", "pre-commit", "staging", "pre-staging" };
+ { "1", "pre-commit", "staging", "pre-staging" };
/**
* Simulate the file system becoming unavailable
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonDropboxRecoveryTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonDropboxRecoveryTest.java
index fe843f705fe..3d6e5e165dc 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonDropboxRecoveryTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonDropboxRecoveryTest.java
@@ -76,6 +76,13 @@ public class JythonDropboxRecoveryTest extends AbstractJythonDataSetHandlerTest
public Object[][] recoveryTestCasesArray()
{
LinkedList<RecoveryTestCase> testCases = recoveryTestCases();
+ LinkedList<RecoveryTestCase> testCasesWithJython27 = recoveryTestCases();
+ for (RecoveryTestCase recoveryTestCase : testCasesWithJython27)
+ {
+ recoveryTestCase.overrideProperties.put("jython-version", "2.7");
+ recoveryTestCase.title += " @ jython 2.7";
+ }
+ testCases.addAll(testCasesWithJython27);
// result value
Object[][] resultsList = new Object[testCases.size()][];
--
GitLab