More polishing for bindings C# and Java

5 files changed, 268 insertions, 41 deletions

diff --git a/embedding/java/src/org/uscxml/tests/TestData.java b/embedding/java/src/org/uscxml/tests/TestData.java
index 44f1ce0..d1ebf20 100644
--- a/embedding/java/src/org/uscxml/tests/TestData.java
+++ b/embedding/java/src/org/uscxml/tests/TestData.java
@@ -1,7 +1,7 @@
 package org.uscxml.tests;
 
 import org.uscxml.Data;
-import org.uscxml.DataNative;
+import org.uscxml.Event;
 
 public class TestData {
 
@@ -9,15 +9,12 @@ public class TestData {
 		System.load("/Users/sradomski/Documents/TK/Code/uscxml/build/cli/lib/libuscxmlNativeJava64.jnilib");
 		{
 			Data data = Data.fromJSON("[1,2,3,4,5]");
-			DataNative nData2 = Data.toNative(data);
-			Data data2 = new Data(nData2);
-			System.out.println(data2);
+			System.out.println(data);
 		}
 		{
 			Data data = Data.fromJSON("{ \"foo\": \"bar\", \"faz\": 12 }");
-			DataNative nData2 = Data.toNative(data);
-			Data data2 = new Data(nData2);
-			System.out.println(data2);
+			System.out.println(data);
 		}
+		
 	}
 }
diff --git a/embedding/java/src/org/uscxml/tests/TestLifecycle.java b/embedding/java/src/org/uscxml/tests/TestLifecycle.java
new file mode 100644
index 0000000..9278cbe
--- /dev/null
+++ b/embedding/java/src/org/uscxml/tests/TestLifecycle.java
@@ -0,0 +1,124 @@
+package org.uscxml.tests;
+
+import org.uscxml.Interpreter;
+import org.uscxml.InterpreterException;
+import org.uscxml.InterpreterState;
+
+public class TestLifecycle {
+	public static void main(String[] args) {
+		System.load("/Users/sradomski/Documents/TK/Code/uscxml/build/cli/lib/libuscxmlNativeJava64.jnilib");
+
+		// syntactic xml parse error -> throws
+		try {
+			String xml = "<invalid";
+			Interpreter interpreter = Interpreter.fromXML(xml);
+			throw new RuntimeException("");
+		} catch (InterpreterException e) {
+			System.err.println(e);
+		}
+
+		// semantic xml parse error -> throws
+		try {
+			String xml = "<invalid />";
+			Interpreter interpreter = Interpreter.fromXML(xml);
+			if (interpreter.getState() != InterpreterState.USCXML_INSTANTIATED) throw new RuntimeException("");
+			interpreter.step();
+			throw new RuntimeException("");
+		} catch (InterpreterException e) {
+			System.err.println(e);
+		}
+
+		// request unknown datamodel -> throws
+		try {
+			String xml =
+			"<scxml datamodel=\"invalid\">" +
+			"	<state id=\"start\">" +
+			"		<transition target=\"done\" />" +
+			" </state>" +
+			" <final id=\"done\" />" +
+			"</scxml>"; 
+			Interpreter interpreter = Interpreter.fromXML(xml);
+			if (interpreter.getState() != InterpreterState.USCXML_INSTANTIATED)  throw new RuntimeException("");
+			interpreter.step();
+			throw new RuntimeException("");
+			
+		} catch (InterpreterException e) {
+			System.err.println(e);
+		}
+
+		try {
+			// two microsteps
+			String xml =
+			"<scxml>" +
+			"	<state id=\"start\">" +
+			"		<transition target=\"s2\" />" +
+			"   </state>" +
+			"	<state id=\"s2\">" +
+			"		<transition target=\"done\" />" +
+			" </state>" +
+			" <final id=\"done\" />" +
+			"</scxml>";
+			
+			Interpreter interpreter = Interpreter.fromXML(xml);
+
+			if (interpreter.getState() != InterpreterState.USCXML_INSTANTIATED) throw new RuntimeException("");
+			if (interpreter.step() != InterpreterState.USCXML_MICROSTEPPED) throw new RuntimeException("");
+			if (interpreter.step() != InterpreterState.USCXML_MICROSTEPPED) throw new RuntimeException("");
+			if (interpreter.step() != InterpreterState.USCXML_FINISHED) throw new RuntimeException("");
+
+		} catch (InterpreterException e) {
+			System.err.println(e);
+		}
+	
+		try {
+			// single macrostep, multiple runs
+			String xml =
+			"<scxml>" +
+			"	<state id=\"start\">" +
+			"		<transition target=\"done\" />" +
+			" </state>" +
+			" <final id=\"done\" />" +
+			"</scxml>";
+			
+			Interpreter interpreter = Interpreter.fromXML(xml);
+			if (interpreter.getState() != InterpreterState.USCXML_INSTANTIATED) throw new RuntimeException("");
+			if (interpreter.step() != InterpreterState.USCXML_MICROSTEPPED) throw new RuntimeException("");
+			if (interpreter.step() != InterpreterState.USCXML_FINISHED) throw new RuntimeException("");
+			interpreter.reset();
+
+			if (interpreter.getState() != InterpreterState.USCXML_INSTANTIATED) throw new RuntimeException("");
+			if (interpreter.step() != InterpreterState.USCXML_MICROSTEPPED) throw new RuntimeException("");
+			if (interpreter.step() != InterpreterState.USCXML_FINISHED) throw new RuntimeException("");
+
+		} catch (InterpreterException e) {
+			System.err.println(e);
+		}
+		
+		try {
+			// macrostep in between
+			String xml =
+			"<scxml>" +
+			"	<state id=\"start\">" +
+			"		<onentry>" +
+			"			<send event=\"continue\" delay=\"2s\"/>" +
+			"		</onentry>" +
+			"		<transition target=\"s2\" event=\"continue\" />" +
+			" </state>" +
+			"	<state id=\"s2\">" +
+			"		<transition target=\"done\" />" +
+			" </state>" +
+			" <final id=\"done\" />" +
+			"</scxml>";
+			
+			Interpreter interpreter = Interpreter.fromXML(xml);
+			if (interpreter.getState() != InterpreterState.USCXML_INSTANTIATED) throw new RuntimeException("");
+			if (interpreter.step() != InterpreterState.USCXML_IDLE) throw new RuntimeException("");
+			if (interpreter.step(true) != InterpreterState.USCXML_MACROSTEPPED) throw new RuntimeException("");
+			if (interpreter.step() != InterpreterState.USCXML_MICROSTEPPED) throw new RuntimeException("");
+			if (interpreter.step() != InterpreterState.USCXML_FINISHED) throw new RuntimeException("");
+
+		} catch (InterpreterException e) {
+			System.err.println(e);
+		}
+	}
+}
diff --git a/embedding/java/src/org/uscxml/tests/execContent/TestCustomExecContent.java b/embedding/java/src/org/uscxml/tests/execContent/TestCustomExecContent.java
index 92d7ed3..7a97ab4 100644
--- a/embedding/java/src/org/uscxml/tests/execContent/TestCustomExecContent.java
+++ b/embedding/java/src/org/uscxml/tests/execContent/TestCustomExecContent.java
@@ -1,11 +1,9 @@
 package org.uscxml.tests.execContent;
 
-import org.uscxml.Data;
-import org.uscxml.Event;
+import org.uscxml.ExecutableContent;
 import org.uscxml.Factory;
 import org.uscxml.Interpreter;
 import org.uscxml.InterpreterException;
-import org.uscxml.ExecutableContent;
 
 public class TestCustomExecContent extends ExecutableContent {
 
diff --git a/embedding/java/src/org/uscxml/tests/invoker/TestCustomInvoker.java b/embedding/java/src/org/uscxml/tests/invoker/TestCustomInvoker.java
index b17b52e..25420ed 100644
--- a/embedding/java/src/org/uscxml/tests/invoker/TestCustomInvoker.java
+++ b/embedding/java/src/org/uscxml/tests/invoker/TestCustomInvoker.java
@@ -1,7 +1,6 @@
 package org.uscxml.tests.invoker;
 
 import org.uscxml.Data;
-import org.uscxml.DataNative;
 import org.uscxml.Event;
 import org.uscxml.Factory;
 import org.uscxml.Interpreter;
@@ -21,27 +20,29 @@ public class TestCustomInvoker extends Invoker {
 	}
 
 	@Override
-	public DataNative getDataModelVariables() {
+	public Data getDataModelVariables() {
 		Data data = new Data();
-		data.array.add(new Data("foo", Data.Type.VERBATIM));
-		return Data.toNative(data);
+		return data;
 	}
 
 	@Override
 	public void send(SendRequest req) {
-		System.out.println("send");
+		System.out.println(req);
+		if ("foo".equals(req.getName()))
+			returnEvent(new Event("received2"), true); // enqueue an external event
 	}
 
 	@Override
 	public void invoke(InvokeRequest req) {
-		System.out.println("invoke");
-
-		System.out.println(req.getData());
-		System.out.println(req.getXML());
+		System.out.println(req);
+		if ("Some string content".equals(req.getContent())) {
+			returnEvent(new Event("received1"), true); // enqueue an external event
+		}
+	}
 
-		Event ev = new Event();
-		ev.setName("foo");
-		returnEvent(ev);
+	@Override
+	public void uninvoke() {
+		System.out.println("uninvoke");
 	}
 
 	@Override
@@ -54,15 +55,35 @@ public class TestCustomInvoker extends Invoker {
 	 * @throws InterpreterException 
 	 */
 	public static void main(String[] args) throws InterpreterException {
-		System.load("/Users/sradomski/Documents/TK/Code/uscxml/build/cli/lib/libuscxmlNativeJava64_d.jnilib");
+		System.load("/Users/sradomski/Documents/TK/Code/uscxml/build/cli/lib/libuscxmlNativeJava64.jnilib");
 
 		TestCustomInvoker invoker = new TestCustomInvoker();
+		// just register prototype at global factory
 		Factory.getInstance().registerInvoker(invoker);
 
-		Interpreter interpreter = Interpreter
-				.fromURI("/Users/sradomski/Documents/TK/Code/uscxml/test/samples/uscxml/test-java-invoker.scxml");
-		while (true)
-			interpreter.interpret();
+		String xml = 
+		"<scxml>" +
+		"  <state id=\"s1\">" +
+		"    <invoke type=\"java\" id=\"javainvoker1\">" +
+		"    	<content>Some string content</content>" +
+		"    </invoke>" +
+		"    <invoke type=\"java\" id=\"javainvoker2\" />" +
+		"    <state id=\"s11\">" +
+		"    	<transition event=\"received1\" target=\"s12\" />" +		
+		"    </state>" +
+		"    <state id=\"s12\">" +
+		"		<onentry>" +
+		"			<send target=\"#_javainvoker2\" event=\"foo\" />" +
+		"		</onentry>" +
+		"    	<transition event=\"received2\" target=\"done\" />" +		
+		"    </state>" +
+		"  </state>" +
+		"  <final id=\"done\" />" +
+		"</scxml>";
+
+		// parse and interpret
+		Interpreter interpreter = Interpreter.fromXML(xml);
+		interpreter.interpret();
 	}
 
 }
diff --git a/embedding/java/src/org/uscxml/tests/ioprocessor/TestCustomIOProc.java b/embedding/java/src/org/uscxml/tests/ioprocessor/TestCustomIOProc.java
index cc4d332..277c505 100644
--- a/embedding/java/src/org/uscxml/tests/ioprocessor/TestCustomIOProc.java
+++ b/embedding/java/src/org/uscxml/tests/ioprocessor/TestCustomIOProc.java
@@ -1,16 +1,30 @@
 package org.uscxml.tests.ioprocessor;
 
+import java.io.IOException;
+import java.io.StringReader;
+
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
 import org.uscxml.Data;
-import org.uscxml.DataNative;
+import org.uscxml.Event;
 import org.uscxml.Factory;
 import org.uscxml.IOProcessor;
 import org.uscxml.Interpreter;
 import org.uscxml.InterpreterException;
 import org.uscxml.SendRequest;
 import org.uscxml.StringList;
+import org.w3c.dom.Document;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
 
 public class TestCustomIOProc extends IOProcessor {
 
+	public Interpreter interpreter;
+
+	/**
+	 * The types we will handle on a <send> element
+	 */
 	@Override
 	public StringList getNames() {
 		StringList ss = new StringList();
@@ -18,38 +32,111 @@ public class TestCustomIOProc extends IOProcessor {
 		return ss;
 	}
 
+	/**
+	 * Optional data we want to make available at
+	 * _ioprocessors[this.getNames.front()] in the datamodel
+	 */
 	@Override
-	public DataNative getDataModelVariables() {
-		Data data = new Data();
-		data.array.add(new Data("foo", Data.Type.VERBATIM));
-		return Data.toNative(data);
+	public Data getDataModelVariables() {
+		return new Data();
 	}
 
+	/**
+	 * Send from the SCXML interpreter to this ioprocessor
+	 */
 	@Override
 	public void send(SendRequest req) {
-		System.out.println("send");
+		System.out.println(req);
+		// send in s1.onentry
+		if ("This is some content!".equals(req.getContent())) {
+			returnEvent(new Event("received1"));
+			return;
+		}
+		// send in s2.onentry
+		if (req.getParams().containsKey("foo")
+				&& "bar".equals(req.getParams().get("foo").get(0).getAtom())) {
+			returnEvent(new Event("received2"));
+			return;
+		}
+		// send in s3
+		if (req.getXML().length() > 0) {
+			try {
+				DocumentBuilderFactory factory = DocumentBuilderFactory
+						.newInstance();
+				Document doc = factory.newDocumentBuilder().parse(
+						new InputSource(new StringReader(req.getXML())));
+				System.out.println("Root element :"
+						+ doc.getDocumentElement().getNodeName());
+				if ("this".equals(doc.getDocumentElement().getNodeName())) {
+					returnEvent(new Event("received3"));
+					return;
+				}
+			} catch (ParserConfigurationException e) {
+				e.printStackTrace();
+			} catch (SAXException e) {
+				e.printStackTrace();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+
 	}
 
+	/**
+	 * Create a new instance of this
+	 */
 	@Override
 	public IOProcessor create(Interpreter interpreter) {
-		return new TestCustomIOProc();
+		TestCustomIOProc ioProc = new TestCustomIOProc();
+		ioProc.interpreter = interpreter;
+		return ioProc;
 	}
 
 	/**
 	 * @param args
-	 * @throws InterpreterException 
+	 * @throws InterpreterException
 	 */
 	public static void main(String[] args) throws InterpreterException {
-		System.load("/Users/sradomski/Documents/TK/Code/uscxml/build/cli/lib/libuscxmlNativeJava64_d.jnilib");
+		System.load("/Users/sradomski/Documents/TK/Code/uscxml/build/cli/lib/libuscxmlNativeJava64.jnilib");
 
 		TestCustomIOProc ioproc = new TestCustomIOProc();
+		// just register prototype at global factory
 		Factory.getInstance().registerIOProcessor(ioproc);
 
-		Interpreter interpreter = Interpreter
-				.fromURI("/Users/sradomski/Documents/TK/Code/uscxml/test/samples/uscxml/test-java-invoker.scxml");
-		
-		while (true)
-			interpreter.interpret();
+		String xml = 
+		"<scxml>" +
+		"  <state id=\"s1\">" +
+		"    <onentry>" +
+		"      <send type=\"java\">" +
+		"        <content>This is some content!</content>" +
+		"      </send>" +
+		"    </onentry>" +
+		"    <transition event=\"received1\" target=\"s2\" />" +
+		"  </state>" +
+		"  <state id=\"s2\">" +
+		"    <onentry>" +
+		"      <send type=\"java\">" +
+		"        <param name=\"foo\" expr=\"bar\" />" +
+		"      </send>" +
+		"    </onentry>" +
+		"    <transition event=\"received2\" target=\"s3\" />" +
+		"  </state>" +
+		"  <state id=\"s3\">" +
+		"    <onentry>" +
+		"      <send type=\"java\">" +
+		"        <content>" +
+		"        <this><is><xml/></is></this>" +
+		"        </content>" +
+		"      </send>" +
+		"    </onentry>" +
+		"    <transition event=\"received3\" target=\"done\" />" +
+		"  </state>" +
+		"  <final id=\"done\" />" +
+		"</scxml>";
+
+		// parse and interpret
+		Interpreter interpreter = Interpreter.fromXML(xml);
+		interpreter.interpret();
 	}
 
 }