From d34225bbce5c21f44749a93656a17a0131184821 Mon Sep 17 00:00:00 2001
From: jakubs <jakubs>
Date: Tue, 19 Apr 2016 08:05:25 +0000
Subject: [PATCH] SSDM-3510 add explicite declaration of jython 2.7 - fix test
SVN: 36222
---
.../JythonTopLevelDataSetRegistratorTest.java | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetRegistratorTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetRegistratorTest.java
index c7b6a023825..9c5a623d70f 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetRegistratorTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetRegistratorTest.java
@@ -33,7 +33,6 @@ import org.jmock.Expectations;
import org.jmock.api.Invocation;
import org.jmock.internal.ExpectationBuilder;
import org.jmock.lib.action.CustomAction;
-import org.python.core.PyException;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
@@ -314,18 +313,21 @@ public class JythonTopLevelDataSetRegistratorTest extends AbstractJythonDataSetH
@Override
public boolean execute(Exception arg)
{
- if (arg instanceof IOExceptionUnchecked)
+ Throwable exc = arg;
+ if (arg instanceof org.python27.core.PyException)
{
- IOExceptionUnchecked tunnel = (IOExceptionUnchecked) arg;
- FileNotFoundException ex = (FileNotFoundException) tunnel.getCause();
- return ex.getMessage().startsWith("Neither '/non/existent/path' nor '");
- } else
+ exc = ((org.python27.core.PyException) arg).getCause();
+ } else if (arg instanceof org.python.core.PyException)
+ {
+ exc = ((org.python.core.PyException) arg).getCause();
+ }
+ if (exc instanceof IOExceptionUnchecked)
{
- PyException pyException = (PyException) arg;
- IOExceptionUnchecked tunnel = (IOExceptionUnchecked) pyException.getCause();
+ IOExceptionUnchecked tunnel = (IOExceptionUnchecked) exc;
FileNotFoundException ex = (FileNotFoundException) tunnel.getCause();
return ex.getMessage().startsWith("Neither '/non/existent/path' nor '");
}
+ return false;
}
};
testCases.addAll(multipleVersionsOfTestCase(testCase));
--
GitLab