Meer testen locaties & quantities

ddOperApi/tests/__init__.py

@@ -36,11 +36,28 @@ class ddOperApiTest(unittest.TestCase):
         self.assertEqual(type(locations), ddOperApi.ddOperLocation)
         self.assertTrue(len(locations.data) > 0)
         self.assertEqual(type(locations.data[0]["properties"]["locationName"]), str)
+
+    def test_locationNames(self):
+        names = self.client.locations().locationNames()
+        self.assertEqual(type(names), type({}.keys()))
+        self.assertTrue(len(names) > 0)
+        for n in names:
+            self.assertEqual(type(n), str)
+
+    def test_locationDetail(self):
+        locations = self.client.locations()
+        name = locations.data[0]["properties"]["locationName"]
+        detail = locations.locationDetail(name)
+        self.assertEqual(type(detail), dict)
+        self.assertEqual(detail["properties"]["locationName"], name)
+
     def test_quantities(self):
         quantities = self.client.quantities()
         self.assertEqual(type(quantities), ddOperApi.ddOperQuantitie)
         self.assertTrue(len(quantities.data) > 0)
         self.assertEqual(type(quantities.data[0]), str)
+        for q in quantities.quantities():
+            self.assertEqual(type(q), str)
 
     def test_values(self):
         values = self.client.values("test1", "null")

ddOperApi/tests/testServer.py

@@ -20,12 +20,9 @@ from flask import Flask, request
 #
 
 class testServer(Flask):
-    def __init__(self, name):
+    def run(self):
-        super().__init__(__name__)
         self.createCert()
         self.writeCert()
-
-    def run(self):
         super().run(ssl_context=(self.certFile.name, self.keyFile.name))
 
     def createCert(self):
@@ -232,7 +229,7 @@ def forkTestServer():
         if (pid == 0):
             app.run()
         else:
-            sleep(0.01)
+            sleep(0.1)
     except Exception as e:
         raise(e)
     return(pid)