Testing updates

jpype/_core.py

@@ -334,7 +334,7 @@ def startJVM(
             # Don't remove
 
         # ok, setup the jpype system classloader and add to the path after startup
-        # this guarentees all classes have the same permissions as they did in the past
+        # this guarantees all classes have the same permissions as they did in the past
         from urllib.parse import quote
         extra_jvm_args += [
             '-Djava.system.class.loader=org.jpype.JPypeClassLoader',
@@ -563,17 +563,17 @@ def synchronized(obj):
     return _jpype._JMonitor(obj)
 
 
-def getJVMVersion():
+def getJVMVersion() -> tuple[int, int, int] | tuple[int, ...]:
     """ Get the JVM version if the JVM is started.
 
     This function can be used to determine the version of the JVM. It is
     useful to help determine why a Jar has failed to load.
 
     Returns:
-      A typle with the (major, minor, revison) of the JVM if running.
+      A tuple with the (major, minor, revision) of the JVM if running.
     """
     if not _jpype.isStarted():
-        return (0, 0, 0)
+        return 0, 0, 0
 
     import re
     runtime = _jpype.JClass('java.lang.Runtime')
@@ -582,8 +582,11 @@ def getJVMVersion():
     # Java 9+ has a version method
     if not version:
         version = runtime.version()
-    version = (re.match("([0-9.]+)", str(version)).group(1))
-    return tuple([int(i) for i in version.split('.')])
+    match = re.match("([0-9.]+)", str(version))
+    if not match:
+        raise RuntimeError("could not determine JVM version")
+    version = match.group(1)
+    return tuple(int(i) for i in version.split('.'))
 
 
 @_jcustomizer.JImplementationFor("java.lang.Runtime")

native/jpype_module/src/main/java/org/jpype/JPypeSignal.java

@@ -15,6 +15,7 @@
 **************************************************************************** */
 package org.jpype;
 
+import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
@@ -51,10 +52,22 @@ static void installHandlers()
       Class SignalHandler = Class.forName("sun.misc.SignalHandler");
       main = Thread.currentThread();
       Method method = Signal.getMethod("handle", Signal, SignalHandler);
+
+      Object handler = Proxy.newProxyInstance(ClassLoader.getSystemClassLoader(), new Class[]
+      {
+        SignalHandler
+      }, new InvocationHandler()
+      {
+        @Override
+        public Object invoke(Object proxy, Method method, Object[] args) throws Throwable
+        {
+          main.interrupt();
+          interruptPy();
+          return null;
+        }
+      });
       Object intr = Signal.getDeclaredConstructor(String.class).newInstance("INT");
-      method.invoke(null, intr, getSignalHandler(SignalHandler, 2));
-      Object intrTerm = Signal.getDeclaredConstructor(String.class).newInstance("TERM");
-      method.invoke(null, intrTerm, getSignalHandler(SignalHandler, 15));
+      method.invoke(null, intr, handler);
     } catch (InvocationTargetException | IllegalArgumentException | IllegalAccessException | InstantiationException | ClassNotFoundException | NoSuchMethodException | SecurityException ex)
     {
       // If we don't get the signal handler run without it.  (ANDROID)

pyproject.toml

@@ -17,7 +17,7 @@ maintainers = [
 description = "A Python to Java bridge"
 readme = "README.rst"
 requires-python = ">=3.8"
-license = {text = "License :: OSI Approved :: Apache Software License"}
+license = {text = "Apache-2.0"}
 classifiers = [
     'Programming Language :: Python :: 3',
     'Programming Language :: Python :: 3.8',

setupext/test_java.py

@@ -87,4 +87,4 @@ def run(self):
         self.announce("  %s" % " ".join(cmdStr), level=distutils.log.INFO)
         subprocess.check_call(cmdStr)
         subprocess.check_call(shlex.split(
-            "javadoc -Xdoclint:none test/harness/jpype/doc/Test.java -d test/classes/"))
+            "javadoc -Xdoclint:none test/harness/jpype/test/doc/Test.java -d test/classes/"))

test/build.xml

@@ -1,16 +1,17 @@
-<project default="test" name="JPype - Native">
+<project default="test" name="JPype - Java test classes">
 
 	<property name="src" location="harness"/>
 	<property name="build" location="classes"/>
-        <property name="version" value="${ant.java.version}"/>
+	<property name="build9" location="classes-9"/>
+	<property name="jar.dir" location="jar"/>
+	<property name="version" value="${ant.java.version}"/>
 
-	<target name="test" depends="compile">
-	</target>
+	<target name="test" depends="compile,build-sample-package,build-late-jars,build-missing-jar,build-unsatisfied-jar,build-mrjar"/>
 
 	<condition property="build-9">
 		<not><or>
-		<equals arg1="${version}" arg2="1.8"/>
-		<equals arg1="${version}" arg2="1.7"/>
+			<equals arg1="${version}" arg2="1.8"/>
+			<equals arg1="${version}" arg2="1.7"/>
 		</or></not>
 	</condition>
 
@@ -20,54 +21,118 @@
 
 	<target name="compile-9" if="build-9">
 		<javac destdir="${build}"
-			source="${version}"
-			target="${version}"
-			>
+			   source="${version}"
+			   target="${version}">
 			<compilerarg value="--add-exports"/>
 			<compilerarg value="java.base/jdk.internal.reflect=ALL-UNNAMED"/>
 			<src>
 				<pathelement location="${src}/java9"/>
 			</src>
-			<include name="jpype/**/*"/>
+			<include name="org/jpype/**/*"/>
 		</javac>
 	</target>
 
 	<target name="compile-8" if="build-8">
 		<javac destdir="${build}"
-			source="${version}"
-			target="${version}"
-			>
+			   source="${version}"
+			   target="${version}">
 			<src>
 				<pathelement location="${src}/java8"/>
 			</src>
-			<include name="jpype/**/*"/>
+			<include name="org/jpype/**/*"/>
 		</javac>
 	</target>
 
 	<target name="compile-main">
 		<mkdir dir="${build}"/>
 		<javac destdir="${build}"
-			source="${version}"
-			target="${version}"
-			debug="true"
-			debuglevel="lines,vars,source"
-			>
+			   source="${version}"
+			   target="${version}"
+			   debug="true"
+			   debuglevel="lines,vars,source">
 			<src>
 				<pathelement location="${src}"/>
 			</src>
 			<include name="jpype/**/*"/>
 			<include name="org/**/*"/>
 		</javac>
-	<!--		<rmic base="${build}"
-			classname="jpype.rmi.ServerImpl"
-		/>
-  -->
 	</target>
 
 	<target name="compile" depends="compile-main,compile-8,compile-9"/>
 
 	<target name="clean">
 		<delete dir="${build}"/>
+		<delete dir="${build9}"/>
+		<delete dir="${jar.dir}"/>
+	</target>
+
+	<target name="init">
+		<mkdir dir="${jar.dir}"/>
+	</target>
+
+	<!-- Task 1: sample_package.jar -->
+	<target name="build-sample-package" depends="compile,init">
+		<jar destfile="${jar.dir}/sample_package.jar">
+			<fileset dir="${build}">
+				<include name="org/jpype/test/sample_package/**"/>
+			</fileset>
+		</jar>
+	</target>
+
+	<!-- Task 2: late.jar and late2.jar -->
+	<target name="build-late-jars" depends="compile,init">
+		<jar destfile="${jar.dir}/late/late.jar">
+			<fileset dir="${build}">
+				<include name="org/jpype/test/late/**"/>
+			</fileset>
+		</jar>
+		<jar destfile="${jar.dir}/late/late2.jar">
+			<fileset dir="${build}">
+				<include name="org/jpype/test/late2/**"/>
+			</fileset>
+		</jar>
+	</target>
+
+	<!-- Task 3: missing.jar -->
+	<target name="build-missing-jar" depends="compile,init">
+		<jar destfile="${jar.dir}/missing.jar">
+			<fileset dir="${build}">
+				<include name="org/jpype/missing/**"/>
+			</fileset>
+		</jar>
+	</target>
+
+	<!-- Task 5: unsatisfied.jar -->
+	<target name="build-unsatisfied-jar" depends="compile,init">
+		<jar destfile="${jar.dir}/unsatisfied.jar">
+			<fileset dir="${build}">
+				<include name="org/jpype/test/unsatisfied/**"/>
+			</fileset>
+		</jar>
+	</target>
+
+	<!-- Task 4: Automated MR-JAR build -->
+	<target name="build-mrjar" depends="init">
+		<!-- Compile Java 7 compatible classes -->
+		<mkdir dir="${build}"/>
+		<javac destdir="${build}" source="7" target="7">
+			<src path="${src}/org/jpype/mrjar"/>
+			<src path="${src}/org/jpype/mrjar/sub"/>
+		</javac>
+
+		<!-- Compile Java 9 classes into META-INF/versions/9 -->
+		<mkdir dir="${build}/META-INF/versions/9"/>
+		<javac destdir="${build}/META-INF/versions/9" source="9" target="9" release="9">
+			<src path="${src}/java9/org/jpype/mrjar"/>
+		</javac>
+
+		<!-- Create MR-JAR -->
+		<jar destfile="${jar.dir}/mrjar.jar">
+			<manifest>
+				<attribute name="Multi-Release" value="true"/>
+			</manifest>
+			<fileset dir="${build}"/>
+		</jar>
 	</target>
 
 </project>

test/harness/java8/jpype/lambda/Test1.java → test/harness/java8/org/jpype/test/lambda/Test1.java

@@ -13,7 +13,7 @@
 
   See NOTICE file for details.
 **************************************************************************** */
-package jpype.lambda;
+package org.jpype.test.lambda;
 
 import java.util.function.Function;
 

test/harness/java9/org/jpype/mrjar/B.java

@@ -0,0 +1,9 @@
+package org.jpype.mrjar;
+
+public class B
+{
+	public String call()
+	{
+		return "9";
+	}
+}

test/harness/java9/jpype/method/Caller.java → test/harness/java9/org/jpype/test/method/Caller.java

@@ -13,7 +13,7 @@
 
   See NOTICE file for details.
 **************************************************************************** */
-package jpype.method;
+package org.jpype.test.method;
 
 import jdk.internal.reflect.CallerSensitive;
 

test/harness/jpype/array/Test2.java → test/harness/org/jpype/test/array/Test2.java

@@ -13,7 +13,7 @@
 
   See NOTICE file for details.
 **************************************************************************** */
-package jpype.array;
+package org.jpype.test.array;
 
 public class Test2
 {

test/harness/jpype/array/TestArray.java → test/harness/org/jpype/test/array/TestArray.java

@@ -13,7 +13,7 @@
 
   See NOTICE file for details.
 **************************************************************************** */
-package jpype.array;
+package org.jpype.test.array;
 
 public class TestArray
 {

test/harness/jpype/attr/ClassWithBuffer.java → test/harness/org/jpype/test/attr/ClassWithBuffer.java

@@ -13,7 +13,7 @@
 
   See NOTICE file for details.
 **************************************************************************** */
-package jpype.attr;
+package org.jpype.test.attr;
 
 import java.awt.image.BufferStrategy;
 

test/harness/jpype/attr/Holder.java → test/harness/org/jpype/test/attr/Holder.java

@@ -13,7 +13,7 @@
 
   See NOTICE file for details.
 **************************************************************************** */
-package jpype.attr;
+package org.jpype.test.attr;
 
 public class Holder
 {

test/harness/jpype/attr/SubHolder.java → test/harness/org/jpype/test/attr/SubHolder.java

@@ -13,7 +13,7 @@
 
   See NOTICE file for details.
 **************************************************************************** */
-package jpype.attr;
+package org.jpype.test.attr;
 
 public class SubHolder extends Holder implements java.io.Serializable
 {

test/harness/jpype/attr/SyntheticMethods.java → test/harness/org/jpype/test/attr/SyntheticMethods.java

@@ -13,7 +13,7 @@
 
   See NOTICE file for details.
 **************************************************************************** */
-package jpype.attr;
+package org.jpype.test.attr;
 
 import java.util.List;
 

test/harness/jpype/attr/Test1.java → test/harness/org/jpype/test/attr/Test1.java

@@ -13,7 +13,7 @@
 
   See NOTICE file for details.
 **************************************************************************** */
-package jpype.attr;
+package org.jpype.test.attr;
 
 public class Test1
 {

test/harness/jpype/attr/Test2.java → test/harness/org/jpype/test/attr/Test2.java

@@ -13,7 +13,7 @@
 
   See NOTICE file for details.
 **************************************************************************** */
-package jpype.attr;
+package org.jpype.test.attr;
 
 public class Test2 extends Test1
 {

test/harness/jpype/attr/TestKeywords.java → test/harness/org/jpype/test/attr/TestKeywords.java

@@ -13,7 +13,7 @@
 
   See NOTICE file for details.
 **************************************************************************** */
-package jpype.attr;
+package org.jpype.test.attr;
 
 public class TestKeywords
 {

test/harness/jpype/attr/TestOverloadA.java → test/harness/org/jpype/test/attr/TestOverloadA.java

@@ -13,7 +13,7 @@
 
   See NOTICE file for details.
 **************************************************************************** */
-package jpype.attr;
+package org.jpype.test.attr;
 
 public class TestOverloadA
 {