[jboss-svn-commits] JBL Code SVN: r16713 - in labs/jbossesb/workspace/jdelong/rs/product/services/jbrules/src/test: resources/drl and 1 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Tue Nov 20 23:47:28 EST 2007


Author: jeffdelong
Date: 2007-11-20 23:47:28 -0500 (Tue, 20 Nov 2007)
New Revision: 16713

Removed:
   labs/jbossesb/workspace/jdelong/rs/product/services/jbrules/src/test/resources/drl/OrderDiscountOnMultipleOrders.drl
   labs/jbossesb/workspace/jdelong/rs/product/services/jbrules/src/test/resources/drl/OrderDiscountOnMultipleOrders2.drl
   labs/jbossesb/workspace/jdelong/rs/product/services/jbrules/src/test/resources/drl/OrderDiscountOnMultipleOrders3.drl
Modified:
   labs/jbossesb/workspace/jdelong/rs/product/services/jbrules/src/test/java/org/jboss/soa/esb/services/rules/Customer.java
   labs/jbossesb/workspace/jdelong/rs/product/services/jbrules/src/test/java/org/jboss/soa/esb/services/rules/DroolsRuleServiceUnitTest.java
   labs/jbossesb/workspace/jdelong/rs/product/services/jbrules/src/test/resources/ruleAgent/brmsdeployedrules.properties
Log:


Modified: labs/jbossesb/workspace/jdelong/rs/product/services/jbrules/src/test/java/org/jboss/soa/esb/services/rules/Customer.java
===================================================================
--- labs/jbossesb/workspace/jdelong/rs/product/services/jbrules/src/test/java/org/jboss/soa/esb/services/rules/Customer.java	2007-11-21 00:40:52 UTC (rev 16712)
+++ labs/jbossesb/workspace/jdelong/rs/product/services/jbrules/src/test/java/org/jboss/soa/esb/services/rules/Customer.java	2007-11-21 04:47:28 UTC (rev 16713)
@@ -51,6 +51,9 @@
         this.discount = discount;
     }
 
+    public String toString() {
+    	return name;
+    }
 	
 
 }

Modified: labs/jbossesb/workspace/jdelong/rs/product/services/jbrules/src/test/java/org/jboss/soa/esb/services/rules/DroolsRuleServiceUnitTest.java
===================================================================
--- labs/jbossesb/workspace/jdelong/rs/product/services/jbrules/src/test/java/org/jboss/soa/esb/services/rules/DroolsRuleServiceUnitTest.java	2007-11-21 00:40:52 UTC (rev 16712)
+++ labs/jbossesb/workspace/jdelong/rs/product/services/jbrules/src/test/java/org/jboss/soa/esb/services/rules/DroolsRuleServiceUnitTest.java	2007-11-21 04:47:28 UTC (rev 16713)
@@ -579,32 +579,51 @@
 	{
  		DroolsRuleService droolsRuleService = new DroolsRuleService();
         try {
+        	System.out.println("first send in customer mark");
        		droolsRuleService.executeStatefulRules("drl/OrderDiscountOnMultipleOrders.drl", null, false, false, message4, objectList4);
-        	
+ 
+        	System.out.println("next send order 5 for customer mark ");
+  
         	droolsRuleService.continueStatefulRulesExecution("drl/OrderDiscountOnMultipleOrders.drl", false, message5, objectList5);
             Customer customerFromMessage5 = (Customer) message5.getBody().get("Customer");
             assertNull(customerFromMessage5);
-            
+            assertEquals(order5.getDiscount(), 0);
+ 
+           	System.out.println("next send order 6 for customer mark ");
+ 
        		droolsRuleService.continueStatefulRulesExecution("drl/OrderDiscountOnMultipleOrders.drl", false, message6, objectList6);
             Customer customerFromMessage6 = (Customer) message6.getBody().get("Customer");
             assertEquals(customerFromMessage6.getDiscount(), 10);
-
+            assertEquals(order6.getDiscount(), 10);
+ 
+          	System.out.println("next send order 7 for customer michael ");
+  
        		droolsRuleService.continueStatefulRulesExecution("drl/OrderDiscountOnMultipleOrders.drl", false, message7, objectList7);
             Customer customerFromMessage7 = (Customer) message7.getBody().get("Customer");
             assertEquals(customerFromMessage7.getDiscount(), 0);  
-            
+            assertEquals(order7.getDiscount(), 0);
+ 
+          	System.out.println("next send order 8 for customer mark ");
+  
       		droolsRuleService.continueStatefulRulesExecution("drl/OrderDiscountOnMultipleOrders.drl", false, message8, objectList8);
             Customer customerFromMessage8 = (Customer) message8.getBody().get("Customer");
             assertEquals(customerFromMessage8.getDiscount(), 10);
-                    
+            assertEquals(order8.getDiscount(), 10);
+ 
+        	System.out.println("next send order 9 for customer michael ");
+   
      		droolsRuleService.continueStatefulRulesExecution("drl/OrderDiscountOnMultipleOrders.drl", false, message9, objectList9);
             Customer customerFromMessage9 = (Customer) message9.getBody().get("Customer");
             assertEquals(customerFromMessage9.getDiscount(), 10);
- 
+            assertEquals(order9.getDiscount(), 10);
+  
+        	System.out.println("next send order 10 for customer tirelli ");
+  
      		droolsRuleService.continueStatefulRulesExecution("drl/OrderDiscountOnMultipleOrders.drl", true, message10, objectList10);
             Customer customerFromMessage10 = (Customer) message10.getBody().get("Customer");
             assertEquals(customerFromMessage10.getDiscount(), 10);
-
+            assertEquals(order10.getDiscount(), 10);
+            
             System.out.println("test drlStateful with continuation passed");
                                  
         } catch (RuleServiceException rse) {
@@ -614,45 +633,45 @@
         }
 	}
 
-	@Test
-	public void drlStatefulOverTime2() throws ObjectMappingException
-	{
- 		DroolsRuleService droolsRuleService = new DroolsRuleService();
-        try {
-       		droolsRuleService.executeStatefulRules("drl/OrderDiscountOnMultipleOrders2.drl", null, false, false, message4, objectList4);
-        	
-        	droolsRuleService.continueStatefulRulesExecution("drl/OrderDiscountOnMultipleOrders2.drl", false, message5, objectList5);
-            Customer customerFromMessage5 = (Customer) message5.getBody().get("Customer");
-            assertNull(customerFromMessage5);
-            
-       		droolsRuleService.continueStatefulRulesExecution("drl/OrderDiscountOnMultipleOrders2.drl", false, message6, objectList6);
-            Order orderFromMessage6 = (Order) message6.getBody().get("Order");
-            assertEquals(orderFromMessage6.getDiscount(), 10.0);
-
-       		droolsRuleService.continueStatefulRulesExecution("drl/OrderDiscountOnMultipleOrders2.drl", false, message7, objectList7);
-            Order orderFromMessage7 = (Order) message7.getBody().get("Order");
-            assertEquals(orderFromMessage7.getDiscount(), -10.0);
-            
-      		droolsRuleService.continueStatefulRulesExecution("drl/OrderDiscountOnMultipleOrders2.drl", false, message8, objectList8);
-            Order orderFromMessage8 = (Order) message8.getBody().get("Order");
-            assertEquals(orderFromMessage8.getDiscount(), 10.0);
-                    
-     		droolsRuleService.continueStatefulRulesExecution("drl/OrderDiscountOnMultipleOrders2.drl", false, message9, objectList9);
-            Order orderFromMessage9 = (Order) message9.getBody().get("Order");
-            assertEquals(orderFromMessage9.getDiscount(), 10.0);
- 
-     		droolsRuleService.continueStatefulRulesExecution("drl/OrderDiscountOnMultipleOrders2.drl", true, message10, objectList10);
-            Order orderFromMessage10 = (Order) message10.getBody().get("Order");
-            assertEquals(orderFromMessage10.getDiscount(), 10.0);
-
-          System.out.println("test drlStateful with continuation passed");
-                                 
-        } catch (RuleServiceException rse) {
-            System.out.println("Exception was thrown.");
-            rse.printStackTrace();
-            assertTrue(false);
-        }
-	}
+//	@Test
+//	public void drlStatefulOverTime2() throws ObjectMappingException
+//	{
+// 		DroolsRuleService droolsRuleService = new DroolsRuleService();
+//        try {
+//       		droolsRuleService.executeStatefulRules("drl/OrderDiscountOnMultipleOrders2.drl", null, false, false, message4, objectList4);
+//        	
+//        	droolsRuleService.continueStatefulRulesExecution("drl/OrderDiscountOnMultipleOrders2.drl", false, message5, objectList5);
+//            Customer customerFromMessage5 = (Customer) message5.getBody().get("Customer");
+//            assertNull(customerFromMessage5);
+//            
+//       		droolsRuleService.continueStatefulRulesExecution("drl/OrderDiscountOnMultipleOrders2.drl", false, message6, objectList6);
+//            Order orderFromMessage6 = (Order) message6.getBody().get("Order");
+//            assertEquals(orderFromMessage6.getDiscount(), 10.0);
+//
+//       		droolsRuleService.continueStatefulRulesExecution("drl/OrderDiscountOnMultipleOrders2.drl", false, message7, objectList7);
+//            Order orderFromMessage7 = (Order) message7.getBody().get("Order");
+//            assertEquals(orderFromMessage7.getDiscount(), -10.0);
+//            
+//      		droolsRuleService.continueStatefulRulesExecution("drl/OrderDiscountOnMultipleOrders2.drl", false, message8, objectList8);
+//            Order orderFromMessage8 = (Order) message8.getBody().get("Order");
+//            assertEquals(orderFromMessage8.getDiscount(), 10.0);
+//                    
+//     		droolsRuleService.continueStatefulRulesExecution("drl/OrderDiscountOnMultipleOrders2.drl", false, message9, objectList9);
+//            Order orderFromMessage9 = (Order) message9.getBody().get("Order");
+//            assertEquals(orderFromMessage9.getDiscount(), 10.0);
+// 
+//     		droolsRuleService.continueStatefulRulesExecution("drl/OrderDiscountOnMultipleOrders2.drl", true, message10, objectList10);
+//            Order orderFromMessage10 = (Order) message10.getBody().get("Order");
+//            assertEquals(orderFromMessage10.getDiscount(), 10.0);
+//
+//          System.out.println("test drlStateful with continuation passed");
+//                                 
+//        } catch (RuleServiceException rse) {
+//            System.out.println("Exception was thrown.");
+//            rse.printStackTrace();
+//            assertTrue(false);
+//        }
+//	}
 	
 	
 	public static junit.framework.Test suite() {

Deleted: labs/jbossesb/workspace/jdelong/rs/product/services/jbrules/src/test/resources/drl/OrderDiscountOnMultipleOrders.drl
===================================================================
--- labs/jbossesb/workspace/jdelong/rs/product/services/jbrules/src/test/resources/drl/OrderDiscountOnMultipleOrders.drl	2007-11-21 00:40:52 UTC (rev 16712)
+++ labs/jbossesb/workspace/jdelong/rs/product/services/jbrules/src/test/resources/drl/OrderDiscountOnMultipleOrders.drl	2007-11-21 04:47:28 UTC (rev 16713)
@@ -1,28 +0,0 @@
-#created on: Oct 22, 2007
-package org.jboss.soa.esb.services.rules
-
-#list any import classes here.
-import org.jboss.soa.esb.services.rules.Order; 
-import org.jboss.soa.esb.services.rules.Customer; 
-
-import java.util.Arrays;
-
-#declare any global variables here
-global org.jboss.soa.esb.message.Message message;
-
-
-
-rule "Apply 10% discount if totalPrice of all orders is over 100"			
-	no-loop true	
-	dialect "java"
-    when
-		$c : Customer()
-		$i : Number(intValue  >= 1000) from accumulate ( Order( customer == $c, $totalPrice : totalPrice), 
-		                                                            sum( $totalPrice ) );
-    then
-   		$c.setDiscount( 10 );
-		System.out.println( "Customer " + $c.getName() + " now has a shopping total of " + $i );
-		message.getBody().add("Customer", $c);
-		System.out.println( "Message has a Customer " + message.getBody().get("Customer").toString() );
-end
-

Deleted: labs/jbossesb/workspace/jdelong/rs/product/services/jbrules/src/test/resources/drl/OrderDiscountOnMultipleOrders2.drl
===================================================================
--- labs/jbossesb/workspace/jdelong/rs/product/services/jbrules/src/test/resources/drl/OrderDiscountOnMultipleOrders2.drl	2007-11-21 00:40:52 UTC (rev 16712)
+++ labs/jbossesb/workspace/jdelong/rs/product/services/jbrules/src/test/resources/drl/OrderDiscountOnMultipleOrders2.drl	2007-11-21 04:47:28 UTC (rev 16713)
@@ -1,69 +0,0 @@
-#created on: Oct 22, 2007
-package org.jboss.soa.esb.services.rules
-
-#list any import classes here.
-import org.jboss.soa.esb.services.rules.Order; 
-import org.jboss.soa.esb.services.rules.Customer; 
-
-import java.util.Arrays;
-
-#declare any global variables here
-global org.jboss.soa.esb.message.Message message;
-
-
-
-rule "Apply 10% discount if totalPrice of all orders is over 1000"			
-	no-loop true	
-	dialect "java"
-    when
-		$c : Customer(discount == 0)
-		$o : Order(customer == $c, discount == 0)
-		$i : Number(intValue  >= 1000) from accumulate ( Order( customer == $c, $totalPrice : totalPrice), 
-		                                                            sum( $totalPrice ) );
-
-		                                                            
-    then
-   		#$c.setDiscount(10);
-   		$o.setDiscount(10);
-		System.out.println("set discount on order " + $o.getOrderId());
-		System.out.println( "Customer " + $c.getName() + " now has a shopping total of " + $i + " and a discount" );
-		#message.getBody().add("Customer", $c);
-		#System.out.println( "Message has a Customer " + message.getBody().get("Customer").toString() );
-		# System.out.println( "Message has a Customer " + message.getBody().get("CustomerWithDiscount").toString() );
-		#update ($c);
-end
-
-rule "Apply -10% discount if totalPrice of all orders is less than 1000"			
-	no-loop true	
-	dialect "java"
-    when
-		$c : Customer(discount == 0)
-		$o : Order(customer == $c, discount == 0)
-		$i : Number(intValue  < 1000) from accumulate ( Order( customer == $c, $totalPrice : totalPrice), 
-		                                                            sum( $totalPrice ) );
-
-		                                                            
-    then
-    	#System.out.println("The totalOrder value for order: " + $o.getOrderId() + " is: " + $o.getTotalPrice());
-  		$o.setDiscount(-10);
-  		#$c.setDiscount(10);
-		System.out.println("set negative discount on order " + $o.getOrderId());
-		System.out.println( "Customer " + $c.getName() + " now has a shopping total of " + $i + " and no discount" );
-		# message.getBody().add("CustomerWithDiscount", $c);
-		# message.getBody().add("Customer", $c);
-		#System.out.println( "Message has a Customer " + message.getBody().get("Customer").toString() );
-		# System.out.println( "Message has a Customer " + message.getBody().get("CustomerWithDiscount").toString() );
-		# update ($o);
-end
-
-#rule "apply discount to order"
-#	no-loop true	
-#	when
-#			$c : Customer(discount > 0)
-#			$o : Order(discount == 0)
-#	then
-#			$o.setDiscount($c.getDiscount());
-#			System.out.println("set discount on order " + $o.getOrderId());
-#			update ($o);
-#end
-

Deleted: labs/jbossesb/workspace/jdelong/rs/product/services/jbrules/src/test/resources/drl/OrderDiscountOnMultipleOrders3.drl
===================================================================
--- labs/jbossesb/workspace/jdelong/rs/product/services/jbrules/src/test/resources/drl/OrderDiscountOnMultipleOrders3.drl	2007-11-21 00:40:52 UTC (rev 16712)
+++ labs/jbossesb/workspace/jdelong/rs/product/services/jbrules/src/test/resources/drl/OrderDiscountOnMultipleOrders3.drl	2007-11-21 04:47:28 UTC (rev 16713)
@@ -1,54 +0,0 @@
-#created on: Oct 22, 2007
-package org.jboss.soa.esb.services.rules
-
-#list any import classes here.
-import org.jboss.soa.esb.services.rules.Order; 
-import org.jboss.soa.esb.services.rules.Customer; 
-
-import java.util.Arrays;
-
-#declare any global variables here
-global org.jboss.soa.esb.message.Message message;
-
-
-
-rule "Apply 10% discount if totalPrice of all orders is over 1000"			
-	no-loop true	
-	dialect "java"
-    when
-		$c : Customer()
-		$i : Number(intValue  >= 1000) from accumulate ( Order( customer == $c, $totalPrice : totalPrice), 
-		                                                            sum( $totalPrice ) );
-		                                                            
-    then
-   		$c.setDiscount(10);
- 		System.out.println( "Customer " + $c.getName() + " now has a shopping total of " + $i + " and a discount" );
-
-end
-
-rule "Retract order if totalPrice of all orders is less than 1000"			
-	no-loop true	
-	salience 0
-    when
-		$c : Customer(discount == 0)
-		$o : Order(customer == $c, discount == 0)
-		$i : Number(intValue  < 1000) from accumulate ( Order( customer == $c, $totalPrice : totalPrice), 
-		                                                            sum( $totalPrice ) );
-
-		                                                            
-    then
- 		retract($0): 
-end
-
-rule "apply discount to order"
-	no-loop true
-	salience -50	
-	when
-		$c : Customer(discount > 0)
-		$o : Order(customer == $c, discount == 0)
-	then
-		$o.setDiscount($c.getDiscount());
-		System.out.println("set discount on order " + $o.getOrderId());
-		update ($o);
-end
-

Modified: labs/jbossesb/workspace/jdelong/rs/product/services/jbrules/src/test/resources/ruleAgent/brmsdeployedrules.properties
===================================================================
--- labs/jbossesb/workspace/jdelong/rs/product/services/jbrules/src/test/resources/ruleAgent/brmsdeployedrules.properties	2007-11-21 00:40:52 UTC (rev 16712)
+++ labs/jbossesb/workspace/jdelong/rs/product/services/jbrules/src/test/resources/ruleAgent/brmsdeployedrules.properties	2007-11-21 04:47:28 UTC (rev 16713)
@@ -1,11 +1,11 @@
 newInstance=true
 
-file=/shared/workspace/ruleservice/product/services/jbrules/src/test/resources/ruleAgent/package/org.jboss.soa.esb.services.rules.pkg
+file=/shared/workspace/rs/product/services/jbrules/src/test/resources/ruleAgent/package/org.jboss.soa.esb.services.rules.pkg
 #dir=/shared/workspace/ruleservice/product/services/jbrules/src/test/resources/ruleAgent/package
 
 
 #url=http://localhost:8080/drools-jbrms/org.drools.brms.JBRMS/package/org.jboss.soa.esb.services.rules/LATEST
-#localCacheDir=/shared/workspace/ruleservice/product/services/jbrules/src/test/resources/ruleAgent/cache
+#localCacheDir=/shared/workspace/rs/product/services/jbrules/src/test/resources/ruleAgent/cache
 poll=30
 
 name=insuranceconfig




More information about the jboss-svn-commits mailing list