Media Type tests added

HLTech · Jun 19, 2020 · 64d1183 · 64d1183
1 parent 59f4240
commit 64d1183
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 11 deletions.
diff --git a/...main/java/com/hltech/judged/server/interfaces/rest/environment/EnvironmentController.java b/...main/java/com/hltech/judged/server/interfaces/rest/environment/EnvironmentController.java
@@ -51,7 +51,9 @@ public List<ServiceDto> getEnvironment(@PathVariable("name") String name) {
             .collect(toList());
     }
 
-    @PutMapping(value = "environments/{name}")
+    @PutMapping(
+        value = "environments/{name}",
+        consumes = MediaType.APPLICATION_JSON_VALUE)
     @ApiOperation(value = "Update the environment", nickname = "update environment")
     @ApiResponses(value = {
         @ApiResponse(code = 200, message = "Success"),

diff --git a/judge-d-server/src/test/groovy/com/hltech/judged/server/domain/validation/JudgeDUT.groovy b/judge-d-server/src/test/groovy/com/hltech/judged/server/domain/validation/JudgeDUT.groovy
@@ -2,6 +2,7 @@ package com.hltech.judged.server.domain.validation
 
 
 import com.hltech.judged.server.domain.JudgeD
+import com.hltech.judged.server.domain.contracts.InMemoryServiceContractsRepository
 import com.hltech.judged.server.domain.contracts.ServiceContracts
 import com.hltech.judged.server.domain.environment.EnvironmentAggregate
 import com.hltech.judged.server.domain.environment.InMemoryEnvironmentRepository
@@ -15,7 +16,7 @@ import static org.assertj.core.util.Lists.newArrayList
 
 class JudgeDUT extends Specification {
 
-    def serviceContractsRepository = new com.hltech.judged.server.domain.contracts.InMemoryServiceContractsRepository();
+    def serviceContractsRepository = new InMemoryServiceContractsRepository();
     def environmentRepository = new InMemoryEnvironmentRepository()
     def contractValidator = new PingContractValidator()
     def judgeD = new JudgeD(environmentRepository, serviceContractsRepository)

diff --git a/...est/groovy/com/hltech/judged/server/domain/validation/rest/RestContractValidatorUT.groovy b/...est/groovy/com/hltech/judged/server/domain/validation/rest/RestContractValidatorUT.groovy
@@ -61,17 +61,23 @@ class RestContractValidatorUT extends Specification {
             }
     }
 
-    def 'should validate contracts specified in openapi v3'() {
+    def 'should validate contracts specified in openapi v3 - should find failures when media type is specified'() {
         given:
             def swagger = new String(toByteArray(getClass().getResourceAsStream("/swagger-openapi3.json")))
             def pact = (RequestResponsePact) loadPact(getClass().getResourceAsStream("/pact.json"))
         when:
             def validationResult = validator.validate(pact, swagger)
         then:
-            for (report in validationResult) {
-                with(report) {
-                    status == OK
-                }
+            validationResult.size() == 2
+            validationResult.any { result ->
+                result.name == 'get envs; 200 OK response' &&
+                    result.status == FAILED &&
+                    result.errors.get(0) == "[Path '/0'] Instance type (integer) does not match any allowed primitive type (allowed: [\"string\"])"
+            }
+            validationResult.any { result ->
+                result.name == 'publish request; 200 OK response' &&
+                    result.status == FAILED &&
+                    result.errors.get(0) == "[Path '/0'] Object instance has properties which are not allowed by the schema: [\"gyyigi\"]"
             }
     }
 }
diff --git a/judge-d-server/src/test/resources/pact.json b/judge-d-server/src/test/resources/pact.json
@@ -10,21 +10,43 @@
       "description": "publish request; 200 OK response",
       "request": {
         "method": "PUT",
-        "path": "environments/nPUmfl0iF1",
+        "path": "environments/9nUWkVyW25",
         "headers": {
-          "X-JUDGE-D-AGENT-SPACE": "dli0ONzhUW"
+          "X-JUDGE-D-AGENT-SPACE": "j3_OIa8MXC",
+          "Content-Type": "application/json"
         },
         "query": "",
         "body": [
           {
             "name": "_uss5_lSrR",
-            "version": "6PPZwQAg8G"
+            "version": "6PPZwQAg8G",
+            "gyyigi": "68tgygk"
           }
         ]
       },
+      "response": {
+        "status": "200"
+      }
+    },
+    {
+      "description": "get envs; 200 OK response",
+      "request": {
+        "method": "GET",
+        "path": "environments",
+        "headers": {
+          "X-JUDGE-D-AGENT-SPACE": "j3_OIa8MXC",
+          "Accept": "application/json"
+        },
+        "query": ""
+      },
       "response": {
         "status": "200",
-        "headers": {}
+        "headers": {
+          "Content-Type": "application/json"
+        },
+        "body": [
+          123
+        ]
       }
     }
   ],