Update to hibernate 5 for cdmlib-io #4716

[cdmlib.git] / cdmlib-io / src / test / java / eu / etaxonomy / cdm / io / excel / taxa / NormalExplicitImportTest.java

diff --git a/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/excel/taxa/NormalExplicitImportTest.java b/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/excel/taxa/NormalExplicitImportTest.java
index fef98668708de637ce020d8652055297b8ec28bd..04d6036b47a43fe47e378dd2360fc542fbd9d1db 100644 (file)
--- a/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/excel/taxa/NormalExplicitImportTest.java
+++ b/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/excel/taxa/NormalExplicitImportTest.java
@@ -29,6 +29,7 @@ import org.junit.Assert;
 import org.junit.Before;\r
 import org.junit.Test;\r
 import org.unitils.dbunit.annotation.DataSet;\r
+import org.unitils.dbunit.annotation.DataSets;\r
 import org.unitils.spring.annotation.SpringBeanByName;\r
 import org.unitils.spring.annotation.SpringBeanByType;\r
 \r
@@ -56,11 +57,11 @@ import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.Taxon;\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 26.08.2009\r
- * @version 1.0\r
  */\r
 public class NormalExplicitImportTest extends CdmTransactionalIntegrationTest{\r
        @SuppressWarnings("unused")\r
@@ -229,8 +230,13 @@ public class NormalExplicitImportTest extends CdmTransactionalIntegrationTest{
        }\r
 \r
        @Test\r
-       @DataSet(value="NormalExplicitImportTest.testUuid.xml")\r
-       public void testUUID() throws URISyntaxException{\r
+//     @DataSet(value="NormalExplicitImportTest.testUuid.xml")\r
+    @DataSets({\r
+        @DataSet(loadStrategy=CleanSweepInsertLoadStrategy.class, value="/eu/etaxonomy/cdm/io/ClearDB_with_Terms_DataSet.xml"),\r
+        @DataSet(value="/eu/etaxonomy/cdm/io/TermsDataSet-with_auditing_info.xml"),\r
+        @DataSet(value="NormalExplicitImportTest.testUuid.xml"),\r
+    })\r
+       public void testUUID(){\r
                UUID taxonUuid = UUID.fromString("aafce7fe-0c5f-42ed-814b-4c7c2c715660");\r
                UUID synonymUuid = UUID.fromString("fc4a995b-37a9-4984-afe6-e352c6c04d92");\r
 \r