dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 16909
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2014-10-01 14:31:39 +0200
message:
  Test fix
modified:
  dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/CompleteDataSetRegistrationServiceTest.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/CompleteDataSetRegistrationServiceTest.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/CompleteDataSetRegistrationServiceTest.java	2014-10-01 11:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/CompleteDataSetRegistrationServiceTest.java	2014-10-01 12:31:39 +0000
@@ -37,7 +37,7 @@
 import java.util.Collection;
 import java.util.Date;
 
-import org.hisp.dhis.DhisSpringTest;
+import org.hisp.dhis.DhisTest;
 import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
 import org.hisp.dhis.dataelement.DataElementCategoryService;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
@@ -51,38 +51,26 @@
  * @author Lars Helge Overland
  */
 public class CompleteDataSetRegistrationServiceTest
-    extends DhisSpringTest
+    extends DhisTest
 {
     private CompleteDataSetRegistration registrationA;
-
     private CompleteDataSetRegistration registrationB;
-
     private CompleteDataSetRegistration registrationC;
-
     private CompleteDataSetRegistration registrationD;
-
     private CompleteDataSetRegistration registrationE;
-
     private CompleteDataSetRegistration registrationF;
-
     private CompleteDataSetRegistration registrationG;
-
     private CompleteDataSetRegistration registrationH;
 
     private DataSet dataSetA;
-
     private DataSet dataSetB;
-
     private DataSet dataSetC;
 
     private Period periodA;
-
     private Period periodB;
 
     private OrganisationUnit sourceA;
-
     private OrganisationUnit sourceB;
-
     private OrganisationUnit sourceC;
 
     private Date onTimeA;
@@ -139,6 +127,12 @@
 
         onTimeA = getDate( 2000, 1, 10 );
     }
+    
+    @Override
+    public boolean emptyDatabaseAfterTest()
+    {
+        return true;
+    }
 
     // -------------------------------------------------------------------------
     // Tests