Project

General

Profile

« Previous | Next » 

Revision 0f789d2f

Added by Andreas Müller over 12 years ago

add integration test functionality to ext

View differences:

cdmlib-ext/src/test/java/eu/etaxonomy/cdm/ext/geo/EditGeoServiceTest.java
28 28
import java.util.Set;
29 29
import java.util.UUID;
30 30

  
31
import javax.xml.stream.XMLStreamException;
32

  
33 31
import org.apache.http.client.ClientProtocolException;
34 32
import org.apache.log4j.Logger;
35 33
import org.junit.After;
36 34
import org.junit.AfterClass;
37
import org.junit.Assert;
38 35
import org.junit.Before;
39 36
import org.junit.BeforeClass;
40 37
import org.junit.Test;
38
import org.unitils.spring.annotation.SpringBeanByType;
41 39

  
42 40
import eu.etaxonomy.cdm.common.CdmUtils;
43 41
import eu.etaxonomy.cdm.common.StreamUtils;
......
54 52
import eu.etaxonomy.cdm.model.location.NamedAreaType;
55 53
import eu.etaxonomy.cdm.model.location.TdwgArea;
56 54
import eu.etaxonomy.cdm.persistence.dao.common.IDefinedTermDao;
57
import eu.etaxonomy.cdm.test.unit.CdmUnitTestBase;
55
import eu.etaxonomy.cdm.test.integration.CdmIntegrationTest;
58 56

  
59 57
/**
60 58
 * @author a.mueller
61 59
 * @created 08.10.2008
62 60
 * @version 1.0
63 61
 */
64
public class EditGeoServiceTest extends CdmUnitTestBase {
62
public class EditGeoServiceTest extends CdmIntegrationTest {
65 63
	@SuppressWarnings("unused")
66 64
	private static final Logger logger = Logger.getLogger(EditGeoServiceTest.class);
67 65

  
......
70 68
	
71 69
	//@SpringBeanByType
72 70
	private IDefinedTermDao termDao;
71

  
72
	@SpringBeanByType
73
	private GeoServiceAreaAnnotatedMapping mapping;
74

  
73 75
	
74 76
	/**
75 77
	 * @throws java.lang.Exception
......
126 128
		String bbox="-20,0,120,70";
127 129
		List<Language> languages = new ArrayList<Language>();
128 130
				
129
		String result = EditGeoServiceUtilities.getDistributionServiceRequestParameterString(distributions, presenceAbsenceColorMap, 600, 300, bbox,backLayer, null, languages );		
131
		String result = EditGeoServiceUtilities.getDistributionServiceRequestParameterString(distributions, mapping, presenceAbsenceColorMap, 600, 300, bbox,backLayer, null, languages );		
130 132
		//TODO Set semantics is not determined
131 133
		//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";
132 134
		System.out.println(result);
......
165 167
		presenceAbsenceColorMap = null;
166 168
		String bbox="-20,0,120,70";
167 169
		List<Language> languages = new ArrayList<Language>();
168
				
169
		String result = EditGeoServiceUtilities.getDistributionServiceRequestParameterString(distributions, presenceAbsenceColorMap, 600, 300, bbox,backLayer, null, languages );		
170
			
171
		String result = EditGeoServiceUtilities.getDistributionServiceRequestParameterString(distributions, mapping, presenceAbsenceColorMap, 600, 300, bbox,backLayer, null, languages );		
170 172
		//TODO Set semantics is not determined
171 173
		//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";
172 174
		assertTrue(result.matches(".*l=earth.*"));
......
277 279
		geoServiceArea.add(geoServiceLayer, layerFieldName, areaValue);
278 280
		geoServiceArea.add(geoServiceLayer, layerFieldName, "BALI");
279 281
		
280
		try {
281
			GeoServiceArea.set(areaBangka,geoServiceArea);
282
		} catch (XMLStreamException e) {
283
			Assert.fail(e.getMessage());
284
		}
282
		mapping.set(areaBangka, geoServiceArea);
285 283
		Set<Distribution> distributions = new HashSet<Distribution>();
286 284
		distributions.add(Distribution.NewInstance(areaBangka, PresenceTerm.PRESENT()));
287 285

  
288 286
		Map<PresenceAbsenceTermBase<?>, Color> presenceAbsenceColorMap = new HashMap<PresenceAbsenceTermBase<?>, Color>();
289 287
		presenceAbsenceColorMap.put(PresenceTerm.PRESENT(), Color.BLUE);
290
		presenceAbsenceColorMap.put(PresenceTerm.INTRODUCED(), Color.BLACK);
291
		presenceAbsenceColorMap.put(PresenceTerm.CULTIVATED(), Color.YELLOW);
292
		presenceAbsenceColorMap.put(AbsenceTerm.ABSENT(), Color.DARK_GRAY);
293 288

  
294 289
		String backLayer ="";
295 290
		presenceAbsenceColorMap = null;
296 291
		String bbox="90,-8,130,8";
297 292
		List<Language> languages = new ArrayList<Language>();
298
				
299
		String result = EditGeoServiceUtilities.getDistributionServiceRequestParameterString(distributions, presenceAbsenceColorMap, 600, 300, bbox,backLayer, null, languages );		
293
		
294
		String result = EditGeoServiceUtilities.getDistributionServiceRequestParameterString(distributions, mapping, presenceAbsenceColorMap, 600, 300, bbox,backLayer, null, languages );		
300 295
		//TODO Set semantics is not determined
301 296
		//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";
302 297
		

Also available in: Unified diff