From b75de90c3ffb2e34689c94d8ce2fc68b2e742028 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Fri, 25 Jun 2010 09:50:23 +0000 Subject: [PATCH] bugfix for specimen import configurator test --- .../abcd206/SpecimenImportConfiguratorTest.java | 12 ++++++++++-- cdmlib-io/src/test/resources/dbscripts/001_cdm.ddl | 2 ++ .../test/resources/eu/etaxonomy/cdm/io/dataset.dtd | 2 ++ 3 files changed, 14 insertions(+), 2 deletions(-) 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 2fc012ac92..19e0a36afc 100644 --- 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; import eu.etaxonomy.cdm.api.service.INameService; +import eu.etaxonomy.cdm.api.service.IOccurrenceService; import eu.etaxonomy.cdm.io.common.CdmApplicationAwareDefaultImport; import eu.etaxonomy.cdm.io.common.IImportConfigurator; import eu.etaxonomy.cdm.io.specimen.abcd206.in.Abcd206ImportConfigurator; +import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase; import eu.etaxonomy.cdm.test.integration.CdmTransactionalIntegrationTest; /** @@ -32,7 +34,6 @@ import eu.etaxonomy.cdm.test.integration.CdmTransactionalIntegrationTest; * @created 29.01.2009 * @version 1.0 */ -@Ignore public class SpecimenImportConfiguratorTest extends CdmTransactionalIntegrationTest { @SpringBeanByName @@ -41,6 +42,10 @@ public class SpecimenImportConfiguratorTest extends CdmTransactionalIntegrationT @SpringBeanByType INameService nameService; + @SpringBeanByType + IOccurrenceService occurrenceService; + + private IImportConfigurator configurator; @Before @@ -54,8 +59,9 @@ public class SpecimenImportConfiguratorTest extends CdmTransactionalIntegrationT @Test public void testInit() { - assertNotNull("cdmTcsXmlImport should not be null", defaultImport); + assertNotNull("import instance should not be null", defaultImport); assertNotNull("nameService should not be null", nameService); + assertNotNull("occurence service should not be null", occurrenceService); } @Test @@ -63,6 +69,8 @@ public class SpecimenImportConfiguratorTest extends CdmTransactionalIntegrationT boolean result = defaultImport.invoke(configurator); assertTrue("Return value for import.invoke should be true", result); assertEquals("Number of TaxonNames should be 10", 10, nameService.count(null)); + //assertEquals("Number of specimen should be 10", 10, occurrenceService.count(DerivedUnitBase.class)); + } } diff --git a/cdmlib-io/src/test/resources/dbscripts/001_cdm.ddl b/cdmlib-io/src/test/resources/dbscripts/001_cdm.ddl index ccc4b55048..cfc50f3fc9 100644 --- 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 a56c4320fe..e8090472b2 100644 --- 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 @@ @@ -1564,6 +1565,7 @@ REV CDATA #REQUIRED DESCRIPTIONELEMENTBASE_ID CDATA #REQUIRED MEDIA_ID CDATA #REQUIRED + SORTINDEX CDATA #REQUIRED REVTYPE CDATA #IMPLIED > -- 2.34.1