dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #24758
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 12188: minor test fix
------------------------------------------------------------
revno: 12188
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2013-09-20 11:56:36 +0200
message:
minor test fix
modified:
dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/event/data/EventAnalyticsServiceTest.java
dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.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-analytics/src/test/java/org/hisp/dhis/analytics/event/data/EventAnalyticsServiceTest.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/event/data/EventAnalyticsServiceTest.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/event/data/EventAnalyticsServiceTest.java 2013-09-20 09:56:36 +0000
@@ -38,9 +38,12 @@
import org.hisp.dhis.patient.PatientIdentifierTypeService;
import org.hisp.dhis.program.Program;
import org.hisp.dhis.program.ProgramService;
+import org.hisp.dhis.program.ProgramStage;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
+import java.util.HashSet;
+
/**
* @author Lars Helge Overland
*/
@@ -49,19 +52,19 @@
{
@Autowired
private EventAnalyticsService analyticsService;
-
+
@Autowired
private ProgramService programService;
-
+
@Autowired
private DataElementService dataElementService;
-
+
@Autowired
private PatientAttributeService attributeService;
@Autowired
private PatientIdentifierTypeService identifierTypeService;
-
+
private Program prA;
private DataElement deA;
private DataElement deB;
@@ -73,13 +76,13 @@
@Override
public void setUpTest()
{
- prA = createProgram( 'A', null, null );
-
+ prA = createProgram( 'A', new HashSet<ProgramStage>(), null );
+
}
-
+
@Test
public void testGetFromUrl()
{
-
+
}
}
=== modified file 'dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java'
--- dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java 2013-09-20 09:17:59 +0000
+++ dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java 2013-09-20 09:56:36 +0000
@@ -363,7 +363,7 @@
*
* @param object the object.
*/
- @SuppressWarnings( "unchecked" )
+ @SuppressWarnings("unchecked")
private <T> T getRealObject( T object )
throws Exception
{