summaryrefslogtreecommitdiffstats
path: root/dcae-analytics/dcae-analytics-test
diff options
context:
space:
mode:
Diffstat (limited to 'dcae-analytics/dcae-analytics-test')
-rw-r--r--dcae-analytics/dcae-analytics-test/pom.xml37
-rw-r--r--dcae-analytics/dcae-analytics-test/src/main/java/org/onap/dcae/analytics/test/BaseAnalyticsTest.java2
2 files changed, 27 insertions, 12 deletions
diff --git a/dcae-analytics/dcae-analytics-test/pom.xml b/dcae-analytics/dcae-analytics-test/pom.xml
index 43afaed..e6ff020 100644
--- a/dcae-analytics/dcae-analytics-test/pom.xml
+++ b/dcae-analytics/dcae-analytics-test/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
<artifactId>dcae-analytics</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<artifactId>dcae-analytics-test</artifactId>
@@ -54,14 +54,21 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
- <version>${spring.boot.version}</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</exclusion>
- </exclusions>
+ <exclusion>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- JSON SERIALIZATION/DESERIALIZATION LIBRARY -->
@@ -70,6 +77,16 @@
<artifactId>jackson-databind</artifactId>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-smile</artifactId>
+ <scope>compile</scope>
+ </dependency>
<!-- JUNIT 5 DEPENDENCIES -->
<dependency>
@@ -102,6 +119,12 @@
<artifactId>apiguardian-api</artifactId>
<scope>compile</scope>
</dependency>
+ <!-- MOCKING FRAMEWORK -->
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>compile</scope>
+ </dependency>
<!-- ASSERTION UTILITIES -->
<dependency>
@@ -114,14 +137,6 @@
<artifactId>jsonassert</artifactId>
<scope>compile</scope>
</dependency>
-
- <!-- MOCKING FRAMEWORK -->
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>compile</scope>
- </dependency>
-
</dependencies>
</project>
diff --git a/dcae-analytics/dcae-analytics-test/src/main/java/org/onap/dcae/analytics/test/BaseAnalyticsTest.java b/dcae-analytics/dcae-analytics-test/src/main/java/org/onap/dcae/analytics/test/BaseAnalyticsTest.java
index 419fe2f..8c7f025 100644
--- a/dcae-analytics/dcae-analytics-test/src/main/java/org/onap/dcae/analytics/test/BaseAnalyticsTest.java
+++ b/dcae-analytics/dcae-analytics-test/src/main/java/org/onap/dcae/analytics/test/BaseAnalyticsTest.java
@@ -271,7 +271,7 @@ abstract class BaseAnalyticsTest {
*/
public static <T> T deserializeJsonFileToModel(final String jsonFileLocation, final Class<T> modelClass,
final ObjectMapper objectMapper) {
- try (final InputStream jsonFileInputStream =
+ try (InputStream jsonFileInputStream =
BaseAnalyticsTest.class.getClassLoader().getResourceAsStream(jsonFileLocation)) {
assertThat(jsonFileInputStream).as("Input JSON File location must be valid").isNotNull();
return objectMapper.readValue(jsonFileInputStream, modelClass);