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

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

Author: michael.neale at jboss.com
Date: 2008-04-01 03:50:04 -0400 (Tue, 01 Apr 2008)
New Revision: 19357

Modified:
   labs/jbossrules/branches/mic_20080325/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/RuleAttribute.java
   labs/jbossrules/branches/mic_20080325/drools-compiler/src/main/java/org/drools/brms/server/util/GuidedDTDRLPersistence.java
   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/BRDRLPersistenceTest.java
   labs/jbossrules/branches/mic_20080325/drools-compiler/src/test/java/org/drools/brms/server/util/GuidedDTDRLPersistenceTest.java
   labs/jbossrules/branches/mic_20080325/drools-compiler/src/test/java/org/drools/brms/server/util/ScenarioXMLPersistenceTest.java
Log:
tidy up

Modified: labs/jbossrules/branches/mic_20080325/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/RuleAttribute.java
===================================================================
--- labs/jbossrules/branches/mic_20080325/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/RuleAttribute.java	2008-04-01 06:31:38 UTC (rev 19356)
+++ labs/jbossrules/branches/mic_20080325/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/RuleAttribute.java	2008-04-01 07:50:04 UTC (rev 19357)
@@ -11,6 +11,7 @@
 
     private static final String NOLOOP   = "no-loop";
     private static final String SALIENCE = "salience";
+    private static final String ENABLED  = "enabled";
 
     public RuleAttribute(final String name,
                          final String value) {
@@ -32,7 +33,7 @@
         if ( NOLOOP.equals( attributeName ) ) {
             ret.append( " " );
             ret.append( this.value == null ? "true" : this.value );
-        } else if ( SALIENCE.equals( this.attributeName ) ) {
+        } else if ( SALIENCE.equals( this.attributeName ) || ENABLED.equals(this.attributeName) ) {
             ret.append( " " );
             ret.append( this.value );
         } else if ( this.value != null ) {

Modified: labs/jbossrules/branches/mic_20080325/drools-compiler/src/main/java/org/drools/brms/server/util/GuidedDTDRLPersistence.java
===================================================================
--- labs/jbossrules/branches/mic_20080325/drools-compiler/src/main/java/org/drools/brms/server/util/GuidedDTDRLPersistence.java	2008-04-01 06:31:38 UTC (rev 19356)
+++ labs/jbossrules/branches/mic_20080325/drools-compiler/src/main/java/org/drools/brms/server/util/GuidedDTDRLPersistence.java	2008-04-01 07:50:04 UTC (rev 19357)
@@ -186,7 +186,7 @@
 	}
 
 	String getName(String tableName, String num) {
-		return num + "_" + tableName;
+		return "Row " + num + " " + tableName;
 	}
 
 	boolean validCell(String c) {

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-04-01 06:31:38 UTC (rev 19356)
+++ labs/jbossrules/branches/mic_20080325/drools-compiler/src/main/java/org/drools/brms/server/util/ScenarioXMLPersistence.java	2008-04-01 07:50:04 UTC (rev 19357)
@@ -36,6 +36,7 @@
     	xt.alias("expect-fact", VerifyFact.class);
     	xt.alias("expect-field", VerifyField.class);
     	xt.alias("expect-rule", VerifyRuleFired.class);
+    	xt.omitField(ExecutionTrace.class, "rulesFired");
     }
 
     public static ScenarioXMLPersistence getInstance() {

Modified: labs/jbossrules/branches/mic_20080325/drools-compiler/src/test/java/org/drools/brms/server/util/BRDRLPersistenceTest.java
===================================================================
--- labs/jbossrules/branches/mic_20080325/drools-compiler/src/test/java/org/drools/brms/server/util/BRDRLPersistenceTest.java	2008-04-01 06:31:38 UTC (rev 19356)
+++ labs/jbossrules/branches/mic_20080325/drools-compiler/src/test/java/org/drools/brms/server/util/BRDRLPersistenceTest.java	2008-04-01 07:50:04 UTC (rev 19357)
@@ -54,6 +54,16 @@
                       drl );
     }
 
+    public void testAttr() {
+    	RuleModel m = new RuleModel();
+    	m.attributes = new RuleAttribute[1];
+    	m.attributes[0] = new RuleAttribute("enabled", "true");
+        final String drl = p.marshal( m );
+
+        assertTrue(drl.indexOf("enabled true") > 0);
+
+    }
+
     public void testMoreComplexRendering() {
         final RuleModel m = getComplexModel();
         String expected = "rule \"Complex Rule\"\n" +

Modified: labs/jbossrules/branches/mic_20080325/drools-compiler/src/test/java/org/drools/brms/server/util/GuidedDTDRLPersistenceTest.java
===================================================================
--- labs/jbossrules/branches/mic_20080325/drools-compiler/src/test/java/org/drools/brms/server/util/GuidedDTDRLPersistenceTest.java	2008-04-01 06:31:38 UTC (rev 19356)
+++ labs/jbossrules/branches/mic_20080325/drools-compiler/src/test/java/org/drools/brms/server/util/GuidedDTDRLPersistenceTest.java	2008-04-01 07:50:04 UTC (rev 19357)
@@ -120,8 +120,8 @@
 
 	public void testName() {
 		GuidedDTDRLPersistence p = new GuidedDTDRLPersistence();
-		assertEquals("42_XXX", p.getName("XXX", "42"));
-		assertEquals("42_YYY", p.getName("YYY", "42"));
+		assertEquals("Row 42 XXX", p.getName("XXX", "42"));
+		assertEquals("Row 42 YYY", p.getName("YYY", "42"));
 	}
 
 	public void testAttribs() {

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-04-01 06:31:38 UTC (rev 19356)
+++ labs/jbossrules/branches/mic_20080325/drools-compiler/src/test/java/org/drools/brms/server/util/ScenarioXMLPersistenceTest.java	2008-04-01 07:50:04 UTC (rev 19357)
@@ -56,6 +56,7 @@
 
 	}
 
+
 	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();