virtual.java: New file.

	* libjava.jni/virtual.java: New file.
	* libjava.jni/virtual.c: New file.
	* libjava.jni/virtual.out: New file.
	* libjava.jni/final_method.java: New file.
	* libjava.jni/final_method.c: New file.
	* libjava.jni/final_method.out: New file.
	* libjava.jni/overload.java: New file.
	* libjava.jni/overload.c: New file.
	* libjava.jni/overload.out: New file.
	* libjava.jni/simple_int.java: New file.
	* libjava.jni/simple_int.c: New file.
	* libjava.jni/simple_int.out: New file.
	* libjava.jni/invoke.out: New file.
	* libjava.jni/invoke.c: New file.
	* libjava.jni/invoke.java: New file.

From-SVN: r31996

diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog
index bc65fa518b090c03831fe69568a8fe7e1d4d7aec..c162f7c00a1913b8298639bc9bdaff4b9958652e 100644 (file)
--- a/libjava/testsuite/ChangeLog
+++ b/libjava/testsuite/ChangeLog
@@ -1,3 +1,21 @@
+2000-02-15  Tom Tromey  <tromey@cygnus.com>
+
+       * libjava.jni/virtual.java: New file.
+       * libjava.jni/virtual.c: New file.
+       * libjava.jni/virtual.out: New file.
+       * libjava.jni/final_method.java: New file.
+       * libjava.jni/final_method.c: New file.
+       * libjava.jni/final_method.out: New file.
+       * libjava.jni/overload.java: New file.
+       * libjava.jni/overload.c: New file.
+       * libjava.jni/overload.out: New file.
+       * libjava.jni/simple_int.java: New file.
+       * libjava.jni/simple_int.c: New file.
+       * libjava.jni/simple_int.out: New file.
+       * libjava.jni/invoke.out: New file.
+       * libjava.jni/invoke.c: New file.
+       * libjava.jni/invoke.java: New file.
+
 2000-02-12  Anthony Green  <green@cygnus.com>
 
        * libjava.compile/comment.java: New file.

diff --git a/libjava/testsuite/libjava.jni/final_method.c b/libjava/testsuite/libjava.jni/final_method.c
new file mode 100644 (file)
index 0000000..8297737
--- /dev/null
+++ b/libjava/testsuite/libjava.jni/final_method.c
@@ -0,0 +1,7 @@
+#include <final_method.h>
+
+jstring
+Java_final_1method_meth (JNIEnv *env, jobject thisv)
+{
+  return (*env)->NewStringUTF (env, "zardoz has spoken");
+}

diff --git a/libjava/testsuite/libjava.jni/final_method.java b/libjava/testsuite/libjava.jni/final_method.java
new file mode 100644 (file)
index 0000000..dcb684e
--- /dev/null
+++ b/libjava/testsuite/libjava.jni/final_method.java
@@ -0,0 +1,17 @@
+// Minimal test a non-static final method.
+
+public class final_method
+{
+  static
+  {
+    System.loadLibrary ("final_method");
+  }
+
+  public final native String meth ();
+
+  public static void main (String[] args)
+  {
+    final_method fm = new final_method ();
+    System.out.println (fm.meth ());
+  }
+}

diff --git a/libjava/testsuite/libjava.jni/final_method.out b/libjava/testsuite/libjava.jni/final_method.out
new file mode 100644 (file)
index 0000000..d93c9b5
--- /dev/null
+++ b/libjava/testsuite/libjava.jni/final_method.out
@@ -0,0 +1 @@
+zardoz has spoken

diff --git a/libjava/testsuite/libjava.jni/invoke.c b/libjava/testsuite/libjava.jni/invoke.c
new file mode 100644 (file)
index 0000000..35a446e
--- /dev/null
+++ b/libjava/testsuite/libjava.jni/invoke.c
@@ -0,0 +1,7 @@
+#include <invoke.h>
+
+jint
+Java_invoke_val (JNIEnv *env, jclass klass)
+{
+  return 23;
+}

diff --git a/libjava/testsuite/libjava.jni/invoke.java b/libjava/testsuite/libjava.jni/invoke.java
new file mode 100644 (file)
index 0000000..91c9d37
--- /dev/null
+++ b/libjava/testsuite/libjava.jni/invoke.java
@@ -0,0 +1,18 @@
+// Test to make sure the minimal invocation works.
+
+public class invoke
+{
+  public static native int val ();
+
+  static
+  {
+    System.out.println ("trying...");
+    System.loadLibrary ("invoke");
+    System.out.println ("loaded");
+  }
+
+  public static void main (String[] args)
+  {
+    System.out.println (val ());
+  }
+}

diff --git a/libjava/testsuite/libjava.jni/invoke.out b/libjava/testsuite/libjava.jni/invoke.out
new file mode 100644 (file)
index 0000000..f59a6d2
--- /dev/null
+++ b/libjava/testsuite/libjava.jni/invoke.out
@@ -0,0 +1,3 @@
+trying...
+loaded
+23

diff --git a/libjava/testsuite/libjava.jni/overload.c b/libjava/testsuite/libjava.jni/overload.c
new file mode 100644 (file)
index 0000000..d171fc3
--- /dev/null
+++ b/libjava/testsuite/libjava.jni/overload.c
@@ -0,0 +1,16 @@
+#include <overload.h>
+
+jint
+Java_overload_over__I (JNIEnv *env, jclass klass, jint val)
+{
+  return val;
+}
+
+
+jint
+Java_overload_over__II (JNIEnv *env, jclass klass, jint one, jint two)
+{
+  return one + two;
+}
+
+

diff --git a/libjava/testsuite/libjava.jni/overload.java b/libjava/testsuite/libjava.jni/overload.java
new file mode 100644 (file)
index 0000000..c2e6037
--- /dev/null
+++ b/libjava/testsuite/libjava.jni/overload.java
@@ -0,0 +1,18 @@
+// Test to make sure overloaded functions with long names work.
+
+public class overload
+{
+  static
+  {
+    System.loadLibrary ("overload");
+  }
+
+  public static native int over (int one);
+  public static native int over (int one, int two);
+
+  public static void main (String[] args)
+  {
+    System.out.println (over (1));
+    System.out.println (over (1, 2));
+  }
+}

diff --git a/libjava/testsuite/libjava.jni/overload.out b/libjava/testsuite/libjava.jni/overload.out
new file mode 100644 (file)
index 0000000..2b2f2e1
--- /dev/null
+++ b/libjava/testsuite/libjava.jni/overload.out
@@ -0,0 +1,2 @@
+1
+3

diff --git a/libjava/testsuite/libjava.jni/simple_int.c b/libjava/testsuite/libjava.jni/simple_int.c
new file mode 100644 (file)
index 0000000..a86f2d2
--- /dev/null
+++ b/libjava/testsuite/libjava.jni/simple_int.c
@@ -0,0 +1,7 @@
+#include <simple_int.h>
+
+jint
+Java_simple_1int_nat (JNIEnv *env, jclass klass, jint val)
+{
+  return 2 * val;
+}

diff --git a/libjava/testsuite/libjava.jni/simple_int.java b/libjava/testsuite/libjava.jni/simple_int.java
new file mode 100644 (file)
index 0000000..6306c4e
--- /dev/null
+++ b/libjava/testsuite/libjava.jni/simple_int.java
@@ -0,0 +1,16 @@
+// Test a simple static function with an `int' argument.
+
+public class simple_int
+{
+  public static native int nat (int z);
+
+  static
+  {
+    System.loadLibrary ("simple_int");
+  }
+
+  public static void main (String[] args)
+  {
+    System.out.println (nat (23));
+  }
+}

diff --git a/libjava/testsuite/libjava.jni/simple_int.out b/libjava/testsuite/libjava.jni/simple_int.out
new file mode 100644 (file)
index 0000000..9e5feb5
--- /dev/null
+++ b/libjava/testsuite/libjava.jni/simple_int.out
@@ -0,0 +1 @@
+46

diff --git a/libjava/testsuite/libjava.jni/virtual.c b/libjava/testsuite/libjava.jni/virtual.c
new file mode 100644 (file)
index 0000000..bda837d
--- /dev/null
+++ b/libjava/testsuite/libjava.jni/virtual.c
@@ -0,0 +1,7 @@
+#include <virtual.h>
+
+jboolean
+Java_virtual_equals (JNIEnv *env, jobject thisv, jobject other)
+{
+  return JNI_FALSE;
+}

diff --git a/libjava/testsuite/libjava.jni/virtual.java b/libjava/testsuite/libjava.jni/virtual.java
new file mode 100644 (file)
index 0000000..496389c
--- /dev/null
+++ b/libjava/testsuite/libjava.jni/virtual.java
@@ -0,0 +1,17 @@
+// Minimal test of a virtual method.
+
+public class virtual
+{
+  static
+  {
+    System.loadLibrary ("virtual");
+  }
+
+  public native boolean equals (Object obj);
+
+  public static void main (String[] args)
+  {
+    Object v = new virtual ();
+    System.out.println (v.equals (v));
+  }
+}

diff --git a/libjava/testsuite/libjava.jni/virtual.out b/libjava/testsuite/libjava.jni/virtual.out
new file mode 100644 (file)
index 0000000..c508d53
--- /dev/null
+++ b/libjava/testsuite/libjava.jni/virtual.out
@@ -0,0 +1 @@
+false