cleanup tests in io and service

diff --git a/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/database/ClearDBDataSet.xml b/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/database/ClearDBDataSet.xml
index 4126546fca31a3dc6e0dd7a58bf4ec7fe6dbcfb4..b1aa4f31d435493b5998c4f6004b491d69e4304d 100644 (file)
--- a/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/database/ClearDBDataSet.xml
+++ b/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/database/ClearDBDataSet.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<dataset>
+<dataset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="schema/dataset.xsd">
   <ADDRESS/>
   <ADDRESS_AUD/>
   <AGENTBASE/>

diff --git a/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/database/ClearDB_with_Terms_DataSet.xml b/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/database/ClearDB_with_Terms_DataSet.xml
index 6fdc6736192f73d3d74ba16c02eeda5788be7bf1..310f907ba0ae5b096318f4c2bf09d98d01b52366 100644 (file)
--- a/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/database/ClearDB_with_Terms_DataSet.xml
+++ b/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/database/ClearDB_with_Terms_DataSet.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<dataset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../service/dataset.xsd">
+<dataset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="schema/dataset.xsd">
 <ADDRESS />
 <ADDRESS_AUD />
 <AGENTBASE />

diff --git a/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml b/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml
index d73498e351b3491438394e5088302a6b43f8fc4f..7d6668753e430091785733eeebcaae196c39eaef 100644 (file)
Binary files a/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml and b/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml differ

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceTest.java
index 98f6adb48f893bd1bc76ffc36796e96d9fdf06c3..04bb8c7d6dbdb05eb7851ea8e33919d205100625 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceTest.java
@@ -248,7 +248,7 @@ public class OccurrenceServiceTest extends CdmTransactionalIntegrationTest {
     }
 
     @Test
-    @DataSet(loadStrategy = CleanSweepInsertLoadStrategy.class, value = "BlankDataSet.xml")
+    @DataSet(loadStrategy = CleanSweepInsertLoadStrategy.class, value = "../../database/BlankDataSet.xml")
     public void testMoveDerivateNoParent() {
         DerivedUnit derivedUnit = DerivedUnit.NewInstance(SpecimenOrObservationType.PreservedSpecimen);
         FieldUnit fieldUnit = FieldUnit.NewInstance();

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceImplTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceImplTest.java
index 28db2089a138d1dbf4c7eb6f48391465a6e5f29c..69b548efa65b449d3a23a3267006f886844e031a 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceImplTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceImplTest.java
@@ -1063,7 +1063,7 @@ public class TaxonServiceImplTest extends CdmTransactionalIntegrationTest {
     }
 
     @Test
-    @DataSet("BlankDataSet.xml")
+    @DataSet("../../database/BlankDataSet.xml")
     public final void testTaxonDeletionConfig(){
         final String[]tableNames = {
                 "Classification", "Classification_AUD",
@@ -1180,7 +1180,7 @@ public class TaxonServiceImplTest extends CdmTransactionalIntegrationTest {
 
 
     @Test
-    @DataSet(value="BlankDataSet.xml")
+    @DataSet(value="../../database/BlankDataSet.xml")
     public final void testDeleteTaxon(){
 
         //create a small classification
@@ -1236,7 +1236,7 @@ public class TaxonServiceImplTest extends CdmTransactionalIntegrationTest {
     }
 
     @Test
-    @DataSet(value="BlankDataSet.xml")
+    @DataSet(value="../../database/BlankDataSet.xml")
     public final void testDeleteTaxonWithAnnotations(){
 
         //create a small classification
@@ -1293,7 +1293,7 @@ public class TaxonServiceImplTest extends CdmTransactionalIntegrationTest {
     }
 
     @Test
-    @DataSet(value="BlankDataSet.xml")
+    @DataSet(value="../../database/BlankDataSet.xml")
     public final void testDeleteTaxonUsedInTaxonRelation(){
 
         //create a small classification
@@ -1355,7 +1355,7 @@ public class TaxonServiceImplTest extends CdmTransactionalIntegrationTest {
     }
 
     @Test
-    @DataSet(loadStrategy=CleanSweepInsertLoadStrategy.class, value="BlankDataSet.xml")
+    @DataSet(loadStrategy=CleanSweepInsertLoadStrategy.class, value="../../database/BlankDataSet.xml")
     public final void testDeleteTaxonDeleteSynonymRelations(){
 
         final String[]tableNames = {
@@ -1395,7 +1395,7 @@ public class TaxonServiceImplTest extends CdmTransactionalIntegrationTest {
 
 
     @Test
-    @DataSet(value="BlankDataSet.xml")
+    @DataSet(value="../../database/BlankDataSet.xml")
     public final void testDeleteTaxonNameUsedInOtherContext(){
 
         //create a small classification
@@ -1427,7 +1427,7 @@ public class TaxonServiceImplTest extends CdmTransactionalIntegrationTest {
     }
 
     @Test
-    @DataSet(value="BlankDataSet.xml")
+    @DataSet(value="../../database/BlankDataSet.xml")
     public final void testDeleteTaxonNameUsedInTwoClassificationsDeleteAllNodes(){
         commitAndStartNewTransaction(null);
         TaxonDeletionConfigurator config = new TaxonDeletionConfigurator();
@@ -1464,7 +1464,7 @@ public class TaxonServiceImplTest extends CdmTransactionalIntegrationTest {
     }
 
     @Test
-    @DataSet(value="BlankDataSet.xml")
+    @DataSet(value="../../database/BlankDataSet.xml")
     public final void testDeleteTaxonNameUsedInTwoClassificationsDoNotDeleteAllNodes(){
         // delete the taxon only in second classification, this should delete only the nodes, not the taxa
         Taxon testTaxon = getTestTaxon();
@@ -1502,7 +1502,7 @@ public class TaxonServiceImplTest extends CdmTransactionalIntegrationTest {
     }
 
     @Test
-    @DataSet(value="BlankDataSet.xml")
+    @DataSet(value="../../database/BlankDataSet.xml")
     public final void testTaxonNodeDeletionConfiguratorMoveToParent(){
         //test childHandling MOVE_TO_PARENT:
         Taxon testTaxon = getTestTaxon();
@@ -1540,7 +1540,7 @@ public class TaxonServiceImplTest extends CdmTransactionalIntegrationTest {
     }
 
     @Test
-    @DataSet(value="BlankDataSet.xml")
+    @DataSet(value="../../database/BlankDataSet.xml")
     public final void testTaxonNodeDeletionConfiguratorDeleteChildren(){
         //test childHandling DELETE:
         Taxon testTaxon = getTestTaxon();
@@ -1580,7 +1580,7 @@ public class TaxonServiceImplTest extends CdmTransactionalIntegrationTest {
 
 
     @Test
-    @DataSet(value="BlankDataSet.xml")
+    @DataSet(value="../../database/BlankDataSet.xml")
     public final void testTaxonDeletionConfiguratorDeleteMarker(){
         //test childHandling DELETE:
         Taxon testTaxon = getTestTaxon();
@@ -1619,7 +1619,7 @@ public class TaxonServiceImplTest extends CdmTransactionalIntegrationTest {
 
 
     @Test
-    @DataSet(value="BlankDataSet.xml")
+    @DataSet(value="../../database/BlankDataSet.xml")
     public final void testTaxonDeletionConfiguratorTaxonWithMisappliedName(){
 
         Taxon testTaxon = getTestTaxon();
@@ -1648,7 +1648,7 @@ public class TaxonServiceImplTest extends CdmTransactionalIntegrationTest {
 
     }
     @Test
-    @DataSet(value="BlankDataSet.xml")
+    @DataSet(value="../../database/BlankDataSet.xml")
     public final void testTaxonDeletionConfiguratorTaxonWithMisappliedNameDoNotDelete(){
 
         Taxon testTaxon = getTestTaxon();
@@ -1678,7 +1678,7 @@ public class TaxonServiceImplTest extends CdmTransactionalIntegrationTest {
     }
 
     @Test
-    @DataSet(value="BlankDataSet.xml")
+    @DataSet(value="../../database/BlankDataSet.xml")
     public final void testTaxonDeletionConfiguratorTaxonMisappliedName(){
 
         Taxon testTaxon = getTestTaxon();
@@ -1715,7 +1715,7 @@ public class TaxonServiceImplTest extends CdmTransactionalIntegrationTest {
     }
 
     @Test
-    @DataSet(value="BlankDataSet.xml")
+    @DataSet(value="../../database/BlankDataSet.xml")
     public final void testLlistIncludedTaxa(){
        Reference citation = null;
        String microcitation = null;

diff --git a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/BlankDataSet.xml b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/database/BlankDataSet.xml
similarity index 85%
rename from cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/BlankDataSet.xml
rename to cdmlib-services/src/test/resources/eu/etaxonomy/cdm/database/BlankDataSet.xml
index 3577af7161d148e971a2156bb88f5586ac63d4ff..b594c991c1fd9f1e8c36fd2b8ac8b3d1bac772b2 100644 (file)
--- a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/BlankDataSet.xml
+++ b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/database/BlankDataSet.xml
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<dataset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../service/dataset.xsd">
-<TAXONRELATIONSHIP/> 
+<dataset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="schema/dataset.xsd">
 <NAMERELATIONSHIP/>
-<TAXONNAME/>
+<!-- This is a quick workaround for some problems in TaxonServiceImplTest -->
+<REPRESENTATION_AUD/>
 <TAXONBASE/>
+<TAXONNAME/>
 <TAXONNODE/>
+<TAXONRELATIONSHIP/> 
 <USERACCOUNT/>
 <USERACCOUNT_GRANTEDAUTHORITYIMPL/>
-<!-- This is a quick workaround for some problems in TaxonServiceImplTest -->
-<REPRESENTATION_AUD/>
 </dataset>