Adding the generic solver code

[optf/osdf.git] / test / test_api_validation.py

diff --git a/test/test_api_validation.py b/test/test_api_validation.py
index 9045530..73d03cd 100644 (file)
--- a/test/test_api_validation.py
+++ b/test/test_api_validation.py
@@ -18,9 +18,10 @@
 import json
 import unittest
 
-from osdf.models.api.placementRequest import PlacementAPI
-from osdf.models.api.placementResponse import PlacementResponse
-from schematics.exceptions import ModelValidationError
+from schematics.exceptions import DataError
+
+from apps.placement.models.api.placementRequest import PlacementAPI
+from apps.placement.models.api.placementResponse import PlacementResponse
 
 
 class TestReqValidation(unittest.TestCase):
@@ -30,16 +31,31 @@ class TestReqValidation(unittest.TestCase):
         req_json = json.loads(open(req_file).read())
         self.assertEqual(PlacementAPI(req_json).validate(), None)
 
+    def test_req_vfmod_validation(self):
+        req_file = "./test/placement-tests/request_vfmod.json"
+        req_json = json.loads(open(req_file).read())
+        self.assertEqual(PlacementAPI(req_json).validate(), None)
+
     def test_req_failure(self):
         req_json = {}
-        self.assertRaises(ModelValidationError, lambda: PlacementAPI(req_json).validate())
+        self.assertRaises(DataError, lambda: PlacementAPI(req_json).validate())
 
 
 class TestResponseValidation(unittest.TestCase):
 
+    def test_res_validation(self):
+        req_file = "./test/placement-tests/response.json"
+        req_json = json.loads(open(req_file).read())
+        self.assertEqual(PlacementResponse(req_json).validate(), None)
+
+    def test_res_vfmod_validation(self):
+        req_file = "./test/placement-tests/response_vfmod.json"
+        req_json = json.loads(open(req_file).read())
+        self.assertEqual(PlacementResponse(req_json).validate(), None)
+
     def test_invalid_response(self):
         resp_json = {}
-        self.assertRaises(ModelValidationError, lambda: PlacementResponse(resp_json).validate())
+        self.assertRaises(DataError, lambda: PlacementResponse(resp_json).validate())
 
 
 if __name__ == "__main__":