fixed test by using old versions of test resources

deegree · Nov 16, 2020 · 73f6963 · 73f6963
1 parent 71c770f
commit 73f6963
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 2 deletions.
diff --git a/...a/org/deegree/protocol/wfs/describefeaturetype/xml/DescribeFeatureTypeXMLAdapterTest.java b/...a/org/deegree/protocol/wfs/describefeaturetype/xml/DescribeFeatureTypeXMLAdapterTest.java
@@ -68,7 +68,8 @@ public void test200Example01()
                             throws Exception {
 
         DescribeFeatureTypeXMLAdapter parser = new DescribeFeatureTypeXMLAdapter();
-        parser.load( get200ExampleUrl( "DescribeFeatureType_Example01_Request.xml" ) );
+        parser.load( DescribeFeatureTypeXMLAdapterTest.class.getResource(
+                                "wfs200/DescribeFeatureType_Example01_Request.xml" ) );
         DescribeFeatureType request = parser.parse();
         assertEquals( VERSION_200, request.getVersion() );
         assertEquals( null, request.getHandle() );
@@ -83,14 +84,20 @@ public void test200Example02()
                             throws Exception {
 
         DescribeFeatureTypeXMLAdapter parser = new DescribeFeatureTypeXMLAdapter();
-        parser.load( get200ExampleUrl( "DescribeFeatureType_Example02_Request.xml" ) );
+        parser.load( DescribeFeatureTypeXMLAdapterTest.class.getResource(
+                                "wfs200/DescribeFeatureType_Example02_Request.xml" ) );
         DescribeFeatureType request = parser.parse();
         assertEquals( VERSION_200, request.getVersion() );
         assertEquals( null, request.getHandle() );
         assertEquals( "text/xml; subtype=gml/3.2", request.getOutputFormat() );
         assertEquals( 1, request.getTypeNames().length );
     }
 
+    /**
+     * TODO: Unused until https://github.com/deegree/deegree3/issues/1091 is implemented.
+     * @param name
+     * @return
+     */
     private URL get200ExampleUrl( String name ) {
         try {
             String url = new RedirectingEntityResolver().redirect( WFS200_EXAMPLES_BASE_URL + name );

diff --git a/...ree/protocol/wfs/describefeaturetype/xml/wfs200/DescribeFeatureType_Example01_Request.xml b/...ree/protocol/wfs/describefeaturetype/xml/wfs200/DescribeFeatureType_Example01_Request.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<DescribeFeatureType
+    service="WFS"
+    version="2.0.0"
+    xmlns="http://www.opengis.net/wfs/2.0"
+    xmlns:myns="http://www.myserver.com/myns"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.opengis.net/wfs/2.0
+                       http://schemas.opengis.net/wfs/2.0/wfs.xsd">
+  <TypeName>myns:TreesA_1M</TypeName>
+  <TypeName>myns:RoadL_1M</TypeName>
+</DescribeFeatureType>
diff --git a/...ree/protocol/wfs/describefeaturetype/xml/wfs200/DescribeFeatureType_Example02_Request.xml b/...ree/protocol/wfs/describefeaturetype/xml/wfs200/DescribeFeatureType_Example02_Request.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<DescribeFeatureType
+    service="WFS"
+    version="2.0.0"
+    outputFormat="text/xml; subtype=gml/3.2"
+    xmlns="http://www.opengis.net/wfs/2.0"
+    xmlns:myns="http://www.someserver.com/myns"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.opengis.net/wfs/2.0
+                       http://schemas.opengis.net/wfs/2.0/wfs.xsd">
+  <TypeName>myns:Person</TypeName>
+</DescribeFeatureType>