From 30cd736670a579985890d8c2dfe363bacbad7568 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Sun, 27 Oct 2013 00:27:24 +0200
Subject: Beta?

---
 src/test/java/MainTest.java | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'src/test/java')

diff --git a/src/test/java/MainTest.java b/src/test/java/MainTest.java
index 99e293a..309f0cf 100644
--- a/src/test/java/MainTest.java
+++ b/src/test/java/MainTest.java
@@ -17,6 +17,13 @@ import com.c2kernel.utils.Resource;
 
 public class MainTest {
 
+	public static void main(String[] args) throws Exception {
+		MainTest me = new MainTest();
+		me.testBootItems();
+		me.testScriptParsing();
+		me.testStateMachine();
+	}
+	
 	public MainTest() throws Exception {
 		Logger.addLogStream(System.out, 1);
 		Properties props = FileStringUtility.loadConfigFile(MainTest.class.getResource("properties.conf").getPath());
@@ -31,6 +38,7 @@ public class MainTest {
 		validators.put("CA", new OutcomeValidator(getSchema("CompositeActivityDef", 0, "boot/OD/CompositeActivityDef.xsd")));
 		validators.put("EA", new OutcomeValidator(getSchema("ElementaryActivityDef", 0, "boot/OD/ElementaryActivityDef.xsd")));
 		validators.put("SC", new OutcomeValidator(getSchema("Script", 0, "boot/OD/Script.xsd")));
+		validators.put("SM", new OutcomeValidator(getSchema("StateMachine", 0, "boot/OD/StateMachine.xsd")));
 		validators.put("OD", new SchemaValidator());
 		
     	String bootItems = FileStringUtility.url2String(Resource.getKernelResourceURL("boot/allbootitems.txt"));
@@ -50,7 +58,7 @@ public class MainTest {
             }
             assert errors.length()==0;
             
-            if (false) if (itemType.equals("CA") || itemType.equals("EA")) {
+            if (itemType.equals("CA") || itemType.equals("EA") || itemType.equals("SM")) {
             	Logger.msg(1, "Remarshalling "+thisItem);
             	long then = System.currentTimeMillis();
 	            Object unmarshalled = Gateway.getMarshaller().unmarshall(data);
@@ -61,7 +69,7 @@ public class MainTest {
 	            castorTime+=(now-then);
 	            errors = validator.validate(remarshalled);
 	            if (errors.length() > 0) {
-	            	Logger.error("Remarshalled resource "+thisItem+" has errors :"+errors);
+	            	Logger.error("Remarshalled resource "+thisItem+" has errors :"+errors+"\nRemarshalled form:\n"+remarshalled);
 	            }
 	            assert errors.length()==0;
 
@@ -104,8 +112,10 @@ public class MainTest {
 	}
 		
 	public void testStateMachine() throws Exception {
+		Logger.msg("Validating test state machine");
 		String smXml = FileStringUtility.url2String(MainTest.class.getResource("TestStateMachine.xml"));
 		StateMachine sm = (StateMachine)Gateway.getMarshaller().unmarshall(smXml);
-		assert sm!=null;
+		sm.validate();
+		assert sm.isCoherent();
 	}
 }
-- 
cgit v1.2.3