[jboss-svn-commits] JBL Code SVN: r14386 - in labs/jbossrules/trunk/drools-compiler/src: test/java/org/drools/brms/modeldriven and 1 other directory.

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

Author: michael.neale at jboss.com
Date: 2007-08-20 03:49:40 -0400 (Mon, 20 Aug 2007)
New Revision: 14386

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/DataEnumLoader.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/DataEnumLoaderTest.java
Log:
JBRULES-1090

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/DataEnumLoader.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/DataEnumLoader.java	2007-08-20 06:06:00 UTC (rev 14385)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/DataEnumLoader.java	2007-08-20 07:49:40 UTC (rev 14386)
@@ -26,6 +26,9 @@
 	}
 
 	private Map loadEnum(String mvelSource) {
+        if (mvelSource == null || (mvelSource.trim().equals( "" ))) {
+            return Collections.EMPTY_MAP;
+        }
 		final Object mvelData;
 		try {
 

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/DataEnumLoaderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/DataEnumLoaderTest.java	2007-08-20 06:06:00 UTC (rev 14385)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/DataEnumLoaderTest.java	2007-08-20 07:49:40 UTC (rev 14386)
@@ -43,9 +43,6 @@
 
 
 
-		loader = new DataEnumLoader("");
-		assertEquals(1, loader.getErrors().size());
-		assertTrue(loader.hasErrors());
 
 		loader = new DataEnumLoader("goober poo error");
 		assertEquals(0, loader.getData().size());
@@ -54,7 +51,18 @@
 
 	}
 
+    public void testNoOp() {
+        DataEnumLoader loader = new DataEnumLoader(" ");
+        assertFalse(loader.hasErrors());
+        assertEquals(0, loader.getData().size());
 
+        loader = new DataEnumLoader("");
+        assertFalse(loader.hasErrors());
+        assertEquals(0, loader.getData().size());
+
+    }
+
+
 	private StringBuffer readLines() throws IOException {
 		BufferedReader r = new BufferedReader(new InputStreamReader(this.getClass().getResourceAsStream("Some.enumeration")));
 		String line = "";