[jboss-svn-commits] JBL Code SVN: r16189 - in labs/jbossrules/trunk/drools-jbrms/src: test/java/org/drools/brms/client/qa and 1 other directory.

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

Author: michael.neale at jboss.com
Date: 2007-10-31 01:29:37 -0400 (Wed, 31 Oct 2007)
New Revision: 16189

Modified:
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/qa/ScenarioWidget.java
   labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/qa/ScenarioWidgetTest.java
Log:
JBRULES-1271 testing framework

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/qa/ScenarioWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/qa/ScenarioWidget.java	2007-10-31 05:28:45 UTC (rev 16188)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/qa/ScenarioWidget.java	2007-10-31 05:29:37 UTC (rev 16189)
@@ -29,23 +29,32 @@
 
 
 
-		List factData = new ArrayList();
 
-		FactData d1 = new FactData("Driver", "d1", new FieldData[] {new FieldData("age", "42", false), new FieldData("name", "david", false)}, false, false);
-		FactData d2 = new FactData("Driver", "d2", new FieldData[] {new FieldData("name", "michael", false)}, false, false);
-		FactData d3 = new FactData("Driver", "d3", new FieldData[] {new FieldData("name", "michael2", false)}, true, false);
-		FactData d4 = new FactData("Accident", "a1", new FieldData[] {new FieldData("name", "michael2", false)}, true, false);
+		FactData d1 = new FactData("Driver", "d1", new FieldData[] {new FieldData("age", "42", false), new FieldData("name", "david", false)}, false);
+		FactData d2 = new FactData("Driver", "d2", new FieldData[] {new FieldData("name", "michael", false)}, false);
 
-		factData.addAll(Arrays.asList(new FactData[] {d1, d2, d3,d4}));
 
+		FactData d3 = new FactData("Driver", "d3", new FieldData[] {new FieldData("name", "michael2", false)}, false);
+		FactData d4 = new FactData("Accident", "a1", new FieldData[] {new FieldData("name", "michael2", false)}, false);
 
+
+		Scenario sc = new Scenario();
+		sc.fixtures.add(d1);
+		sc.fixtures.add(d2);
+
+		sc.globals.add(d3);
+		sc.globals.add(d4);
+
+
+
 		//now have to sort this out for the view.
 
-		//we want facts and globs separate, but grouped by type
-		Map facts = new HashMap();
-		Map globals = new HashMap();
-		breakUpFactData(factData, facts, globals);
+		//we want data grouped by type, for the purposes of the grid
 
+		Map facts = breakUpFactData(sc.fixtures);
+		Map globals = breakUpFactData(sc.globals);
+
+
 		//now we have them grouped by type and global/fact, so we can render them appropriately.
 		//maps are a map of Type => List of FactData
 
@@ -76,25 +85,23 @@
 	 * Separate out the elements into the appropriate types.
 	 * Will be keyed on the type name.
 	 */
-    static void breakUpFactData(List factData, Map facts, Map globals) {
+    static Map breakUpFactData(List factData) {
+    	Map facts = new HashMap();
 		for (Iterator iterator = factData.iterator(); iterator.hasNext();) {
 			Object f = (Object) iterator.next();
 			if (f instanceof FactData) {
 				FactData fd = (FactData) f;
-				if (fd.isGlobal) {
-					addToMap(globals, fd);
-				} else {
-					addToMap(facts, fd);
-				}
+				addToMap(facts, fd);
 			}
 		}
+		return facts;
 	}
 
-	private static void addToMap(Map globals, FactData fd) {
-		if (!globals.containsKey(fd.type)) {
-			globals.put(fd.type, new ArrayList());
+	private static void addToMap(Map m, FactData fd) {
+		if (!m.containsKey(fd.type)) {
+			m.put(fd.type, new ArrayList());
 		}
-		List l = (List) globals.get(fd.type);
+		List l = (List) m.get(fd.type);
 		l.add(fd);
 	}
 

Modified: labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/qa/ScenarioWidgetTest.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/qa/ScenarioWidgetTest.java	2007-10-31 05:28:45 UTC (rev 16188)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/qa/ScenarioWidgetTest.java	2007-10-31 05:29:37 UTC (rev 16189)
@@ -1,36 +1,36 @@
 package org.drools.brms.client.qa;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
+import junit.framework.TestCase;
+
 import org.drools.brms.client.modeldriven.testing.FactData;
 
-import junit.framework.TestCase;
-
 public class ScenarioWidgetTest extends TestCase {
 
     public void testMapSeparate() {
         List l = new ArrayList();
-        FactData fd1 = new FactData("Driver", "d1", null, false, false);
-        FactData fd2 = new FactData("Driver", "d2", null, false, false);
-        FactData fd3 = new FactData("Driver", "d3", null, true, false);
+        FactData fd1 = new FactData("Driver", "d1", null, false);
+        FactData fd2 = new FactData("Driver", "d2", null, false);
+        FactData fd3 = new FactData("Person", "d3", null, false);
         l.add(fd1); l.add(fd2); l.add(fd3);
 
-        HashMap facts = new HashMap();
-        HashMap globals = new HashMap();
 
-        ScenarioWidget.breakUpFactData(l, facts, globals);
 
-        assertEquals(1, facts.size());
-        assertEquals(1, globals.size());
 
+        Map facts = ScenarioWidget.breakUpFactData(l);
+
+        assertEquals(2, facts.size());
+
+
         List fl = (List) facts.get("Driver");
         assertEquals(2, fl.size());
         assertEquals(fd1, fl.get(0));
         assertEquals(fd2, fl.get(1));
 
-        List gl = (List) globals.get("Driver");
+        List gl = (List) facts.get("Person");
         assertEquals(1, gl.size());
         assertEquals(fd3, gl.get(0));
     }