Move Python3TestUtils to org.knime.python3.testing util plugin

knime · Mar 13, 2023 · 19d764a · 19d764a
1 parent 9d826d3
commit 19d764a
Show file tree

Hide file tree

Showing 23 changed files with 1,471 additions and 11 deletions.
diff --git a/org.knime.python3.arrow.tests/META-INF/MANIFEST.MF b/org.knime.python3.arrow.tests/META-INF/MANIFEST.MF
@@ -11,5 +11,6 @@ Require-Bundle: org.junit;bundle-version="[4.13.0,5.0.0)",
  io.netty.all;bundle-version="[4.1.68,4.2.0)",
  org.apache.commons.lang3;bundle-version="[3.9.0,4.0.0)",
  org.knime.core.columnar;bundle-version="[5.0.0,6.0.0)",
- org.knime.core.data.columnar;bundle-version="[5.0.0,6.0.0)"
+ org.knime.core.data.columnar;bundle-version="[5.0.0,6.0.0)",
+ org.knime.python3.testing;bundle-version="[5.1.0,6.0.0)"
 Automatic-Module-Name: org.knime.python3.arrow.tests
diff --git a/org.knime.python3.arrow.tests/src/test/java/org/knime/python3/arrow/TestUtils.java b/org.knime.python3.arrow.tests/src/test/java/org/knime/python3/arrow/TestUtils.java
@@ -60,7 +60,6 @@
 import org.knime.core.columnar.store.FileHandle;
 import org.knime.python3.DefaultPythonGateway;
 import org.knime.python3.Python3SourceDirectory;
-import org.knime.python3.Python3TestUtils;
 import org.knime.python3.PythonCommand;
 import org.knime.python3.PythonDataSink;
 import org.knime.python3.PythonDataSource;
@@ -70,6 +69,7 @@
 import org.knime.python3.PythonGateway;
 import org.knime.python3.PythonPath;
 import org.knime.python3.PythonPath.PythonPathBuilder;
+import org.knime.python3.testing.Python3TestUtils;
 
 /**
  * Utilities for Python Arrow data transfer tests.

diff --git a/org.knime.python3.arrow.types.tests/META-INF/MANIFEST.MF b/org.knime.python3.arrow.types.tests/META-INF/MANIFEST.MF
@@ -15,6 +15,7 @@ Require-Bundle: org.knime.core.table;bundle-version="[5.0.0,6.0.0)",
  org.junit;bundle-version="[4.13.0,5.0.0)",
  org.knime.core.data.columnar;bundle-version="[5.0.0,6.0.0)",
  com.fasterxml.jackson.core.jackson-databind;bundle-version="[2.12.1,3.0.0)",
- org.knime.python3.types;bundle-version="[5.0.0,6.0.0)"
+ org.knime.python3.types;bundle-version="[5.0.0,6.0.0)",
+ org.knime.python3.testing;bundle-version="[5.1.0,6.0.0)"
 Automatic-Module-Name: org.knime.python3.arrow.types.tests
 Export-Package: org.knime.python3.arrow.types
diff --git a/...types.tests/src/test/java/org/knime/python3/arrow/types/KnimeArrowExtensionTypesTest.java b/...types.tests/src/test/java/org/knime/python3/arrow/types/KnimeArrowExtensionTypesTest.java
@@ -172,7 +172,6 @@
 import org.knime.filehandling.core.data.location.cell.SimpleFSLocationCellFactory;
 import org.knime.python3.DefaultPythonGateway;
 import org.knime.python3.Python3SourceDirectory;
-import org.knime.python3.Python3TestUtils;
 import org.knime.python3.PythonCommand;
 import org.knime.python3.PythonDataSink;
 import org.knime.python3.PythonDataSource;
@@ -187,6 +186,7 @@
 import org.knime.python3.arrow.PythonArrowDataUtils.TableDomainAndMetadata;
 import org.knime.python3.arrow.PythonArrowExtension;
 import org.knime.python3.arrow.TestUtils;
+import org.knime.python3.testing.Python3TestUtils;
 import org.knime.python3.types.PythonModule;
 import org.knime.python3.types.PythonValueFactoryModule;
 import org.knime.python3.types.PythonValueFactoryRegistry;

diff --git a/org.knime.python3.nodes.tests/META-INF/MANIFEST.MF b/org.knime.python3.nodes.tests/META-INF/MANIFEST.MF
@@ -12,5 +12,6 @@ Require-Bundle: org.junit;bundle-version="[4.13.0,5.0.0)",
  org.apache.commons.lang3;bundle-version="[3.9.0,4.0.0)",
  org.knime.core.columnar;bundle-version="[5.0.0,6.0.0)",
  org.knime.core.data.columnar;bundle-version="[5.0.0,6.0.0)",
- org.mockito.mockito-core;bundle-version="[2.28.2,3.0.0)"
+ org.mockito.mockito-core;bundle-version="[2.28.2,3.0.0)",
+ org.knime.python3.testing;bundle-version="[5.1.0,6.0.0)"
 Automatic-Module-Name: org.knime.python3.nodes.tests
diff --git a/org.knime.python3.nodes.tests/src/test/java/org/knime/python3/nodes/PythonNodeTestUtils.java b/org.knime.python3.nodes.tests/src/test/java/org/knime/python3/nodes/PythonNodeTestUtils.java
@@ -54,14 +54,14 @@
 
 import org.knime.python3.DefaultPythonGateway;
 import org.knime.python3.Python3SourceDirectory;
-import org.knime.python3.Python3TestUtils;
 import org.knime.python3.PythonEntryPoint;
 import org.knime.python3.PythonExtension;
 import org.knime.python3.PythonGateway;
 import org.knime.python3.PythonPath;
 import org.knime.python3.PythonPath.PythonPathBuilder;
 import org.knime.python3.arrow.Python3ArrowSourceDirectory;
 import org.knime.python3.arrow.PythonArrowExtension;
+import org.knime.python3.testing.Python3TestUtils;
 import org.knime.python3.types.PythonModule;
 import org.knime.python3.views.Python3ViewsSourceDirectory;
 

diff --git a/org.knime.python3.scripting.tests/META-INF/MANIFEST.MF b/org.knime.python3.scripting.tests/META-INF/MANIFEST.MF
@@ -10,4 +10,5 @@ Fragment-Host: org.knime.python3.scripting;bundle-version="[5.0.0,6.0.0)"
 Automatic-Module-Name: org.knime.python3.scripting.tests
 Export-Package: org.knime.python3.scripting
 Require-Bundle: org.junit;bundle-version="[4.13.0,5.0.0)",
- org.apache.arrow.memory-core;bundle-version="[9.0.0,10.0.0)"
+ org.apache.arrow.memory-core;bundle-version="[9.0.0,10.0.0)",
+ org.knime.python3.testing;bundle-version="[5.1.0,6.0.0)"
diff --git a/...ipting.tests/src/test/java/org/knime/python3/scripting/Python3KernelBackendProxyTest.java b/...ipting.tests/src/test/java/org/knime/python3/scripting/Python3KernelBackendProxyTest.java
@@ -84,7 +84,6 @@
 import org.knime.python2.kernel.PythonKernelBackendUtils;
 import org.knime.python3.DefaultPythonGateway;
 import org.knime.python3.Python3SourceDirectory;
-import org.knime.python3.Python3TestUtils;
 import org.knime.python3.PythonDataSource;
 import org.knime.python3.PythonEntryPoint;
 import org.knime.python3.PythonExtension;
@@ -95,6 +94,7 @@
 import org.knime.python3.arrow.PythonArrowDataUtils;
 import org.knime.python3.arrow.PythonArrowExtension;
 import org.knime.python3.arrow.TestUtils;
+import org.knime.python3.testing.Python3TestUtils;
 import org.knime.python3.views.Python3ViewsSourceDirectory;
 
 /**

diff --git a/org.knime.python3.testing/.classpath b/org.knime.python3.testing/.classpath
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11" />
+        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+        <classpathentry kind="src" path="src/test/java" output="target/classes">
+                <attributes>
+                        <attribute name="test" value="true"/>
+                </attributes>
+        </classpathentry>
+</classpath>
diff --git a/org.knime.python3.testing/.settings/org.eclipse.core.resources.prefs b/org.knime.python3.testing/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		eclipse.preferences.version=1
		encoding/<project>=UTF-8