From 8992bc7fe9cd90341884511a42ae14189f08a74e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Mon, 22 Sep 2014 16:28:12 +0000 Subject: [PATCH] fix Specimen import test --- .gitattributes | 2 +- .../in/SpecimenImportConfiguratorTest.java | 43 +++++++ .../abcd206/in/SpecimenImportTest.java | 116 ------------------ ...ecimenImportConfiguratorTest.doInvoke2.xml | 38 ++++++ 4 files changed, 82 insertions(+), 117 deletions(-) delete mode 100644 cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/SpecimenImportTest.java create mode 100644 cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/specimen/abcd206/in/SpecimenImportConfiguratorTest.doInvoke2.xml diff --git a/.gitattributes b/.gitattributes index aa4ca0cf83..c8b614db20 100644 --- a/.gitattributes +++ b/.gitattributes @@ -565,7 +565,6 @@ cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/sdd/in/SDDImportTest.java -text cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/sdd/out/SDDCdmExporterTest.java -text cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/ABCDImportConfiguratorTestNonEmptyDB.java -text cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/SpecimenImportConfiguratorTest.java -text -cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/SpecimenImportTest.java -text cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/specimen/excel/in/ExcelImportConfiguratorTest.java -text cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/specimen/excel/in/ExcelSpecimenImportExampleTest.java -text cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/taxonx/TaxonXImportConfiguratorTest.java -text @@ -642,6 +641,7 @@ cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/specimen/abcd206/in/ABCDImportT cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/specimen/abcd206/in/ABCDImportTestCalvumPart2.xml -text cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/specimen/abcd206/in/Campanula_ABCD_import_3_taxa_11_units.xml -text cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/specimen/abcd206/in/SpecimenImportConfiguratorTest-input.xml -text +cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/specimen/abcd206/in/SpecimenImportConfiguratorTest.doInvoke2.xml -text cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/specimen/abcd206/in/SpecimenImportConfiguratorTest.xml -text cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/specimen/excel/in/ExcelImportConfiguratorTest-input.xls -text cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/specimen/excel/in/ExcelSpecimenImportExampleTest-input.xls -text diff --git a/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/SpecimenImportConfiguratorTest.java b/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/SpecimenImportConfiguratorTest.java index 0d145ef5b7..20b34a04be 100644 --- a/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/SpecimenImportConfiguratorTest.java +++ b/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/SpecimenImportConfiguratorTest.java @@ -18,6 +18,7 @@ import java.net.URL; import org.junit.Assert; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.unitils.dbunit.annotation.DataSet; import org.unitils.spring.annotation.SpringBeanByName; @@ -26,12 +27,15 @@ import org.unitils.spring.annotation.SpringBeanByType; import eu.etaxonomy.cdm.api.service.ICommonService; import eu.etaxonomy.cdm.api.service.INameService; import eu.etaxonomy.cdm.api.service.IOccurrenceService; +import eu.etaxonomy.cdm.api.service.IReferenceService; import eu.etaxonomy.cdm.api.service.ITaxonNodeService; import eu.etaxonomy.cdm.api.service.ITermService; import eu.etaxonomy.cdm.io.common.CdmApplicationAwareDefaultImport; import eu.etaxonomy.cdm.io.common.IImportConfigurator; import eu.etaxonomy.cdm.model.name.TaxonNameBase; import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; +import eu.etaxonomy.cdm.model.occurrence.FieldUnit; +import eu.etaxonomy.cdm.model.reference.Reference; import eu.etaxonomy.cdm.model.taxon.TaxonNode; import eu.etaxonomy.cdm.test.integration.CdmTransactionalIntegrationTest; import eu.etaxonomy.cdm.test.unitils.CleanSweepInsertLoadStrategy; @@ -59,9 +63,14 @@ public class SpecimenImportConfiguratorTest extends CdmTransactionalIntegrationT @SpringBeanByType ITaxonNodeService taxonNodeService; + + @SpringBeanByType + private IReferenceService referenceService; + private IImportConfigurator configurator; + private IImportConfigurator configurator2; @Before public void setUp() { @@ -75,6 +84,18 @@ public class SpecimenImportConfiguratorTest extends CdmTransactionalIntegrationT Assert.fail(); } assertNotNull("Configurator2 could not be created", configurator); + + //test2 + String inputFile2 = "/eu/etaxonomy/cdm/io/specimen/abcd206/in/Campanula_ABCD_import_3_taxa_11_units.xml"; + URL url2 = this.getClass().getResource(inputFile2); + assertNotNull("URL for the test file '" + inputFile2 + "' does not exist", url2); + try { + configurator2 = Abcd206ImportConfigurator.NewInstance(url2.toURI(), null,false); + } catch (URISyntaxException e) { + e.printStackTrace(); + Assert.fail(); + } + assertNotNull("Configurator could not be created", configurator2); } @Test @@ -101,4 +122,26 @@ public class SpecimenImportConfiguratorTest extends CdmTransactionalIntegrationT assertEquals("Number of TaxonNodes is incorrect", 3, taxonNodeService.count(TaxonNode.class)); assertEquals("Number of specimen and observation is incorrect", 10, occurrenceService.count(DerivedUnit.class)); } + + + @Test + @DataSet(value="SpecimenImportConfiguratorTest.doInvoke2.xml", loadStrategy=CleanSweepInsertLoadStrategy.class) + public void testDoInvoke2() { + boolean result = defaultImport.invoke(configurator2); + assertTrue("Return value for import.invoke should be true", result); + assertEquals("Number of TaxonNames is incorrect", 4, nameService.count(TaxonNameBase.class)); + /* + * 5 taxon nodes: + * + * Classification + * - Campanula + * - Campanula patula + * - Campanula tridentata + * - Campanula lactiflora + */ + assertEquals("Number of TaxonNodes is incorrect", 5, taxonNodeService.count(TaxonNode.class)); + assertEquals("Number of derived units is incorrect", 11, occurrenceService.count(DerivedUnit.class)); + assertEquals("Number of field units is incorrect", 11, occurrenceService.count(FieldUnit.class)); + assertEquals("Number of field units is incorrect", 1, referenceService.count(Reference.class)); + } } diff --git a/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/SpecimenImportTest.java b/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/SpecimenImportTest.java deleted file mode 100644 index 0d90ab7ba4..0000000000 --- a/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/SpecimenImportTest.java +++ /dev/null @@ -1,116 +0,0 @@ -/** -* Copyright (C) 2007 EDIT -* European Distributed Institute of Taxonomy -* http://www.e-taxonomy.eu -* -* The contents of this file are subject to the Mozilla Public License Version 1.1 -* See LICENSE.TXT at the top of this package for the full license terms. -*/ - -package eu.etaxonomy.cdm.io.specimen.abcd206.in; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.net.URISyntaxException; -import java.net.URL; - -import org.junit.Assert; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; -import org.unitils.dbunit.annotation.DataSet; -import org.unitils.spring.annotation.SpringBeanByName; -import org.unitils.spring.annotation.SpringBeanByType; - -import eu.etaxonomy.cdm.api.service.ICommonService; -import eu.etaxonomy.cdm.api.service.INameService; -import eu.etaxonomy.cdm.api.service.IOccurrenceService; -import eu.etaxonomy.cdm.api.service.IReferenceService; -import eu.etaxonomy.cdm.api.service.ITaxonNodeService; -import eu.etaxonomy.cdm.api.service.ITermService; -import eu.etaxonomy.cdm.io.common.CdmApplicationAwareDefaultImport; -import eu.etaxonomy.cdm.io.common.IImportConfigurator; -import eu.etaxonomy.cdm.model.name.TaxonNameBase; -import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; -import eu.etaxonomy.cdm.model.occurrence.FieldUnit; -import eu.etaxonomy.cdm.model.reference.Reference; -import eu.etaxonomy.cdm.model.taxon.TaxonNode; -import eu.etaxonomy.cdm.test.integration.CdmTransactionalIntegrationTest; -import eu.etaxonomy.cdm.test.unitils.CleanSweepInsertLoadStrategy; - -/** - * @author a.mueller - * @created 29.01.2009 - */ -public class SpecimenImportTest extends CdmTransactionalIntegrationTest { - - @SpringBeanByName - private CdmApplicationAwareDefaultImport defaultImport; - - @SpringBeanByType - private INameService nameService; - - @SpringBeanByType - private IOccurrenceService occurrenceService; - - @SpringBeanByType - private ITermService termService; - - @SpringBeanByType - private ICommonService commonService; - - @SpringBeanByType - private ITaxonNodeService taxonNodeService; - - @SpringBeanByType - private IReferenceService referenceService; - - private IImportConfigurator configurator; - - @Before - public void setUp() { - String inputFile = "/eu/etaxonomy/cdm/io/specimen/abcd206/in/Campanula_ABCD_import_3_taxa_11_units.xml"; - URL url = this.getClass().getResource(inputFile); - assertNotNull("URL for the test file '" + inputFile + "' does not exist", url); - try { - configurator = Abcd206ImportConfigurator.NewInstance(url.toURI(), null,false); - } catch (URISyntaxException e) { - e.printStackTrace(); - Assert.fail(); - } - assertNotNull("Configurator could not be created", configurator); - } - - @Test - public void testInit() { - assertNotNull("import instance should not be null", defaultImport); - assertNotNull("nameService should not be null", nameService); - assertNotNull("occurence service should not be null", occurrenceService); - assertNotNull("term service should not be null", termService); - assertNotNull("common service should not be null", commonService); - } - - @Test - @DataSet( value="../../../BlankDataSet.xml", loadStrategy=CleanSweepInsertLoadStrategy.class) - @Ignore //TODO does currently not run in suite as we get ID problems when saving terms (NamedArea) - public void testDoInvoke() { - boolean result = defaultImport.invoke(configurator); - assertTrue("Return value for import.invoke should be true", result); - assertEquals("Number of TaxonNames is incorrect", 4, nameService.count(TaxonNameBase.class)); - /* - * 5 taxon nodes: - * - * Classification - * - Campanula - * - Campanula patula - * - Campanula tridentata - * - Campanula lactiflora - */ - assertEquals("Number of TaxonNodes is incorrect", 5, taxonNodeService.count(TaxonNode.class)); - assertEquals("Number of derived units is incorrect", 11, occurrenceService.count(DerivedUnit.class)); - assertEquals("Number of field units is incorrect", 11, occurrenceService.count(FieldUnit.class)); - assertEquals("Number of field units is incorrect", 1, referenceService.count(Reference.class)); - } -} diff --git a/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/specimen/abcd206/in/SpecimenImportConfiguratorTest.doInvoke2.xml b/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/specimen/abcd206/in/SpecimenImportConfiguratorTest.doInvoke2.xml new file mode 100644 index 0000000000..2687a382bb --- /dev/null +++ b/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/specimen/abcd206/in/SpecimenImportConfiguratorTest.doInvoke2.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- 2.34.1