Project

General

Profile

« Previous | Next » 

Revision 03c4eee9

Added by Andreas Kohlbecker about 9 years ago

performance: avoiding second distribution filtering when creating the DistributionServiceRequestParameterString - #4911

View differences:

cdmlib-ext/src/test/java/eu/etaxonomy/cdm/ext/geo/EditGeoServiceTest.java
122 122
        boolean subAreaPreference = false;
123 123
        boolean statusOrderPreference = false;
124 124
        String result = EditGeoServiceUtilities.getDistributionServiceRequestParameterString(distributions,
125
                subAreaPreference, statusOrderPreference, null, mapping,
126
                presenceAbsenceColorMap, null, languages );
125
                null, mapping, presenceAbsenceColorMap, null,
126
                languages );
127 127
        logger.warn(result);
128 128
        Assert.assertTrue("WebServiceUrl must contain country part for Germany", result.matches(".*ad=country_earth(%3A|:)gmi_cntry:a:DEU.*"));
129 129

  
......
153 153
        boolean subAreaPreference = false;
154 154
        boolean statusOrderPreference = false;
155 155
        String result = EditGeoServiceUtilities.getDistributionServiceRequestParameterString(distributions,
156
                subAreaPreference ,
157
                statusOrderPreference,
158
                null, mapping, presenceAbsenceColorMap, null, languages );
156
                null ,
157
                mapping,
158
                presenceAbsenceColorMap, null, languages );
159 159
        //TODO Set semantics is not determined
160 160
        //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";
161 161
        logger.debug(result);
......
196 196
        boolean subAreaPreference = false;
197 197
        boolean statusOrderPreference = false;
198 198
        String result = EditGeoServiceUtilities.getDistributionServiceRequestParameterString(distributions,
199
                subAreaPreference ,
200
                statusOrderPreference,
201
                null, mapping, presenceAbsenceColorMap, null, languages );
199
                null ,
200
                mapping,
201
                presenceAbsenceColorMap, null, languages );
202 202
        //TODO Set semantics is not determined
203 203
        //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";
204 204
        assertTrue(result.matches(".*ad=cyprusdivs%3Abdcode:.*"));
......
351 351
        boolean subAreaPreference = false;
352 352
        boolean statusOrderPreference = false;
353 353
        String result = EditGeoServiceUtilities.getDistributionServiceRequestParameterString(distributions,
354
                subAreaPreference ,
355
                statusOrderPreference,
356
                null, mapping, presenceAbsenceColorMap, null, languages );
354
                null ,
355
                mapping,
356
                presenceAbsenceColorMap, null, languages );
357 357
        //TODO Set semantics is not determined
358 358
        //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";
359 359

  

Also available in: Unified diff