dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 19540
committer: Bob Jolliffe <bobjolliffe@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2015-07-03 21:56:20 +0100
message:
  Removed failing test
removed:
  dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/adx/DefaultADXDataServiceTest.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

=== removed file 'dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/adx/DefaultADXDataServiceTest.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/adx/DefaultADXDataServiceTest.java	2015-07-03 16:31:04 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/adx/DefaultADXDataServiceTest.java	1970-01-01 00:00:00 +0000
@@ -1,90 +0,0 @@
-package org.hisp.dhis.dxf2.adx;
-
-/*
- * Copyright (c) 2004-2015, 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.InputStream;
-import org.hisp.dhis.DhisSpringTest;
-import static org.hisp.dhis.common.IdentifiableProperty.CODE;
-import org.hisp.dhis.datavalue.DataValue;
-import org.hisp.dhis.dxf2.common.ImportOptions;
-import org.hisp.dhis.dxf2.datavalueset.DataValueSetService;
-import org.hisp.dhis.dxf2.importsummary.ImportSummaries;
-import org.hisp.dhis.jdbc.batchhandler.DataValueBatchHandler;
-import org.hisp.dhis.mock.batchhandler.MockBatchHandler;
-import org.hisp.dhis.mock.batchhandler.MockBatchHandlerFactory;
-import static org.junit.Assert.assertEquals;
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.ClassPathResource;
-
-/**
- *
- * @author bobj
- */
-public class DefaultADXDataServiceTest
-    extends DhisSpringTest
-{
-    @Autowired
-    private DataValueSetService dataValueSetService;
-
-    @Autowired
-    private ADXDataService adxDataService;
-
-    protected static final String SIMPLE_ADX_SAMPLE = "adx/adx_data_sample1.xml";
-
-    private MockBatchHandler<DataValue> mockDataValueBatchHandler = null;
-
-    private MockBatchHandlerFactory mockBatchHandlerFactory = null;
-
-    @Override
-    public void setUpTest()
-    {
-        mockDataValueBatchHandler = new MockBatchHandler<>();
-        mockBatchHandlerFactory = new MockBatchHandlerFactory();
-        mockBatchHandlerFactory.registerBatchHandler( DataValueBatchHandler.class, mockDataValueBatchHandler );
-        setDependency( dataValueSetService, "batchHandlerFactory", mockBatchHandlerFactory );
-        setDependency( adxDataService,"dataValueSetService", dataValueSetService );
-    }
-
-    @Test
-    public void testpostData() throws Exception
-    {
-        InputStream in = new ClassPathResource( SIMPLE_ADX_SAMPLE ).getInputStream();
-        
-        ImportOptions options = new ImportOptions();
-        options.setDataElementIdScheme( "CODE");
-        options.setOrgUnitIdScheme( "CODE" );
-        
-        ImportSummaries importSummaries =  adxDataService.postData(in, options);
-        
-        assertEquals(importSummaries.getImportSummaries().size(), 2);
-        // only testing this far .. summaries are full of conflicts for now ...
-    }
-
-}