diff options
Diffstat (limited to 'aai-schema-ingest')
| -rw-r--r-- | aai-schema-ingest/pom.xml | 16 | ||||
| -rw-r--r-- | aai-schema-ingest/src/test/resources/edgerequests.json | 18 | ||||
| -rw-r--r-- | aai-schema-ingest/src/test/resources/mockrequests.json | 18 |
3 files changed, 32 insertions, 20 deletions
diff --git a/aai-schema-ingest/pom.xml b/aai-schema-ingest/pom.xml index 58b73c2e..7193ebd9 100644 --- a/aai-schema-ingest/pom.xml +++ b/aai-schema-ingest/pom.xml @@ -26,7 +26,7 @@ limitations under the License. <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-parent</artifactId> - <version>1.13.0-SNAPSHOT</version> + <version>1.13.1-SNAPSHOT</version> <relativePath>../aai-parent/pom.xml</relativePath> </parent> <artifactId>aai-schema-ingest</artifactId> @@ -138,9 +138,21 @@ limitations under the License. <artifactId>junit</artifactId> <scope>test</scope> </dependency> + <!-- TODO: Migrate tests to junit 5 and remove this dependency --> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-core</artifactId> + </exclusion> + </exclusions> + </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/aai-schema-ingest/src/test/resources/edgerequests.json b/aai-schema-ingest/src/test/resources/edgerequests.json index 0878686f..28f5da79 100644 --- a/aai-schema-ingest/src/test/resources/edgerequests.json +++ b/aai-schema-ingest/src/test/resources/edgerequests.json @@ -4,47 +4,47 @@ { "aai-uri": "/versions", "response-file": "payload/versions.json", - "content": "application/json;charset=UTF-8" + "content": "application/json" }, { "aai-uri": "/edgerules?version=v8", "response-file": "edgeRules/test_v8.json", - "content": "application/json;charset=UTF-8" + "content": "application/json" }, { "aai-uri": "/edgerules?version=v9", "response-file": "edgeRules/test_v9.json", - "content": "application/json;charset=UTF-8" + "content": "application/json" }, { "aai-uri": "/edgerules?version=v10", "response-file": "edgeRules/test_v10.json", - "content": "application/json;charset=UTF-8" + "content": "application/json" }, { "aai-uri": "/edgerules?version=v11", "response-file": "edgeRules/test_v11.json", - "content": "application/json;charset=UTF-8" + "content": "application/json" }, { "aai-uri": "/edgerules?version=v12", "response-file": "edgeRules/test_v12.json", - "content": "application/json;charset=UTF-8" + "content": "application/json" }, { "aai-uri": "/edgerules?version=v13", "response-file": "edgeRules/test_v13.json", - "content": "application/json;charset=UTF-8" + "content": "application/json" }, { "aai-uri": "/edgerules?version=v14", "response-file": "edgeRules/test_v14.json", - "content": "application/json;charset=UTF-8" + "content": "application/json" }, { "aai-uri": "/edgerules?version=v15", "response-file": "edgeRules/test_v15.json", - "content": "application/json;charset=UTF-8" + "content": "application/json" } ] } diff --git a/aai-schema-ingest/src/test/resources/mockrequests.json b/aai-schema-ingest/src/test/resources/mockrequests.json index 7d669007..db7c6e66 100644 --- a/aai-schema-ingest/src/test/resources/mockrequests.json +++ b/aai-schema-ingest/src/test/resources/mockrequests.json @@ -4,47 +4,47 @@ { "aai-uri": "/versions", "response-file": "payload/versions.json", - "content": "application/json;charset=UTF-8" + "content": "application/json" }, { "aai-uri": "/nodes?version=v8", "response-file": "oxm/test_combined_network_business_v8.xml", - "content": "application/json;charset=UTF-8" + "content": "application/json" }, { "aai-uri": "/nodes?version=v9", "response-file": "oxm/test_combined_network_business_v9.xml", - "content": "application/json;charset=UTF-8" + "content": "application/json" }, { "aai-uri": "/nodes?version=v10", "response-file": "oxm/test_combined_network_business_v10.xml", - "content": "application/json;charset=UTF-8" + "content": "application/json" }, { "aai-uri": "/nodes?version=v11", "response-file": "oxm/test_combined_network_business_v11.xml", - "content": "application/json;charset=UTF-8" + "content": "application/json" }, { "aai-uri": "/nodes?version=v12", "response-file": "oxm/test_combined_network_business_v12.xml", - "content": "application/json;charset=UTF-8" + "content": "application/json" }, { "aai-uri": "/nodes?version=v13", "response-file": "oxm/test_combined_v13.xml", - "content": "application/json;charset=UTF-8" + "content": "application/json" }, { "aai-uri": "/nodes?version=v14", "response-file": "oxm/test_combined_network_business_v14.xml", - "content": "application/json;charset=UTF-8" + "content": "application/json" }, { "aai-uri": "/nodes?version=v15", "response-file": "oxm/test_combined_network_business_v15.xml", - "content": "application/json;charset=UTF-8" + "content": "application/json" } ] |