dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #33197
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 16933: Autowiring dependencies int tests
------------------------------------------------------------
revno: 16933
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2014-10-02 12:21:06 +0200
message:
Autowiring dependencies int tests
modified:
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementServiceTest.java
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementStoreTest.java
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/DataSetServiceTest.java
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/DataSetStoreTest.java
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/SectionStoreTest.java
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/indicator/IndicatorServiceTest.java
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/indicator/IndicatorStoreTest.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/dataelement/DataElementServiceTest.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementServiceTest.java 2014-10-02 09:41:32 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementServiceTest.java 2014-10-02 10:21:06 +0000
@@ -39,6 +39,7 @@
import org.hisp.dhis.DhisSpringTest;
import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Kristian Nordal
@@ -46,20 +47,10 @@
public class DataElementServiceTest
extends DhisSpringTest
{
+ @Autowired
private DataElementService dataElementService;
// -------------------------------------------------------------------------
- // Fixture
- // -------------------------------------------------------------------------
-
- @Override
- public void setUpTest()
- throws Exception
- {
- dataElementService = (DataElementService) getBean( DataElementService.ID );
- }
-
- // -------------------------------------------------------------------------
// Tests
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementStoreTest.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementStoreTest.java 2014-09-23 07:43:22 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementStoreTest.java 2014-10-02 10:21:06 +0000
@@ -43,6 +43,7 @@
import org.hisp.dhis.dataset.DataSetService;
import org.hisp.dhis.period.MonthlyPeriodType;
import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Torgeir Lorange Ostby
@@ -51,25 +52,12 @@
public class DataElementStoreTest
extends DhisSpringTest
{
+ @Autowired
private DataElementStore dataElementStore;
+ @Autowired
private DataSetService dataSetService;
-
- // -------------------------------------------------------------------------
- // Fixture
- // -------------------------------------------------------------------------
-
- @Override
- public void setUpTest()
- throws Exception
- {
- dataElementStore = (DataElementStore) getBean( DataElementStore.ID );
-
- dataElementService = (DataElementService) getBean( DataElementService.ID );
-
- dataSetService = (DataSetService) getBean( DataSetService.ID );
- }
-
+
// -------------------------------------------------------------------------
// Tests
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/DataSetServiceTest.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/DataSetServiceTest.java 2014-10-02 09:41:32 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/DataSetServiceTest.java 2014-10-02 10:21:06 +0000
@@ -39,6 +39,7 @@
import org.hisp.dhis.period.PeriodType;
import org.junit.Ignore;
import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
import java.util.Collection;
import java.util.HashSet;
@@ -62,6 +63,18 @@
private OrganisationUnit unitE;
private OrganisationUnit unitF;
+ @Autowired
+ private DataSetService dataSetService;
+
+ @Autowired
+ private DataElementService dataElementService;
+
+ @Autowired
+ private OrganisationUnitService organisationUnitService;
+
+ @Autowired
+ private PeriodService periodService;
+
// -------------------------------------------------------------------------
// Fixture
// -------------------------------------------------------------------------
@@ -70,14 +83,6 @@
public void setUpTest()
throws Exception
{
- dataSetService = (DataSetService) getBean( DataSetService.ID );
-
- dataElementService = (DataElementService) getBean( DataElementService.ID );
-
- organisationUnitService = (OrganisationUnitService) getBean( OrganisationUnitService.ID );
-
- periodService = (PeriodService) getBean( PeriodService.ID );
-
periodType = new MonthlyPeriodType();
period = createPeriod( periodType, getDate( 2000, 3, 1 ), getDate( 2000, 3, 31 ) );
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/DataSetStoreTest.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/DataSetStoreTest.java 2014-10-01 11:14:19 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/DataSetStoreTest.java 2014-10-02 10:21:06 +0000
@@ -42,6 +42,7 @@
import org.hisp.dhis.period.PeriodType;
import org.junit.Ignore;
import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Kristian Nordal
@@ -50,7 +51,11 @@
public class DataSetStoreTest
extends DhisSpringTest
{
+ @Autowired
private DataSetStore dataSetStore;
+
+ @Autowired
+ private OrganisationUnitService organisationUnitService;
private PeriodType periodType;
@@ -58,10 +63,6 @@
public void setUpTest()
throws Exception
{
- dataSetStore = (DataSetStore) getBean( DataSetStore.ID );
-
- organisationUnitService = (OrganisationUnitService) getBean( OrganisationUnitService.ID );
-
periodType = PeriodType.getAvailablePeriodTypes().iterator().next();
}
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/SectionStoreTest.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/SectionStoreTest.java 2014-10-01 11:14:19 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/SectionStoreTest.java 2014-10-02 10:21:06 +0000
@@ -41,6 +41,7 @@
import org.hisp.dhis.dataelement.DataElementService;
import org.hisp.dhis.period.MonthlyPeriodType;
import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Lars Helge Overland
@@ -48,6 +49,16 @@
public class SectionStoreTest
extends DhisSpringTest
{
+ @Autowired
+ private DataElementService dataElementService;
+
+ @Autowired
+ private DataSetService dataSetService;
+
+ @Autowired
+ private DataElementCategoryService categoryService;
+
+ @Autowired
private SectionStore sectionStore;
private DataSet dataSet;
@@ -59,11 +70,6 @@
@Override
public void setUpTest()
{
- sectionStore = (SectionStore) getBean( SectionStore.ID );
- dataElementService = (DataElementService) getBean( DataElementService.ID );
- dataSetService = (DataSetService) getBean( DataSetService.ID );
- categoryService = (DataElementCategoryService) getBean( DataElementCategoryService.ID );
-
dataSet = createDataSet( 'A', new MonthlyPeriodType() );
dataSetService.addDataSet( dataSet );
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/indicator/IndicatorServiceTest.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/indicator/IndicatorServiceTest.java 2014-10-02 09:41:32 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/indicator/IndicatorServiceTest.java 2014-10-02 10:21:06 +0000
@@ -39,6 +39,7 @@
import org.hisp.dhis.DhisSpringTest;
import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Lars Helge Overland
@@ -47,20 +48,10 @@
public class IndicatorServiceTest
extends DhisSpringTest
{
+ @Autowired
private IndicatorService indicatorService;
// -------------------------------------------------------------------------
- // Set up/tear down
- // -------------------------------------------------------------------------
-
- @Override
- public void setUpTest()
- throws Exception
- {
- indicatorService = (IndicatorService) getBean( IndicatorService.ID );
- }
-
- // -------------------------------------------------------------------------
// Support methods
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/indicator/IndicatorStoreTest.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/indicator/IndicatorStoreTest.java 2014-10-01 08:54:50 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/indicator/IndicatorStoreTest.java 2014-10-02 10:21:06 +0000
@@ -31,6 +31,7 @@
import org.hisp.dhis.DhisSpringTest;
import org.hisp.dhis.common.GenericIdentifiableObjectStore;
import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
import java.util.Collection;
@@ -44,6 +45,7 @@
public class IndicatorStoreTest
extends DhisSpringTest
{
+ @Autowired
private IndicatorStore indicatorStore;
private GenericIdentifiableObjectStore<IndicatorType> indicatorTypeStore;
@@ -56,11 +58,7 @@
public void setUpTest()
throws Exception
{
- indicatorStore = (IndicatorStore) getBean( IndicatorStore.ID );
-
indicatorTypeStore = (GenericIdentifiableObjectStore<IndicatorType>) getBean( "org.hisp.dhis.indicator.IndicatorTypeStore" );
-
- indicatorService = (IndicatorService) getBean( IndicatorService.ID );
}
// -------------------------------------------------------------------------
