[jboss-svn-commits] JBL Code SVN: r33321 - in labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/test: resources/org/drools/planner/examples/nurserostering/data and 1 other directory.

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

Author: ge0ffrey
Date: 2010-06-02 14:59:14 -0400 (Wed, 02 Jun 2010)
New Revision: 33321

Modified:
   labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/test/java/org/drools/planner/examples/nurserostering/solver/NurseRosteringScoreRulesTest.java
   labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/test/resources/org/drools/planner/examples/nurserostering/data/testNurseRosteringScoreRules.xml
Log:
fix testcase

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/test/java/org/drools/planner/examples/nurserostering/solver/NurseRosteringScoreRulesTest.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/test/java/org/drools/planner/examples/nurserostering/solver/NurseRosteringScoreRulesTest.java	2010-06-02 18:28:22 UTC (rev 33320)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/test/java/org/drools/planner/examples/nurserostering/solver/NurseRosteringScoreRulesTest.java	2010-06-02 18:59:14 UTC (rev 33321)
@@ -26,10 +26,7 @@
  */
 public class NurseRosteringScoreRulesTest extends TestCase {
 
-	public void testEmpty() {
-	}
-
-    public void TODOtestMoveAndUndoMove() {
+    public void testMoveAndUndoMove() {
         LocalSearchSolverScope localSearchSolverScope = new LocalSearchSolverScope();
         localSearchSolverScope.setRuleBase(buildRuleBase());
         localSearchSolverScope.setWorkingScoreCalculator(new DefaultHardAndSoftConstraintScoreCalculator());

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/test/resources/org/drools/planner/examples/nurserostering/data/testNurseRosteringScoreRules.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/test/resources/org/drools/planner/examples/nurserostering/data/testNurseRosteringScoreRules.xml	2010-06-02 18:28:22 UTC (rev 33320)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/test/resources/org/drools/planner/examples/nurserostering/data/testNurseRosteringScoreRules.xml	2010-06-02 18:59:14 UTC (rev 33321)
@@ -18,6 +18,7 @@
       <index>0</index>
       <startTimeString>06:30:00</startTimeString>
       <endTimeString>14:30:00</endTimeString>
+      <night>false</night>
       <description>Early shift type</description>
     </ShiftType>
     <ShiftType id="3002">
@@ -26,6 +27,7 @@
       <index>1</index>
       <startTimeString>14:30:00</startTimeString>
       <endTimeString>22:30:00</endTimeString>
+      <night>false</night>
       <description>Late shift type</description>
     </ShiftType>
     <ShiftType id="3003">
@@ -34,6 +36,7 @@
       <index>2</index>
       <startTimeString>08:30:00</startTimeString>
       <endTimeString>16:30:00</endTimeString>
+      <night>false</night>
       <description>Day shift type</description>
     </ShiftType>
     <ShiftType id="3004">
@@ -42,6 +45,7 @@
       <index>3</index>
       <startTimeString>22:30:00</startTimeString>
       <endTimeString>06:30:00</endTimeString>
+      <night>true</night>
       <description>Night shift</description>
     </ShiftType>
     <ShiftType id="3005">
@@ -50,6 +54,7 @@
       <index>4</index>
       <startTimeString>08:30:00</startTimeString>
       <endTimeString>16:30:00</endTimeString>
+      <night>false</night>
       <description>Head nurse day shift type</description>
     </ShiftType>
   </shiftTypeList>
@@ -81,33 +86,19 @@
     </ShiftTypeSkillRequirement>
   </shiftTypeSkillRequirementList>
   <patternList id="17">
-    <Pattern id="18">
-      <id>0</id>
-      <code>0</code>
-      <weight>1</weight>
-    </Pattern>
-    <Pattern id="19">
-      <id>1</id>
-      <code>1</code>
-      <weight>1</weight>
-    </Pattern>
-    <Pattern id="20">
-      <id>2</id>
-      <code>2</code>
-      <weight>1</weight>
-    </Pattern>
   </patternList>
   <contractList id="21">
     <Contract id="22">
       <id>0</id>
       <code>0</code>
       <description>fulltime</description>
+      <weekendDefinition>SATURDAY_SUNDAY</weekendDefinition>
       <contractLineList id="23">
         <org.drools.planner.examples.nurserostering.domain.contract.BooleanContractLine id="24">
           <id>0</id>
           <contract reference="22"/>
           <contractLineType>SINGLE_ASSIGNMENT_PER_DAY</contractLineType>
-          <enabled>false</enabled>
+          <enabled>true</enabled>
           <weight>1</weight>
         </org.drools.planner.examples.nurserostering.domain.contract.BooleanContractLine>
         <org.drools.planner.examples.nurserostering.domain.contract.MinMaxContractLine id="25">
@@ -147,14 +138,14 @@
           <id>4</id>
           <contract reference="22"/>
           <contractLineType>COMPLETE_WEEKENDS</contractLineType>
-          <enabled>false</enabled>
+          <enabled>true</enabled>
           <weight>1</weight>
         </org.drools.planner.examples.nurserostering.domain.contract.BooleanContractLine>
         <org.drools.planner.examples.nurserostering.domain.contract.BooleanContractLine id="29">
           <id>5</id>
           <contract reference="22"/>
           <contractLineType>IDENTICAL_SHIFT_TYPES_DURING_WEEKEND</contractLineType>
-          <enabled>false</enabled>
+          <enabled>true</enabled>
           <weight>1</weight>
         </org.drools.planner.examples.nurserostering.domain.contract.BooleanContractLine>
       </contractLineList>
@@ -163,12 +154,13 @@
       <id>1</id>
       <code>1</code>
       <description>75_time</description>
+      <weekendDefinition>SATURDAY_SUNDAY</weekendDefinition>
       <contractLineList id="31">
         <org.drools.planner.examples.nurserostering.domain.contract.BooleanContractLine id="32">
           <id>6</id>
           <contract reference="30"/>
           <contractLineType>SINGLE_ASSIGNMENT_PER_DAY</contractLineType>
-          <enabled>false</enabled>
+          <enabled>true</enabled>
           <weight>1</weight>
         </org.drools.planner.examples.nurserostering.domain.contract.BooleanContractLine>
         <org.drools.planner.examples.nurserostering.domain.contract.MinMaxContractLine id="33">
@@ -208,14 +200,14 @@
           <id>10</id>
           <contract reference="30"/>
           <contractLineType>COMPLETE_WEEKENDS</contractLineType>
-          <enabled>false</enabled>
+          <enabled>true</enabled>
           <weight>1</weight>
         </org.drools.planner.examples.nurserostering.domain.contract.BooleanContractLine>
         <org.drools.planner.examples.nurserostering.domain.contract.BooleanContractLine id="37">
           <id>11</id>
           <contract reference="30"/>
           <contractLineType>IDENTICAL_SHIFT_TYPES_DURING_WEEKEND</contractLineType>
-          <enabled>false</enabled>
+          <enabled>true</enabled>
           <weight>1</weight>
         </org.drools.planner.examples.nurserostering.domain.contract.BooleanContractLine>
       </contractLineList>
@@ -235,6 +227,8 @@
     <org.drools.planner.examples.nurserostering.domain.contract.BooleanContractLine reference="36"/>
     <org.drools.planner.examples.nurserostering.domain.contract.BooleanContractLine reference="37"/>
   </contractLineList>
+  <patternContractLineList id="18">
+  </patternContractLineList>
   <employeeList id="39">
     <Employee id="1000">
       <id>0</id>