diff options
author | Bartosz Gardziejewski <bartosz.gardziejewski@nokia.com> | 2020-03-18 09:38:27 +0100 |
---|---|---|
committer | Bartosz Gardziejewski <bartosz.gardziejewski@nokia.com> | 2020-03-18 09:38:27 +0100 |
commit | c85a8965e876fde2089582a6468eb02ce18bafd5 (patch) | |
tree | 1ab921ecfb1221f1e58d9ea7fd9d2be6e58acd47 /certService/src/test/java/org/onap/aaf/certservice/certification/adapter | |
parent | 15b97eff96d424102f1ced9d5bd37616260414a3 (diff) |
Resolve all checkstyle warnings
Issue-ID: AAF-1107
Signed-off-by: Bartosz Gardziejewski <bartosz.gardziejewski@nokia.com>
Change-Id: I28cfc2b82f1a4800a984e30f59ff36fe90bebb38
Diffstat (limited to 'certService/src/test/java/org/onap/aaf/certservice/certification/adapter')
-rw-r--r-- | certService/src/test/java/org/onap/aaf/certservice/certification/adapter/Cmpv2ClientAdapterTest.java | 16 | ||||
-rw-r--r-- | certService/src/test/java/org/onap/aaf/certservice/certification/adapter/CsrMetaBuilderTest.java (renamed from certService/src/test/java/org/onap/aaf/certservice/certification/adapter/CSRMetaBuilderTest.java) | 28 | ||||
-rw-r--r-- | certService/src/test/java/org/onap/aaf/certservice/certification/adapter/RsaContentSignerBuilderTest.java (renamed from certService/src/test/java/org/onap/aaf/certservice/certification/adapter/RSAContentSignerBuilderTest.java) | 6 | ||||
-rw-r--r-- | certService/src/test/java/org/onap/aaf/certservice/certification/adapter/X509CertificateBuilderTest.java | 2 |
4 files changed, 26 insertions, 26 deletions
diff --git a/certService/src/test/java/org/onap/aaf/certservice/certification/adapter/Cmpv2ClientAdapterTest.java b/certService/src/test/java/org/onap/aaf/certservice/certification/adapter/Cmpv2ClientAdapterTest.java index 296f63cd..32fd2074 100644 --- a/certService/src/test/java/org/onap/aaf/certservice/certification/adapter/Cmpv2ClientAdapterTest.java +++ b/certService/src/test/java/org/onap/aaf/certservice/certification/adapter/Cmpv2ClientAdapterTest.java @@ -22,7 +22,6 @@ package org.onap.aaf.certservice.certification.adapter; import java.io.IOException; import java.io.InputStream; -import java.io.StringWriter; import java.nio.charset.StandardCharsets; import java.security.NoSuchProviderException; import java.security.PrivateKey; @@ -32,6 +31,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Objects; + import org.apache.commons.io.IOUtils; import org.bouncycastle.asn1.x509.Certificate; import org.bouncycastle.cert.X509CertificateHolder; @@ -51,7 +51,7 @@ import org.onap.aaf.certservice.certification.model.CertificationModel; import org.onap.aaf.certservice.certification.model.CsrModel; import org.onap.aaf.certservice.cmpv2client.api.CmpClient; import org.onap.aaf.certservice.cmpv2client.exceptions.CmpClientException; -import org.onap.aaf.certservice.cmpv2client.external.CSRMeta; +import org.onap.aaf.certservice.cmpv2client.external.CsrMeta; import org.springframework.boot.test.context.SpringBootTest; @SpringBootTest @@ -64,7 +64,7 @@ class Cmpv2ClientAdapterTest { @Mock private Cmpv2Server server; @Mock - private RSAContentSignerBuilder rsaContentSignerBuilder; + private RsaContentSignerBuilder rsaContentSignerBuilder; @Mock private X509CertificateBuilder x509CertificateBuilder; @Mock @@ -84,9 +84,9 @@ class Cmpv2ClientAdapterTest { @Mock private CertificateFactoryProvider certificateFactoryProvider; @Mock - private CSRMetaBuilder csrMetaBuilder; + private CsrMetaBuilder csrMetaBuilder; @Mock - private CSRMeta csrMeta; + private CsrMeta csrMeta; @InjectMocks private Cmpv2ClientAdapter adapter; @@ -97,7 +97,7 @@ class Cmpv2ClientAdapterTest { @Test void adapterShouldRethrowClientExceptionOnFailure() throws CmpClientException, IOException, OperatorCreationException, CertificateException, - NoSuchProviderException { + NoSuchProviderException { // Given stubInternalProperties(); @@ -112,7 +112,7 @@ class Cmpv2ClientAdapterTest { @Test void shouldConvertToCertificationModel() throws OperatorCreationException, CertificateException, NoSuchProviderException, IOException, - CmpClientException, Cmpv2ClientAdapterException { + CmpClientException, Cmpv2ClientAdapterException { // Given stubInternalProperties(); @@ -139,7 +139,7 @@ class Cmpv2ClientAdapterTest { @Test void adapterShouldThrowClientAdapterExceptionOnFailure() throws OperatorCreationException, CertificateException, NoSuchProviderException, IOException, - CmpClientException { + CmpClientException { // Given stubInternalProperties(); diff --git a/certService/src/test/java/org/onap/aaf/certservice/certification/adapter/CSRMetaBuilderTest.java b/certService/src/test/java/org/onap/aaf/certservice/certification/adapter/CsrMetaBuilderTest.java index adb89b31..feb4bdba 100644 --- a/certService/src/test/java/org/onap/aaf/certservice/certification/adapter/CSRMetaBuilderTest.java +++ b/certService/src/test/java/org/onap/aaf/certservice/certification/adapter/CsrMetaBuilderTest.java @@ -28,7 +28,7 @@ import org.onap.aaf.certservice.certification.configuration.model.Authentication import org.onap.aaf.certservice.certification.configuration.model.CaMode; import org.onap.aaf.certservice.certification.configuration.model.Cmpv2Server; import org.onap.aaf.certservice.certification.model.CsrModel; -import org.onap.aaf.certservice.cmpv2client.external.CSRMeta; +import org.onap.aaf.certservice.cmpv2client.external.CsrMeta; import java.security.PrivateKey; import java.security.PublicKey; @@ -39,16 +39,16 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class CSRMetaBuilderTest { +public class CsrMetaBuilderTest { - private CSRMetaBuilder csrMetaBuilder; + private CsrMetaBuilder csrMetaBuilder; private static final String TEST_CA = "testCA"; private static final X500Name TEST_SUBJECT_DATA = new X500Name("CN=testIssuer"); @BeforeEach void setUp() { - csrMetaBuilder = new CSRMetaBuilder(); + csrMetaBuilder = new CsrMetaBuilder(); } @Test @@ -63,23 +63,23 @@ public class CSRMetaBuilderTest { when(testCsrModel.getPrivateKey()).thenReturn(mockPrivateKey); PublicKey mockPublicKey = mock(PublicKey.class); when(testCsrModel.getPublicKey()).thenReturn(mockPublicKey); - List<String> testSans = Arrays.asList("SAN01","SAN02"); + List<String> testSans = Arrays.asList("SAN01", "SAN02"); when(testCsrModel.getSans()).thenReturn(testSans); when(testCsrModel.getSubjectData()).thenReturn(TEST_SUBJECT_DATA); // When - CSRMeta createdCSRMeta = csrMetaBuilder.build(testCsrModel, testServer); + CsrMeta createdCsrMeta = csrMetaBuilder.build(testCsrModel, testServer); // Then - assertThat(createdCSRMeta.getPassword()).isEqualTo(testServer.getAuthentication().getIak()); - assertThat(createdCSRMeta.getSenderKid()).isEqualTo(testServer.getAuthentication().getRv()); - assertThat(createdCSRMeta.getCaUrl()).isEqualTo(testServer.getUrl()); - assertThat(createdCSRMeta.getSans()).containsAll(testSans); - assertThat(createdCSRMeta.getKeyPair().getPrivate()).isEqualTo(mockPrivateKey); - assertThat(createdCSRMeta.getKeyPair().getPublic()).isEqualTo(mockPublicKey); - assertThat(createdCSRMeta.getX500Name()).isEqualTo(TEST_SUBJECT_DATA); - assertThat(createdCSRMeta.getIssuerX500Name()).isEqualTo(TEST_SUBJECT_DATA); + assertThat(createdCsrMeta.getPassword()).isEqualTo(testServer.getAuthentication().getIak()); + assertThat(createdCsrMeta.getSenderKid()).isEqualTo(testServer.getAuthentication().getRv()); + assertThat(createdCsrMeta.getCaUrl()).isEqualTo(testServer.getUrl()); + assertThat(createdCsrMeta.getSans()).containsAll(testSans); + assertThat(createdCsrMeta.getKeyPair().getPrivate()).isEqualTo(mockPrivateKey); + assertThat(createdCsrMeta.getKeyPair().getPublic()).isEqualTo(mockPublicKey); + assertThat(createdCsrMeta.getX500Name()).isEqualTo(TEST_SUBJECT_DATA); + assertThat(createdCsrMeta.getIssuerX500Name()).isEqualTo(TEST_SUBJECT_DATA); } private Cmpv2Server createTestServer() { diff --git a/certService/src/test/java/org/onap/aaf/certservice/certification/adapter/RSAContentSignerBuilderTest.java b/certService/src/test/java/org/onap/aaf/certservice/certification/adapter/RsaContentSignerBuilderTest.java index 3c5c534c..44669216 100644 --- a/certService/src/test/java/org/onap/aaf/certservice/certification/adapter/RSAContentSignerBuilderTest.java +++ b/certService/src/test/java/org/onap/aaf/certservice/certification/adapter/RsaContentSignerBuilderTest.java @@ -34,13 +34,13 @@ import java.security.PrivateKey; import static org.assertj.core.api.Assertions.assertThat; import static org.onap.aaf.certservice.certification.TestUtils.createCsrModel; -class RSAContentSignerBuilderTest { +class RsaContentSignerBuilderTest { - private RSAContentSignerBuilder rsaContentSignerBuilder; + private RsaContentSignerBuilder rsaContentSignerBuilder; @BeforeEach void setUp() { - rsaContentSignerBuilder = new RSAContentSignerBuilder(); + rsaContentSignerBuilder = new RsaContentSignerBuilder(); } @Test diff --git a/certService/src/test/java/org/onap/aaf/certservice/certification/adapter/X509CertificateBuilderTest.java b/certService/src/test/java/org/onap/aaf/certservice/certification/adapter/X509CertificateBuilderTest.java index 26d11fc3..d53c6c72 100644 --- a/certService/src/test/java/org/onap/aaf/certservice/certification/adapter/X509CertificateBuilderTest.java +++ b/certService/src/test/java/org/onap/aaf/certservice/certification/adapter/X509CertificateBuilderTest.java @@ -53,7 +53,7 @@ public class X509CertificateBuilderTest { CsrModel testCsrModel = createCsrModel(); PKCS10CertificationRequest testCertificationRequest = testCsrModel.getCsr(); PrivateKey testPrivateKey = testCsrModel.getPrivateKey(); - RSAContentSignerBuilder rsaContentSignerBuilder = new RSAContentSignerBuilder(); + RsaContentSignerBuilder rsaContentSignerBuilder = new RsaContentSignerBuilder(); ContentSigner createdContentSigner = rsaContentSignerBuilder.build(testCertificationRequest, testPrivateKey); // When |