bugfix for specimen import configurator test

diff --git a/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/specimen/abcd206/SpecimenImportConfiguratorTest.java b/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/specimen/abcd206/SpecimenImportConfiguratorTest.java
index 2fc012ac9210bfe70e80e6f33f7a1d949359422b..19e0a36afcf6e6189ba54860a269694a256a4545 100644 (file)
--- a/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/specimen/abcd206/SpecimenImportConfiguratorTest.java
+++ b/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/specimen/abcd206/SpecimenImportConfiguratorTest.java
@@ -22,9 +22,11 @@ import org.unitils.spring.annotation.SpringBeanByName;
 import org.unitils.spring.annotation.SpringBeanByType;\r
 \r
 import eu.etaxonomy.cdm.api.service.INameService;\r
+import eu.etaxonomy.cdm.api.service.IOccurrenceService;\r
 import eu.etaxonomy.cdm.io.common.CdmApplicationAwareDefaultImport;\r
 import eu.etaxonomy.cdm.io.common.IImportConfigurator;\r
 import eu.etaxonomy.cdm.io.specimen.abcd206.in.Abcd206ImportConfigurator;\r
+import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;\r
 import eu.etaxonomy.cdm.test.integration.CdmTransactionalIntegrationTest;\r
 \r
 /**\r
@@ -32,7 +34,6 @@ import eu.etaxonomy.cdm.test.integration.CdmTransactionalIntegrationTest;
  * @created 29.01.2009\r
  * @version 1.0\r
  */\r
-@Ignore\r
 public class SpecimenImportConfiguratorTest extends CdmTransactionalIntegrationTest {\r
        \r
        @SpringBeanByName\r
@@ -41,6 +42,10 @@ public class SpecimenImportConfiguratorTest extends CdmTransactionalIntegrationT
        @SpringBeanByType\r
        INameService nameService;\r
 \r
+       @SpringBeanByType\r
+       IOccurrenceService occurrenceService;\r
+\r
+       \r
        private IImportConfigurator configurator;\r
        \r
        @Before\r
@@ -54,8 +59,9 @@ public class SpecimenImportConfiguratorTest extends CdmTransactionalIntegrationT
        \r
        @Test\r
        public void testInit() {\r
-               assertNotNull("cdmTcsXmlImport should not be null", defaultImport);\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
        }\r
        \r
        @Test\r
@@ -63,6 +69,8 @@ public class SpecimenImportConfiguratorTest extends CdmTransactionalIntegrationT
                boolean result = defaultImport.invoke(configurator);\r
                assertTrue("Return value for import.invoke should be true", result);\r
                assertEquals("Number of TaxonNames should be 10", 10, nameService.count(null));\r
+               //assertEquals("Number of specimen should be 10", 10, occurrenceService.count(DerivedUnitBase.class));\r
+               \r
        }\r
 \r
 }\r

diff --git a/cdmlib-io/src/test/resources/dbscripts/001_cdm.ddl b/cdmlib-io/src/test/resources/dbscripts/001_cdm.ddl
index ccc4b5504885c93bd9cef780df2eb2a11b9cb22f..cfc50f3fc9e0a4e90ef363a4e469974e3fc9f850 100644 (file)
--- a/cdmlib-io/src/test/resources/dbscripts/001_cdm.ddl
+++ b/cdmlib-io/src/test/resources/dbscripts/001_cdm.ddl
@@ -1267,6 +1267,7 @@
     create table DescriptionElementBase_Media (
         DescriptionElementBase_id integer not null,
         media_id integer not null,
+        sortIndex integer not null,
         primary key (DescriptionElementBase_id, media_id)
     );
 
@@ -1274,6 +1275,7 @@
         REV integer not null,
         DescriptionElementBase_id integer not null,
         media_id integer not null,
+        sortIndex integer not null,
         revtype tinyint,
         primary key (REV, DescriptionElementBase_id, media_id)
     );

diff --git a/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/dataset.dtd b/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/dataset.dtd
index a56c4320fe7c6bc9a6f1a0df2b3003d5db75caf0..e8090472b2bb61e156296666a54c7356d154e5ea 100644 (file)
--- a/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/dataset.dtd
+++ b/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/dataset.dtd
@@ -1557,6 +1557,7 @@
 <!ATTLIST DESCRIPTIONELEMENTBASE_MEDIA
     DESCRIPTIONELEMENTBASE_ID CDATA #REQUIRED
     MEDIA_ID CDATA #REQUIRED
+    SORTINDEX CDATA #REQUIRED
 >
 
 <!ELEMENT DESCRIPTIONELEMENTBASE_MEDIA_AUD EMPTY>
@@ -1564,6 +1565,7 @@
     REV CDATA #REQUIRED
     DESCRIPTIONELEMENTBASE_ID CDATA #REQUIRED
     MEDIA_ID CDATA #REQUIRED
+    SORTINDEX CDATA #REQUIRED
     REVTYPE CDATA #IMPLIED
 >