[jboss-svn-commits] JBL Code SVN: r36100 - in labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/test/java/org/drools/planner/examples: nqueens and 1 other directories.

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

Author: ge0ffrey
Date: 2010-11-29 04:43:19 -0500 (Mon, 29 Nov 2010)
New Revision: 36100

Modified:
   labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/test/java/org/drools/planner/examples/examination/solver/ExaminationScoreRulesTest.java
   labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/test/java/org/drools/planner/examples/nqueens/NQueensSmokeTest.java
   labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/test/java/org/drools/planner/examples/nurserostering/solver/NurseRosteringScoreRulesTest.java
Log:
upgrade to junit 4 annotations

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/test/java/org/drools/planner/examples/examination/solver/ExaminationScoreRulesTest.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/test/java/org/drools/planner/examples/examination/solver/ExaminationScoreRulesTest.java	2010-11-29 09:29:13 UTC (rev 36099)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/test/java/org/drools/planner/examples/examination/solver/ExaminationScoreRulesTest.java	2010-11-29 09:43:19 UTC (rev 36100)
@@ -36,14 +36,17 @@
 import org.drools.planner.examples.examination.domain.Room;
 import org.drools.planner.examples.examination.persistence.ExaminationDaoImpl;
 import org.drools.planner.examples.examination.solver.move.ExaminationMoveHelper;
+import org.junit.Test;
 
+import static org.junit.Assert.* ;
+
 /**
  * @author Geoffrey De Smet
  */
-public class ExaminationScoreRulesTest extends TestCase {
+public class ExaminationScoreRulesTest {
 
-
-    public void testMove() {
+    @Test
+    public void moveRoom() {
         LocalSearchSolverScope localSearchSolverScope = new LocalSearchSolverScope();
         localSearchSolverScope.setRuleBase(buildRuleBase());
         localSearchSolverScope.setWorkingScoreCalculator(new DefaultHardAndSoftConstraintScoreCalculator());

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/test/java/org/drools/planner/examples/nqueens/NQueensSmokeTest.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/test/java/org/drools/planner/examples/nqueens/NQueensSmokeTest.java	2010-11-29 09:29:13 UTC (rev 36099)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/test/java/org/drools/planner/examples/nqueens/NQueensSmokeTest.java	2010-11-29 09:43:19 UTC (rev 36100)
@@ -24,19 +24,22 @@
 import org.drools.planner.config.XmlSolverConfigurer;
 import org.drools.planner.examples.common.persistence.SolutionDao;
 import org.drools.planner.examples.nqueens.persistence.NQueensDaoImpl;
+import org.junit.Test;
 
+import static org.junit.Assert.* ;
+
 /**
  * @author Geoffrey De Smet
  */
-public class NQueensSmokeTest extends TestCase {
+public class NQueensSmokeTest {
 
     public static final String SOLVER_CONFIG
             = "/org/drools/planner/examples/nqueens/solver/nqueensSmokeSolverConfig.xml";
     public static final String UNSOLVED_DATA
             = "/org/drools/planner/examples/nqueens/data/unsolvedNQueensSmoke.xml";
 
-
-    public void testSmoke() {
+    @Test
+    public void solve4Queens() {
         XmlSolverConfigurer configurer = new XmlSolverConfigurer();
         configurer.configure(SOLVER_CONFIG);
         Solver solver = configurer.buildSolver();

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-11-29 09:29:13 UTC (rev 36099)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/test/java/org/drools/planner/examples/nurserostering/solver/NurseRosteringScoreRulesTest.java	2010-11-29 09:43:19 UTC (rev 36100)
@@ -36,13 +36,17 @@
 import org.drools.planner.examples.nurserostering.domain.NurseRoster;
 import org.drools.planner.examples.nurserostering.persistence.NurseRosteringDaoImpl;
 import org.drools.planner.examples.nurserostering.solver.move.NurseRosteringMoveHelper;
+import org.junit.Test;
 
+import static org.junit.Assert.* ;
+
 /**
  * @author Geoffrey De Smet
  */
-public class NurseRosteringScoreRulesTest extends TestCase {
+public class NurseRosteringScoreRulesTest {
 
-    public void testMoveAndUndoMove() {
+    @Test
+    public void switchEmployeeAndUndo() {
         LocalSearchSolverScope localSearchSolverScope = new LocalSearchSolverScope();
         localSearchSolverScope.setRuleBase(buildRuleBase());
         localSearchSolverScope.setWorkingScoreCalculator(new DefaultHardAndSoftConstraintScoreCalculator());