Merge pull request #79 from occamlabs/wmts-it-tests-fix

Adapt tests to new demo
deegree · Apr 2, 2013 · 313f206 · 313f206
2 parents 2c1f8e5 + 28a9484
commit 313f206
Show file tree

Hide file tree

Showing 16 changed files with 91 additions and 93 deletions.
diff --git a/...re-remotewms/src/main/java/org/deegree/tile/persistence/remotewms/TileDataSetBuilder.java b/...re-remotewms/src/main/java/org/deegree/tile/persistence/remotewms/TileDataSetBuilder.java
@@ -105,8 +105,16 @@ Map<String, TileDataSet> extractTileDataSets()
     }
 
     private DefaultTileDataSet buildTileDataSet( RequestParams requestParams, TileMatrixSet tms, WMSClient client,
-                                                 String outputFormat ) {
+                                                 String outputFormat )
+                            throws ResourceInitException {
         List<String> layers = splitNullSafe( requestParams.getLayers() );
+
+        for ( String l : layers ) {
+            if ( !client.hasLayer( l ) ) {
+                throw new ResourceInitException( "The layer named " + l + " is not available from the remote WMS." );
+            }
+        }
+
         List<String> styles = splitNullSafe( requestParams.getStyles() );
         String format = requestParams.getFormat();
         String crs = requestParams.getCRS();
@@ -123,7 +131,9 @@ private DefaultTileDataSet buildTileDataSet( RequestParams requestParams, TileMa
 
         List<TileDataLevel> dataLevels = new ArrayList<TileDataLevel>();
         for ( TileMatrix tm : tms.getTileMatrices() ) {
-            TileDataLevel m = new RemoteWMSTileDataLevel( tm, format, layers, styles, client, outputFormat, crs, defaultGetMap, defaultGetFeatureInfo, hardGetMap, hardGetFeatureInfo );
+            TileDataLevel m = new RemoteWMSTileDataLevel( tm, format, layers, styles, client, outputFormat, crs,
+                                                          defaultGetMap, defaultGetFeatureInfo, hardGetMap,
+                                                          hardGetFeatureInfo );
             dataLevels.add( 0, m );
         }
         return new DefaultTileDataSet( dataLevels, tms, "image/" + outputFormat );

diff --git a/...urces/org/deegree/tile/persistence/remotewms/workspace/datasources/remoteows/utah-wms.xml b/...urces/org/deegree/tile/persistence/remotewms/workspace/datasources/remoteows/utah-wms.xml
@@ -1,5 +1,5 @@
 <RemoteWMS xmlns="http://www.deegree.org/remoteows/wms" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.deegree.org/remoteows/wms remotewms.xsd" configVersion="3.1.0">
   <CapabilitiesDocumentLocation
-    location="http://deegree3-demo.deegree.org:80/utah-workspace/services?request=GetCapabilities&amp;service=WMS&amp;version=1.1.1" />
+    location="http://deegree3-demo.deegree.org/utah-workspace/services?request=GetCapabilities&amp;service=WMS&amp;version=1.1.1" />
 </RemoteWMS>
diff --git a/...esources/org/deegree/tile/persistence/remotewms/workspace/datasources/tile/tiles26912.xml b/...esources/org/deegree/tile/persistence/remotewms/workspace/datasources/tile/tiles26912.xml
@@ -14,7 +14,7 @@
     <OutputFormat>image/png</OutputFormat>
     <RequestParams>
       <!-- [1] Comma-separated list of layer names -->
-      <Layers>CountyBoundaries,CountyNames</Layers>
+      <Layers>countyboundaries,countynames</Layers>
       <!-- [0..1] Comma-separated list of styles -->
       <Styles>default,default</Styles>
       <!-- [1] Image format -->

diff --git a/...resources/org/deegree/tile/persistence/remotewms/workspace/datasources/tile/tiles4326.xml b/...resources/org/deegree/tile/persistence/remotewms/workspace/datasources/tile/tiles4326.xml
@@ -13,7 +13,7 @@
     <OutputFormat>image/png</OutputFormat>
     <RequestParams>
       <!-- [1] Comma-separated list of layer names -->
-      <Layers>CountyBoundaries,CountyNames</Layers>
+      <Layers>countyboundaries,countynames</Layers>
       <!-- [0..1] Comma-separated list of styles -->
       <Styles>default,default</Styles>
       <!-- [1] Image format -->

diff --git a/...tests/deegree-wmts-tests/src/main/webapp/WEB-INF/workspace/datasources/tile/remotewms.xml b/...tests/deegree-wmts-tests/src/main/webapp/WEB-INF/workspace/datasources/tile/remotewms.xml
@@ -11,7 +11,7 @@
     <TileMatrixSetId>utah</TileMatrixSetId>
     <OutputFormat>image/png</OutputFormat>
     <RequestParams>
-      <Layers>SatelliteProvo,DominantVegetation</Layers>
+      <Layers>orthophoto,dominantvegetation</Layers>
       <Styles>default,default</Styles>
       <Format>image/png</Format>
       <CRS>EPSG:26912</CRS>
@@ -23,7 +23,7 @@
     <TileMatrixSetId>utah</TileMatrixSetId>
     <OutputFormat>image/png</OutputFormat>
     <RequestParams>
-      <Layers>DominantVegetation</Layers>
+      <Layers>dominantvegetation</Layers>
       <Styles>default</Styles>
       <Format>image/png</Format>
       <CRS>EPSG:26912</CRS>

diff --git a/...ts/deegree-wmts-tests/src/main/webapp/WEB-INF/workspace/datasources/tile/remotewms130.xml b/...ts/deegree-wmts-tests/src/main/webapp/WEB-INF/workspace/datasources/tile/remotewms130.xml
@@ -14,7 +14,7 @@
     <OutputFormat>image/png</OutputFormat>
     <RequestParams>
       <!-- [1] Comma-separated list of layer names -->
-      <Layers>SatelliteProvo,DominantVegetation</Layers>
+      <Layers>orthophoto,dominantvegetation</Layers>
       <!-- [0..1] Comma-separated list of styles -->
       <Styles>default,default</Styles>
       <!-- [1] Image format -->

diff --git a/...s/deegree-wmts-tests/src/main/webapp/WEB-INF/workspace/datasources/tile/remotewms4326.xml b/...s/deegree-wmts-tests/src/main/webapp/WEB-INF/workspace/datasources/tile/remotewms4326.xml
@@ -14,7 +14,7 @@
     <OutputFormat>image/png</OutputFormat>
     <RequestParams>
       <!-- [1] Comma-separated list of layer names -->
-      <Layers>SatelliteProvo</Layers>
+      <Layers>orthophoto</Layers>
       <!-- [0..1] Comma-separated list of styles -->
       <Styles>default</Styles>
       <!-- [1] Image format -->

diff --git a/...egree-wmts-tests/src/main/webapp/WEB-INF/workspace/datasources/tile/remotewms4326_130.xml b/...egree-wmts-tests/src/main/webapp/WEB-INF/workspace/datasources/tile/remotewms4326_130.xml
@@ -14,7 +14,7 @@
     <OutputFormat>image/png</OutputFormat>
     <RequestParams>
       <!-- [1] Comma-separated list of layer names -->
-      <Layers>SatelliteProvo</Layers>
+      <Layers>orthophoto</Layers>
       <!-- [0..1] Comma-separated list of styles -->
       <Styles>default</Styles>
       <!-- [1] Image format -->

diff --git a/...s/deegree-wmts-tests/src/main/webapp/WEB-INF/workspace/datasources/tile/remotewms_gif.xml b/...s/deegree-wmts-tests/src/main/webapp/WEB-INF/workspace/datasources/tile/remotewms_gif.xml
@@ -14,7 +14,7 @@
     <OutputFormat>image/png</OutputFormat>
     <RequestParams>
       <!-- [1] Comma-separated list of layer names -->
-      <Layers>SatelliteProvo,DominantVegetation</Layers>
+      <Layers>orthophoto,dominantvegetation</Layers>
       <!-- [0..1] Comma-separated list of styles -->
       <Styles>default,default</Styles>
       <!-- [1] Image format -->

diff --git a/deegree-tests/deegree-wmts-tests/src/test/java/org/deegree/services/wmts/WmtsIT.java b/deegree-tests/deegree-wmts-tests/src/test/java/org/deegree/services/wmts/WmtsIT.java
@@ -50,7 +50,6 @@
 import javax.xml.namespace.QName;
 import javax.xml.stream.FactoryConfigurationError;
 import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
@@ -59,7 +58,6 @@
 import org.deegree.commons.xml.CommonNamespaces;
 import org.deegree.commons.xml.schema.SchemaValidator;
 import org.deegree.commons.xml.stax.XMLStreamUtils;
-import org.deegree.protocol.ows.capabilities.OWSCommon110CapabilitiesAdapter;
 import org.deegree.protocol.wfs.WFSConstants;
 import org.deegree.protocol.wmts.client.Layer;
 import org.deegree.protocol.wmts.client.WMTSClient;

diff --git a/deegree-tests/deegree-wmts-tests/src/test/requests/cached_gfi.response b/deegree-tests/deegree-wmts-tests/src/test/requests/cached_gfi.response
@@ -18,9 +18,9 @@
 
 opt = document.getElementById('SGID500_DominantVegetation')
 if(!opt){
-  opt = newnode(sw, 'option', 'SGID500_DominantVegetation')
-  opt.setAttribute('id', 'SGID500_DominantVegetation')
-  opt.setAttribute('value', 'SGID500_DominantVegetation')
+  opt = newnode(sw, 'option', 'DominantVegetation')
+  opt.setAttribute('id', 'DominantVegetation')
+  opt.setAttribute('value', 'DominantVegetation')
 }
 
 
@@ -55,112 +55,107 @@ if(!opt){
         this[document.getElementById('theswitch').value + "_switchfunction"]()
       }
 
-if(! this.SGID500_DominantVegetation_switchfunction){
-  this.SGID500_DominantVegetation_switchfunction = function(){
+if(! this.DominantVegetation_switchfunction){
+  this.DominantVegetation_switchfunction = function(){
     var div = document.getElementById('table')
     while(div.firstChild) div.removeChild(div.firstChild)
     var table = this.tbody(this.table(div))
     var row = tr(table)
     th(row, "Field").style.cssText = headerStyle
     th(row, "Value").style.cssText = headerStyle
-    for(var i in SGID500_DominantVegetation){
+    for(var i in DominantVegetation){
       row = tr(table)
       td(row, 'GML ID').style.cssText = headerStyle
-      td(row, 'SGID500_DOMINANTVEGETATION_329').style.cssText = headerStyle
-      SGID500_DominantVegetation[i](table)
+      td(row, 'DOMINANTVEGETATION_329').style.cssText = headerStyle
+      DominantVegetation[i](table)
     }
   }
 
-  SGID500_DominantVegetation = []
+  DominantVegetation = []
 }
 
-SGID500_DominantVegetation[SGID500_DominantVegetation.length] = function (table) {
+DominantVegetation[DominantVegetation.length] = function (table) {
   var odd = true
   var row
 
 row = tr(table)
-td(row, 'OBJECTID').style.cssText = odd ? oddStyle : evenStyle
+td(row, 'objectid').style.cssText = odd ? oddStyle : evenStyle
 td(row, '330').style.cssText = odd ? oddStyle : evenStyle
 odd = !odd
 
 row = tr(table)
-td(row, 'CODE').style.cssText = odd ? oddStyle : evenStyle
+td(row, 'code').style.cssText = odd ? oddStyle : evenStyle
 td(row, '202').style.cssText = odd ? oddStyle : evenStyle
 odd = !odd
 
 row = tr(table)
-td(row, 'DOM').style.cssText = odd ? oddStyle : evenStyle
-td(row, 'B2').style.cssText = odd ? oddStyle : evenStyle
-odd = !odd
-
-row = tr(table)
-td(row, 'SS1').style.cssText = odd ? oddStyle : evenStyle
+td(row, 'ss1').style.cssText = odd ? oddStyle : evenStyle
 td(row, 'B1').style.cssText = odd ? oddStyle : evenStyle
 odd = !odd
 
 row = tr(table)
-td(row, 'SS2').style.cssText = odd ? oddStyle : evenStyle
+td(row, 'ss2').style.cssText = odd ? oddStyle : evenStyle
 td(row, 'A1').style.cssText = odd ? oddStyle : evenStyle
 odd = !odd
 
 row = tr(table)
-td(row, 'SS3').style.cssText = odd ? oddStyle : evenStyle
+td(row, 'ss3').style.cssText = odd ? oddStyle : evenStyle
 td(row, 'B6').style.cssText = odd ? oddStyle : evenStyle
 odd = !odd
 
 row = tr(table)
-td(row, 'SS4').style.cssText = odd ? oddStyle : evenStyle
+td(row, 'ss4').style.cssText = odd ? oddStyle : evenStyle
 td(row, 'a2').style.cssText = odd ? oddStyle : evenStyle
 odd = !odd
 
 row = tr(table)
-td(row, 'SS5').style.cssText = odd ? oddStyle : evenStyle
+td(row, 'ss5').style.cssText = odd ? oddStyle : evenStyle
 td(row, 'a6').style.cssText = odd ? oddStyle : evenStyle
 odd = !odd
 
 row = tr(table)
-td(row, 'SS6').style.cssText = odd ? oddStyle : evenStyle
+td(row, 'ss6').style.cssText = odd ? oddStyle : evenStyle
 td(row, 'b3').style.cssText = odd ? oddStyle : evenStyle
 odd = !odd
 
 row = tr(table)
-td(row, 'SS7').style.cssText = odd ? oddStyle : evenStyle
+td(row, 'ss7').style.cssText = odd ? oddStyle : evenStyle
 td(row, 'b4').style.cssText = odd ? oddStyle : evenStyle
 odd = !odd
 
 row = tr(table)
-td(row, 'SS8').style.cssText = odd ? oddStyle : evenStyle
+td(row, 'ss8').style.cssText = odd ? oddStyle : evenStyle
 td(row, 'b7').style.cssText = odd ? oddStyle : evenStyle
 odd = !odd
 
 row = tr(table)
-td(row, 'SS9').style.cssText = odd ? oddStyle : evenStyle
+td(row, 'ss9').style.cssText = odd ? oddStyle : evenStyle
 td(row, 'b8').style.cssText = odd ? oddStyle : evenStyle
 odd = !odd
 
 row = tr(table)
-td(row, 'SS10').style.cssText = odd ? oddStyle : evenStyle
+td(row, 'ss10').style.cssText = odd ? oddStyle : evenStyle
 td(row, 'b17').style.cssText = odd ? oddStyle : evenStyle
 odd = !odd
 
 row = tr(table)
-td(row, 'LAB').style.cssText = odd ? oddStyle : evenStyle
+td(row, 'lab').style.cssText = odd ? oddStyle : evenStyle
 td(row, 'B').style.cssText = odd ? oddStyle : evenStyle
 odd = !odd
 
 row = tr(table)
-td(row, 'SHAPE_AREA').style.cssText = odd ? oddStyle : evenStyle
+td(row, 'area').style.cssText = odd ? oddStyle : evenStyle
 td(row, '3281815517.40').style.cssText = odd ? oddStyle : evenStyle
 odd = !odd
 
 row = tr(table)
-td(row, 'SHAPE_LEN').style.cssText = odd ? oddStyle : evenStyle
+td(row, 'length').style.cssText = odd ? oddStyle : evenStyle
 td(row, '1283380.64563').style.cssText = odd ? oddStyle : evenStyle
 odd = !odd
 
 }
 
-if(!first) first = SGID500_DominantVegetation_switchfunction
+if(!first) first = DominantVegetation_switchfunction
 
 
     </script>

diff --git a/deegree-tests/deegree-wmts-tests/src/test/requests/remotewms_gif.response b/deegree-tests/deegree-wmts-tests/src/test/requests/remotewms_gif.response