remove ignore

[cdmlib.git] / cdmlib-services / src / test / java / eu / etaxonomy / cdm / validation / ValidationTest.java

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/validation/ValidationTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/validation/ValidationTest.java
index ff062f3f612d5da5803fdde05f1ffd8b79c9c53a..a683beea3d361f9fa48fb01cb0644edc7d7dfbbb 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/validation/ValidationTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/validation/ValidationTest.java
@@ -1,6 +1,12 @@
 /**\r
- * \r
- */\r
+* Copyright (C) 2009 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.validation;\r
 \r
 import static org.junit.Assert.assertEquals;\r
@@ -12,7 +18,9 @@ import java.util.Set;
 import java.util.UUID;\r
 \r
 import javax.validation.ConstraintViolation;\r
+import javax.validation.Validation;\r
 import javax.validation.Validator;\r
+import javax.validation.ValidatorFactory;\r
 import javax.validation.groups.Default;\r
 \r
 import junit.framework.Assert;\r
@@ -21,13 +29,16 @@ import org.apache.log4j.Logger;
 import org.junit.Before;\r
 import org.junit.Ignore;\r
 import org.junit.Test;\r
+import org.unitils.UnitilsJUnit4;\r
 import org.unitils.dbunit.annotation.DataSet;\r
 import org.unitils.spring.annotation.SpringBeanByType;\r
 \r
+import eu.etaxonomy.cdm.api.service.ITermService;\r
 import eu.etaxonomy.cdm.model.agent.AgentBase;\r
 import eu.etaxonomy.cdm.model.agent.Person;\r
 import eu.etaxonomy.cdm.model.common.Annotation;\r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
+import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;\r
 import eu.etaxonomy.cdm.model.common.Group;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
 import eu.etaxonomy.cdm.model.common.User;\r
@@ -36,8 +47,8 @@ import eu.etaxonomy.cdm.model.name.BotanicalName;
 import eu.etaxonomy.cdm.model.name.Rank;\r
 import eu.etaxonomy.cdm.model.occurrence.Specimen;\r
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;\r
-import eu.etaxonomy.cdm.model.reference.Article;\r
-import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
+\r
+import eu.etaxonomy.cdm.model.reference.Reference;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.cdm.test.integration.CdmIntegrationTest;\r
 \r
@@ -57,11 +68,20 @@ public class ValidationTest extends CdmIntegrationTest {
        @SpringBeanByType\r
        private Validator validator;\r
        \r
+       @SpringBeanByType\r
+       private ITermService termService;\r
+\r
        private BotanicalName name;\r
        \r
        @Before\r
        public void setUp() {\r
-               name = BotanicalName.NewInstance(Rank.SPECIES());\r
+               /*DefaultTermInitializer vocabularyStore = new DefaultTermInitializer();\r
+               vocabularyStore.initialize();\r
+               ValidatorFactory validatorFactory = Validation.buildDefaultValidatorFactory();\r
+               validator = validatorFactory.getValidator();*/\r
+               \r
+               Rank speciesRank = (Rank)termService.find(Rank.uuidSpecies);\r
+               name = BotanicalName.NewInstance(speciesRank);\r
        }\r
        \r
        \r
@@ -108,7 +128,7 @@ public class ValidationTest extends CdmIntegrationTest {
                name.setSpecificEpithet("balsamea");\r
                name.setNameCache("Abies balsamea");\r
                name.setAuthorshipCache("L.");\r
-               name.setTitleCache("Abies balsamea L.");\r
+               name.setTitleCache("Abies balsamea L.", true);\r
                name.setFullTitleCache("Abies balsamea L.");\r
                \r
         Set<ConstraintViolation<BotanicalName>> constraintViolations  = validator.validate(name, Default.class,Level2.class);\r
@@ -142,7 +162,7 @@ public class ValidationTest extends CdmIntegrationTest {
                name.setSpecificEpithet("balsamea");\r
                name.setNameCache("Abies balsamea");\r
                name.setAuthorshipCache("L.");\r
-               name.setTitleCache("Abies balsamea L.");\r
+               name.setTitleCache("Abies balsamea L.", true);\r
                name.setFullTitleCache("Abies balsamea L.");\r
                \r
         Set<ConstraintViolation<BotanicalName>> constraintViolations  = validator.validate(name, Default.class,Level2.class, Level3.class);\r
@@ -159,12 +179,15 @@ public class ValidationTest extends CdmIntegrationTest {
                name.setSpecificEpithet("alba");\r
                name.setNameCache("Abies alba");\r
                name.setAuthorshipCache("Mill.");\r
-               name.setTitleCache("Abies alba Mill.");\r
+               name.setTitleCache("Abies alba Mill.", true);\r
                name.setFullTitleCache("Abies alba Mill.");\r
+               name.setNomenclaturalReference(null);\r
+               //name.setNomenclaturalMicroReference(" ");\r
                \r
         Set<ConstraintViolation<BotanicalName>> constraintViolations  = validator.validate(name, Default.class, Level2.class);\r
         assertTrue("There should not be a constraint violation as this name is valid at the default and second level",constraintViolations.isEmpty());\r
         constraintViolations  = validator.validate(name, Default.class,Level2.class, Level3.class);\r
         assertFalse("There should be a constraint violation as this name is valid at the default and second level, but invalid at the third level",constraintViolations.isEmpty());\r
+        \r
        }\r
 }\r