Update unit tests

qgis · Apr 18, 2020 · 4946e8f · 4946e8f
1 parent 2439571
commit 4946e8f
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 6 deletions.
diff --git a/tests/testdata/qgis_server/api/test_wfs3_api_project.json b/tests/testdata/qgis_server/api/test_wfs3_api_project.json
@@ -1,4 +1,4 @@
-Content-Type: application/openapi+json;version=3.0
+Content-Type: application/vnd.oai.openapi+json;version=3.0
 
 {
   "components": {
@@ -529,7 +529,7 @@ Content-Type: application/openapi+json;version=3.0
         "responses": {
           "200": {
             "content": {
-              "application/openapi+json;version=3.0": {
+              "application/vnd.oai.openapi+json;version=3.0": {
                 "schema": {
                   "type": "object"
                 }
@@ -1329,4 +1329,4 @@ Content-Type: application/openapi+json;version=3.0
       "name": "Features"
     }
   ]
-}
+}
diff --git a/tests/testdata/qgis_server/api/test_wfs3_collection_testlayer_èé.html b/tests/testdata/qgis_server/api/test_wfs3_collection_testlayer_èé.html
@@ -18,6 +18,18 @@
     <link rel="stylesheet" href="/wfs3/static/jsonFormatter.min.css" crossorigin="anonymous"></script>
     <script src="/wfs3/static/jsonFormatter.min.js" crossorigin="anonymous"></script>
 
+    <!-- template for the WFS3 API links list -->
+
+    <link rel="alternate" href="http://server.qgis.org/wfs3/collections/testlayer%20%C3%A8%C3%A9.json" title="Feature collection as JSON" type="application/json">
+
+    <link rel="self" href="http://server.qgis.org/wfs3/collections/testlayer%20%C3%A8%C3%A9.html" title="Feature collection as HTML" type="text/html">
+
+    <link rel="items" href="http://server.qgis.org/wfs3/collections/testlayer%20%C3%A8%C3%A9/items.json" title="A test vector layer èé" type="application/json">
+
+    <link rel="items" href="http://server.qgis.org/wfs3/collections/testlayer%20%C3%A8%C3%A9/items.html" title="A test vector layer èé" type="text/html">
+
+
+
     <title>A test vector layer èé</title>
   </head>
   <body>

diff --git a/tests/testdata/qgis_server/api/test_wfs3_collections_empty.html b/tests/testdata/qgis_server/api/test_wfs3_collections_empty.html
@@ -18,6 +18,14 @@
     <link rel="stylesheet" href="/wfs3/static/jsonFormatter.min.css" crossorigin="anonymous"></script>
     <script src="/wfs3/static/jsonFormatter.min.js" crossorigin="anonymous"></script>
 
+    <!-- template for the WFS3 API links list -->
+
+    <link rel="alternate" href="http://server.qgis.org/wfs3/collections.json" title="Feature collections as JSON" type="application/json">
+
+    <link rel="self" href="http://server.qgis.org/wfs3/collections.html" title="Feature collections as HTML" type="text/html">
+
+
+
     <title>Feature collections</title>
   </head>
   <body>

diff --git a/tests/testdata/qgis_server/api/test_wfs3_collections_project.html b/tests/testdata/qgis_server/api/test_wfs3_collections_project.html
@@ -18,6 +18,14 @@
     <link rel="stylesheet" href="/wfs3/static/jsonFormatter.min.css" crossorigin="anonymous"></script>
     <script src="/wfs3/static/jsonFormatter.min.js" crossorigin="anonymous"></script>
 
+    <!-- template for the WFS3 API links list -->
+
+    <link rel="alternate" href="http://server.qgis.org/wfs3/collections.json" title="Feature collections as JSON" type="application/json">
+
+    <link rel="self" href="http://server.qgis.org/wfs3/collections.html" title="Feature collections as HTML" type="text/html">
+
+
+
     <title>Feature collections</title>
   </head>
   <body>

diff --git a/tests/testdata/qgis_server/api/test_wfs3_landing_page.html b/tests/testdata/qgis_server/api/test_wfs3_landing_page.html
@@ -18,6 +18,20 @@
     <link rel="stylesheet" href="/wfs3/static/jsonFormatter.min.css" crossorigin="anonymous"></script>
     <script src="/wfs3/static/jsonFormatter.min.js" crossorigin="anonymous"></script>
 
+    <!-- template for the WFS3 API links list -->
+
+    <link rel="alternate" href="http://server.qgis.org/wfs3.json" title="Landing page as JSON" type="application/json">
+
+    <link rel="self" href="http://server.qgis.org/wfs3.html" title="Landing page as HTML" type="text/html">
+
+    <link rel="data" href="http://server.qgis.org/wfs3/collections" title="Feature collections" type="application/json">
+
+    <link rel="conformance" href="http://server.qgis.org/wfs3/conformance" title="WFS 3.0 conformance classes" type="application/json">
+
+    <link rel="service-desc" href="http://server.qgis.org/wfs3/api.json" title="API definition" type="application/vnd.oai.openapi+json;version=3.0">
+
+
+
     <title>Landing page</title>
   </head>
   <body>
@@ -69,7 +83,7 @@ <h2>Available services</h2>
 
 
 
-        <li><a rel="service-desc" href="http://server.qgis.org/wfs3/api">API definition</a></li>
+        <li><a rel="service-desc" href="http://server.qgis.org/wfs3/api.json">API definition</a></li>
 
 
 

diff --git a/tests/testdata/qgis_server/api/test_wfs3_landing_page.json b/tests/testdata/qgis_server/api/test_wfs3_landing_page.json
@@ -27,10 +27,10 @@ Content-Type: application/json
       "type": "application/json"
     },
     {
-      "href": "http://server.qgis.org/wfs3/api",
+      "href": "http://server.qgis.org/wfs3/api.json",
       "rel": "service-desc",
       "title": "API definition",
-      "type": "application/openapi+json;version=3.0"
+      "type": "application/vnd.oai.openapi+json;version=3.0"
     }
   ],
   "timeStamp": "2019-10-16T13:53:57Z"