From: Andreas Kohlbecker <a.kohlbecker@bgbm.org>
Date: Wed, 10 Mar 2010 13:45:54 +0000 (+0000)
Subject: fixing EditGeoServiceTest
X-Git-Tag: 3.0.3~1217
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/commitdiff_plain/d234c7a00faef48a0a7994e2627fa306e75899eb

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 b4c6a872ec..3c9693a630 100644
--- 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
 			if (languages == null){
 				languages = new ArrayList<Language>();
+			}
+			if (languages.size() == 0){
 				languages.add(Language.DEFAULT());
 			}
-			Representation representation = 
-				status.getPreferredRepresentation(languages);
+			Representation representation = status.getPreferredRepresentation(languages);
 			String statusLabel = representation.getLabel();
 			areaTitle += "|" + style + ":" + statusLabel;
 			
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 7ab44bb60a..a3405935da 100644
--- 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;
 import org.junit.Before;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 
+import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.description.AbsenceTerm;
 import eu.etaxonomy.cdm.model.description.Distribution;
@@ -40,7 +40,7 @@ import eu.etaxonomy.cdm.model.location.TdwgArea;
  * @created 08.10.2008
  * @version 1.0
  */
-public class EditGeoServiceTest {
+public class EditGeoServiceTest  {
 	private static final Logger logger = Logger.getLogger(EditGeoServiceTest.class);
 
 	/**
@@ -48,7 +48,8 @@ public class EditGeoServiceTest {
 	 */
 	@BeforeClass
 	public static void setUpBeforeClass() throws Exception {
-		logger.debug("Start class setup");
+		DefaultTermInitializer initializer = new DefaultTermInitializer();
+		initializer.initialize();
 	}
 
 	/**
@@ -73,7 +74,7 @@ public class EditGeoServiceTest {
 	}
 	
 //******************************************** TESTS**************
-	@Ignore
+	@Test
 	public void testGetWebServiceUrl() {
 		//String webServiceUrl = "http://www.test.de/webservice";
 		Set<Distribution> distributions = new HashSet<Distribution>();
@@ -94,7 +95,7 @@ public class EditGeoServiceTest {
 		String bbox="-20,0,120,70";
 		List<Language> languages = new ArrayList<Language>();
 				
-		String result = EditGeoServiceUtilities.getEditGeoServiceUrlParameterString(distributions, presenceAbsenceColorMap, 600, 300, bbox,backLayer, languages );
+		String result = EditGeoServiceUtilities.getEditGeoServiceUrlParameterString(distributions, presenceAbsenceColorMap, 600, 300, bbox,backLayer, languages );		
 		//TODO Set semantics is not determined
 		//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";
 		System.out.println(result);