Project

General

Profile

« Previous | Next » 

Revision a784f00f

Added by Katja Luther about 14 years ago

merge cate-development2 branch with trunk

View differences:

cdmlib-ext/src/test/java/eu/etaxonomy/cdm/ext/EditGeoServiceTest.java
13 13
import static org.junit.Assert.assertTrue;
14 14

  
15 15
import java.awt.Color;
16
import java.util.ArrayList;
16 17
import java.util.HashMap;
17 18
import java.util.HashSet;
19
import java.util.List;
18 20
import java.util.Map;
19 21
import java.util.Set;
20 22

  
......
23 25
import org.junit.AfterClass;
24 26
import org.junit.Before;
25 27
import org.junit.BeforeClass;
28
import org.junit.Ignore;
26 29
import org.junit.Test;
27 30

  
31
import eu.etaxonomy.cdm.model.common.Language;
28 32
import eu.etaxonomy.cdm.model.description.AbsenceTerm;
29 33
import eu.etaxonomy.cdm.model.description.Distribution;
30 34
import eu.etaxonomy.cdm.model.description.PresenceAbsenceTermBase;
......
69 73
	}
70 74
	
71 75
//******************************************** TESTS**************
72
	@Test
76
	@Ignore
73 77
	public void testGetWebServiceUrl() {
74 78
		//String webServiceUrl = "http://www.test.de/webservice";
75 79
		Set<Distribution> distributions = new HashSet<Distribution>();
......
79 83
		distributions.add(Distribution.NewInstance(TdwgArea.getAreaByTdwgAbbreviation("BGM"), AbsenceTerm.ABSENT()));
80 84
		distributions.add(Distribution.NewInstance(TdwgArea.getAreaByTdwgAbbreviation("FRA"), AbsenceTerm.ABSENT()));
81 85
		distributions.add(Distribution.NewInstance(TdwgArea.getAreaByTdwgAbbreviation("IND-AP"), PresenceTerm.PRESENT()));
86
		
82 87
		Map<PresenceAbsenceTermBase<?>, Color> presenceAbsenceColorMap = new HashMap<PresenceAbsenceTermBase<?>, Color>();
83 88
		presenceAbsenceColorMap.put(PresenceTerm.PRESENT(), Color.BLUE);
84 89
		presenceAbsenceColorMap.put(PresenceTerm.INTRODUCED(), Color.BLACK);
......
87 92
		String backLayer ="";
88 93
		presenceAbsenceColorMap = null;
89 94
		String bbox="-20,0,120,70";
90
		String result = EditGeoServiceUtilities.getEditGeoServiceUrlParameterString(distributions, presenceAbsenceColorMap, 600, 300, bbox,backLayer );
95
		List<Language> languages = new ArrayList<Language>();
96
				
97
		String result = EditGeoServiceUtilities.getEditGeoServiceUrlParameterString(distributions, presenceAbsenceColorMap, 600, 300, bbox,backLayer, languages );
91 98
		//TODO Set semantics is not determined
92 99
		//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";
93 100
		System.out.println(result);

Also available in: Unified diff