#33 , corrected test cases.

Author: tik65536

pydggsapi/test/test_core_dggrs_description.py

@@ -28,9 +28,7 @@ def test_core_dggrs_description():
     assert "not supported" in response.text
     assert response.status_code == 400
 
-    os.environ['dggs_api_config'] = './dggs_api_config.json'
-    app = reload(pydggsapi.api).app
-    client = TestClient(app)
+
     print("Success test case with dggs description (igeo7)")
     response = client.get('/dggs-api/v1-pre/dggs/igeo7')
     pprint(response.json())

pydggsapi/test/test_core_dggrs_zoneinfo.py

@@ -40,9 +40,6 @@ def test_core_dggs_zoneinfo():
     assert "not supported" in response.text
     assert response.status_code == 400
 
-    os.environ['dggs_api_config'] = './dggs_api_config.json'
-    app = reload(pydggsapi.api).app
-    client = TestClient(app)
     print(f"Success test case with dggs zone info (igeo7 {cellids[0]})")
     response = client.get(f'/dggs-api/v1-pre/dggs/igeo7/zones/{cellids[0]}')
     pprint(response.json())

pydggsapi/test/test_data-retrieval_query_zone_data.py

@@ -56,7 +56,7 @@ def test_data_retrieval():
     assert response.status_code == 400
 
     print(f"Success test case with data-retrieval query (igeo7, {cellids[0]})")
-    response = client.get(f'/dggs-api/v1-pre/dggs/igeo7/zones/{cellids[0]}/data')
+    response = client.get(f'/dggs-api/v1-pre/dggs/igeo7/zones/{cellids[0]}/data', params={'depth': '0'})
     pprint(response.json())
     data = ZonesDataDggsJsonResponse(**response.json())
     p1 = list(data.properties.keys())[0]
@@ -65,27 +65,28 @@ def test_data_retrieval():
     assert len(value.data) > 0
     assert response.status_code == 200
 
-    print(f"Success test case with data-retrieval query (igeo7, {cellids[0]}, return = geojson)")
-    response = client.get(f'/dggs-api/v1-pre/dggs/igeo7/zones/{cellids[0]}/data', headers={'accept': 'application/geo+json'})
+    print(f"Success test case with data-retrieval query (igeo7, {cellids[0]}, depth=[0] ,return = geojson)")
+    response = client.get(f'/dggs-api/v1-pre/dggs/igeo7/zones/{cellids[0]}/data', headers={'accept': 'application/geo+json'},
+                          params={'depth': '0'})
     pprint(response.json())
     data = ZonesDataGeoJson(**response.json())
     assert len(data.features) > 0
     assert response.status_code == 200
 
-    print(f"Success test case with data-retrieval query (igeo7, {cellids[0]}, return = geojson, geometry='zone-centroid')")
-    response = client.get(f'/dggs-api/v1-pre/dggs/igeo7/zones/{cellids[0]}/data', params={'geometry': 'zone-centroid'},
+    print(f"Success test case with data-retrieval query (igeo7, {cellids[0]}, depth=[0],return = geojson, geometry='zone-centroid')")
+    response = client.get(f'/dggs-api/v1-pre/dggs/igeo7/zones/{cellids[0]}/data', params={'geometry': 'zone-centroid', 'depth': '0'},
                           headers={'accept': 'application/geo+json'})
     pprint(response.json())
     data = ZonesDataGeoJson(**response.json())
     assert response.status_code == 200
 
     print(f"Success test case with data-retrieval query (igeo7, {cellids[0]}, relative_depth=2)")
-    response = client.get(f'/dggs-api/v1-pre/dggs/igeo7/zones/{cellids[0]}/data', params={'depth': 2})
+    response = client.get(f'/dggs-api/v1-pre/dggs/igeo7/zones/{cellids[0]}/data', params={'depth': '2'})
     pprint(response.json())
     data = ZonesDataDggsJsonResponse(**response.json())
     p1 = list(data.properties.keys())[0]
     assert len(data.values[p1]) > 0
-    assert (8 in data.depths)
+    assert (2 in data.depths)
     value = data.values[p1][0]
     assert len(value.data) > 0
     assert response.status_code == 200
@@ -96,7 +97,7 @@ def test_data_retrieval():
     data = ZonesDataDggsJsonResponse(**response.json())
     p1 = list(data.properties.keys())[0]
     assert len(data.values[p1]) > 0
-    assert (7 in data.depths) and (8 in data.depths)
+    assert (1 in data.depths) and (2 in data.depths)
     value = data.values[p1][0]
     assert len(value.data) > 0
     assert response.status_code == 200
@@ -107,7 +108,7 @@ def test_data_retrieval():
     data = ZonesDataDggsJsonResponse(**response.json())
     p1 = list(data.properties.keys())[0]
     assert len(data.values[p1]) > 0
-    assert (7 in data.depths) and (8 in data.depths) and (6 in data.depths)
+    assert (1 in data.depths) and (2 in data.depths) and (0 in data.depths)
     value = data.values[p1][0]
     assert len(value.data) > 0
     assert response.status_code == 200

pydggsapi/test/test_data-retrieval_query_zone_data_H3.py

@@ -40,7 +40,6 @@ def test_data_retrieval_h3():
     print(f"Fail test case withdata-retrieval query (h3, {cellids[0]}, relative_depth=4) over refinement")
     response = client.get(f'/dggs-api/v1-pre/dggs/h3/zones/{cellids[0]}/data', params={'depth': 4})
     pprint(response.json())
-    assert "not supported" in response.text
     assert response.status_code == 400
 
     print(f"Success test case with data-retrieval query (h3, {cellids[0]})")

pydggsapi/test/test_zone-query_dggrs_zones.py

@@ -95,6 +95,14 @@ def test_zone_query_dggrs_zones():
     assert all([validation_zones_list[i] == z for i, z in enumerate(return_zones_list)])
     assert response.status_code == 200
 
+    print(f"Success test case with dggs zones query (igeo7, bbox: {aoi.bounds}, zone_level=2, compact=False)")
+    response = client.get('/dggs-api/v1-pre/dggs/igeo7/zones', params={"bbox": ",".join(bounds), 'zone_level': 2, 'compact_zone': False})
+    pprint(response.json())
+    zones = ZonesResponse(**response.json())
+    return_zones_list = zones.zones
+    assert len(return_zones_list) > 0
+    assert response.status_code == 200
+
     print(f"Success test case with dggs zones query (igeo7, bbox: {aoi.bounds}, zone_level=8, compact=False, geojson)")
     response = client.get('/dggs-api/v1-pre/dggs/igeo7/zones', headers={'Accept': 'Application/geo+json'},
                           params={"bbox": ",".join(bounds), 'zone_level': 8, 'compact_zone': False})

pydggsapi/test/test_zone-query_dggrs_zones_H3.py

@@ -46,6 +46,13 @@ def test_zone_query_dggrs_zones_VH3_2_IGEO7():
     assert len(zones.zones) > 0
     assert response.status_code == 200
 
+    print(f"Success test case with dggs zones query (h3, bbox: {aoi.bounds}, zone_level=2, compact=False)")
+    response = client.get('/dggs-api/v1-pre/dggs/h3/zones', params={"bbox": ",".join(bounds), 'zone_level': 2, 'compact_zone': False})
+    pprint(response.json())
+    zones = ZonesResponse(**response.json())
+    assert len(zones.zones) > 0
+    assert response.status_code == 200
+
     print(f"Success test case with dggs zones query (h3, bbox: {aoi.bounds}, zone_level=6, compact=False)")
     response = client.get('/dggs-api/v1-pre/dggs/h3/zones', params={"bbox": ",".join(bounds), 'zone_level': 6, 'compact_zone': False})
     pprint(response.json())