change FRANCEFRENCHREPUBLIC to FRANCE

diff --git a/cdmlib-ext/src/test/java/eu/etaxonomy/cdm/ext/geo/EditGeoServiceTest.java b/cdmlib-ext/src/test/java/eu/etaxonomy/cdm/ext/geo/EditGeoServiceTest.java
index 74d0d50c490cc4b292685211590837ac629fbe3a..7a21f99daf9c0f7e4c6800065a05744303a02365 100644 (file)
--- a/cdmlib-ext/src/test/java/eu/etaxonomy/cdm/ext/geo/EditGeoServiceTest.java
+++ b/cdmlib-ext/src/test/java/eu/etaxonomy/cdm/ext/geo/EditGeoServiceTest.java
@@ -365,7 +365,7 @@ public class EditGeoServiceTest extends CdmTransactionalIntegrationTest {
         taxonDescriptions.add(description1);
         Distribution distribution1 = Distribution.NewInstance(Country.GERMANY(), null);
         description1.addElement(distribution1);
-        Distribution distribution2 = Distribution.NewInstance(Country.FRANCEFRENCHREPUBLIC(), null);
+        Distribution distribution2 = Distribution.NewInstance(Country.FRANCE(), null);
         distribution2.setFeature(Feature.COMMON_NAME());
         description1.addElement(distribution2);
 

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/Country.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/Country.java
index 75b647ed7d4a1eae932cd79d80a12505de87e804..496704a18e3eabaa398eb00f4a9e697688c60089 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/Country.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/Country.java
@@ -399,7 +399,7 @@ public class Country extends NamedArea {
        public static final Country FALKLANDISLANDS () { return (Country)termMap.get(Country.uuidFalklandIslands );}
        public static final Country FIJIREPUBLICOFTHEFIJIISLANDS () { return (Country)termMap.get(Country.uuidFijiRepublicoftheFijiIslands );}
        public static final Country FINLANDREPUBLICOF () { return (Country)termMap.get(Country.uuidFinlandRepublicof );}
-       public static final Country FRANCEFRENCHREPUBLIC () { return (Country)termMap.get(Country.uuidFranceFrenchRepublic );}
+       public static final Country FRANCE () { return (Country)termMap.get(Country.uuidFranceFrenchRepublic );}
        public static final Country FRENCHGUIANA () { return (Country)termMap.get(Country.uuidFrenchGuiana );}
        public static final Country FRENCHPOLYNESIA () { return (Country)termMap.get(Country.uuidFrenchPolynesia );}
        public static final Country FRENCHSOUTHERNTERRITORIES () { return (Country)termMap.get(Country.uuidFrenchSouthernTerritories );}

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeTest.java
index e5eb0de4b4f8f08d0c3f6cf59ef0e905f6ddf86a..b08bf17599dd7f5a19730aaceb39f861f27bdfe2 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeTest.java
@@ -481,8 +481,8 @@ public class DerivedUnitFacadeTest extends CdmTransactionalIntegrationTest {
     @Test
     public void testGetSetCountry() {
         assertEquals("Country must be same", Country.GERMANY(), specimenFacade.getCountry());
-        specimenFacade.setCountry(Country.FRANCEFRENCHREPUBLIC());
-        assertEquals("New country must be France", Country.FRANCEFRENCHREPUBLIC(), specimenFacade.getCountry());
+        specimenFacade.setCountry(Country.FRANCE());
+        assertEquals("New country must be France", Country.FRANCE(), specimenFacade.getCountry());
     }
 
     /**

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTest.java
index 9b6960c286eae977a4573fe6dee08b7b0f694dfe..c1c22adfdc3b795b6f6bf9f0926e284668d8075a 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTest.java
@@ -141,7 +141,7 @@ public class TaxonServiceSearchTest extends CdmTransactionalIntegrationTest {
         typesToIndex.add(TaxonRelationship.class);\r
 \r
         germany =  Country.GERMANY();\r
-        france = Country.FRANCEFRENCHREPUBLIC();\r
+        france = Country.FRANCE();\r
         russia = Country.RUSSIANFEDERATION();\r
         canada = Country.CANADA();\r
 \r