[jboss-svn-commits] JBL Code SVN: r19288 - in labs/jbossrules/branches/mic_20080325/drools-compiler/src: test/java/org/drools/brms/server/util and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: michael.neale at jboss.com
Date: 2008-03-28 01:39:57 -0400 (Fri, 28 Mar 2008)
New Revision: 19288

Modified:
   labs/jbossrules/branches/mic_20080325/drools-compiler/src/main/java/org/drools/brms/server/util/ScenarioXMLPersistence.java
   labs/jbossrules/branches/mic_20080325/drools-compiler/src/test/java/org/drools/brms/server/util/ScenarioXMLPersistenceTest.java
Log:
fixed it erasing too much of tests on marshal

Modified: labs/jbossrules/branches/mic_20080325/drools-compiler/src/main/java/org/drools/brms/server/util/ScenarioXMLPersistence.java
===================================================================
--- labs/jbossrules/branches/mic_20080325/drools-compiler/src/main/java/org/drools/brms/server/util/ScenarioXMLPersistence.java	2008-03-28 05:31:19 UTC (rev 19287)
+++ labs/jbossrules/branches/mic_20080325/drools-compiler/src/main/java/org/drools/brms/server/util/ScenarioXMLPersistence.java	2008-03-28 05:39:57 UTC (rev 19288)
@@ -46,7 +46,12 @@
 
     public String marshal(Scenario sc) {
     	if (sc.fixtures.size() > 1  && sc.fixtures.get(sc.fixtures.size() - 1) instanceof ExecutionTrace) {
-    		sc.fixtures.remove(sc.fixtures.size() - 1);
+    		Object f = sc.fixtures.get(sc.fixtures.size() - 2);
+
+    		if (f instanceof Expectation) {
+    			sc.fixtures.remove(sc.fixtures.size() - 1);
+    		}
+
     	}
     	return xt.toXML(sc);
     }

Modified: labs/jbossrules/branches/mic_20080325/drools-compiler/src/test/java/org/drools/brms/server/util/ScenarioXMLPersistenceTest.java
===================================================================
--- labs/jbossrules/branches/mic_20080325/drools-compiler/src/test/java/org/drools/brms/server/util/ScenarioXMLPersistenceTest.java	2008-03-28 05:31:19 UTC (rev 19287)
+++ labs/jbossrules/branches/mic_20080325/drools-compiler/src/test/java/org/drools/brms/server/util/ScenarioXMLPersistenceTest.java	2008-03-28 05:39:57 UTC (rev 19288)
@@ -41,12 +41,13 @@
 		Scenario orig = getDemo();
 		sc.fixtures.add(new ExecutionTrace());
 
+		int origSize = orig.fixtures.size();
 
-		assertEquals(orig.fixtures.size() + 1, sc.fixtures.size());
+		assertEquals(origSize + 1, sc.fixtures.size());
 		String xml = ScenarioXMLPersistence.getInstance().marshal(sc);
 		Scenario sc_ = ScenarioXMLPersistence.getInstance().unmarshal(xml);
 
-		assertEquals(orig.fixtures.size(), sc_.fixtures.size());
+		assertEquals(origSize, sc_.fixtures.size());
 
 
 
@@ -55,6 +56,26 @@
 
 	}
 
+	public void testNewScenario() {
+        FactData d1 = new FactData("Driver", "d1", ls(new FieldData[] {new FieldData("age", "42"), new FieldData("name", "david")}), false);
+        Scenario sc = new Scenario();
+        sc.fixtures.add(d1);
+        sc.fixtures.add(new ExecutionTrace());
+
+        int size = sc.fixtures.size();
+
+		String xml = ScenarioXMLPersistence.getInstance().marshal(sc);
+		Scenario sc_ = ScenarioXMLPersistence.getInstance().unmarshal(xml);
+
+		assertEquals(size, sc_.fixtures.size());
+
+		sc = new Scenario();
+		sc.fixtures.add(new ExecutionTrace());
+		xml = ScenarioXMLPersistence.getInstance().marshal(sc);
+		sc_ = ScenarioXMLPersistence.getInstance().unmarshal(xml);
+		assertEquals(1, sc_.fixtures.size());
+	}
+
 	private Scenario getDemo() {
         //Sample data
         FactData d1 = new FactData("Driver", "d1", ls(new FieldData[] {new FieldData("age", "42"), new FieldData("name", "david")}), false);