diff --git a/open-metadata-implementation/access-services/analytics-modeling/analytics-modeling-server/pom.xml b/open-metadata-implementation/access-services/analytics-modeling/analytics-modeling-server/pom.xml
index db0d6f8a1df..b0a1ae1feff 100644
--- a/open-metadata-implementation/access-services/analytics-modeling/analytics-modeling-server/pom.xml
+++ b/open-metadata-implementation/access-services/analytics-modeling/analytics-modeling-server/pom.xml
@@ -115,12 +115,6 @@
test
-
- org.mockito
- mockito-junit-jupiter
- test
-
-
org.testng
testng
diff --git a/open-metadata-implementation/adapters/open-connectors/configuration-store-connectors/configuration-encrypted-file-store-connector/src/test/org/odpi/openmetadata/adapters/adminservices/configurationstore/encryptedfile/TestEncryptedFileBasedServerConfigStoreConnector.java b/open-metadata-implementation/adapters/open-connectors/configuration-store-connectors/configuration-encrypted-file-store-connector/src/test/java/org/odpi/openmetadata/adapters/adminservices/configurationstore/encryptedfile/TestEncryptedFileBasedServerConfigStoreConnector.java
similarity index 100%
rename from open-metadata-implementation/adapters/open-connectors/configuration-store-connectors/configuration-encrypted-file-store-connector/src/test/org/odpi/openmetadata/adapters/adminservices/configurationstore/encryptedfile/TestEncryptedFileBasedServerConfigStoreConnector.java
rename to open-metadata-implementation/adapters/open-connectors/configuration-store-connectors/configuration-encrypted-file-store-connector/src/test/java/org/odpi/openmetadata/adapters/adminservices/configurationstore/encryptedfile/TestEncryptedFileBasedServerConfigStoreConnector.java
diff --git a/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/cohort-registry-store-connectors/cohort-registry-file-store-connector/src/test/org/odpi/openmetadata/adapters/repositoryservices/cohortregistrystore/file/TestFileBasedRegistryStoreConnector.java b/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/cohort-registry-store-connectors/cohort-registry-file-store-connector/src/test/org/odpi/openmetadata/adapters/repositoryservices/cohortregistrystore/file/TestFileBasedRegistryStoreConnector.java
deleted file mode 100644
index e6214ad3166..00000000000
--- a/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/cohort-registry-store-connectors/cohort-registry-file-store-connector/src/test/org/odpi/openmetadata/adapters/repositoryservices/cohortregistrystore/file/TestFileBasedRegistryStoreConnector.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/* SPDX-License-Identifier: Apache-2.0 */
-package org.odpi.openmetadata.adapters.repositoryservices.cohortregistrystore.file;
-
-import org.odpi.openmetadata.frameworks.connectors.properties.ConnectionProperties;
-import org.odpi.openmetadata.frameworks.connectors.properties.beans.Connection;
-import org.odpi.openmetadata.frameworks.connectors.properties.beans.ConnectorType;
-import org.odpi.openmetadata.frameworks.connectors.properties.beans.Endpoint;
-import org.odpi.openmetadata.repositoryservices.connectors.stores.cohortregistrystore.properties.MemberRegistration;
-import org.testng.annotations.Test;
-
-import java.util.Date;
-import java.util.UUID;
-
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-
-/**
- * Test that the FileBasedRegistryStoreConnector can respond sensibility to many different
- * file states.
- */
-public class TestFileBasedRegistryStoreConnector
-{
- private Connection getGoodConnection()
- {
- final String endpointGUID = "8bf8f5fa-b5d8-40e1-a00e-e4a0c59fd6c0";
- final String connectorTypeGUID = "2e1556a3-908f-4303-812d-d81b48b19bab";
- final String connectionGUID = "b9af734f-f005-4085-9975-bf46c67a099a";
-
- final String endpointDescription = "OMRS default cohort registry endpoint.";
-
- String endpointAddress = "Test.registrystore";
- String endpointName = "DefaultCohortRegistry.Endpoint." + endpointAddress;
-
- Endpoint endpoint = new Endpoint();
-
- endpoint.setType(Endpoint.getEndpointType());
- endpoint.setGUID(endpointGUID);
- endpoint.setQualifiedName(endpointName);
- endpoint.setDisplayName(endpointName);
- endpoint.setDescription(endpointDescription);
- endpoint.setAddress(endpointAddress);
-
-
- final String connectorTypeDescription = "OMRS default cohort registry connector type.";
- final String connectorTypeJavaClassName = FileBasedRegistryStoreProvider.class.getName();
-
- String connectorTypeName = "DefaultCohortRegistry.ConnectorType.Test";
-
- ConnectorType connectorType = new ConnectorType();
-
- connectorType.setType(ConnectorType.getConnectorTypeType());
- connectorType.setGUID(connectorTypeGUID);
- connectorType.setQualifiedName(connectorTypeName);
- connectorType.setDisplayName(connectorTypeName);
- connectorType.setDescription(connectorTypeDescription);
- connectorType.setConnectorProviderClassName(connectorTypeJavaClassName);
-
-
- final String connectionDescription = "OMRS default cohort registry connection.";
-
- String connectionName = "DefaultCohortRegistry.Connection.Test";
-
- Connection connection = new Connection();
-
- connection.setType(Connection.getConnectionType());
- connection.setGUID(connectionGUID);
- connection.setQualifiedName(connectionName);
- connection.setDisplayName(connectionName);
- connection.setDescription(connectionDescription);
- connection.setEndpoint(endpoint);
- connection.setConnectorType(connectorType);
-
- return connection;
- }
-
-
- private ConnectionProperties getGoodConnectionProperties()
- {
- Connection connection = getGoodConnection();
-
- return new ConnectionProperties(connection);
- }
-
- private ConnectionProperties getNullEndpointConnectionProperties()
- {
- Connection connection = getGoodConnection();
- Endpoint endpoint = connection.getEndpoint();
-
- endpoint.setAddress(null);
- connection.setEndpoint(endpoint);
-
- return new ConnectionProperties(connection);
- }
-
-
- private MemberRegistration getMemberRegistration(String name)
- {
- MemberRegistration member = new MemberRegistration();
-
- member.setMetadataCollectionId(name + "MetadataCollectionId");
- member.setOrganizationName(name + "OrganizationName");
- member.setServerName(name + "ServerName");
- member.setServerType(name + "ServerType");
- member.setRegistrationTime(new Date());
- member.setRepositoryConnection(new Connection());
-
- return member;
- }
-
-
- private void exerciseActiveConnector(FileBasedRegistryStoreConnector connector)
- {
- MemberRegistration local = getMemberRegistration("local");
-
- assertTrue(connector.retrieveLocalRegistration() == null);
- assertTrue(connector.retrieveRemoteRegistrations() == null);
-
- connector.saveLocalRegistration(null);
-
- assertTrue(connector.retrieveLocalRegistration() == null);
- assertTrue(connector.retrieveRemoteRegistrations() == null);
-
- connector.saveLocalRegistration(local);
-
- assertTrue(local.equals(connector.retrieveLocalRegistration()));
- assertTrue(connector.retrieveRemoteRegistration("FredMetadataCollectionId") == null);
- assertTrue(connector.retrieveRemoteRegistrations() == null);
-
- connector.saveLocalRegistration(null);
-
- assertTrue(local.equals(connector.retrieveLocalRegistration()));
- assertTrue(connector.retrieveRemoteRegistration("FredMetadataCollectionId") == null);
- assertTrue(connector.retrieveRemoteRegistrations() == null);
-
- MemberRegistration fred = getMemberRegistration("Fred");
-
- connector.saveRemoteRegistration(fred);
-
- assertTrue(local.equals(connector.retrieveLocalRegistration()));
- assertTrue(fred.equals(connector.retrieveRemoteRegistration("FredMetadataCollectionId")));
- assertTrue(connector.retrieveRemoteRegistration("JoeMetadataCollectionId") == null);
-
- connector.removeLocalRegistration();
-
- assertTrue(connector.retrieveLocalRegistration() == null);
- assertTrue(fred.equals(connector.retrieveRemoteRegistration("FredMetadataCollectionId")));
- assertTrue(connector.retrieveRemoteRegistration("JoeMetadataCollectionId") == null);
-
- local.setMetadataCollectionId("newLocalMetadataCollectionId");
- connector.saveLocalRegistration(local);
-
- assertTrue(local.equals(connector.retrieveLocalRegistration()));
- assertTrue(fred.equals(connector.retrieveRemoteRegistration("FredMetadataCollectionId")));
- assertTrue(connector.retrieveRemoteRegistration("JoeMetadataCollectionId") == null);
-
- MemberRegistration joe = getMemberRegistration("Joe");
-
- connector.saveRemoteRegistration(joe);
- assertTrue(local.equals(connector.retrieveLocalRegistration()));
- assertTrue(fred.equals(connector.retrieveRemoteRegistration("FredMetadataCollectionId")));
- assertTrue(joe.equals(connector.retrieveRemoteRegistration("JoeMetadataCollectionId")));
- assertTrue(connector.retrieveRemoteRegistration("newLocalMetadataCollectionId") == null);
-
- connector.clearAllRegistrations();
-
- assertTrue(connector.retrieveLocalRegistration() == null);
- assertTrue(connector.retrieveRemoteRegistration("JoeMetadataCollectionId") == null);
- assertTrue(connector.retrieveRemoteRegistrations() == null);
- }
-
-
- @Test public void testFileManagement()
- {
- FileBasedRegistryStoreConnector connector = new FileBasedRegistryStoreConnector();
-
-
- connector.initialize(UUID.randomUUID().toString(), getGoodConnectionProperties());
- assertFalse(connector.isActive());
-
- try
- {
- connector.start();
- }
- catch (Throwable exception)
- {
- assertTrue(false);
- }
-
- assertTrue(connector.isActive());
-
- exerciseActiveConnector(connector);
-
- try
- {
- connector.close();
- }
- catch (Throwable exception)
- {
- assertTrue(false);
- }
-
- assertFalse(connector.isActive());
-
- connector = new FileBasedRegistryStoreConnector();
-
- try
- {
- connector.initialize(UUID.randomUUID().toString(), getNullEndpointConnectionProperties());
- assertFalse(connector.isActive());
-
- connector.start();
- assertTrue(connector.isActive());
-
- connector.close();
- assertFalse(connector.isActive());
- }
- catch (Throwable exception)
- {
- assertTrue(false);
- }
-
- }
-
-
- @Test public void testLifecycle()
- {
- FileBasedRegistryStoreConnector connector = new FileBasedRegistryStoreConnector();
-
- try
- {
- connector.initialize(UUID.randomUUID().toString(), getGoodConnectionProperties());
- assertFalse(connector.isActive());
-
- connector.start();
- assertTrue(connector.isActive());
-
- connector.close();
- assertFalse(connector.isActive());
- }
- catch (Throwable exception)
- {
- assertTrue(false);
- }
- }
-}
diff --git a/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/cohort-registry-store-connectors/cohort-registry-file-store-connector/src/test/org/odpi/openmetadata/adapters/repositoryservices/cohortregistrystore/file/TestFileBasedRegistryStoreProvider.java b/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/cohort-registry-store-connectors/cohort-registry-file-store-connector/src/test/org/odpi/openmetadata/adapters/repositoryservices/cohortregistrystore/file/TestFileBasedRegistryStoreProvider.java
deleted file mode 100644
index 39ab69a473d..00000000000
--- a/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/cohort-registry-store-connectors/cohort-registry-file-store-connector/src/test/org/odpi/openmetadata/adapters/repositoryservices/cohortregistrystore/file/TestFileBasedRegistryStoreProvider.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/* SPDX-License-Identifier: Apache-2.0 */
-package org.odpi.openmetadata.adapters.repositoryservices.cohortregistrystore.file;
-
-import org.odpi.openmetadata.frameworks.connectors.properties.ConnectorTypeProperties;
-import org.testng.annotations.Test;
-
-import static org.testng.Assert.assertTrue;
-
-/**
- * Ensures FileBasedRegistryStoreProvider correctly initializes its superclass.
- */
-public class TestFileBasedRegistryStoreProvider
-{
- @Test public void testProviderInitialization()
- {
- FileBasedRegistryStoreProvider provider = new FileBasedRegistryStoreProvider();
-
- assertTrue(provider.getConnectorClassName().equals(FileBasedRegistryStoreConnector.class.getName()));
-
- ConnectorTypeProperties connectorTypeProperties = provider.getConnectorTypeProperties();
-
- assertTrue(connectorTypeProperties != null);
-
- assertTrue(connectorTypeProperties.getConnectorProviderClassName().equals(FileBasedRegistryStoreProvider.class.getName()));
- }
-}
diff --git a/open-metadata-implementation/view-services/glossary-author-view/glossary-author-view-server/build.gradle b/open-metadata-implementation/view-services/glossary-author-view/glossary-author-view-server/build.gradle
index 2c3fc55db1b..c18bfdc4f1a 100644
--- a/open-metadata-implementation/view-services/glossary-author-view/glossary-author-view-server/build.gradle
+++ b/open-metadata-implementation/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/open-metadata-implementation/view-services/glossary-author-view/glossary-author-view-server/pom.xml b/open-metadata-implementation/view-services/glossary-author-view/glossary-author-view-server/pom.xml
index 6e30b80cc3a..6cfe23452bb 100644
--- a/open-metadata-implementation/view-services/glossary-author-view/glossary-author-view-server/pom.xml
+++ b/open-metadata-implementation/view-services/glossary-author-view/glossary-author-view-server/pom.xml
@@ -77,20 +77,14 @@
open-connector-framework
-
- org.testng
- testng
- test
-
-
com.fasterxml.jackson.core
jackson-annotations
- junit
- junit
+ org.junit.jupiter
+ junit-jupiter-api
test
diff --git a/open-metadata-implementation/view-services/glossary-author-view/glossary-author-view-server/src/test/org/odpi/openmetadata/viewservices/glossaryauthor/properties/BreadCrumbTrailTest.java b/open-metadata-implementation/view-services/glossary-author-view/glossary-author-view-server/src/test/java/org/odpi/openmetadata/viewservices/glossaryauthor/properties/BreadCrumbTrailTest.java
similarity index 96%
rename from open-metadata-implementation/view-services/glossary-author-view/glossary-author-view-server/src/test/org/odpi/openmetadata/viewservices/glossaryauthor/properties/BreadCrumbTrailTest.java
rename to open-metadata-implementation/view-services/glossary-author-view/glossary-author-view-server/src/test/java/org/odpi/openmetadata/viewservices/glossaryauthor/properties/BreadCrumbTrailTest.java
index ab4eb72e3b7..40b80fe2e88 100644
--- a/open-metadata-implementation/view-services/glossary-author-view/glossary-author-view-server/src/test/org/odpi/openmetadata/viewservices/glossaryauthor/properties/BreadCrumbTrailTest.java
+++ b/open-metadata-implementation/view-services/glossary-author-view/glossary-author-view-server/src/test/java/org/odpi/openmetadata/viewservices/glossaryauthor/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 {