dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #41726
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 21279: minor testfixes
------------------------------------------------------------
revno: 21279
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2015-12-03 10:21:32 +0700
message:
minor testfixes
modified:
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementStoreTest.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/DataElementStoreTest.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementStoreTest.java 2015-12-03 03:12:51 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementStoreTest.java 2015-12-03 03:21:32 +0000
@@ -507,7 +507,7 @@
}
@Test
- public void testDataElementByAttributeValue() throws NonUniqueAttributeValueException
+ public void testDataElementByUniqueAttributeValue() throws NonUniqueAttributeValueException
{
Attribute attribute = new Attribute( "cid", ValueType.TEXT );
attribute.setDataElementAttribute( true );
@@ -544,4 +544,36 @@
assertEquals( "DataElementB", dataElementStore.getByAttributeValue( attribute, "CID2" ).getName() );
assertEquals( "DataElementC", dataElementStore.getByAttributeValue( attribute, "CID3" ).getName() );
}
+
+ @Test
+ public void testDataElementByNonUniqueAttributeValue() throws NonUniqueAttributeValueException
+ {
+ Attribute attribute = new Attribute( "cid", ValueType.TEXT );
+ attribute.setDataElementAttribute( true );
+ attributeService.addAttribute( attribute );
+
+ DataElement dataElementA = createDataElement( 'A' );
+ DataElement dataElementB = createDataElement( 'B' );
+ DataElement dataElementC = createDataElement( 'C' );
+
+ dataElementStore.save( dataElementA );
+ dataElementStore.save( dataElementB );
+ dataElementStore.save( dataElementC );
+
+ AttributeValue attributeValueA = new AttributeValue( "CID1", attribute );
+ AttributeValue attributeValueB = new AttributeValue( "CID2", attribute );
+ AttributeValue attributeValueC = new AttributeValue( "CID3", attribute );
+
+ attributeService.addAttributeValue( dataElementA, attributeValueA );
+ attributeService.addAttributeValue( dataElementB, attributeValueB );
+ attributeService.addAttributeValue( dataElementC, attributeValueC );
+
+ dataElementStore.update( dataElementA );
+ dataElementStore.update( dataElementB );
+ dataElementStore.update( dataElementC );
+
+ assertNull( dataElementStore.getByAttributeValue( attribute, "CID1" ) );
+ assertNull( dataElementStore.getByAttributeValue( attribute, "CID2" ) );
+ assertNull( dataElementStore.getByAttributeValue( attribute, "CID3" ) );
+ }
}