From 4613aec90a9a58d30729d7675557883467c099d2 Mon Sep 17 00:00:00 2001 From: Nigel Jones Date: Wed, 26 May 2021 15:33:28 +0100 Subject: [PATCH 1/6] #5225 fix pom for analytics modeling server UTs to run under maven Signed-off-by: Nigel Jones --- .../analytics-modeling/analytics-modeling-server/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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..051d7eb6a1a 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,11 +115,11 @@ test - + org.testng From c7063f52f9aa562730416bc2b58fcd0d1abc6bf6 Mon Sep 17 00:00:00 2001 From: Nigel Jones Date: Wed, 26 May 2021 15:51:32 +0100 Subject: [PATCH 2/6] #5225 correct path for glossary author view server UTs and use JUnit5 Signed-off-by: Nigel Jones --- .../glossary-author-view-server/pom.xml | 10 ++-------- .../glossaryauthor/properties/BreadCrumbTrailTest.java | 4 ++-- 2 files changed, 4 insertions(+), 10 deletions(-) rename open-metadata-implementation/view-services/glossary-author-view/glossary-author-view-server/src/test/{ => java}/org/odpi/openmetadata/viewservices/glossaryauthor/properties/BreadCrumbTrailTest.java (96%) 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 { From d3dfb2bcccdf82edeebac8734093d716bae22c93 Mon Sep 17 00:00:00 2001 From: Nigel Jones Date: Wed, 26 May 2021 15:54:48 +0100 Subject: [PATCH 3/6] #5225 correct encrypted config connector UTs - file path wrong Signed-off-by: Nigel Jones --- .../TestEncryptedFileBasedServerConfigStoreConnector.java | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename 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 (100%) 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 From 8fe0fe99e27e452483d2105daf9dfa5431fe6829 Mon Sep 17 00:00:00 2001 From: Nigel Jones Date: Wed, 26 May 2021 16:07:21 +0100 Subject: [PATCH 4/6] #5225 remove commented section used in testing unit tests Signed-off-by: Nigel Jones --- .../analytics-modeling/analytics-modeling-server/pom.xml | 6 ------ 1 file changed, 6 deletions(-) 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 051d7eb6a1a..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.testng testng From 8558e0860fc57242cf7b3d303ec4a2afc533afc9 Mon Sep 17 00:00:00 2001 From: Nigel Jones Date: Wed, 26 May 2021 16:20:37 +0100 Subject: [PATCH 5/6] #4225 remove old test files for cohort registry in orphaned directory Signed-off-by: Nigel Jones --- .../TestFileBasedRegistryStoreConnector.java | 245 ------------------ .../TestFileBasedRegistryStoreProvider.java | 26 -- 2 files changed, 271 deletions(-) delete mode 100644 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 delete mode 100644 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 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())); - } -} From a3c971123cf0242fbb67142b0af65b12e4e4dc11 Mon Sep 17 00:00:00 2001 From: Nigel Jones Date: Wed, 26 May 2021 16:44:19 +0100 Subject: [PATCH 6/6] #5225 fix gradle build for glossary author view server Signed-off-by: Nigel Jones --- .../glossary-author-view-server/build.gradle | 1 + 1 file changed, 1 insertion(+) 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' }