[jboss-svn-commits] JBL Code SVN: r20864 - in labs/jbossrules/trunk/drools-guvnor/src: test/java/org/drools/guvnor/server/contenthandler and 1 other directory.

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

Author: michael.neale at jboss.com
Date: 2008-07-01 23:38:09 -0400 (Tue, 01 Jul 2008)
New Revision: 20864

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/FactModelContentHandler.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/FactModelContentHandlerTest.java
Log:
tidied it up to work with roles etc

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/FactModelContentHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/FactModelContentHandler.java	2008-07-01 19:50:33 UTC (rev 20863)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/FactModelContentHandler.java	2008-07-02 03:38:09 UTC (rev 20864)
@@ -76,11 +76,22 @@
     	for (TypeDeclarationDescr td : types) {
     		FactMetaModel mm = new FactMetaModel();
 			mm.name = td.getTypeName();
+			if (td.getMetaAttributes().size() > 0) {
+				//can't do this yet
+				throw new DroolsParserException("will have to use text for this");
+			}
+
+
 			Map<String, TypeFieldDescr> fields = td.getFields();
 			for (Iterator<String> iterator = fields.keySet().iterator(); iterator.hasNext();) {
 				String fieldName = iterator.next();
 				TypeFieldDescr descr = fields.get(fieldName);
+				if (descr.getMetaAttributes().size() > 0) {
+					//can't do this yet
+					throw new DroolsParserException("using text");
+				}
 				FieldMetaModel fm = new FieldMetaModel(fieldName, descr.getPattern().getObjectType());
+
 				mm.fields.add(fm);
 			}
 			list.add(mm);

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/FactModelContentHandlerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/FactModelContentHandlerTest.java	2008-07-01 19:50:33 UTC (rev 20863)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/FactModelContentHandlerTest.java	2008-07-02 03:38:09 UTC (rev 20864)
@@ -1,20 +1,16 @@
 package org.drools.guvnor.server.contenthandler;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 import junit.framework.TestCase;
 
-import org.apache.derby.diag.ErrorLogReader;
+import org.drools.compiler.DroolsParserException;
 import org.drools.guvnor.client.factmodel.FactMetaModel;
 import org.drools.guvnor.client.factmodel.FactModels;
 import org.drools.guvnor.client.factmodel.FieldMetaModel;
 import org.drools.guvnor.client.rpc.RuleAsset;
 import org.drools.guvnor.client.rpc.RuleContentText;
-import org.drools.guvnor.server.builder.BRMSPackageBuilder;
-import org.drools.guvnor.server.builder.ContentPackageAssembler;
-import org.drools.guvnor.server.builder.ContentPackageAssembler.ErrorLogger;
 import org.drools.guvnor.server.util.TestEnvironmentSessionHelper;
 import org.drools.repository.AssetItem;
 import org.drools.repository.PackageItem;
@@ -65,6 +61,20 @@
     	assertEquals("f2", fm.name);
     	assertEquals("String", fm.type);
 
+
+    	drl = "declare FooBar\n\t @role(event)  \nend";
+    	try {
+    		ch.toModel(drl);
+    		fail("should not parse this");
+    	} catch (DroolsParserException e) {
+    		assertNotNull(e.getMessage());
+    	}
+
+
+
+
+
+
     }