final implementation of MaterialOrMethodEvent, Cloning, PreservationMethod, ... ...

[cdmlib.git] / cdmlib-services / src / test / java / eu / etaxonomy / cdm / api / facade / DerivedUnitFacadeFieldUnitCacheStrategyTest.java

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeFieldUnitCacheStrategyTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeFieldUnitCacheStrategyTest.java
index fd819a48e00e97547ac741c2a9e9f2efdc394375..e35f6eeafb1be5948f21cc6520934e0c99991fa3 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeFieldUnitCacheStrategyTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeFieldUnitCacheStrategyTest.java
@@ -23,7 +23,7 @@ import eu.etaxonomy.cdm.model.common.TimePeriod;
 import eu.etaxonomy.cdm.model.location.NamedArea;\r
 import eu.etaxonomy.cdm.model.location.Point;\r
 import eu.etaxonomy.cdm.model.location.ReferenceSystem;\r
-import eu.etaxonomy.cdm.model.location.WaterbodyOrCountry;\r
+import eu.etaxonomy.cdm.model.location.Country;\r
 import eu.etaxonomy.cdm.model.media.Media;\r
 import eu.etaxonomy.cdm.model.name.BotanicalName;\r
 import eu.etaxonomy.cdm.model.name.Rank;\r
@@ -72,7 +72,7 @@ public class DerivedUnitFacadeFieldUnitCacheStrategyTest extends CdmIntegrationT
        DefinedTerm lifeStage = DefinedTerm.NewStageInstance("A wonderful stage", "stage", "st");\r
        DefinedTerm sex = DefinedTerm.NewSexInstance("FemaleMale", "FM", "FM");\r
        LanguageString locality = LanguageString.NewInstance("Berlin-Dahlem, E side of Englerallee", Language.DEFAULT());\r
-       NamedArea country = WaterbodyOrCountry.GERMANY();\r
+       NamedArea country = Country.GERMANY();\r
 \r
        String exsiccatum = "Greuter, Pl. Dahlem. 456";\r
        String accessionNumber = "8909756";\r
@@ -81,7 +81,7 @@ public class DerivedUnitFacadeFieldUnitCacheStrategyTest extends CdmIntegrationT
        String collectorsNumber = "234589913A34";\r
        Collection collection = Collection.NewInstance();\r
 \r
-       PreservationMethod preservationMethod = PreservationMethod.NewInstance("my prservation", null, null);\r
+       PreservationMethod preservationMethod = PreservationMethod.NewInstance(null, "my prservation");\r
 \r
        DerivedUnitFacade specimenFacade;\r
 \r