dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #24718
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 12165: moved tests from dxf.metadata to dxf2.metadata
------------------------------------------------------------
revno: 12165
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-09-19 14:37:27 +0200
message:
moved tests from dxf.metadata to dxf2.metadata
removed:
dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf/
dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf/metadata/
dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf/metadata/DefaultExportServiceTest.java
dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf/metadata/JacksonUtilsTest.java
added:
dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata/
dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata/DefaultExportServiceTest.java
dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata/JacksonUtilsTest.java
modified:
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.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-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java 2013-09-17 12:15:39 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java 2013-09-19 12:37:27 +0000
@@ -193,8 +193,6 @@
List<ProgramStageInstance> programStageInstances = new ArrayList<ProgramStageInstance>(
programStageInstanceService.getProgramStageInstances( programInstances, false ) );
- System.err.println( "programStageInstances: " + programStageInstances );
-
if ( programStageInstances.isEmpty() )
{
return new ImportSummary( ImportStatus.ERROR, "No active event exists for single event program " + program.getUid()
@@ -222,7 +220,7 @@
return new ImportSummary( ImportStatus.ERROR, "Program is not assigned to this organisation unit." );
}
- return saveEvent( program, programStage, organisationUnit, event, importOptions );
+ return saveEvent( program, programInstance, programStage, programStageInstance, organisationUnit, event, importOptions );
}
// -------------------------------------------------------------------------
@@ -525,7 +523,7 @@
}
}
- private ProgramStageInstance saveEventDate( ProgramStage programStage, ProgramInstance programInstance, OrganisationUnit organisationUnit, Date date, Boolean completed,
+ private ProgramStageInstance createProgramStageInstance( ProgramStage programStage, ProgramInstance programInstance, OrganisationUnit organisationUnit, Date date, Boolean completed,
Coordinate coordinate, String storedBy )
{
ProgramStageInstance programStageInstance = new ProgramStageInstance();
@@ -559,10 +557,15 @@
return programStageInstance;
}
- private ImportSummary saveEvent( Program program, ProgramStage programStage, OrganisationUnit organisationUnit, Event event, ImportOptions importOptions )
+ private ImportSummary saveEvent( Program program, ProgramInstance programInstance, ProgramStage programStage, ProgramStageInstance programStageInstance, OrganisationUnit organisationUnit, Event event, ImportOptions importOptions )
{
+ Assert.notNull( program );
+ Assert.notNull( programInstance );
+ Assert.notNull( programStage );
+
ImportSummary importSummary = new ImportSummary();
importSummary.setStatus( ImportStatus.SUCCESS );
+ boolean dryRun = importOptions != null && importOptions.isDryRun();
if ( !program.isSingleEvent() )
{
@@ -578,13 +581,9 @@
String storedBy = getStoredBy( event, importSummary );
- ProgramStageInstance programStageInstance = null;
-
- if ( importOptions == null || !importOptions.isDryRun() )
+ if ( !dryRun && programStageInstance == null )
{
- ProgramInstance programInstance = programInstanceService.getProgramInstances( program ).iterator().next();
-
- programStageInstance = saveEventDate( programStage, programInstance, organisationUnit, eventDate,
+ programStageInstance = createProgramStageInstance( programStage, programInstance, organisationUnit, eventDate,
event.getCompleted(), event.getCoordinate(), storedBy );
importSummary.setReference( programStageInstance.getUid() );
@@ -596,7 +595,7 @@
if ( dataElement == null )
{
- importSummary.getConflicts().add( new ImportConflict( "dataElementId", dataValue.getDataElement() + " is not a valid dataElementId." ) );
+ importSummary.getConflicts().add( new ImportConflict( "dataElement", dataValue.getDataElement() + " is not a valid dataElementId." ) );
importSummary.getDataValueCount().incrementIgnored();
}
else
@@ -605,7 +604,7 @@
{
String dataValueStoredBy = dataValue.getStoredBy() != null ? dataValue.getStoredBy() : storedBy;
- if ( importOptions == null || !importOptions.isDryRun() )
+ if ( !dryRun )
{
saveDataValue( programStageInstance, dataValueStoredBy, dataElement, dataValue.getValue(), dataValue.getProvidedElsewhere() );
}
=== removed directory 'dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf'
=== removed directory 'dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf/metadata'
=== removed file 'dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf/metadata/DefaultExportServiceTest.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf/metadata/DefaultExportServiceTest.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf/metadata/DefaultExportServiceTest.java 1970-01-01 00:00:00 +0000
@@ -1,175 +0,0 @@
-package org.hisp.dhis.dxf.metadata;
-
-/*
- * Copyright (c) 2004-2013, 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.io.IOException;
-import java.util.HashMap;
-import javax.xml.xpath.XPathExpressionException;
-import org.hisp.dhis.DhisTest;
-import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
-import org.hisp.dhis.dataelement.DataElementCategoryService;
-import org.hisp.dhis.dataelement.DataElementService;
-import org.hisp.dhis.dataset.CompleteDataSetRegistrationService;
-import org.hisp.dhis.dataset.DataSet;
-import org.hisp.dhis.dataset.DataSetService;
-import org.hisp.dhis.datavalue.DataValueService;
-import org.hisp.dhis.dxf2.datavalueset.DataValueSetService;
-import org.hisp.dhis.dxf2.metadata.ExportService;
-import org.hisp.dhis.dxf2.metadata.MetaData;
-import org.hisp.dhis.dxf2.metadata.Options;
-import org.hisp.dhis.dxf2.utils.JacksonUtils;
-import org.hisp.dhis.organisationunit.OrganisationUnit;
-import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.period.MonthlyPeriodType;
-import org.hisp.dhis.period.Period;
-import org.hisp.dhis.period.PeriodService;
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import static org.junit.Assert.assertEquals;
-
-/**
- *
- * @author bobj
- */
-public class DefaultExportServiceTest
- extends DhisTest
-{
- @Autowired
- private ExportService exportService;
-
- @Autowired
- private DataElementService dataElementService;
-
- @Autowired
- private DataElementCategoryService categoryService;
-
- @Autowired
- private DataSetService dataSetService;
-
- @Autowired
- private OrganisationUnitService organisationUnitService;
-
- @Autowired
- private PeriodService periodService;
-
- @Autowired
- private DataValueSetService dataValueSetService;
-
- @Autowired
- private DataValueService dataValueService;
-
- @Autowired
- private CompleteDataSetRegistrationService registrationService;
-
- public ExportService getExportService()
- {
- return exportService;
- }
-
- public void setExportService( ExportService exportService )
- {
- this.exportService = exportService;
- }
-
- private DataElement deA;
-
- private DataElement deB;
-
- private DataElement deC;
-
- private DataSet dsA;
-
- private OrganisationUnit ouA;
-
- private OrganisationUnit ouB;
-
- private Period peA;
-
- private Period peB;
-
- private DataElementCategoryOptionCombo optionComboA;
-
- @Override
- public boolean emptyDatabaseAfterTest()
- {
- return true;
- }
-
- @Override
- public void setUpTest()
- {
- deA = createDataElement( 'A' );
- deB = createDataElement( 'B' );
- deC = createDataElement( 'C' );
- dsA = createDataSet( 'A', new MonthlyPeriodType() );
- ouA = createOrganisationUnit( 'A' );
- ouB = createOrganisationUnit( 'B' );
- peA = createPeriod( getDate( 2012, 1, 1 ), getDate( 2012, 1, 31 ) );
- peB = createPeriod( getDate( 2012, 2, 1 ), getDate( 2012, 2, 29 ) );
- optionComboA = categoryService.getDefaultDataElementCategoryOptionCombo();
-
- deA.setUid( "f7n9E0hX8qk" );
- deB.setUid( "Ix2HsbDMLea" );
- deC.setUid( "eY5ehpbEsB7" );
- dsA.setUid( "pBOMPrpg1QX" );
- ouA.setUid( "DiszpKrYNg8" );
- ouB.setUid( "BdfsJfj87js" );
-
- deA.setCode( "DE_A" );
- deB.setCode( "DE_B" );
- deC.setCode( "DE_C" );
- dsA.setCode( "DS_A" );
- ouA.setCode( "OU_A" );
- ouB.setCode( "OU_B" );
-
- dataElementService.addDataElement( deA );
- dataElementService.addDataElement( deB );
- dataElementService.addDataElement( deC );
- dataSetService.addDataSet( dsA );
- organisationUnitService.addOrganisationUnit( ouA );
- organisationUnitService.addOrganisationUnit( ouB );
- periodService.addPeriod( peA );
- periodService.addPeriod( peB );
- }
-
- @Test
- public void exportMetaDataTest() throws IOException, XPathExpressionException
- {
- Options options = new Options(new HashMap<String,String>() );
- MetaData metaData = exportService.getMetaData( options);
-
- String metaDataXml = JacksonUtils.toXmlAsString( metaData);
-
- assertEquals("1", xpathTest("count(//d:organisationUnits)", metaDataXml));
- assertEquals("2", xpathTest("count(//d:organisationUnit)", metaDataXml));
- assertEquals("3", xpathTest("count(//d:dataElement)", metaDataXml));
- assertEquals("DE_A", xpathTest("//d:dataElement[@name='DataElementA']/@code", metaDataXml));
- }
-}
=== removed file 'dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf/metadata/JacksonUtilsTest.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf/metadata/JacksonUtilsTest.java 2013-08-28 11:29:37 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf/metadata/JacksonUtilsTest.java 1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-package org.hisp.dhis.dxf.metadata;
-
-/*
- * Copyright (c) 2004-2013, 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 org.hisp.dhis.common.view.DetailedView;
-import org.hisp.dhis.common.view.ExportView;
-import org.hisp.dhis.dxf2.metadata.MetaData;
-import org.hisp.dhis.dxf2.utils.JacksonUtils;
-import org.junit.Test;
-
-/**
- * @author Morten Olav Hansen <mortenoh@xxxxxxxxx>
- */
-public class JacksonUtilsTest
-{
- @Test
- public void serializableTest() throws Exception
- {
- JacksonUtils.toJsonAsString( new MetaData() );
- JacksonUtils.toXmlAsString( new MetaData() );
- JacksonUtils.toJsonWithViewAsString( new MetaData(), DetailedView.class );
- JacksonUtils.toXmlWithViewAsString( new MetaData(), DetailedView.class );
- JacksonUtils.toJsonWithViewAsString( new MetaData(), ExportView.class );
- JacksonUtils.toXmlWithViewAsString( new MetaData(), ExportView.class );
- }
-
- @Test
- public void deserializableTest() throws Exception
- {
- JacksonUtils.fromJson( "{}", MetaData.class );
- JacksonUtils.fromXml( "<?xml version='1.0' encoding='UTF-8'?><metaData xmlns=\"http://dhis2.org/schema/dxf/2.0\"/>", MetaData.class );
- }
-}
=== added directory 'dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata'
=== added file 'dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata/DefaultExportServiceTest.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata/DefaultExportServiceTest.java 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata/DefaultExportServiceTest.java 2013-09-19 12:37:27 +0000
@@ -0,0 +1,176 @@
+package org.hisp.dhis.dxf2.metadata;
+
+/*
+ * Copyright (c) 2004-2013, 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.io.IOException;
+import java.util.HashMap;
+import javax.xml.xpath.XPathExpressionException;
+import org.hisp.dhis.DhisTest;
+import org.hisp.dhis.dataelement.DataElement;
+import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
+import org.hisp.dhis.dataelement.DataElementCategoryService;
+import org.hisp.dhis.dataelement.DataElementService;
+import org.hisp.dhis.dataset.CompleteDataSetRegistrationService;
+import org.hisp.dhis.dataset.DataSet;
+import org.hisp.dhis.dataset.DataSetService;
+import org.hisp.dhis.datavalue.DataValueService;
+import org.hisp.dhis.dxf2.datavalueset.DataValueSetService;
+import org.hisp.dhis.dxf2.metadata.ExportService;
+import org.hisp.dhis.dxf2.metadata.MetaData;
+import org.hisp.dhis.dxf2.metadata.Options;
+import org.hisp.dhis.dxf2.utils.JacksonUtils;
+import org.hisp.dhis.organisationunit.OrganisationUnit;
+import org.hisp.dhis.organisationunit.OrganisationUnitService;
+import org.hisp.dhis.period.MonthlyPeriodType;
+import org.hisp.dhis.period.Period;
+import org.hisp.dhis.period.PeriodService;
+import org.junit.Assert;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import static org.junit.Assert.assertEquals;
+
+/**
+ *
+ * @author bobj
+ */
+public class DefaultExportServiceTest
+ extends DhisTest
+{
+ @Autowired
+ private ExportService exportService;
+
+ @Autowired
+ private DataElementService dataElementService;
+
+ @Autowired
+ private DataElementCategoryService categoryService;
+
+ @Autowired
+ private DataSetService dataSetService;
+
+ @Autowired
+ private OrganisationUnitService organisationUnitService;
+
+ @Autowired
+ private PeriodService periodService;
+
+ @Autowired
+ private DataValueSetService dataValueSetService;
+
+ @Autowired
+ private DataValueService dataValueService;
+
+ @Autowired
+ private CompleteDataSetRegistrationService registrationService;
+
+ public ExportService getExportService()
+ {
+ return exportService;
+ }
+
+ public void setExportService( ExportService exportService )
+ {
+ this.exportService = exportService;
+ }
+
+ private DataElement deA;
+
+ private DataElement deB;
+
+ private DataElement deC;
+
+ private DataSet dsA;
+
+ private OrganisationUnit ouA;
+
+ private OrganisationUnit ouB;
+
+ private Period peA;
+
+ private Period peB;
+
+ private DataElementCategoryOptionCombo optionComboA;
+
+ @Override
+ public boolean emptyDatabaseAfterTest()
+ {
+ return true;
+ }
+
+ @Override
+ public void setUpTest()
+ {
+ deA = DhisConvenienceTest.createDataElement( 'A' );
+ deB = DhisConvenienceTest.createDataElement( 'B' );
+ deC = DhisConvenienceTest.createDataElement( 'C' );
+ dsA = DhisConvenienceTest.createDataSet( 'A', new MonthlyPeriodType() );
+ ouA = DhisConvenienceTest.createOrganisationUnit( 'A' );
+ ouB = DhisConvenienceTest.createOrganisationUnit( 'B' );
+ peA = DhisConvenienceTest.createPeriod( DhisConvenienceTest.getDate( 2012, 1, 1 ), DhisConvenienceTest.getDate( 2012, 1, 31 ) );
+ peB = DhisConvenienceTest.createPeriod( DhisConvenienceTest.getDate( 2012, 2, 1 ), DhisConvenienceTest.getDate( 2012, 2, 29 ) );
+ optionComboA = categoryService.getDefaultDataElementCategoryOptionCombo();
+
+ deA.setUid( "f7n9E0hX8qk" );
+ deB.setUid( "Ix2HsbDMLea" );
+ deC.setUid( "eY5ehpbEsB7" );
+ dsA.setUid( "pBOMPrpg1QX" );
+ ouA.setUid( "DiszpKrYNg8" );
+ ouB.setUid( "BdfsJfj87js" );
+
+ deA.setCode( "DE_A" );
+ deB.setCode( "DE_B" );
+ deC.setCode( "DE_C" );
+ dsA.setCode( "DS_A" );
+ ouA.setCode( "OU_A" );
+ ouB.setCode( "OU_B" );
+
+ dataElementService.addDataElement( deA );
+ dataElementService.addDataElement( deB );
+ dataElementService.addDataElement( deC );
+ dataSetService.addDataSet( dsA );
+ organisationUnitService.addOrganisationUnit( ouA );
+ organisationUnitService.addOrganisationUnit( ouB );
+ periodService.addPeriod( peA );
+ periodService.addPeriod( peB );
+ }
+
+ @Test
+ public void exportMetaDataTest() throws IOException, XPathExpressionException
+ {
+ Options options = new Options(new HashMap<String,String>() );
+ MetaData metaData = exportService.getMetaData( options);
+
+ String metaDataXml = JacksonUtils.toXmlAsString( metaData);
+
+ assertEquals( "1", xpathTest( "count(//d:organisationUnits)", metaDataXml ) );
+ assertEquals( "2", xpathTest( "count(//d:organisationUnit)", metaDataXml ) );
+ assertEquals( "3", xpathTest( "count(//d:dataElement)", metaDataXml ) );
+ assertEquals( "DE_A", xpathTest( "//d:dataElement[@name='DataElementA']/@code", metaDataXml ) );
+ }
+}
=== added file 'dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata/JacksonUtilsTest.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata/JacksonUtilsTest.java 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata/JacksonUtilsTest.java 2013-09-19 12:37:27 +0000
@@ -0,0 +1,59 @@
+package org.hisp.dhis.dxf2.metadata;
+
+/*
+ * Copyright (c) 2004-2013, 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 org.hisp.dhis.common.view.DetailedView;
+import org.hisp.dhis.common.view.ExportView;
+import org.hisp.dhis.dxf2.metadata.MetaData;
+import org.hisp.dhis.dxf2.utils.JacksonUtils;
+import org.junit.Test;
+
+/**
+ * @author Morten Olav Hansen <mortenoh@xxxxxxxxx>
+ */
+public class JacksonUtilsTest
+{
+ @Test
+ public void serializableTest() throws Exception
+ {
+ JacksonUtils.toJsonAsString( new MetaData() );
+ JacksonUtils.toXmlAsString( new MetaData() );
+ JacksonUtils.toJsonWithViewAsString( new MetaData(), DetailedView.class );
+ JacksonUtils.toXmlWithViewAsString( new MetaData(), DetailedView.class );
+ JacksonUtils.toJsonWithViewAsString( new MetaData(), ExportView.class );
+ JacksonUtils.toXmlWithViewAsString( new MetaData(), ExportView.class );
+ }
+
+ @Test
+ public void deserializableTest() throws Exception
+ {
+ JacksonUtils.fromJson( "{}", MetaData.class );
+ JacksonUtils.fromXml( "<?xml version='1.0' encoding='UTF-8'?><metaData xmlns=\"http://dhis2.org/schema/dxf/2.0\"/>", MetaData.class );
+ }
+}
