[jboss-svn-commits] JBL Code SVN: r23792 - in labs/jbossrules/trunk: drools-core/src/test/java/org/drools/event/knowledgebase and 2 other directories.

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

Author: mark.proctor at jboss.com
Date: 2008-11-09 08:51:28 -0500 (Sun, 09 Nov 2008)
New Revision: 23792

Modified:
   labs/jbossrules/trunk/drools-api/src/main/java/org/drools/KnowledgeBase.java
   labs/jbossrules/trunk/drools-core/src/test/java/org/drools/event/knowledgebase/KnowledgeBaseEventSupportTest.java
   labs/jbossrules/trunk/drools-core/src/test/java/org/drools/event/process/ProcessEventSupportTest.java
   labs/jbossrules/trunk/drools-core/src/test/java/org/drools/event/rule/AgendaEventSupportTest.java
Log:
JBRULES-1734 Drools API 
-Removed single package addition for now, just to keep api slim. Can always add back again later if demand is there.

Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/KnowledgeBase.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/KnowledgeBase.java	2008-11-09 08:16:20 UTC (rev 23791)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/KnowledgeBase.java	2008-11-09 13:51:28 UTC (rev 23792)
@@ -8,7 +8,6 @@
 import org.drools.runtime.StatefulKnowledgeSession;
 
 public interface KnowledgeBase extends KnowledgeBaseEventManager {    
-    void addKnowledgePackage(KnowledgePackage knowledgePackage);
     
     void addKnowledgePackages(Collection<KnowledgePackage> knowledgePackage);
     

Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/event/knowledgebase/KnowledgeBaseEventSupportTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/event/knowledgebase/KnowledgeBaseEventSupportTest.java	2008-11-09 08:16:20 UTC (rev 23791)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/event/knowledgebase/KnowledgeBaseEventSupportTest.java	2008-11-09 13:51:28 UTC (rev 23792)
@@ -20,6 +20,8 @@
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
+import java.util.ArrayList;
+import java.util.List;
 
 import junit.framework.TestCase;
 
@@ -35,6 +37,7 @@
 import org.drools.base.ValueType;
 import org.drools.base.evaluators.EqualityEvaluatorsDefinition;
 import org.drools.base.evaluators.Operator;
+import org.drools.definition.KnowledgePackage;
 import org.drools.knowledge.definitions.impl.KnowledgePackageImp;
 import org.drools.rule.LiteralConstraint;
 import org.drools.rule.Package;
@@ -170,7 +173,9 @@
         assertEquals( 0,
                       listener2.getAfterRuleAdded() );
 
-        this.kbase.addKnowledgePackage( pkg );
+        List<KnowledgePackage> pkgs = new ArrayList<KnowledgePackage>();
+        pkgs.add( pkg );
+        this.kbase.addKnowledgePackages( pkgs );
 
         assertEquals( 1,
                       listener1.getBeforePackageAdded() );
@@ -191,7 +196,9 @@
     }
 
     public void testRemovePackageEvents() throws Exception {
-        this.kbase.addKnowledgePackage( pkg );
+        List<KnowledgePackage> pkgs = new ArrayList<KnowledgePackage>();
+        pkgs.add( pkg );
+        this.kbase.addKnowledgePackages( pkgs );
 
         assertEquals( 0,
                       listener1.getBeforeKnowledgePackageRemoved() );

Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/event/process/ProcessEventSupportTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/event/process/ProcessEventSupportTest.java	2008-11-09 08:16:20 UTC (rev 23791)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/event/process/ProcessEventSupportTest.java	2008-11-09 13:51:28 UTC (rev 23792)
@@ -23,6 +23,7 @@
 
 import org.drools.KnowledgeBase;
 import org.drools.KnowledgeBaseFactory;
+import org.drools.definition.KnowledgePackage;
 import org.drools.knowledge.definitions.impl.KnowledgePackageImp;
 import org.drools.rule.Package;
 import org.drools.ruleflow.core.RuleFlowProcess;
@@ -82,7 +83,9 @@
         );
         
         pkg.addProcess(process);
-        kbase.addKnowledgePackage( new KnowledgePackageImp( pkg ) );
+        List<KnowledgePackage> pkgs = new ArrayList<KnowledgePackage>();
+        pkgs.add( new KnowledgePackageImp( pkg ) );
+        kbase.addKnowledgePackages( pkgs );
         
         StatefulKnowledgeSession session = kbase.newStatefulKnowledgeSession();
         final List<ProcessEvent> processEventList = new ArrayList<ProcessEvent>();

Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/event/rule/AgendaEventSupportTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/event/rule/AgendaEventSupportTest.java	2008-11-09 08:16:20 UTC (rev 23791)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/event/rule/AgendaEventSupportTest.java	2008-11-09 13:51:28 UTC (rev 23792)
@@ -40,6 +40,7 @@
 import org.drools.base.evaluators.SetEvaluatorsDefinition;
 import org.drools.base.evaluators.SoundslikeEvaluatorsDefinition;
 import org.drools.common.InternalFactHandle;
+import org.drools.definition.KnowledgePackage;
 import org.drools.knowledge.definitions.impl.KnowledgePackageImp;
 import org.drools.rule.LiteralConstraint;
 import org.drools.rule.Package;
@@ -114,7 +115,9 @@
         pkg.addRule( rule );
         
                 
-        kbase.addKnowledgePackage( new KnowledgePackageImp( pkg ) );
+        List<KnowledgePackage> pkgs = new ArrayList<KnowledgePackage>();
+        pkgs.add( new KnowledgePackageImp( pkg ) );
+        kbase.addKnowledgePackages( pkgs );
 
         // create a new working memory and add an AgendaEventListener
         StatefulKnowledgeSession session = kbase.newStatefulKnowledgeSession();