diff options
Diffstat (limited to 'sdc-distribution-client/src/test/java/org/onap/sdc/impl/DistributionClientTest.java')
| -rw-r--r-- | sdc-distribution-client/src/test/java/org/onap/sdc/impl/DistributionClientTest.java | 52 |
1 files changed, 31 insertions, 21 deletions
diff --git a/sdc-distribution-client/src/test/java/org/onap/sdc/impl/DistributionClientTest.java b/sdc-distribution-client/src/test/java/org/onap/sdc/impl/DistributionClientTest.java index bb3c7bf..bc4f78e 100644 --- a/sdc-distribution-client/src/test/java/org/onap/sdc/impl/DistributionClientTest.java +++ b/sdc-distribution-client/src/test/java/org/onap/sdc/impl/DistributionClientTest.java @@ -3,6 +3,7 @@ * sdc-distribution-client * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Modifications copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,6 +23,7 @@ package org.onap.sdc.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import static org.mockito.Matchers.any; import static org.mockito.Mockito.doReturn; import java.io.IOException; @@ -32,6 +34,8 @@ import org.junit.After; import org.junit.Assert; import org.junit.Test; import org.mockito.Mockito; +import org.onap.sdc.http.HttpAsdcClient; +import org.onap.sdc.utils.Pair; import org.onap.sdc.utils.TestConfiguration; import org.onap.sdc.api.IDistributionClient; import org.onap.sdc.api.consumer.IConfiguration; @@ -68,10 +72,12 @@ public class DistributionClientTest { @Test public void validateConfigurationTest() { - DistributionActionResultEnum validationResult = client.validateAndInitConfiguration(new Wrapper<IDistributionClientResult>(), testConfiguration); + final Pair<DistributionActionResultEnum, Configuration> distributionActionResultEnumConfigurationPair = client.validateAndInitConfiguration(new Wrapper<IDistributionClientResult>(), testConfiguration); + DistributionActionResultEnum validationResult = distributionActionResultEnumConfigurationPair.getFirst(); + Configuration configuration = distributionActionResultEnumConfigurationPair.getSecond(); Assert.assertEquals(DistributionActionResultEnum.SUCCESS, validationResult); - Assert.assertEquals(testConfiguration.getPollingInterval(), client.configuration.getPollingInterval()); - Assert.assertEquals(testConfiguration.getPollingTimeout(), client.configuration.getPollingTimeout()); + Assert.assertEquals(testConfiguration.getPollingInterval(), configuration.getPollingInterval()); + Assert.assertEquals(testConfiguration.getPollingTimeout(), configuration.getPollingTimeout()); } @Test @@ -79,10 +85,12 @@ public class DistributionClientTest { TestConfiguration userConfig = new TestConfiguration(); userConfig.setPollingInterval(1); userConfig.setPollingTimeout(2); - DistributionActionResultEnum validationResult = client.validateAndInitConfiguration(new Wrapper<IDistributionClientResult>(), userConfig); + final Pair<DistributionActionResultEnum, Configuration> distributionActionResultEnumConfigurationPair = client.validateAndInitConfiguration(new Wrapper<IDistributionClientResult>(), userConfig); + DistributionActionResultEnum validationResult = distributionActionResultEnumConfigurationPair.getFirst(); + Configuration configuration = distributionActionResultEnumConfigurationPair.getSecond(); Assert.assertEquals(DistributionActionResultEnum.SUCCESS, validationResult); - assertEquals(15, client.configuration.getPollingInterval()); - assertEquals(15, client.configuration.getPollingTimeout()); + assertEquals(15, configuration.getPollingInterval()); + assertEquals(15, configuration.getPollingTimeout()); } @Test @@ -111,11 +119,11 @@ public class DistributionClientTest { Wrapper<IDistributionClientResult> errorWrapper = new Wrapper<>(); TestConfiguration testPassword = new TestConfiguration(); testPassword.setPassword(null); - DistributionActionResultEnum validationResult = client.validateAndInitConfiguration(errorWrapper, testPassword); + DistributionActionResultEnum validationResult = client.validateAndInitConfiguration(errorWrapper, testPassword).getFirst(); Assert.assertEquals(DistributionActionResultEnum.CONF_MISSING_PASSWORD, validationResult); testPassword.setPassword(""); - validationResult = client.validateAndInitConfiguration(errorWrapper, testPassword); + validationResult = client.validateAndInitConfiguration(errorWrapper, testPassword).getFirst(); Assert.assertEquals(DistributionActionResultEnum.CONF_MISSING_PASSWORD, validationResult); } @@ -125,11 +133,11 @@ public class DistributionClientTest { Wrapper<IDistributionClientResult> errorWrapper = new Wrapper<>(); TestConfiguration testUser = new TestConfiguration(); testUser.setUser(null); - DistributionActionResultEnum validationResult = client.validateAndInitConfiguration(errorWrapper, testUser); + DistributionActionResultEnum validationResult = client.validateAndInitConfiguration(errorWrapper, testUser).getFirst(); Assert.assertEquals(DistributionActionResultEnum.CONF_MISSING_USERNAME, validationResult); testUser.setUser(""); - validationResult = client.validateAndInitConfiguration(errorWrapper, testUser); + validationResult = client.validateAndInitConfiguration(errorWrapper, testUser).getFirst(); Assert.assertEquals(DistributionActionResultEnum.CONF_MISSING_USERNAME, validationResult); } @@ -144,7 +152,7 @@ public class DistributionClientTest { Either<TopicRegistrationResponse, DistributionClientResultImpl> topicsResult = Either.left(topics); Mockito.when(connector.registerAsdcTopics(Mockito.any(ApiCredential.class))).thenReturn(topicsResult); - client.asdcConnector = connector; + reconfigureAsdcConnector(connector, client); // cambriaMock @@ -211,6 +219,10 @@ public class DistributionClientTest { Mockito.verify(connector, Mockito.times(0)).registerAsdcTopics(Mockito.any(ApiCredential.class)); } + private void reconfigureAsdcConnector(SdcConnectorClient connector, DistributionClientImpl client) { + doReturn(connector).when(client).createAsdcConnector(any()); + } + @Test public void initFailedConnectAsdcTest() throws HttpException, CambriaApiException, IOException { // cambriaMock @@ -274,7 +286,7 @@ public class DistributionClientTest { IDistributionClientResult success = initSuccesResult(); Mockito.when(connector.unregisterTopics(Mockito.any(ApiCredential.class))).thenReturn(success); - client.asdcConnector = connector; + reconfigureAsdcConnector(connector, client); // cambriaMock @@ -321,7 +333,7 @@ public class DistributionClientTest { IDistributionClientResult success = initSuccesResult(); Mockito.when(connector.unregisterTopics(Mockito.any(ApiCredential.class))).thenReturn(success); - client.asdcConnector = connector; + reconfigureAsdcConnector(connector, client); // cambriaMock @@ -368,7 +380,7 @@ public class DistributionClientTest { Either<TopicRegistrationResponse, DistributionClientResultImpl> topicsResult = Either.left(topics); Mockito.when(connector.registerAsdcTopics(Mockito.any(ApiCredential.class))).thenReturn(topicsResult); - client.asdcConnector = connector; + reconfigureAsdcConnector(connector, client); // cambriaMock @@ -398,7 +410,7 @@ public class DistributionClientTest { Either<TopicRegistrationResponse, DistributionClientResultImpl> topicsResult = Either.left(topics); Mockito.when(connector.registerAsdcTopics(Mockito.any(ApiCredential.class))).thenReturn(topicsResult); - client.asdcConnector = connector; + reconfigureAsdcConnector(connector, client); // cambriaMock @@ -424,7 +436,7 @@ public class DistributionClientTest { Either<TopicRegistrationResponse, DistributionClientResultImpl> topicsResult = Either.right(failureResult); Mockito.when(connector.registerAsdcTopics(Mockito.any(ApiCredential.class))).thenReturn(topicsResult); - client.asdcConnector = connector; + reconfigureAsdcConnector(connector, client); // cambriaMock @@ -513,8 +525,7 @@ public class DistributionClientTest { public void connectorRegisterCI() { - SdcConnectorClient connector = new SdcConnectorClient(); - connector.init(testConfiguration); + SdcConnectorClient connector = new SdcConnectorClient(testConfiguration, new HttpAsdcClient(testConfiguration)); ApiCredential creds = new ApiCredential("publicKey", "secretKey"); Either<TopicRegistrationResponse, DistributionClientResultImpl> topicsFromAsdc = connector.registerAsdcTopics(creds); @@ -523,10 +534,9 @@ public class DistributionClientTest { } public void downloadArtifactTestCI() { - SdcConnectorClient connector = new SdcConnectorClient(); - connector.init(testConfiguration); + SdcConnectorClient connector = new SdcConnectorClient(testConfiguration, new HttpAsdcClient(testConfiguration)); IArtifactInfo artifactInfo = initArtifactInfo(); - connector.dowloadArtifact(artifactInfo); + connector.downloadArtifact(artifactInfo); } // ########### TESTS TO ADD TO CI END ########### |