diff options
author | baniewsk <pawel.baniewski@nokia.com> | 2020-07-29 16:01:27 +0200 |
---|---|---|
committer | Pawel <pawel.kasperkiewicz@nokia.com> | 2020-08-05 14:18:54 +0200 |
commit | b8c4e6867d6b26652f4382e93665c220769cdc9f (patch) | |
tree | bb60a44b012731e3ee6fdffe2466f5ed7d6b5c7b /certServiceClient/src/test/java/org | |
parent | fc31c9e47b3e08f8914dcd1f0c5b6d18aa625567 (diff) |
Removing AAF references from Cert-Service in OOM repo.
Certificates regenerated
External files (from legacy AAF) removed
Still left:
* Sonar link,
* Link to documentation,
* Names of K8s resources in RTD documentation,
* Link to CSITs
Issue-ID: OOM-2526
Signed-off-by: Pawel Baniewski <pawel.baniewski@nokia.com>
Change-Id: I675f7485160b9b8e46e9ea573550e62ed28ca607
Diffstat (limited to 'certServiceClient/src/test/java/org')
-rw-r--r-- | certServiceClient/src/test/java/org/onap/oom/certservice/client/CerServiceRequestTestData.java (renamed from certServiceClient/src/test/java/org/onap/aaf/certservice/client/CerServiceRequestTestData.java) | 4 | ||||
-rw-r--r-- | certServiceClient/src/test/java/org/onap/oom/certservice/client/CertServiceClientTest.java (renamed from certServiceClient/src/test/java/org/onap/aaf/certservice/client/CertServiceClientTest.java) | 8 | ||||
-rw-r--r-- | certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/ArtifactsCreatorProviderTest.java (renamed from certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/ArtifactsCreatorProviderTest.java) | 10 | ||||
-rw-r--r-- | certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/CsrFactoryTest.java (renamed from certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/CsrFactoryTest.java) | 10 | ||||
-rw-r--r-- | certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/KeyPairFactoryTest.java (renamed from certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/KeyPairFactoryTest.java) | 6 | ||||
-rw-r--r-- | certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/PrivateKeyToPemEncoderTest.java (renamed from certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/PrivateKeyToPemEncoderTest.java) | 6 | ||||
-rw-r--r-- | certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/conversion/ConvertedArtifactsCreatorTest.java (renamed from certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/conversion/ConvertedArtifactsCreatorTest.java) | 10 | ||||
-rw-r--r-- | certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/conversion/PemArtifactsCreatorTest.java (renamed from certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/conversion/PemArtifactsCreatorTest.java) | 10 | ||||
-rw-r--r-- | certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/conversion/PemConverterTest.java (renamed from certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/conversion/PemConverterTest.java) | 8 | ||||
-rw-r--r-- | certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/conversion/RandomPasswordGeneratorTest.java (renamed from certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/conversion/RandomPasswordGeneratorTest.java) | 4 | ||||
-rw-r--r-- | certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/writer/CertFileWriterTest.java (renamed from certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/writer/CertFileWriterTest.java) | 6 | ||||
-rw-r--r-- | certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/EnvProviderTest.java (renamed from certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/EnvProviderTest.java) | 4 | ||||
-rw-r--r-- | certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/EnvsForCsrTest.java (renamed from certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/EnvsForCsrTest.java) | 4 | ||||
-rw-r--r-- | certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/EnvsForTlsTest.java (renamed from certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/EnvsForTlsTest.java) | 4 | ||||
-rw-r--r-- | certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/exception/TlsConfigurationExceptionTest.java (renamed from certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/exception/TlsConfigurationExceptionTest.java) | 6 | ||||
-rw-r--r-- | certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/factory/AbstractConfigurationFactoryTest.java (renamed from certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/factory/AbstractConfigurationFactoryTest.java) | 4 | ||||
-rw-r--r-- | certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/factory/ClientConfigurationFactoryTest.java (renamed from certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/factory/ClientConfigurationFactoryTest.java) | 22 | ||||
-rw-r--r-- | certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/factory/CsrConfigurationFactoryTest.java (renamed from certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/factory/CsrConfigurationFactoryTest.java) | 14 | ||||
-rw-r--r-- | certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/factory/SslContextFactoryTest.java (renamed from certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/factory/SslContextFactoryTest.java) | 8 | ||||
-rw-r--r-- | certServiceClient/src/test/java/org/onap/oom/certservice/client/httpclient/HttpClientTest.java (renamed from certServiceClient/src/test/java/org/onap/aaf/certservice/client/httpclient/HttpClientTest.java) | 24 |
20 files changed, 86 insertions, 86 deletions
diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/CerServiceRequestTestData.java b/certServiceClient/src/test/java/org/onap/oom/certservice/client/CerServiceRequestTestData.java index 8f252c31..0e5ec191 100644 --- a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/CerServiceRequestTestData.java +++ b/certServiceClient/src/test/java/org/onap/oom/certservice/client/CerServiceRequestTestData.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client; +package org.onap.oom.certservice.client; import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/CertServiceClientTest.java b/certServiceClient/src/test/java/org/onap/oom/certservice/client/CertServiceClientTest.java index 9e256f98..0a5806fd 100644 --- a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/CertServiceClientTest.java +++ b/certServiceClient/src/test/java/org/onap/oom/certservice/client/CertServiceClientTest.java @@ -1,5 +1,5 @@ /*============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -17,7 +17,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client; +package org.onap.oom.certservice.client; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -26,8 +26,8 @@ import org.mockito.junit.jupiter.MockitoExtension; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.verify; -import static org.onap.aaf.certservice.client.api.ExitStatus.CLIENT_CONFIGURATION_EXCEPTION; -import static org.onap.aaf.certservice.client.api.ExitStatus.SUCCESS; +import static org.onap.oom.certservice.client.api.ExitStatus.CLIENT_CONFIGURATION_EXCEPTION; +import static org.onap.oom.certservice.client.api.ExitStatus.SUCCESS; @ExtendWith(MockitoExtension.class) class CertServiceClientTest { diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/ArtifactsCreatorProviderTest.java b/certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/ArtifactsCreatorProviderTest.java index 46bacef8..503ed70f 100644 --- a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/ArtifactsCreatorProviderTest.java +++ b/certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/ArtifactsCreatorProviderTest.java @@ -1,5 +1,5 @@ /*============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -17,15 +17,15 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.certification; +package org.onap.oom.certservice.client.certification; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; import org.junit.jupiter.params.provider.ValueSource; -import org.onap.aaf.certservice.client.certification.conversion.ArtifactsCreator; -import org.onap.aaf.certservice.client.certification.conversion.ConvertedArtifactsCreator; -import org.onap.aaf.certservice.client.certification.conversion.PemArtifactsCreator; +import org.onap.oom.certservice.client.certification.conversion.ArtifactsCreator; +import org.onap.oom.certservice.client.certification.conversion.ConvertedArtifactsCreator; +import org.onap.oom.certservice.client.certification.conversion.PemArtifactsCreator; import static org.assertj.core.api.Assertions.assertThat; diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/CsrFactoryTest.java b/certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/CsrFactoryTest.java index ae18e6fb..e2bfa976 100644 --- a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/CsrFactoryTest.java +++ b/certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/CsrFactoryTest.java @@ -1,5 +1,5 @@ /*============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -17,13 +17,13 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.certification; +package org.onap.oom.certservice.client.certification; import org.junit.jupiter.api.Test; -import org.onap.aaf.certservice.client.certification.exception.CsrGenerationException; -import org.onap.aaf.certservice.client.certification.exception.KeyPairGenerationException; -import org.onap.aaf.certservice.client.configuration.model.CsrConfiguration; +import org.onap.oom.certservice.client.certification.exception.CsrGenerationException; +import org.onap.oom.certservice.client.certification.exception.KeyPairGenerationException; +import org.onap.oom.certservice.client.configuration.model.CsrConfiguration; import java.security.KeyPair; diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/KeyPairFactoryTest.java b/certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/KeyPairFactoryTest.java index 3d3d3c17..765a58ca 100644 --- a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/KeyPairFactoryTest.java +++ b/certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/KeyPairFactoryTest.java @@ -1,5 +1,5 @@ /*============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -17,10 +17,10 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.certification; +package org.onap.oom.certservice.client.certification; import org.junit.jupiter.api.Test; -import org.onap.aaf.certservice.client.certification.exception.KeyPairGenerationException; +import org.onap.oom.certservice.client.certification.exception.KeyPairGenerationException; import java.security.KeyPair; diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/PrivateKeyToPemEncoderTest.java b/certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/PrivateKeyToPemEncoderTest.java index 41f15bb7..6424611e 100644 --- a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/PrivateKeyToPemEncoderTest.java +++ b/certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/PrivateKeyToPemEncoderTest.java @@ -1,5 +1,5 @@ /*============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -17,13 +17,13 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.certification; +package org.onap.oom.certservice.client.certification; import org.bouncycastle.util.io.pem.PemObject; import org.bouncycastle.util.io.pem.PemReader; import org.junit.jupiter.api.Test; -import org.onap.aaf.certservice.client.certification.exception.PkEncodingException; +import org.onap.oom.certservice.client.certification.exception.PkEncodingException; import java.io.IOException; import java.io.StringReader; diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/conversion/ConvertedArtifactsCreatorTest.java b/certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/conversion/ConvertedArtifactsCreatorTest.java index e13f8be8..3a4d3419 100644 --- a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/conversion/ConvertedArtifactsCreatorTest.java +++ b/certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/conversion/ConvertedArtifactsCreatorTest.java @@ -1,5 +1,5 @@ /*============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -17,13 +17,13 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.certification.conversion; +package org.onap.oom.certservice.client.certification.conversion; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.onap.aaf.certservice.client.certification.exception.CertFileWriterException; -import org.onap.aaf.certservice.client.certification.exception.PemConversionException; -import org.onap.aaf.certservice.client.certification.writer.CertFileWriter; +import org.onap.oom.certservice.client.certification.exception.CertFileWriterException; +import org.onap.oom.certservice.client.certification.exception.PemConversionException; +import org.onap.oom.certservice.client.certification.writer.CertFileWriter; import java.security.PrivateKey; import java.util.List; diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/conversion/PemArtifactsCreatorTest.java b/certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/conversion/PemArtifactsCreatorTest.java index 5e79b96f..fd6d95c5 100644 --- a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/conversion/PemArtifactsCreatorTest.java +++ b/certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/conversion/PemArtifactsCreatorTest.java @@ -1,5 +1,5 @@ /*============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -17,12 +17,12 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.certification.conversion; +package org.onap.oom.certservice.client.certification.conversion; import org.junit.jupiter.api.Test; -import org.onap.aaf.certservice.client.api.ExitableException; -import org.onap.aaf.certservice.client.certification.PrivateKeyToPemEncoder; -import org.onap.aaf.certservice.client.certification.writer.CertFileWriter; +import org.onap.oom.certservice.client.api.ExitableException; +import org.onap.oom.certservice.client.certification.PrivateKeyToPemEncoder; +import org.onap.oom.certservice.client.certification.writer.CertFileWriter; import java.security.PrivateKey; import java.util.List; diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/conversion/PemConverterTest.java b/certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/conversion/PemConverterTest.java index e3a58c3f..c5adec08 100644 --- a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/conversion/PemConverterTest.java +++ b/certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/conversion/PemConverterTest.java @@ -1,5 +1,5 @@ /*============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -17,14 +17,14 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.certification.conversion; +package org.onap.oom.certservice.client.certification.conversion; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; -import org.onap.aaf.certservice.client.certification.EncryptionAlgorithmConstants; -import org.onap.aaf.certservice.client.certification.exception.PemConversionException; +import org.onap.oom.certservice.client.certification.EncryptionAlgorithmConstants; +import org.onap.oom.certservice.client.certification.exception.PemConversionException; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/conversion/RandomPasswordGeneratorTest.java b/certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/conversion/RandomPasswordGeneratorTest.java index 483e35e0..3457f32a 100644 --- a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/conversion/RandomPasswordGeneratorTest.java +++ b/certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/conversion/RandomPasswordGeneratorTest.java @@ -1,5 +1,5 @@ /*============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -17,7 +17,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.certification.conversion; +package org.onap.oom.certservice.client.certification.conversion; import org.junit.jupiter.api.Test; diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/writer/CertFileWriterTest.java b/certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/writer/CertFileWriterTest.java index c45876ec..11259368 100644 --- a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/writer/CertFileWriterTest.java +++ b/certServiceClient/src/test/java/org/onap/oom/certservice/client/certification/writer/CertFileWriterTest.java @@ -1,5 +1,5 @@ /*============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -17,12 +17,12 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.certification.writer; +package org.onap.oom.certservice.client.certification.writer; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; -import org.onap.aaf.certservice.client.certification.exception.CertFileWriterException; +import org.onap.oom.certservice.client.certification.exception.CertFileWriterException; import java.io.File; import java.io.IOException; diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/EnvProviderTest.java b/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/EnvProviderTest.java index 74c8c2a1..3181ec9f 100644 --- a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/EnvProviderTest.java +++ b/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/EnvProviderTest.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.configuration; +package org.onap.oom.certservice.client.configuration; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/EnvsForCsrTest.java b/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/EnvsForCsrTest.java index d6af20c6..ade13f75 100644 --- a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/EnvsForCsrTest.java +++ b/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/EnvsForCsrTest.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.configuration; +package org.onap.oom.certservice.client.configuration; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/EnvsForTlsTest.java b/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/EnvsForTlsTest.java index 7f599aa5..54ed56b7 100644 --- a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/EnvsForTlsTest.java +++ b/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/EnvsForTlsTest.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.configuration; +package org.onap.oom.certservice.client.configuration; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/exception/TlsConfigurationExceptionTest.java b/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/exception/TlsConfigurationExceptionTest.java index e9e5c3bf..6ebc3f2a 100644 --- a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/exception/TlsConfigurationExceptionTest.java +++ b/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/exception/TlsConfigurationExceptionTest.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -18,10 +18,10 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.configuration.exception; +package org.onap.oom.certservice.client.configuration.exception; import org.junit.jupiter.api.Test; -import org.onap.aaf.certservice.client.api.ExitStatus; +import org.onap.oom.certservice.client.api.ExitStatus; import static org.assertj.core.api.Assertions.assertThat; diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/factory/AbstractConfigurationFactoryTest.java b/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/factory/AbstractConfigurationFactoryTest.java index e4d71b31..e55e55b6 100644 --- a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/factory/AbstractConfigurationFactoryTest.java +++ b/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/factory/AbstractConfigurationFactoryTest.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.configuration.factory; +package org.onap.oom.certservice.client.configuration.factory; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/factory/ClientConfigurationFactoryTest.java b/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/factory/ClientConfigurationFactoryTest.java index 20a6c7ef..44827494 100644 --- a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/factory/ClientConfigurationFactoryTest.java +++ b/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/factory/ClientConfigurationFactoryTest.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -18,13 +18,13 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.configuration.factory; +package org.onap.oom.certservice.client.configuration.factory; import org.junit.jupiter.api.Test; -import org.onap.aaf.certservice.client.configuration.ClientConfigurationEnvs; -import org.onap.aaf.certservice.client.configuration.EnvsForClient; -import org.onap.aaf.certservice.client.configuration.exception.ClientConfigurationException; -import org.onap.aaf.certservice.client.configuration.model.ClientConfiguration; +import org.onap.oom.certservice.client.configuration.ClientConfigurationEnvs; +import org.onap.oom.certservice.client.configuration.EnvsForClient; +import org.onap.oom.certservice.client.configuration.exception.ClientConfigurationException; +import org.onap.oom.certservice.client.configuration.model.ClientConfiguration; import java.util.Optional; @@ -35,13 +35,13 @@ import static org.mockito.Mockito.when; public class ClientConfigurationFactoryTest { - private static final String CA_NAME_VALID = "caaaftest2"; + private static final String CA_NAME_VALID = "catest2"; private static final String TIME_OUT_VALID = "30000"; - private static final String OUTPUT_PATH_VALID = "/opt/app/osaaf"; + private static final String OUTPUT_PATH_VALID = "/opt/app/oom"; private static final String URL_TO_CERT_SERVICE_VALID = "https://cert-service:8443/v1/certificate/"; - private static final String URL_TO_CERT_SERVICE_DEFAULT = "https://aaf-cert-service:8443/v1/certificate/"; - private static final String CA_NAME_INVALID = "caaaftest2#$"; - private static final String OUTPUT_PATH_INVALID = "/opt//app/osaaf"; + private static final String URL_TO_CERT_SERVICE_DEFAULT = "https://oom-cert-service:8443/v1/certificate/"; + private static final String CA_NAME_INVALID = "catest2#$"; + private static final String OUTPUT_PATH_INVALID = "/opt//app/oom"; private static final String OUTPUT_TYPE_VALID = "JKS"; private static final String OUTPUT_TYPE_INVALID = "JKSS"; private static final String OUTPUT_TYPE_DEFAULT = "P12"; diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/factory/CsrConfigurationFactoryTest.java b/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/factory/CsrConfigurationFactoryTest.java index b9b9b078..e27cb57a 100644 --- a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/factory/CsrConfigurationFactoryTest.java +++ b/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/factory/CsrConfigurationFactoryTest.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -18,15 +18,15 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.configuration.factory; +package org.onap.oom.certservice.client.configuration.factory; import org.assertj.core.api.Condition; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.onap.aaf.certservice.client.configuration.CsrConfigurationEnvs; -import org.onap.aaf.certservice.client.configuration.EnvsForCsr; -import org.onap.aaf.certservice.client.configuration.exception.CsrConfigurationException; -import org.onap.aaf.certservice.client.configuration.model.CsrConfiguration; +import org.onap.oom.certservice.client.configuration.CsrConfigurationEnvs; +import org.onap.oom.certservice.client.configuration.EnvsForCsr; +import org.onap.oom.certservice.client.configuration.exception.CsrConfigurationException; +import org.onap.oom.certservice.client.configuration.model.CsrConfiguration; import java.util.Optional; @@ -34,7 +34,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.onap.aaf.certservice.client.api.ExitStatus.CSR_CONFIGURATION_EXCEPTION; +import static org.onap.oom.certservice.client.api.ExitStatus.CSR_CONFIGURATION_EXCEPTION; public class CsrConfigurationFactoryTest { diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/factory/SslContextFactoryTest.java b/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/factory/SslContextFactoryTest.java index 8e6e8369..923bc18d 100644 --- a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/factory/SslContextFactoryTest.java +++ b/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/factory/SslContextFactoryTest.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -18,14 +18,14 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.configuration.factory; +package org.onap.oom.certservice.client.configuration.factory; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import org.onap.aaf.certservice.client.configuration.EnvsForTls; -import org.onap.aaf.certservice.client.configuration.exception.TlsConfigurationException; +import org.onap.oom.certservice.client.configuration.EnvsForTls; +import org.onap.oom.certservice.client.configuration.exception.TlsConfigurationException; import javax.net.ssl.SSLContext; import java.util.Optional; diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/httpclient/HttpClientTest.java b/certServiceClient/src/test/java/org/onap/oom/certservice/client/httpclient/HttpClientTest.java index a109749b..553de25c 100644 --- a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/httpclient/HttpClientTest.java +++ b/certServiceClient/src/test/java/org/onap/oom/certservice/client/httpclient/HttpClientTest.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * aaf-certservice-client + * oom-certservice-client * ================================================================================ * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.aaf.certservice.client.httpclient; +package org.onap.oom.certservice.client.httpclient; import org.apache.http.HttpEntity; import org.apache.http.StatusLine; @@ -27,9 +27,9 @@ import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.CloseableHttpClient; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.onap.aaf.certservice.client.httpclient.exception.CertServiceApiResponseException; -import org.onap.aaf.certservice.client.httpclient.exception.HttpClientException; -import org.onap.aaf.certservice.client.httpclient.model.CertServiceResponse; +import org.onap.oom.certservice.client.httpclient.exception.CertServiceApiResponseException; +import org.onap.oom.certservice.client.httpclient.exception.HttpClientException; +import org.onap.oom.certservice.client.httpclient.model.CertServiceResponse; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -42,13 +42,13 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.mockito.Mockito.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.onap.aaf.certservice.client.CerServiceRequestTestData.CA_NAME; -import static org.onap.aaf.certservice.client.CerServiceRequestTestData.CORRECT_RESPONSE; -import static org.onap.aaf.certservice.client.CerServiceRequestTestData.CSR; -import static org.onap.aaf.certservice.client.CerServiceRequestTestData.EXPECTED_FIRST_ELEMENT_OF_CERTIFICATE_CHAIN; -import static org.onap.aaf.certservice.client.CerServiceRequestTestData.EXPECTED_FIRST_ELEMENT_OF_TRUSTED_CERTIFICATES; -import static org.onap.aaf.certservice.client.CerServiceRequestTestData.MISSING_PK_RESPONSE; -import static org.onap.aaf.certservice.client.CerServiceRequestTestData.PK; +import static org.onap.oom.certservice.client.CerServiceRequestTestData.CA_NAME; +import static org.onap.oom.certservice.client.CerServiceRequestTestData.CORRECT_RESPONSE; +import static org.onap.oom.certservice.client.CerServiceRequestTestData.CSR; +import static org.onap.oom.certservice.client.CerServiceRequestTestData.EXPECTED_FIRST_ELEMENT_OF_CERTIFICATE_CHAIN; +import static org.onap.oom.certservice.client.CerServiceRequestTestData.EXPECTED_FIRST_ELEMENT_OF_TRUSTED_CERTIFICATES; +import static org.onap.oom.certservice.client.CerServiceRequestTestData.MISSING_PK_RESPONSE; +import static org.onap.oom.certservice.client.CerServiceRequestTestData.PK; class HttpClientTest { |