From 4eb711602d54fcdbaeb544d60dfde89f81c2d817 Mon Sep 17 00:00:00 2001 From: pwielebs Date: Thu, 17 May 2018 17:02:30 +0200 Subject: Exclusion for auto-generated classes Change-Id: I979f8a310c7bcf4192eb7fd7e8635eaf3953dfc0 Issue-ID: DCAEGEN2-451 Signed-off-by: pwielebs --- pom.xml | 7 +++ .../config/AAIHttpClientConfigurationTest.java | 62 ---------------------- .../services/prh/model/CommonFunctionsTest.java | 35 ++++++++++++ .../services/prh/model/ConsumerDmaapModelTest.java | 50 +++++++++++++++++ .../prh/model/ImmutableConsumerDmaapModelTest.java | 50 ----------------- 5 files changed, 92 insertions(+), 112 deletions(-) delete mode 100644 prh-aai-client/src/test/java/org/onap/dcaegen2/services/prh/service/config/AAIHttpClientConfigurationTest.java create mode 100644 prh-commons/src/test/java/org/onap/dcaegen2/services/prh/model/CommonFunctionsTest.java create mode 100644 prh-commons/src/test/java/org/onap/dcaegen2/services/prh/model/ConsumerDmaapModelTest.java delete mode 100644 prh-commons/src/test/java/org/onap/dcaegen2/services/prh/model/ImmutableConsumerDmaapModelTest.java diff --git a/pom.xml b/pom.xml index 4b4d3698..d30fb0b4 100644 --- a/pom.xml +++ b/pom.xml @@ -324,6 +324,13 @@ org.jacoco jacoco-maven-plugin + + + **/Immutable* + **/GsonAdapters* + **/*ForUnitTest* + + default-prepare-agent diff --git a/prh-aai-client/src/test/java/org/onap/dcaegen2/services/prh/service/config/AAIHttpClientConfigurationTest.java b/prh-aai-client/src/test/java/org/onap/dcaegen2/services/prh/service/config/AAIHttpClientConfigurationTest.java deleted file mode 100644 index 929d3f18..00000000 --- a/prh-aai-client/src/test/java/org/onap/dcaegen2/services/prh/service/config/AAIHttpClientConfigurationTest.java +++ /dev/null @@ -1,62 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * PNF-REGISTRATION-HANDLER - * ================================================================================ - * Copyright (C) 2018 NOKIA Intellectual Property. 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.dcaegen2.services.prh.service.config; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; -import org.onap.dcaegen2.services.prh.config.AAIClientConfiguration; -import org.onap.dcaegen2.services.prh.config.ImmutableAAIClientConfiguration; - -public class AAIHttpClientConfigurationTest { - - private static AAIClientConfiguration client; - private static final String AAI_HOST = "/aai/v11/network/pnfs/pnf/NOKQTFCOC540002E"; - private static final Integer PORT = 1234; - private static final String PROTOCOL = "https"; - private static final String USER_NAME_PASSWORD = "PRH"; - private static final String BASE_PATH = "/aai/v11"; - private static final String PNF_PATH = "/network/pnfs/pnf"; - - @BeforeAll - public static void init() { - client = new ImmutableAAIClientConfiguration.Builder() - .aaiHost(AAI_HOST) - .aaiHostPortNumber(PORT) - .aaiProtocol(PROTOCOL) - .aaiUserName(USER_NAME_PASSWORD) - .aaiUserPassword(USER_NAME_PASSWORD) - .aaiIgnoreSSLCertificateErrors(true) - .aaiBasePath(BASE_PATH) - .aaiPnfPath(PNF_PATH) - .build(); - } - - @Test - public void testGetters_success() { - Assertions.assertEquals(AAI_HOST, client.aaiHost()); - Assertions.assertEquals(PORT, client.aaiHostPortNumber()); - Assertions.assertEquals(PROTOCOL, client.aaiProtocol()); - Assertions.assertEquals(USER_NAME_PASSWORD, client.aaiUserName()); - Assertions.assertEquals(USER_NAME_PASSWORD, client.aaiUserPassword()); - Assertions.assertEquals(true, client.aaiIgnoreSSLCertificateErrors()); - } -} diff --git a/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/model/CommonFunctionsTest.java b/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/model/CommonFunctionsTest.java new file mode 100644 index 00000000..2b9f2a97 --- /dev/null +++ b/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/model/CommonFunctionsTest.java @@ -0,0 +1,35 @@ +/* + * ============LICENSE_START======================================================= + * PNF-REGISTRATION-HANDLER + * ================================================================================ + * Copyright (C) 2018 NOKIA Intellectual Property. 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.dcaegen2.services.prh.model; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public class CommonFunctionsTest { + + private ConsumerDmaapModel model = new ConsumerDmaapModelForUnitTest(); + private String expectedResult = "{\"pnfName\":\"NOKnhfsadhff\",\"ipv4\":\"11.22.33.155\",\"ipv6\":\"2001:0db8:85a3:0000:0000:8a2e:0370:7334\"}"; + + @Test + public void createJsonBody_shouldReturnJsonInString() { + Assertions.assertEquals(expectedResult, CommonFunctions.createJsonBody(model)); + } +} diff --git a/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/model/ConsumerDmaapModelTest.java b/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/model/ConsumerDmaapModelTest.java new file mode 100644 index 00000000..c54bac11 --- /dev/null +++ b/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/model/ConsumerDmaapModelTest.java @@ -0,0 +1,50 @@ +/*- + * ============LICENSE_START======================================================= + * PNF-REGISTRATION-HANDLER + * ================================================================================ + * Copyright (C) 2018 NOKIA Intellectual Property. 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.dcaegen2.services.prh.model; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public class ConsumerDmaapModelTest { + + // Given + private ConsumerDmaapModel consumerDmaapModel; + private String pnfName = "NOKnhfsadhff"; + private String ipv4 = "11.22.33.155"; + private String ipv6 = "2001:0db8:85a3:0000:0000:8a2e:0370:7334"; + + @Test + public void consumerDmaapModelBuilder_shouldBuildAnObject() { + + // When + consumerDmaapModel = ImmutableConsumerDmaapModel.builder() + .pnfName(pnfName) + .ipv4(ipv4) + .ipv6(ipv6) + .build(); + + // Then + Assertions.assertNotNull(consumerDmaapModel); + Assertions.assertEquals(pnfName,consumerDmaapModel.getPnfName()); + Assertions.assertEquals(ipv4,consumerDmaapModel.getIpv4()); + Assertions.assertEquals(ipv6,consumerDmaapModel.getIpv6()); + } +} diff --git a/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/model/ImmutableConsumerDmaapModelTest.java b/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/model/ImmutableConsumerDmaapModelTest.java deleted file mode 100644 index dd9fe7b2..00000000 --- a/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/model/ImmutableConsumerDmaapModelTest.java +++ /dev/null @@ -1,50 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * PNF-REGISTRATION-HANDLER - * ================================================================================ - * Copyright (C) 2018 NOKIA Intellectual Property. 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.dcaegen2.services.prh.model; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - -public class ImmutableConsumerDmaapModelTest { - - // Given - private ConsumerDmaapModel consumerDmaapModel; - private String pnfName = "NOKnhfsadhff"; - private String ipv4 = "11.22.33.155"; - private String ipv6 = "2001:0db8:85a3:0000:0000:8a2e:0370:7334"; - - @Test - public void consumerDmaapModelBuilder_shouldBuildAnObject() { - - // When - consumerDmaapModel = ImmutableConsumerDmaapModel.builder() - .pnfName(pnfName) - .ipv4(ipv4) - .ipv6(ipv6) - .build(); - - // Then - Assertions.assertNotNull(consumerDmaapModel); - Assertions.assertEquals(pnfName,consumerDmaapModel.getPnfName()); - Assertions.assertEquals(ipv4,consumerDmaapModel.getIpv4()); - Assertions.assertEquals(ipv6,consumerDmaapModel.getIpv6()); - } -} -- cgit 1.2.3-korg