dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #14158
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 4690: Improved testing
------------------------------------------------------------
revno: 4690
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2011-09-26 18:24:46 +0200
message:
Improved testing
added:
dhis-2/dhis-api/src/test/java/org/hisp/dhis/dataelement/DataElementCategoryComboTest.java
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryCombo.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-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryCombo.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryCombo.java 2011-09-26 15:36:02 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryCombo.java 2011-09-26 16:24:46 +0000
@@ -134,18 +134,27 @@
return arrays;
}
- public void generateOptionCombos()
+ public List<DataElementCategoryOptionCombo> generateOptionCombosList()
{
+ List<DataElementCategoryOptionCombo> list = new ArrayList<DataElementCategoryOptionCombo>();
+
CombinationGenerator<DataElementCategoryOption> generator =
- new CombinationGenerator<DataElementCategoryOption>( this.getCategoryOptionsAsArray() );
+ new CombinationGenerator<DataElementCategoryOption>( getCategoryOptionsAsArray() );
while ( generator.hasNext() )
{
DataElementCategoryOptionCombo optionCombo = new DataElementCategoryOptionCombo();
optionCombo.setCategoryOptions( generator.getNext() );
optionCombo.setCategoryCombo( this );
- this.optionCombos.add( optionCombo );
+ list.add( optionCombo );
}
+
+ return list;
+ }
+
+ public void generateOptionCombos()
+ {
+ this.optionCombos = new HashSet<DataElementCategoryOptionCombo>( generateOptionCombosList() );
}
//TODO update category option -> category option combo association
=== added file 'dhis-2/dhis-api/src/test/java/org/hisp/dhis/dataelement/DataElementCategoryComboTest.java'
--- dhis-2/dhis-api/src/test/java/org/hisp/dhis/dataelement/DataElementCategoryComboTest.java 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-api/src/test/java/org/hisp/dhis/dataelement/DataElementCategoryComboTest.java 2011-09-26 16:24:46 +0000
@@ -0,0 +1,125 @@
+package org.hisp.dhis.dataelement;
+
+/*
+ * Copyright (c) 2004-2010, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static junit.framework.Assert.*;
+
+/**
+ * @author Lars Helge Overland
+ */
+public class DataElementCategoryComboTest
+{
+ private DataElementCategoryOption categoryOptionA;
+ private DataElementCategoryOption categoryOptionB;
+ private DataElementCategoryOption categoryOptionC;
+ private DataElementCategoryOption categoryOptionD;
+ private DataElementCategoryOption categoryOptionE;
+ private DataElementCategoryOption categoryOptionF;
+
+ private DataElementCategory categoryA;
+ private DataElementCategory categoryB;
+ private DataElementCategory categoryC;
+
+ private DataElementCategoryCombo categoryCombo;
+
+ // -------------------------------------------------------------------------
+ // Fixture
+ // -------------------------------------------------------------------------
+
+ @Before
+ public void before()
+ {
+ categoryOptionA = new DataElementCategoryOption( "OptionA" );
+ categoryOptionB = new DataElementCategoryOption( "OptionB" );
+ categoryOptionC = new DataElementCategoryOption( "OptionC" );
+ categoryOptionD = new DataElementCategoryOption( "OptionD" );
+ categoryOptionE = new DataElementCategoryOption( "OptionE" );
+ categoryOptionF = new DataElementCategoryOption( "OptionF" );
+
+ categoryA = new DataElementCategory( "CategoryA" );
+ categoryB = new DataElementCategory( "CategoryB" );
+ categoryC = new DataElementCategory( "CategoryC" );
+
+ categoryA.getCategoryOptions().add( categoryOptionA );
+ categoryA.getCategoryOptions().add( categoryOptionB );
+ categoryB.getCategoryOptions().add( categoryOptionC );
+ categoryB.getCategoryOptions().add( categoryOptionD );
+ categoryC.getCategoryOptions().add( categoryOptionE );
+ categoryC.getCategoryOptions().add( categoryOptionF );
+
+ categoryOptionA.setCategory( categoryA );
+ categoryOptionB.setCategory( categoryA );
+ categoryOptionC.setCategory( categoryB );
+ categoryOptionD.setCategory( categoryB );
+ categoryOptionE.setCategory( categoryC );
+ categoryOptionF.setCategory( categoryC );
+
+ categoryCombo = new DataElementCategoryCombo( "CategoryCombo" );
+
+ categoryCombo.getCategories().add( categoryA );
+ categoryCombo.getCategories().add( categoryB );
+ categoryCombo.getCategories().add( categoryC );
+ }
+
+ @Test
+ public void testGenerate()
+ {
+ List<DataElementCategoryOptionCombo> list = categoryCombo.generateOptionCombosList();
+
+ assertNotNull( list );
+ assertEquals( 8, list.size() );
+
+ assertEquals( createCategoryOptionCombo( categoryCombo, categoryOptionA, categoryOptionC, categoryOptionE ), list.get( 0 ) );
+ assertEquals( createCategoryOptionCombo( categoryCombo, categoryOptionA, categoryOptionC, categoryOptionF ), list.get( 1 ) );
+ assertEquals( createCategoryOptionCombo( categoryCombo, categoryOptionA, categoryOptionD, categoryOptionE ), list.get( 2 ) );
+ assertEquals( createCategoryOptionCombo( categoryCombo, categoryOptionA, categoryOptionD, categoryOptionF ), list.get( 3 ) );
+ assertEquals( createCategoryOptionCombo( categoryCombo, categoryOptionB, categoryOptionC, categoryOptionE ), list.get( 4 ) );
+ assertEquals( createCategoryOptionCombo( categoryCombo, categoryOptionB, categoryOptionC, categoryOptionF ), list.get( 5 ) );
+ assertEquals( createCategoryOptionCombo( categoryCombo, categoryOptionB, categoryOptionD, categoryOptionE ), list.get( 6 ) );
+ assertEquals( createCategoryOptionCombo( categoryCombo, categoryOptionB, categoryOptionD, categoryOptionF ), list.get( 7 ) );
+ }
+
+ private static DataElementCategoryOptionCombo createCategoryOptionCombo( DataElementCategoryCombo categoryCombo, DataElementCategoryOption... categoryOptions )
+ {
+ DataElementCategoryOptionCombo categoryOptionCombo = new DataElementCategoryOptionCombo();
+
+ categoryOptionCombo.setCategoryCombo( categoryCombo );
+
+ for ( DataElementCategoryOption categoryOption : categoryOptions )
+ {
+ categoryOptionCombo.getCategoryOptions().add( categoryOption );
+ }
+
+ return categoryOptionCombo;
+ }
+}
