Merge branch 'maint-r13' into dev

* maint-r13:
  Add test suite for jinterface

10 files changed, 1040 insertions, 0 deletions

diff --git a/lib/jinterface/test/jinterface_SUITE_data/BooleanAtom.java b/lib/jinterface/test/jinterface_SUITE_data/BooleanAtom.java
new file mode 100644
index 0000000000..9554d50c9f
--- /dev/null
+++ b/lib/jinterface/test/jinterface_SUITE_data/BooleanAtom.java
@@ -0,0 +1,46 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2004-2010. All Rights Reserved.
+ *
+ * The contents of this file are subject to the Erlang Public License,
+ * Version 1.1, (the "License"); you may not use this file except in
+ * compliance with the License. You should have received a copy of the
+ * Erlang Public License along with this software. If not, it can be
+ * retrieved online at http://www.erlang.org/.
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+ * the License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * %CopyrightEnd%
+ */
+
+import com.ericsson.otp.erlang.*;
+
+class BooleanAtom {
+
+    /*
+      Implements test case jinterface_SUITE:boolean_atom/1
+
+      Test the function OtpErlangAtom.booleanValue()
+    */
+
+    public static void main(String argv[]) {
+
+	OtpErlangAtom atom = new OtpErlangAtom("true");
+	if (!atom.booleanValue()) fail(1);
+
+	atom = new OtpErlangAtom("false");
+	if (atom.booleanValue()) fail(2);
+
+	atom = new OtpErlangAtom("somethingelse");
+	if (atom.booleanValue()) fail(3);
+
+    }
+
+    private static void fail(int reason) {
+	System.exit(reason);
+    }
+}
diff --git a/lib/jinterface/test/jinterface_SUITE_data/GetNames.java b/lib/jinterface/test/jinterface_SUITE_data/GetNames.java
new file mode 100644
index 0000000000..3d2bc4ac84
--- /dev/null
+++ b/lib/jinterface/test/jinterface_SUITE_data/GetNames.java
@@ -0,0 +1,68 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2004-2010. All Rights Reserved.
+ *
+ * The contents of this file are subject to the Erlang Public License,
+ * Version 1.1, (the "License"); you may not use this file except in
+ * compliance with the License. You should have received a copy of the
+ * Erlang Public License along with this software. If not, it can be
+ * retrieved online at http://www.erlang.org/.
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+ * the License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * %CopyrightEnd%
+ */
+
+import java.util.ArrayList;
+import com.ericsson.otp.erlang.*;
+
+class GetNames {
+
+    /*
+      Implements test case jinterface_SUITE:get_names/1
+
+    */
+
+    public static void main(String argv[]) {
+
+	try {
+	    OtpNode node = new OtpNode("javanode");
+	    OtpMbox mbox1 = node.createMbox();
+	    mbox1.registerName("mbox1");
+	    node.createMbox("mbox2");
+	    OtpMbox mbox3 = node.createMbox();
+	    node.registerName("mbox3",mbox3);
+
+	    ArrayList existing_names = new ArrayList();
+	    existing_names.add("mbox3");
+	    existing_names.add("mbox2");
+	    existing_names.add("mbox1");
+
+	    String[] names = node.getNames();
+	    if (names.length != existing_names.size()) fail(1);
+
+	    for(int i=0; i<names.length; i++) {
+		System.out.println("" + names[i]);
+		existing_names.remove(names[i]);
+	    }
+
+	    if (!existing_names.isEmpty()) fail(2);
+	}
+	catch (Exception e) {
+	    fail("" + e, 3);
+	}
+    }
+
+    private static void fail(int reason) {
+	System.exit(reason);
+    }
+
+    private static void fail(String str, int reason) {
+	System.out.println(str);
+	System.exit(reason);
+    }
+}
diff --git a/lib/jinterface/test/jinterface_SUITE_data/Makefile.src b/lib/jinterface/test/jinterface_SUITE_data/Makefile.src
new file mode 100644
index 0000000000..2a3dca463b
--- /dev/null
+++ b/lib/jinterface/test/jinterface_SUITE_data/Makefile.src
@@ -0,0 +1,62 @@
+#
+# %CopyrightBegin%
+#
+# Copyright Ericsson AB 2004-2010. All Rights Reserved.
+#
+# The contents of this file are subject to the Erlang Public License,
+# Version 1.1, (the "License"); you may not use this file except in
+# compliance with the License. You should have received a copy of the
+# Erlang Public License along with this software. If not, it can be
+# retrieved online at http://www.erlang.org/.
+#
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+# the License for the specific language governing rights and limitations
+# under the License.
+#
+# %CopyrightEnd%
+#
+
+# Note: This file *must* work for both Unix and Windows
+#
+# We use both `rm' (Unix) and `del' (Windows) for removing files, but
+# with a `-' in front so that the error in not finding `rm' (`del') on
+# Windows (Unix) is ignored.
+#
+# VxWorks? XXX
+#
+
+.SUFFIXES:
+.SUFFIXES: .java
+
+
+JAVAC = @JAVAC@
+ERLC = erlc
+
+JINTERFACE_CLASSPATH = @jinterface_classpath@
+
+CLASSPATH = .@PS@$(JINTERFACE_CLASSPATH)@PS@
+
+JAVA_FILES = \
+	Nodename.java \
+	RegisterAndWhereis.java \
+	GetNames.java \
+	BooleanAtom.java \
+	NodePing.java \
+	MboxPing.java \
+	MboxSendReceive.java \
+	MboxLinkUnlink.java \
+	NodeStatusHandler.java
+
+CLASS_FILES = $(JAVA_FILES:.java=.class)
+
+all: $(CLASS_FILES)
+
+clean:
+	-rm -f $(CLASS_FILES)
+	-del /F /Q $(CLASS_FILES)
+
+$(CLASS_FILES) : $(JAVA_FILES)
+	$(JAVAC) -classpath $(CLASSPATH) $(JAVA_FILES)
+
+#
diff --git a/lib/jinterface/test/jinterface_SUITE_data/MboxLinkUnlink.java b/lib/jinterface/test/jinterface_SUITE_data/MboxLinkUnlink.java
new file mode 100644
index 0000000000..5d1d097cc8
--- /dev/null
+++ b/lib/jinterface/test/jinterface_SUITE_data/MboxLinkUnlink.java
@@ -0,0 +1,201 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2004-2010. All Rights Reserved.
+ *
+ * The contents of this file are subject to the Erlang Public License,
+ * Version 1.1, (the "License"); you may not use this file except in
+ * compliance with the License. You should have received a copy of the
+ * Erlang Public License along with this software. If not, it can be
+ * retrieved online at http://www.erlang.org/.
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+ * the License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * %CopyrightEnd%
+ */
+
+import com.ericsson.otp.erlang.*;
+
+class MboxLinkUnlink {
+
+    /*
+      Implements test case jinterface_SUITE:mbox_link_unlink/1
+
+
+
+    */
+
+    private static final int java_link_and_exit = 1;
+    private static final int erl_link_and_exit = 2;
+    private static final int erl_link_java_exit = 3;
+    private static final int java_link_erl_exit = 4;
+    private static final int internal_link_linking_exits = 5;
+    private static final int internal_link_linked_exits = 6;
+    private static final int internal_unlink_linking_exits = 7;
+    private static final int internal_unlink_linked_exits = 8;
+    private static final int normal_exit = 9;
+    private static final int kill_mbox = 10;
+    private static final int kill_erl_proc_from_java = 11;
+    private static final int kill_mbox_from_erlang = 12;
+    private static final int erl_exit_with_reason_any_term = 13;
+    private static final int java_exit_with_reason_any_term = 14;
+
+    private static boolean dbg = true;
+
+
+    public static void main(String argv[]) {
+
+
+	//String cookie = argv[0];
+	String erlNode = argv[1];
+	OtpErlangObject expected = null;
+	boolean waiting = false;
+
+	try { //
+	    OtpNode node = new OtpNode("javanode");
+	    OtpMbox mainMbox = node.createMbox();
+
+	    try {
+		// Initiate and set up connection to erlang process
+		OtpMbox mbox = node.createMbox();
+		OtpMbox mbox2;
+
+		OtpErlangObject[] msg = {mainMbox.self(),mbox.self()};
+		mbox.send("erl_link_server", erlNode, new OtpErlangTuple(msg));
+		OtpErlangObject o = mbox.receive(1000);
+		if (o == null) System.exit(1);
+		OtpErlangTuple tuple = (OtpErlangTuple)o;
+		int tag = (int)((OtpErlangLong)tuple.elementAt(0)).longValue();
+
+		switch (tag) {
+
+		case java_exit_with_reason_any_term:
+		case java_link_and_exit:
+		    dbg("Java got \"java_link_and_exit\" or " +
+			"\"java_exit_with_reason_any_term\"");
+		    mbox.link((OtpErlangPid)tuple.elementAt(1));
+		    mbox.send((OtpErlangPid)tuple.elementAt(1),
+			      new OtpErlangAtom("ok"));
+		    mbox.exit(tuple.elementAt(2));
+		    break;
+		case erl_exit_with_reason_any_term:
+		case erl_link_and_exit:
+		    dbg("Java got \"erl_link_and_exit\" or " +
+			"\"erl_exit_with_reason_any_term\"");
+		    mbox.send((OtpErlangPid)tuple.elementAt(1),
+			      new OtpErlangAtom("ok"));
+		    waiting = true;
+		    expected = tuple.elementAt(2);
+		    mbox.receive(1000);
+		    System.exit(2);
+		case erl_link_java_exit:
+		    dbg("Java got \"erl_link_java_exit\"");
+		    mbox.exit(tuple.elementAt(2));
+		    break;
+		case java_link_erl_exit:
+		    dbg("Java got \"java_link_erl_exit\"");
+		    mbox.link((OtpErlangPid)tuple.elementAt(1));
+		    mbox.send((OtpErlangPid)tuple.elementAt(1),
+			      new OtpErlangAtom("ok"));
+		    waiting = true;
+		    expected = tuple.elementAt(2);
+		    mbox.receive(1000);
+		    System.exit(3);
+		case internal_link_linking_exits:
+		    dbg("Java got \"internal_link_linking_exits\"");
+		    mbox2 = node.createMbox();
+		    mbox.link(mbox2.self());
+		    mbox.exit(tuple.elementAt(2));
+		    waiting = true;
+		    expected = tuple.elementAt(2);
+		    mbox2.receive(1000); // hanging waiting for exit
+		    System.exit(4);  // got someting other than exit
+		case internal_link_linked_exits:
+		    dbg("Java got \"internal_link_linked_exits\"");
+		    mbox2 = node.createMbox();
+		    mbox.link(mbox2.self());
+		    mbox2.exit(tuple.elementAt(2));
+		    waiting = true;
+		    expected = tuple.elementAt(2);
+		    mbox.receive(1000); // hanging waiting for exit
+		    System.exit(5);  // got someting other than exit
+		case internal_unlink_linking_exits:
+		    dbg("Java got \"internal_unlink_linking_exits\"");
+		    mbox2 = node.createMbox();
+		    mbox.link(mbox2.self());
+		    mbox.unlink(mbox2.self());
+		    mbox.link(mbox2.self());
+		    mbox2.unlink(mbox.self());
+		    mbox2.exit(tuple.elementAt(2));
+		    if (mbox.receive(500)!=null) System.exit(6);
+		    break;
+		case internal_unlink_linked_exits:
+		    dbg("Java got \"internal_unlink_linked_exits\"");
+		    mbox2 = node.createMbox();
+		    mbox.link(mbox2.self());
+		    mbox.unlink(mbox2.self());
+		    mbox.link(mbox2.self());
+		    mbox2.unlink(mbox.self());
+		    mbox.exit(tuple.elementAt(2));
+		    if (mbox2.receive(500)!=null) System.exit(7);
+		    break;
+		case normal_exit:
+		    dbg("Java got \"normal_exit\"");
+		    mbox.close();
+		    break;
+		case kill_mbox:
+		    dbg("Java got \"kill_mbox\"");
+		    mbox.exit("kill");
+		    break;
+		case kill_erl_proc_from_java:
+		    dbg("Java got \"kill_erl_proc_from_java\"");
+		    mbox.exit((OtpErlangPid)tuple.elementAt(1),"kill");
+		    break;
+		case kill_mbox_from_erlang:
+		    dbg("Java got \"kill_mbox_from_erlang\"");
+		    /* This will make the testcase successful, but it is
+		       not the correct way to do it...
+		       Mbox should probably just die when the kill signal is
+		       received from erlang (or other mbox).
+
+		    try {
+			mbox.receive(1000);
+			System.exit(8);
+		    }
+		    catch (OtpErlangExit exit) {
+			if(!(exit.reason().equals(new OtpErlangAtom("kill"))))
+			    System.exit(9);
+			mbox.exit("killed");
+		    }
+		    */
+		    break;
+		}
+	    }
+	    catch (OtpErlangExit exit) {
+		dbg("Java got exit: " + exit.reason());
+		if(!(waiting && exit.reason().equals(expected)))
+		    System.exit(10);
+	    }
+
+	    OtpErlangAtom done = new OtpErlangAtom("done");
+	    mainMbox.send("erl_link_server", erlNode, done);
+	    OtpErlangObject o = mainMbox.receive(1000);
+	    if (o == null) System.exit(11);
+	    else if (!((OtpErlangAtom)o).equals(done))
+		System.exit(12);
+
+	}
+	catch (Exception e) {
+	    System.out.println("EXCEPTION: " + e);
+	    System.exit(13);
+	}
+    }
+
+    private static void dbg(String str) {
+	if (dbg) System.out.println(str);
+    }
+
+}
diff --git a/lib/jinterface/test/jinterface_SUITE_data/MboxPing.java b/lib/jinterface/test/jinterface_SUITE_data/MboxPing.java
new file mode 100644
index 0000000000..3a8497028e
--- /dev/null
+++ b/lib/jinterface/test/jinterface_SUITE_data/MboxPing.java
@@ -0,0 +1,50 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2004-2010. All Rights Reserved.
+ *
+ * The contents of this file are subject to the Erlang Public License,
+ * Version 1.1, (the "License"); you may not use this file except in
+ * compliance with the License. You should have received a copy of the
+ * Erlang Public License along with this software. If not, it can be
+ * retrieved online at http://www.erlang.org/.
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+ * the License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * %CopyrightEnd%
+ */
+
+import com.ericsson.otp.erlang.*;
+
+class MboxPing {
+
+    /*
+      Implements test case jinterface_SUITE:mbox_ping/1
+
+      Creates an OtpNode object with an OtpMbox object. The test_server
+      node is pinged from the OtpMbox.
+    */
+
+    public static void main(String argv[]) {
+
+	try {
+	    OtpNode node = new OtpNode("javanode",argv[0]);
+	    OtpMbox mbox = node.createMbox();
+	    if (mbox.ping(argv[1],2000)) {
+		System.out.println("OtpMbox.ping(" + argv[1] + ") -> true");
+	    }
+	    else {
+		System.out.println("ERROR: OtpMbox.ping(" + argv[1] +
+				   ") -> false");
+		System.exit(1);
+	    }
+	}
+	catch (Exception e) {
+	    System.out.println("" + e);
+	    System.exit(2);
+	}
+    }
+}
diff --git a/lib/jinterface/test/jinterface_SUITE_data/MboxSendReceive.java b/lib/jinterface/test/jinterface_SUITE_data/MboxSendReceive.java
new file mode 100644
index 0000000000..2db71bb5cd
--- /dev/null
+++ b/lib/jinterface/test/jinterface_SUITE_data/MboxSendReceive.java
@@ -0,0 +1,229 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2004-2010. All Rights Reserved.
+ *
+ * The contents of this file are subject to the Erlang Public License,
+ * Version 1.1, (the "License"); you may not use this file except in
+ * compliance with the License. You should have received a copy of the
+ * Erlang Public License along with this software. If not, it can be
+ * retrieved online at http://www.erlang.org/.
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+ * the License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * %CopyrightEnd%
+ */
+
+import com.ericsson.otp.erlang.*;
+
+class MboxSendReceive {
+
+    /*
+      Implements test case jinterface_SUITE:mbox_send_receive/1
+
+      Test OtpMbox.send(...) and OtpMbox.receive(...)
+     */
+
+    private static final boolean dbg = true;
+    private static final int recTime = 2000;
+
+    private static final int java_erlang_send_receive = 1;
+    private static final int java_internal_send_receive_same_node = 2;
+    private static final int java_internal_send_receive_different_nodes = 3;
+    private static final int java_internal_send_receive_self = 4;
+
+    public static void main(String argv[]) {
+
+	String cookie = argv[0];
+	String erlNode = argv[1];
+
+	OtpErlangObject[] msgArray = new OtpErlangObject[2];
+	msgArray[1] = new OtpErlangAtom("hello world");
+	OtpErlangTuple msg = null;
+
+	try {
+	    // Initiate: create javanode and mboxes
+	    OtpNode node = new OtpNode("javanode",cookie);
+	    OtpMbox mbox = node.createMbox();
+	    OtpMbox mbox2 = node.createMbox("java_echo_server2");
+
+	    // Send the pid of mbox to erlang and wait for test case
+	    // instruction: {TestCaseTag, Pid}
+	    mbox.send("erl_send_receive_server", erlNode, mbox.self());
+	    OtpErlangObject o = mbox.receive(recTime);
+	    if (o == null) System.exit(1);
+	    OtpErlangTuple testCase = (OtpErlangTuple)o;
+	    dbg("mbox received " + testCase);
+	    int tag = (int)((OtpErlangLong)testCase.elementAt(0)).longValue();
+	    OtpErlangPid erlangPid = (OtpErlangPid)testCase.elementAt(1);
+
+	    switch (tag) {
+
+	    case java_erlang_send_receive:
+
+		// Test1 (happened during initiation):
+		// Send mbox pid to erlang process with registered name.
+		// Erlang process sent back its pid to the mbox pid.
+
+		// Test2: Register name and sent it to the erlang pid. Erlang
+		// process shall send message back to my registered name.
+
+		mbox.registerName("java_echo_server");
+		msgArray[0] = getNameNode("java_echo_server",node);
+		msg = new OtpErlangTuple(msgArray);
+
+		dbg("java_echo_server sending " + msg);
+		mbox.send(erlangPid,msg);
+
+		o = mbox.receive(recTime);
+		dbg("java_echo_server received " + o);
+		if (o == null) System.exit(2);
+		if (!((OtpErlangAtom)o).equals(msgArray[1])) System.exit(3);
+
+		// Test3: Same as Test2, but using a new mbox2 which
+		// got its name already when it is created - i.e. not
+		// using mbox.registerName
+		msgArray[0] = getNameNode("java_echo_server2",node);
+		msg = new OtpErlangTuple(msgArray);
+
+		dbg("java_echo_server2 sending " + msg);
+		mbox2.send(erlangPid,msg);
+
+		o = mbox2.receive(recTime);
+		dbg("java_echo_server received " + o);
+		if (o == null) System.exit(4);
+		if (!((OtpErlangAtom)o).equals(msgArray[1])) System.exit(5);
+
+		break;
+
+	    case java_internal_send_receive_same_node:
+
+		// Test1: Sending message between mboxes on same node
+		// given registered name and node without host.
+		mbox.send("java_echo_server2","javanode",msgArray[1]);
+		o = mbox2.receive(recTime);
+		dbg("Mbox at same node: " + o);
+		if (o == null) System.exit(6);
+		if(!((OtpErlangAtom)o).equals(msgArray[1])) System.exit(7);
+
+		// Test2: Sending message between mboxes on same node
+		// given registered name and node with host.
+		mbox.send("java_echo_server2",mbox2.self().node(),msgArray[1]);
+		o = mbox2.receive(recTime);
+		dbg("Mbox at same node: " + o);
+		if (o == null) System.exit(8);
+		if(!((OtpErlangAtom)o).equals(msgArray[1])) System.exit(9);
+
+		// Test3: Sending message between mboxes on same node
+		// given registered name but not node.
+		mbox.send("java_echo_server2",msgArray[1]);
+		o = mbox2.receive(recTime);
+		dbg("Mbox at same node: " + o);
+		if (o == null) System.exit(10);
+		if(!((OtpErlangAtom)o).equals(msgArray[1])) System.exit(11);
+
+		// Test4: Sending message between mboxes on same node
+		// given pid.
+		mbox.send(mbox2.self(),msgArray[1]);
+		o = mbox2.receive(recTime);
+		dbg("Mbox at same node: " + o);
+		if (o == null) System.exit(12);
+		if(!((OtpErlangAtom)o).equals(msgArray[1])) System.exit(13);
+
+		break;
+
+	    case java_internal_send_receive_different_nodes:
+
+		OtpNode node2 = new OtpNode("javanode2", cookie);
+		OtpMbox mboxOtherNode = node2.createMbox("mboxOtherNode");
+
+		// Test1: Sending message between mboxes on different
+		// nodes given registered name and node without host.
+		mbox.send("mboxOtherNode","javanode2",msgArray[1]);
+		o = mboxOtherNode.receive(recTime);
+		dbg("Mbox at same node: " + o);
+		if (o == null) System.exit(14);
+		if(!((OtpErlangAtom)o).equals(msgArray[1])) System.exit(15);
+
+		// Test2: Sending message between mboxes on different
+		// nodes given registered name and node with host.
+		mbox.send("mboxOtherNode",mboxOtherNode.self().node(),
+			  msgArray[1]);
+		o = mboxOtherNode.receive(recTime);
+		dbg("Mbox at same node: " + o);
+		if (o == null) System.exit(16);
+		if(!((OtpErlangAtom)o).equals(msgArray[1])) System.exit(17);
+
+		// Test3: Sending message between mboxes on different
+		// nodes given pid.
+		mbox.send(mboxOtherNode.self(),msgArray[1]);
+		o = mboxOtherNode.receive(recTime);
+		dbg("Mbox at same node: " + o);
+		if (o == null) System.exit(18);
+		if(!((OtpErlangAtom)o).equals(msgArray[1])) System.exit(19);
+
+		break;
+
+
+	    case java_internal_send_receive_self:
+
+		// Test1: Sending message to myself given registered
+		// name and node without host.
+		mbox2.send("java_echo_server2","javanode",msgArray[1]);
+		o = mbox2.receive(recTime);
+		dbg("Self: " + o);
+		if (o == null) System.exit(18);
+		if(!((OtpErlangAtom)o).equals(msgArray[1])) System.exit(19);
+
+		// Test2: Sending message to myself given registered
+		// name and node with host.
+		mbox2.send("java_echo_server2",mbox2.self().node(),msgArray[1]);
+		o = mbox2.receive(recTime);
+		dbg("Self: " + o);
+		if (o == null) System.exit(20);
+		if(!((OtpErlangAtom)o).equals(msgArray[1])) System.exit(21);
+
+		// Test3: Sending message to myself given registered
+		// name but not host.
+		mbox2.send("java_echo_server2",msgArray[1]);
+		o = mbox2.receive(recTime);
+		dbg("Self: " + o);
+		if (o == null) System.exit(22);
+		if(!((OtpErlangAtom)o).equals(msgArray[1])) System.exit(23);
+
+		// Test4: Sending message to myself given pid.
+		mbox2.send(mbox2.self(),msgArray[1]);
+		o = mbox2.receive(recTime);
+		dbg("Self: " + o);
+		if (o == null) System.exit(24);
+		if(!((OtpErlangAtom)o).equals(msgArray[1])) System.exit(25);
+
+		break;
+
+	    }
+
+	    // Closing erl_send_receive_server by sending the atom 'done' to it.
+	    mbox.send(erlangPid,new OtpErlangAtom("done"));
+	}
+	catch (Exception e) {
+	    System.out.println("" + e);
+	    System.exit(26);
+	}
+    }
+
+    private static OtpErlangTuple getNameNode(String mboxName,OtpNode node) {
+	OtpErlangObject[] array = {new OtpErlangAtom(mboxName),
+				   new OtpErlangAtom(node.node())};
+	return new OtpErlangTuple(array);
+
+    }
+
+    private static void dbg(String str) {
+	if (dbg) System.out.println(str);
+    }
+
+
+}
diff --git a/lib/jinterface/test/jinterface_SUITE_data/NodePing.java b/lib/jinterface/test/jinterface_SUITE_data/NodePing.java
new file mode 100644
index 0000000000..d0df5c46b5
--- /dev/null
+++ b/lib/jinterface/test/jinterface_SUITE_data/NodePing.java
@@ -0,0 +1,83 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2004-2010. All Rights Reserved.
+ *
+ * The contents of this file are subject to the Erlang Public License,
+ * Version 1.1, (the "License"); you may not use this file except in
+ * compliance with the License. You should have received a copy of the
+ * Erlang Public License along with this software. If not, it can be
+ * retrieved online at http://www.erlang.org/.
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+ * the License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * %CopyrightEnd%
+ */
+
+import com.ericsson.otp.erlang.*;
+
+class NodePing {
+
+    /*
+      Implements test case jinterface_SUITE:node_ping/1
+
+      Creates three OtpNode objects. One with default cookie, one with
+      specified same cookie as the node running the test case and one
+      with a faulty cookie. From each OtpNode object the test_server
+      node is pinged.
+
+      Also the default cookie node pings itself, and the node with the
+      specified cookie pings the node with default cookie.
+    */
+
+    public static void main(String argv[]) {
+
+	String cookie = argv[0];
+	String erlNode = argv[1];
+
+	try {
+	    OtpNode node1 = new OtpNode("javanode1");
+	    ping(node1,erlNode,"Default cookie:",true,1);
+	    ping(node1,node1.node(),"Self:",true,2);
+	    ping(node1,"javanode1","Self:",true,3);
+
+	    OtpNode node2 = new OtpNode("javanode2",cookie);
+	    ping(node2,erlNode,"Specified cookie:",true,4);
+	    ping(node2,"javanode1","Javanode (no host):",true,5);
+	    ping(node2,node1.node(),"Javanode:",true,6);
+
+	    OtpNode node3 = new OtpNode("javanode3","faultycookie");
+	    ping(node3,erlNode,"Faulty cookie:",false,7);
+
+	    // Test OtpNode.cookie() and OtpNode.setCookie(cookie) as well
+	    if (!node3.cookie().equals("faultycookie"))
+		fail("Testing OtpNode.cookie()",8);
+	    String old = node3.setCookie(cookie);
+	    if (!old.equals("faultycookie"))
+		fail("Checking return of OtpNode.setCookie(cookie)",9);
+	    ping(node3,erlNode,"setCookie:",true,10);
+	}
+	catch (Exception e) {
+	    fail("" + e, 11);
+	}
+    }
+
+    private static void ping(OtpNode node, String remote, String descr,
+			     boolean expected, int reason) {
+	if ( node.ping(remote,2000) == expected ) {
+	    System.out.println(descr + " ping(" + remote + ") -> " + expected);
+	}
+	else {
+	    fail("ERROR: " + descr + " ping(" + remote +") -> " + !expected,
+		 reason);
+	}
+    }
+
+    private static void fail(String str, int reason) {
+	System.out.println(str);
+	System.exit(reason);
+    }
+}
diff --git a/lib/jinterface/test/jinterface_SUITE_data/NodeStatusHandler.java b/lib/jinterface/test/jinterface_SUITE_data/NodeStatusHandler.java
new file mode 100644
index 0000000000..51ea15b5ef
--- /dev/null
+++ b/lib/jinterface/test/jinterface_SUITE_data/NodeStatusHandler.java
@@ -0,0 +1,168 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2004-2010. All Rights Reserved.
+ *
+ * The contents of this file are subject to the Erlang Public License,
+ * Version 1.1, (the "License"); you may not use this file except in
+ * compliance with the License. You should have received a copy of the
+ * Erlang Public License along with this software. If not, it can be
+ * retrieved online at http://www.erlang.org/.
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+ * the License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * %CopyrightEnd%
+ */
+
+import com.ericsson.otp.erlang.*;
+
+public class NodeStatusHandler extends OtpNodeStatus {
+    /*
+      Implements java side of test cases in jinterface_SUITE.erl
+
+      Test OtpNode.registerStatusHandler(...) and class OtpNodeStatus.
+     */
+
+    private static final boolean dbg = true;
+    private static final int recTime = 2000;
+
+    private static String erlNode = null;
+    private static String cookie = null;
+    private static OtpMbox mbox = null;
+
+    private static final int status_handler_localStatus = 1;
+    private static final int status_handler_remoteStatus = 2;
+    private static final int status_handler_connAttempt = 3;
+
+    public static void main(String argv[]) {
+
+	cookie = argv[0];
+	erlNode = argv[1];
+
+	try {
+	  OtpNode javaNode = new OtpNode("javanode", cookie);
+	  mbox = javaNode.createMbox();
+	}
+	catch (Exception e) {
+	    dbg("EXCEPTION when creating javanode: " + e);
+	    System.exit(1);
+	}
+
+	try {
+	    OtpNode node1 = new OtpNode("javanode1", cookie);
+	    node1.registerStatusHandler(new NodeStatusHandler());
+
+	    switch (Integer.parseInt(argv[2])) {
+
+	    case status_handler_localStatus:
+		dbg("java running test case \"status_handler_localStatus\"");
+
+		Thread.sleep(200); // Give 'nodeup' message a chance
+		                   // before closing
+		node1.close();
+		Thread.sleep(500);
+		break;
+
+	    case status_handler_remoteStatus:
+		dbg("java running test case \"status_handler_remoteStatus\"");
+
+		OtpNode node2 = new OtpNode("javanode2", cookie);
+		node2.ping(node1.node(),2000);
+		node2.close();
+		Thread.sleep(500);
+		break;
+
+	    case status_handler_connAttempt:
+		dbg("java running test case \"status_handler_connAttempt\"");
+
+		OtpNode node3 = new OtpNode("javanode3","othercookie");
+		node3.ping(node1.node(),2000);
+		node1.ping(node3.node(),2000);
+		break;
+
+	    }
+
+	    OtpErlangObject o = mbox.receive(recTime);
+	    if (o == null) System.exit(2);
+	    if (! ((OtpErlangAtom)o).atomValue().equals("done"))
+		System.exit(3);
+
+	}
+	catch (Exception e) {
+	    dbg("EXCEPTION: " + e);
+	    System.exit(4);
+	}
+
+    }
+
+
+
+  public void remoteStatus(String node, boolean up, Object info) {
+      try {
+	  dbg("Got remoteStatus: " + node + " " + up + " "  + info);
+	  OtpErlangObject[] msgArray = new OtpErlangObject[4];
+	  msgArray[0] = new OtpErlangAtom("remoteStatus");
+	  msgArray[1] = new OtpErlangString(node);
+	  msgArray[2] = new OtpErlangBoolean(up);
+	  msgArray[3] = mbox.self();
+	  OtpErlangTuple msg = new OtpErlangTuple(msgArray);
+	  mbox.send("erl_status_server", erlNode, msg);
+
+      }
+      catch (Exception e) {
+	  dbg("EXCEPTION in remoteStatus: " + e + "\nArgs:  " +
+			     node + " " + up + " "  + info);
+	  System.exit(5);
+      }
+  }
+
+
+  public void localStatus(String node, boolean up, Object info) {
+      try {
+	  dbg("Got localStatus: " + node + " " + up + " "  + info);
+	  OtpErlangObject[] msgArray = new OtpErlangObject[4];
+	  msgArray[0] = new OtpErlangAtom("localStatus");
+	  msgArray[1] = new OtpErlangString(node);
+	  msgArray[2] = new OtpErlangBoolean(up);
+	  msgArray[3] = mbox.self();
+	  OtpErlangTuple msg = new OtpErlangTuple(msgArray);
+	  mbox.send("erl_status_server", erlNode, msg);
+
+      }
+      catch (Exception e) {
+	  dbg("EXCEPTION in localStatus: " + e + "\nArgs:  " +
+			     node + " " + up + " "  + info);
+	  System.exit(6);
+      }
+  }
+
+
+
+  public void connAttempt(String node, boolean incoming, Object info) {
+      try {
+	  dbg("Got connAttempt: " + node + " " + incoming + " "  + info);
+	  OtpErlangObject[] msgArray = new OtpErlangObject[4];
+	  msgArray[0] = new OtpErlangAtom("connAttempt");
+	  msgArray[1] = new OtpErlangString(node);
+	  msgArray[2] = new OtpErlangBoolean(incoming);
+	  msgArray[3] = mbox.self();
+	  OtpErlangTuple msg = new OtpErlangTuple(msgArray);
+	  mbox.send("erl_status_server", erlNode, msg);
+
+      }
+      catch (Exception e) {
+	  dbg("EXCEPTION in connAttempt: " + e + "\nArgs:  " +
+			     node + " " + incoming + " "  + info);
+	  System.exit(7);
+      }
+  }
+
+
+    private static void dbg(String str) {
+	if (dbg) System.out.println(str);
+    }
+
+}
diff --git a/lib/jinterface/test/jinterface_SUITE_data/Nodename.java b/lib/jinterface/test/jinterface_SUITE_data/Nodename.java
new file mode 100644
index 0000000000..dc8cb9c49f
--- /dev/null
+++ b/lib/jinterface/test/jinterface_SUITE_data/Nodename.java
@@ -0,0 +1,54 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2004-2010. All Rights Reserved.
+ *
+ * The contents of this file are subject to the Erlang Public License,
+ * Version 1.1, (the "License"); you may not use this file except in
+ * compliance with the License. You should have received a copy of the
+ * Erlang Public License along with this software. If not, it can be
+ * retrieved online at http://www.erlang.org/.
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+ * the License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * %CopyrightEnd%
+ */
+
+import com.ericsson.otp.erlang.*;
+
+class Nodename {
+
+    /*
+      Implements test case jinterface_SUITE:nodename/1
+
+    */
+
+    public static void main(String argv[]) {
+
+	String host = argv[0];
+
+	try {
+	    OtpNode node = new OtpNode("javanode");
+	    System.out.println("Given host: " + host +
+			       " Host: " + node.host() +
+			       " Alive: " + node.alive() +
+			       " Node: " + node.node());
+
+	    if (!node.host().equals(host)) fail(1);
+	    if (!node.alive().equals("javanode")) fail(2);
+	    if (!node.node().equals("javanode@" + host)) fail(3);
+	}
+	catch (Exception e) {
+	    System.out.println("" + e);
+	    fail(4);
+	}
+    }
+
+    private static void fail(int reason) {
+	System.exit(reason);
+    }
+
+}
diff --git a/lib/jinterface/test/jinterface_SUITE_data/RegisterAndWhereis.java b/lib/jinterface/test/jinterface_SUITE_data/RegisterAndWhereis.java
new file mode 100644
index 0000000000..9df01981b2
--- /dev/null
+++ b/lib/jinterface/test/jinterface_SUITE_data/RegisterAndWhereis.java
@@ -0,0 +1,79 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2004-2010. All Rights Reserved.
+ *
+ * The contents of this file are subject to the Erlang Public License,
+ * Version 1.1, (the "License"); you may not use this file except in
+ * compliance with the License. You should have received a copy of the
+ * Erlang Public License along with this software. If not, it can be
+ * retrieved online at http://www.erlang.org/.
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+ * the License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * %CopyrightEnd%
+ */
+
+import com.ericsson.otp.erlang.*;
+
+class RegisterAndWhereis {
+
+    /*
+      Implements test case jinterface_SUITE:register_and_whereis/1
+
+    */
+
+    public static void main(String argv[]) {
+
+	try {
+	    OtpNode node = new OtpNode("javanode");
+	    OtpMbox mbox1 = node.createMbox();
+	    mbox1.registerName("mbox1");
+	    OtpMbox mbox2 = node.createMbox("mbox2");
+	    OtpMbox mbox3 = node.createMbox();
+	    node.registerName("mbox3",mbox3);
+
+	    OtpErlangPid pid1 = mbox1.self();
+	    OtpErlangPid pid2 = mbox2.self();
+	    OtpErlangPid pid3 = mbox3.self();
+
+	    if (!pid1.equals(node.whereis("mbox1"))) fail(1);
+	    if (!pid1.equals(mbox1.whereis("mbox1"))) fail(2);
+	    if (!pid1.equals(mbox2.whereis("mbox1"))) fail(3);
+	    if (!pid1.equals(mbox3.whereis("mbox1"))) fail(4);
+	    if (!pid2.equals(node.whereis("mbox2"))) fail(5);
+	    if (!pid2.equals(mbox2.whereis("mbox2"))) fail(6);
+	    if (!pid3.equals(node.whereis("mbox3"))) fail(7);
+	    if (!pid3.equals(mbox3.whereis("mbox3"))) fail(8);
+
+	    node.closeMbox(mbox1);
+	    mbox2.close();
+
+	    if (node.whereis("mbox1") != null) fail(9);
+	    if (node.whereis("mbox2") != null) fail(10);
+	    if (mbox3.whereis("mbox1") != null) fail(11);
+	    if (mbox3.whereis("mbox2") != null) fail(12);
+
+	    mbox3.close();
+	    if (mbox2.whereis("mbox3") != null) fail(13);
+
+
+
+	}
+	catch (Exception e) {
+	    fail("" + e, 14);
+	}
+    }
+
+    private static void fail(int reason) {
+	System.exit(reason);
+    }
+
+    private static void fail(String str, int reason) {
+	System.out.println(str);
+	System.exit(reason);
+    }
+}