fix Specimen import test
authorAndreas Müller <a.mueller@bgbm.org>
Mon, 22 Sep 2014 16:28:12 +0000 (16:28 +0000)
committerAndreas Müller <a.mueller@bgbm.org>
Mon, 22 Sep 2014 16:28:12 +0000 (16:28 +0000)
.gitattributes
cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/SpecimenImportConfiguratorTest.java
cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/SpecimenImportTest.java [deleted file]
cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/specimen/abcd206/in/SpecimenImportConfiguratorTest.doInvoke2.xml [new file with mode: 0644]

index aa4ca0cf83a36bfacadd1d667fcedd68ef16677c..c8b614db20ccc63f3649f585115dba542a076ec8 100644 (file)
@@ -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
index 0d145ef5b76bb735798f765e26f69b4a7b84261c..20b34a04be034e48efbe2ebad1ef64537cc6493f 100644 (file)
@@ -18,6 +18,7 @@ import java.net.URL;
 \r
 import org.junit.Assert;\r
 import org.junit.Before;\r
+import org.junit.Ignore;\r
 import org.junit.Test;\r
 import org.unitils.dbunit.annotation.DataSet;\r
 import org.unitils.spring.annotation.SpringBeanByName;\r
@@ -26,12 +27,15 @@ import org.unitils.spring.annotation.SpringBeanByType;
 import eu.etaxonomy.cdm.api.service.ICommonService;\r
 import eu.etaxonomy.cdm.api.service.INameService;\r
 import eu.etaxonomy.cdm.api.service.IOccurrenceService;\r
+import eu.etaxonomy.cdm.api.service.IReferenceService;\r
 import eu.etaxonomy.cdm.api.service.ITaxonNodeService;\r
 import eu.etaxonomy.cdm.api.service.ITermService;\r
 import eu.etaxonomy.cdm.io.common.CdmApplicationAwareDefaultImport;\r
 import eu.etaxonomy.cdm.io.common.IImportConfigurator;\r
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;\r
+import eu.etaxonomy.cdm.model.occurrence.FieldUnit;\r
+import eu.etaxonomy.cdm.model.reference.Reference;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;\r
 import eu.etaxonomy.cdm.test.integration.CdmTransactionalIntegrationTest;\r
 import eu.etaxonomy.cdm.test.unitils.CleanSweepInsertLoadStrategy;\r
@@ -59,9 +63,14 @@ public class SpecimenImportConfiguratorTest extends CdmTransactionalIntegrationT
 \r
        @SpringBeanByType\r
        ITaxonNodeService taxonNodeService;\r
+       \r
+       @SpringBeanByType\r
+       private IReferenceService referenceService;\r
+\r
 \r
 \r
        private IImportConfigurator configurator;\r
+       private IImportConfigurator configurator2;\r
 \r
        @Before\r
        public void setUp() {\r
@@ -75,6 +84,18 @@ public class SpecimenImportConfiguratorTest extends CdmTransactionalIntegrationT
             Assert.fail();\r
         }\r
         assertNotNull("Configurator2 could not be created", configurator);\r
+        \r
+        //test2\r
+        String inputFile2 = "/eu/etaxonomy/cdm/io/specimen/abcd206/in/Campanula_ABCD_import_3_taxa_11_units.xml";\r
+               URL url2 = this.getClass().getResource(inputFile2);\r
+               assertNotNull("URL for the test file '" + inputFile2 + "' does not exist", url2);\r
+               try {\r
+                       configurator2 = Abcd206ImportConfigurator.NewInstance(url2.toURI(), null,false);\r
+               } catch (URISyntaxException e) {\r
+                       e.printStackTrace();\r
+                       Assert.fail();\r
+               }\r
+               assertNotNull("Configurator could not be created", configurator2);\r
        }\r
 \r
        @Test\r
@@ -101,4 +122,26 @@ public class SpecimenImportConfiguratorTest extends CdmTransactionalIntegrationT
         assertEquals("Number of TaxonNodes is incorrect", 3, taxonNodeService.count(TaxonNode.class));\r
         assertEquals("Number of specimen and observation is incorrect", 10, occurrenceService.count(DerivedUnit.class));\r
     }\r
+       \r
+\r
+       @Test\r
+       @DataSet(value="SpecimenImportConfiguratorTest.doInvoke2.xml",  loadStrategy=CleanSweepInsertLoadStrategy.class)\r
+       public void testDoInvoke2() {\r
+               boolean result = defaultImport.invoke(configurator2);\r
+               assertTrue("Return value for import.invoke should be true", result);\r
+               assertEquals("Number of TaxonNames is incorrect", 4, nameService.count(TaxonNameBase.class));\r
+               /*\r
+                * 5 taxon nodes:\r
+                *\r
+         * Classification\r
+         * - Campanula\r
+         *   - Campanula patula\r
+         *   - Campanula tridentata\r
+         *   - Campanula lactiflora\r
+         */\r
+        assertEquals("Number of TaxonNodes is incorrect", 5, taxonNodeService.count(TaxonNode.class));\r
+               assertEquals("Number of derived units is incorrect", 11, occurrenceService.count(DerivedUnit.class));\r
+               assertEquals("Number of field units is incorrect", 11, occurrenceService.count(FieldUnit.class));\r
+               assertEquals("Number of field units is incorrect", 1, referenceService.count(Reference.class));\r
+       }\r
 }\r
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 (file)
index 0d90ab7..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy\r
-* http://www.e-taxonomy.eu\r
-*\r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.io.specimen.abcd206.in;\r
-\r
-import static org.junit.Assert.assertEquals;\r
-import static org.junit.Assert.assertNotNull;\r
-import static org.junit.Assert.assertTrue;\r
-\r
-import java.net.URISyntaxException;\r
-import java.net.URL;\r
-\r
-import org.junit.Assert;\r
-import org.junit.Before;\r
-import org.junit.Ignore;\r
-import org.junit.Test;\r
-import org.unitils.dbunit.annotation.DataSet;\r
-import org.unitils.spring.annotation.SpringBeanByName;\r
-import org.unitils.spring.annotation.SpringBeanByType;\r
-\r
-import eu.etaxonomy.cdm.api.service.ICommonService;\r
-import eu.etaxonomy.cdm.api.service.INameService;\r
-import eu.etaxonomy.cdm.api.service.IOccurrenceService;\r
-import eu.etaxonomy.cdm.api.service.IReferenceService;\r
-import eu.etaxonomy.cdm.api.service.ITaxonNodeService;\r
-import eu.etaxonomy.cdm.api.service.ITermService;\r
-import eu.etaxonomy.cdm.io.common.CdmApplicationAwareDefaultImport;\r
-import eu.etaxonomy.cdm.io.common.IImportConfigurator;\r
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
-import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;\r
-import eu.etaxonomy.cdm.model.occurrence.FieldUnit;\r
-import eu.etaxonomy.cdm.model.reference.Reference;\r
-import eu.etaxonomy.cdm.model.taxon.TaxonNode;\r
-import eu.etaxonomy.cdm.test.integration.CdmTransactionalIntegrationTest;\r
-import eu.etaxonomy.cdm.test.unitils.CleanSweepInsertLoadStrategy;\r
-\r
-/**\r
- * @author a.mueller\r
- * @created 29.01.2009\r
- */\r
-public class SpecimenImportTest extends CdmTransactionalIntegrationTest {\r
-\r
-       @SpringBeanByName\r
-       private CdmApplicationAwareDefaultImport<?> defaultImport;\r
-\r
-       @SpringBeanByType\r
-       private INameService nameService;\r
-\r
-       @SpringBeanByType\r
-       private IOccurrenceService occurrenceService;\r
-\r
-       @SpringBeanByType\r
-       private ITermService termService;\r
-\r
-       @SpringBeanByType\r
-       private ICommonService commonService;\r
-\r
-       @SpringBeanByType\r
-       private ITaxonNodeService taxonNodeService;\r
-\r
-       @SpringBeanByType\r
-       private IReferenceService referenceService;\r
-\r
-       private IImportConfigurator configurator;\r
-\r
-       @Before\r
-       public void setUp() {\r
-               String inputFile = "/eu/etaxonomy/cdm/io/specimen/abcd206/in/Campanula_ABCD_import_3_taxa_11_units.xml";\r
-               URL url = this.getClass().getResource(inputFile);\r
-               assertNotNull("URL for the test file '" + inputFile + "' does not exist", url);\r
-               try {\r
-                       configurator = Abcd206ImportConfigurator.NewInstance(url.toURI(), null,false);\r
-               } catch (URISyntaxException e) {\r
-                       e.printStackTrace();\r
-                       Assert.fail();\r
-               }\r
-               assertNotNull("Configurator could not be created", configurator);\r
-       }\r
-\r
-       @Test\r
-       public void testInit() {\r
-               assertNotNull("import instance should not be null", defaultImport);\r
-               assertNotNull("nameService should not be null", nameService);\r
-               assertNotNull("occurence service should not be null", occurrenceService);\r
-               assertNotNull("term service should not be null", termService);\r
-               assertNotNull("common service should not be null", commonService);\r
-       }\r
-\r
-       @Test\r
-       @DataSet( value="../../../BlankDataSet.xml", loadStrategy=CleanSweepInsertLoadStrategy.class)\r
-       @Ignore //TODO does currently not run in suite as we get ID problems when saving terms (NamedArea)\r
-       public void testDoInvoke() {\r
-               boolean result = defaultImport.invoke(configurator);\r
-               assertTrue("Return value for import.invoke should be true", result);\r
-               assertEquals("Number of TaxonNames is incorrect", 4, nameService.count(TaxonNameBase.class));\r
-               /*\r
-                * 5 taxon nodes:\r
-                *\r
-         * Classification\r
-         * - Campanula\r
-         *   - Campanula patula\r
-         *   - Campanula tridentata\r
-         *   - Campanula lactiflora\r
-         */\r
-        assertEquals("Number of TaxonNodes is incorrect", 5, taxonNodeService.count(TaxonNode.class));\r
-               assertEquals("Number of derived units is incorrect", 11, occurrenceService.count(DerivedUnit.class));\r
-               assertEquals("Number of field units is incorrect", 11, occurrenceService.count(FieldUnit.class));\r
-               assertEquals("Number of field units is incorrect", 1, referenceService.count(Reference.class));\r
-       }\r
-}\r
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 (file)
index 0000000..2687a38
--- /dev/null
@@ -0,0 +1,38 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<dataset>
+  <HIBERNATE_SEQUENCES SEQUENCE_NAME="AgentBase" NEXT_VAL="3676"/>
+  <HIBERNATE_SEQUENCES SEQUENCE_NAME="Annotation" NEXT_VAL="3006"/>
+  <HIBERNATE_SEQUENCES SEQUENCE_NAME="CdmMetaData" NEXT_VAL="3003"/>
+  <HIBERNATE_SEQUENCES SEQUENCE_NAME="Classification" NEXT_VAL="3004"/>
+  <HIBERNATE_SEQUENCES SEQUENCE_NAME="Collection" NEXT_VAL="3001"/>
+  <HIBERNATE_SEQUENCES SEQUENCE_NAME="DefinedTermBase" NEXT_VAL="3054"/>
+  <HIBERNATE_SEQUENCES SEQUENCE_NAME="DerivationEvent" NEXT_VAL="3010"/>
+  <HIBERNATE_SEQUENCES SEQUENCE_NAME="DescriptionBase" NEXT_VAL="3015"/>
+  <HIBERNATE_SEQUENCES SEQUENCE_NAME="DescriptionElementBase" NEXT_VAL="3038"/>
+  <HIBERNATE_SEQUENCES SEQUENCE_NAME="DeterminationEvent" NEXT_VAL="3010"/>
+  <HIBERNATE_SEQUENCES SEQUENCE_NAME="GatheringEvent" NEXT_VAL="3010"/>
+  <HIBERNATE_SEQUENCES SEQUENCE_NAME="GrantedAuthorityImpl" NEXT_VAL="3001"/>
+  <HIBERNATE_SEQUENCES SEQUENCE_NAME="HomotypicalGroup" NEXT_VAL="3347"/>
+  <HIBERNATE_SEQUENCES SEQUENCE_NAME="KeyStatement" NEXT_VAL="3495"/>
+  <HIBERNATE_SEQUENCES SEQUENCE_NAME="LanguageString" NEXT_VAL="3512"/>
+  <HIBERNATE_SEQUENCES SEQUENCE_NAME="Marker" NEXT_VAL="3001"/>
+  <HIBERNATE_SEQUENCES SEQUENCE_NAME="Media" NEXT_VAL="3001"/>
+  <HIBERNATE_SEQUENCES SEQUENCE_NAME="MediaRepresentation" NEXT_VAL="3001"/>
+  <HIBERNATE_SEQUENCES SEQUENCE_NAME="MediaRepresentationPart" NEXT_VAL="3001"/>
+  <HIBERNATE_SEQUENCES SEQUENCE_NAME="OriginalSourceBase" NEXT_VAL="3040"/>
+  <HIBERNATE_SEQUENCES SEQUENCE_NAME="PolytomousKey" NEXT_VAL="3001"/>
+  <HIBERNATE_SEQUENCES SEQUENCE_NAME="PolytomousKeyNode" NEXT_VAL="3496"/>
+  <HIBERNATE_SEQUENCES SEQUENCE_NAME="Reference" NEXT_VAL="3952"/>
+  <HIBERNATE_SEQUENCES SEQUENCE_NAME="Representation" NEXT_VAL="3059"/>
+  <HIBERNATE_SEQUENCES SEQUENCE_NAME="RightsInfo" NEXT_VAL="3001"/>
+  <HIBERNATE_SEQUENCES SEQUENCE_NAME="SpecimenOrObservationBase" NEXT_VAL="3020"/>
+  <HIBERNATE_SEQUENCES SEQUENCE_NAME="StateData" NEXT_VAL="3003"/>
+  <HIBERNATE_SEQUENCES SEQUENCE_NAME="StatisticalMeasurementValue" NEXT_VAL="3005"/>
+  <HIBERNATE_SEQUENCES SEQUENCE_NAME="SynonymRelationship" NEXT_VAL="3005"/>
+  <HIBERNATE_SEQUENCES SEQUENCE_NAME="TaxonBase" NEXT_VAL="3347"/>
+  <HIBERNATE_SEQUENCES SEQUENCE_NAME="TaxonNameBase" NEXT_VAL="3347"/>
+  <HIBERNATE_SEQUENCES SEQUENCE_NAME="TaxonNode" NEXT_VAL="3020"/>
+  <HIBERNATE_SEQUENCES SEQUENCE_NAME="TermVocabulary" NEXT_VAL="55"/>
+  <HIBERNATE_SEQUENCES SEQUENCE_NAME="UserAccount" NEXT_VAL="3001"/>
+  <HIBERNATE_SEQUENCES SEQUENCE_NAME="WorkingSet" NEXT_VAL="3001"/>
+</dataset>