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

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

Author: michael.neale at jboss.com
Date: 2009-08-25 04:03:38 -0400 (Tue, 25 Aug 2009)
New Revision: 29042

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplementationTest.java
Log:
GUVNOR-437 disabled scenarios should not be executed

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java	2009-08-24 23:54:21 UTC (rev 29041)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java	2009-08-25 08:03:38 UTC (rev 29042)
@@ -2053,18 +2053,21 @@
             RuleCoverageListener coverage = new RuleCoverageListener( expectedRules( bin ) );
 
             while ( it.hasNext() ) {
-                RuleAsset asset = loadAsset( (AssetItem) it.next() );
-                Scenario sc = (Scenario) asset.content;
-                runScenario( item.getName(),
-                             sc,
-                             coverage );//runScenario(sc, res, workingMemory).scenario;
+                AssetItem as= it.next();
+                if (!as.getDisabled()) {
+                    RuleAsset asset = loadAsset( as );
+                    Scenario sc = (Scenario) asset.content;
+                    runScenario( item.getName(),
+                                 sc,
+                                 coverage );//runScenario(sc, res, workingMemory).scenario;
 
-                int[] totals = sc.countFailuresTotal();
-                resultSummaries.add( new ScenarioResultSummary( totals[0],
-                                                                totals[1],
-                                                                asset.metaData.name,
-                                                                asset.metaData.description,
-                                                                asset.uuid ) );
+                    int[] totals = sc.countFailuresTotal();
+                    resultSummaries.add( new ScenarioResultSummary( totals[0],
+                                                                    totals[1],
+                                                                    asset.metaData.name,
+                                                                    asset.metaData.description,
+                                                                    asset.uuid ) );
+                }
             }
 
             ScenarioResultSummary[] summaries = resultSummaries.toArray( new ScenarioResultSummary[resultSummaries.size()] );

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplementationTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplementationTest.java	2009-08-24 23:54:21 UTC (rev 29041)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplementationTest.java	2009-08-25 08:03:38 UTC (rev 29042)
@@ -2335,7 +2335,14 @@
 		scenario2.updateContent(ScenarioXMLPersistence.getInstance().marshal(sc));
 		scenario2.checkin("");
 
+        AssetItem scenario3 = pkg.addAsset("scenBOGUS", "");
+        scenario3.updateFormat(AssetFormats.TEST_SCENARIO);
+        scenario3.updateContent("SOME RUBBISH");
+        scenario3.updateDisabled(true);
+        scenario3.checkin("");
 
+
+
 		//love you
 		long time = System.currentTimeMillis();
 		BulkTestRunResult result = impl.runScenariosInPackage(pkg.getUUID());