fixing EditGeoServiceTest

diff --git a/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/EditGeoServiceUtilities.java b/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/EditGeoServiceUtilities.java
index b4c6a872ece2ba290ab8ffdd2e1f33170ec783e6..3c9693a6306b69c8e747c5c870d67806e5c3dd7d 100644 (file)
--- a/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/EditGeoServiceUtilities.java
+++ b/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/EditGeoServiceUtilities.java
@@ -158,10 +158,11 @@ public class EditGeoServiceUtilities {
                        //getting the area title\r
                        if (languages == null){\r
                                languages = new ArrayList<Language>();\r
+                       }\r
+                       if (languages.size() == 0){\r
                                languages.add(Language.DEFAULT());\r
                        }\r
-                       Representation representation = \r
-                               status.getPreferredRepresentation(languages);\r
+                       Representation representation = status.getPreferredRepresentation(languages);\r
                        String statusLabel = representation.getLabel();\r
                        areaTitle += "|" + style + ":" + statusLabel;\r
                        \r

diff --git a/cdmlib-ext/src/test/java/eu/etaxonomy/cdm/ext/EditGeoServiceTest.java b/cdmlib-ext/src/test/java/eu/etaxonomy/cdm/ext/EditGeoServiceTest.java
index 7ab44bb60a2bd74c213c6bef471665d13ea93074..a3405935da71f86842e253b13271b268c8d84b33 100644 (file)
--- a/cdmlib-ext/src/test/java/eu/etaxonomy/cdm/ext/EditGeoServiceTest.java
+++ b/cdmlib-ext/src/test/java/eu/etaxonomy/cdm/ext/EditGeoServiceTest.java
@@ -25,9 +25,9 @@ import org.junit.After;
 import org.junit.AfterClass;\r
 import org.junit.Before;\r
 import org.junit.BeforeClass;\r
-import org.junit.Ignore;\r
 import org.junit.Test;\r
 \r
+import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
 import eu.etaxonomy.cdm.model.description.AbsenceTerm;\r
 import eu.etaxonomy.cdm.model.description.Distribution;\r
@@ -40,7 +40,7 @@ import eu.etaxonomy.cdm.model.location.TdwgArea;
  * @created 08.10.2008\r
  * @version 1.0\r
  */\r
-public class EditGeoServiceTest {\r
+public class EditGeoServiceTest  {\r
        private static final Logger logger = Logger.getLogger(EditGeoServiceTest.class);\r
 \r
        /**\r
@@ -48,7 +48,8 @@ public class EditGeoServiceTest {
         */\r
        @BeforeClass\r
        public static void setUpBeforeClass() throws Exception {\r
-               logger.debug("Start class setup");\r
+               DefaultTermInitializer initializer = new DefaultTermInitializer();\r
+               initializer.initialize();\r
        }\r
 \r
        /**\r
@@ -73,7 +74,7 @@ public class EditGeoServiceTest {
        }\r
        \r
 //******************************************** TESTS**************\r
-       @Ignore\r
+       @Test\r
        public void testGetWebServiceUrl() {\r
                //String webServiceUrl = "http://www.test.de/webservice";\r
                Set<Distribution> distributions = new HashSet<Distribution>();\r
@@ -94,7 +95,7 @@ public class EditGeoServiceTest {
                String bbox="-20,0,120,70";\r
                List<Language> languages = new ArrayList<Language>();\r
                                \r
-               String result = EditGeoServiceUtilities.getEditGeoServiceUrlParameterString(distributions, presenceAbsenceColorMap, 600, 300, bbox,backLayer, languages );\r
+               String result = EditGeoServiceUtilities.getEditGeoServiceUrlParameterString(distributions, presenceAbsenceColorMap, 600, 300, bbox,backLayer, languages );              \r
                //TODO Set semantics is not determined\r
                //String expected = "http://www.test.de/webservice?l=tdwg3&ad=tdwg3:a:GER|b:OKL|c:BGM|b:SPA|d:FRA&as=a:005500|b:00FF00|c:FFFFFF|d:001100&bbox=-20,40,40,40&ms=400x300";\r
                System.out.println(result);\r