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

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

Author: michael.neale at jboss.com
Date: 2009-02-24 22:04:27 -0500 (Tue, 24 Feb 2009)
New Revision: 25415

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/ContentPackageAssembler.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/ContentPackageAssemblerTest.java
Log:
GUVNOR-159 handling of disabled models

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/ContentPackageAssembler.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/ContentPackageAssembler.java	2009-02-25 02:46:08 UTC (rev 25414)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/ContentPackageAssembler.java	2009-02-25 03:04:27 UTC (rev 25415)
@@ -374,9 +374,9 @@
 		AssetItemIterator it = this.pkg.listAssetsByFormat(new String[] {
 				AssetFormats.FUNCTION, AssetFormats.DRL_MODEL });
 		while (it.hasNext()) {
-			AssetItem func = (AssetItem) it.next();
-			if (!func.isArchived()) {
-				src.append(func.getContent() + "\n\n");
+			AssetItem func = it.next();
+			if (!func.isArchived() && !func.getDisabled()) {
+                src.append(func.getContent()).append("\n\n");
 			}
 		}
 

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/ContentPackageAssemblerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/ContentPackageAssemblerTest.java	2009-02-25 02:46:08 UTC (rev 25414)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/ContentPackageAssemblerTest.java	2009-02-25 03:04:27 UTC (rev 25415)
@@ -588,6 +588,15 @@
         rule2.updateContent( "when \n foo \n then \n call a func" );
         rule2.checkin( "" );
 
+        AssetItem rule3 = pkg.addAsset( "model1",
+                                        "" );
+        rule3.updateFormat( AssetFormats.DRL_MODEL );
+        rule3.updateContent( "garbage" );
+        rule3.updateDisabled(true);
+        rule3.checkin( "" );
+
+
+
         ContentPackageAssembler asm = new ContentPackageAssembler( pkg,
                                                                    false,
                                                                    null );
@@ -608,6 +617,8 @@
         assertContains( "rule 'foo' when Goo() then end",
                         drl );
 
+        assertEquals(-1, drl.indexOf("garbage"));
+
     }
 
     public void testSkipDisabledAssets() throws Exception {