Merge pull request odpi#5228 from planetf1/issue5225a

Unit test fixes for analytics modeling, glossary author view server, encrypted file connector
planetf1 · May 27, 2021 · d8f750c · d8f750c
2 parents 3fff065 + f901814
commit d8f750c
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 287 deletions.
diff --git a/...adata-implementation/access-services/analytics-modeling/analytics-modeling-server/pom.xml b/...adata-implementation/access-services/analytics-modeling/analytics-modeling-server/pom.xml
@@ -115,12 +115,6 @@
 			<scope>test</scope>
 		</dependency>
 
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-junit-jupiter</artifactId>
-			<scope>test</scope>
-		</dependency>
-
 		<dependency>
 			<groupId>org.testng</groupId>
 			<artifactId>testng</artifactId>

diff --git a/...dFileBasedServerConfigStoreConnector.java → ...dFileBasedServerConfigStoreConnector.java b/...dFileBasedServerConfigStoreConnector.java → ...dFileBasedServerConfigStoreConnector.java
diff --git a/...ters/repositoryservices/cohortregistrystore/file/TestFileBasedRegistryStoreConnector.java b/...ters/repositoryservices/cohortregistrystore/file/TestFileBasedRegistryStoreConnector.java
diff --git a/...pters/repositoryservices/cohortregistrystore/file/TestFileBasedRegistryStoreProvider.java b/...pters/repositoryservices/cohortregistrystore/file/TestFileBasedRegistryStoreProvider.java
diff --git a/...mplementation/view-services/glossary-author-view/glossary-author-view-server/build.gradle b/...mplementation/view-services/glossary-author-view/glossary-author-view-server/build.gradle
@@ -16,6 +16,7 @@ dependencies {
     implementation project(':open-metadata-implementation:frameworks:audit-log-framework')
     implementation project(':open-metadata-implementation:frameworks:open-connector-framework')
     implementation 'com.fasterxml.jackson.core:jackson-annotations'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api'
 
 }
 

diff --git a/...ata-implementation/view-services/glossary-author-view/glossary-author-view-server/pom.xml b/...ata-implementation/view-services/glossary-author-view/glossary-author-view-server/pom.xml
@@ -77,20 +77,14 @@
             <artifactId>open-connector-framework</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
 

diff --git a/...uthor/properties/BreadCrumbTrailTest.java → ...uthor/properties/BreadCrumbTrailTest.java b/...uthor/properties/BreadCrumbTrailTest.java → ...uthor/properties/BreadCrumbTrailTest.java
@@ -2,13 +2,13 @@
 /* Copyright Contributors to the ODPi Egeria category. */
 package org.odpi.openmetadata.viewservices.glossaryauthor.properties;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.odpi.openmetadata.accessservices.subjectarea.properties.objects.graph.NodeType;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 
 public class BreadCrumbTrailTest {