diff options
7 files changed, 13 insertions, 20 deletions
diff --git a/certService/src/test/java/org/onap/oom/certservice/api/ReadinessControllerTest.java b/certService/src/test/java/org/onap/oom/certservice/api/ReadinessControllerTest.java index 267a281b..2512458d 100644 --- a/certService/src/test/java/org/onap/oom/certservice/api/ReadinessControllerTest.java +++ b/certService/src/test/java/org/onap/oom/certservice/api/ReadinessControllerTest.java @@ -31,29 +31,27 @@ import org.onap.oom.certservice.certification.configuration.CmpServersConfig; import org.springframework.http.HttpStatus; @ExtendWith(MockitoExtension.class) -public class ReadinessControllerTest { +class ReadinessControllerTest { @Mock private CmpServersConfig cmpServersConfig; @Test - public void shouldReturnStatusOkWhenConfigIsReady() { + void shouldReturnStatusOkWhenConfigIsReady() { // Given Mockito.when(cmpServersConfig.isReady()).thenReturn(true); // Then assertThat(new ReadinessController(cmpServersConfig).checkReady().getStatusCode()).isEqualTo(HttpStatus.OK); - ; } @Test - public void shouldReturnStatusServiceUnavailableWhenConfigIsNotReady() { + void shouldReturnStatusServiceUnavailableWhenConfigIsNotReady() { // Given Mockito.when(cmpServersConfig.isReady()).thenReturn(false); // Then assertThat(new ReadinessController(cmpServersConfig).checkReady().getStatusCode()).isEqualTo(HttpStatus.SERVICE_UNAVAILABLE); - ; } } diff --git a/certService/src/test/java/org/onap/oom/certservice/certification/X509CertificateBuilderTest.java b/certService/src/test/java/org/onap/oom/certservice/certification/X509CertificateBuilderTest.java index e980aa2c..52ed99e7 100644 --- a/certService/src/test/java/org/onap/oom/certservice/certification/X509CertificateBuilderTest.java +++ b/certService/src/test/java/org/onap/oom/certservice/certification/X509CertificateBuilderTest.java @@ -36,7 +36,7 @@ import java.security.PrivateKey; import static org.assertj.core.api.Assertions.assertThat; import static org.onap.oom.certservice.certification.TestUtils.createCsrModel; -public class X509CertificateBuilderTest { +class X509CertificateBuilderTest { private X509CertificateBuilder certificateBuilder; diff --git a/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/EnvsForCsrTest.java b/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/EnvsForCsrTest.java index ade13f75..9212269c 100644 --- a/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/EnvsForCsrTest.java +++ b/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/EnvsForCsrTest.java @@ -99,7 +99,7 @@ class EnvsForCsrTest { } @Test - public void shouldReportThatSystemEnvOuVariableIsNotPresentWhenItWasNotDefined() { + void shouldReportThatSystemEnvOuVariableIsNotPresentWhenItWasNotDefined() { // when final Optional<String> testEnv = envsForCsr.getOrganizationUnit(); @@ -191,7 +191,7 @@ class EnvsForCsrTest { } @Test - public void shouldReportThatSystemEnvSansVariableIsNotPresentWhenItWasNotDefined() { + void shouldReportThatSystemEnvSansVariableIsNotPresentWhenItWasNotDefined() { // when final Optional<String> testEnv = envsForCsr.getSubjectAlternativesName(); diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/TruststoreFactory.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/TruststoreFactory.java index b6984f36..5167c301 100644 --- a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/TruststoreFactory.java +++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/TruststoreFactory.java @@ -23,9 +23,6 @@ import static org.onap.oom.certservice.postprocessor.api.CertificateConstants.JK import static org.onap.oom.certservice.postprocessor.api.CertificateConstants.PKCS12_TYPE; import java.io.File; -import org.onap.oom.certservice.postprocessor.merger.exception.KeystoreInstanceException; -import org.onap.oom.certservice.postprocessor.merger.exception.LoadTruststoreException; -import org.onap.oom.certservice.postprocessor.merger.exception.PasswordReaderException; import org.onap.oom.certservice.postprocessor.common.ExtensionResolver; import org.onap.oom.certservice.postprocessor.merger.exception.TruststoreFileFactoryException; @@ -41,8 +38,7 @@ public class TruststoreFactory { private TruststoreFactory() { } - public static Truststore create(String truststoreFilePath, String truststorePasswordPath) - throws TruststoreFileFactoryException, PasswordReaderException, KeystoreInstanceException, LoadTruststoreException { + public static Truststore create(String truststoreFilePath, String truststorePasswordPath) { File truststoreFile = new File(truststoreFilePath); if (!ExtensionResolver.checkIfFileExists(truststoreFile)) { throw new TruststoreFileFactoryException(String.format(FILE_DOES_NOT_EXIST_MSG_TEMPLATE, truststoreFile)); @@ -50,8 +46,7 @@ public class TruststoreFactory { return createTypedTruststore(truststoreFile, truststorePasswordPath); } - private static Truststore createTypedTruststore(File truststoreFile, String truststorePasswordPath) - throws KeystoreInstanceException, PasswordReaderException, LoadTruststoreException, TruststoreFileFactoryException { + private static Truststore createTypedTruststore(File truststoreFile, String truststorePasswordPath) { String extension = ExtensionResolver.get(truststoreFile); switch (extension) { case JKS_EXTENSION: diff --git a/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/AppExecutorTest.java b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/AppExecutorTest.java index 5c79f6e9..19833cb8 100644 --- a/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/AppExecutorTest.java +++ b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/AppExecutorTest.java @@ -35,7 +35,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.onap.oom.certservice.postprocessor.merger.exception.AliasConflictException; @ExtendWith(MockitoExtension.class) -public class AppExecutorTest { +class AppExecutorTest { @Mock Runnable logic; diff --git a/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/common/FileToolsTest.java b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/common/FileToolsTest.java index 56f76e17..7b3b28ae 100644 --- a/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/common/FileToolsTest.java +++ b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/common/FileToolsTest.java @@ -28,7 +28,7 @@ import org.apache.commons.io.FileUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -public class FileToolsTest { +class FileToolsTest { public static final String BAK_EXTENSION = ".bak"; @@ -43,7 +43,7 @@ public class FileToolsTest { //when new FileTools().createBackup(fileToBackup); //then - assertThat(fileToBackup.equals(new File(backupFilePath))); + assertThat(fileToBackup).hasSameBinaryContentAs(new File(backupFilePath)); } @Test @@ -54,7 +54,7 @@ public class FileToolsTest { //when new FileTools().copy(sourceFile, destinationFile); //then - assertThat(sourceFile.equals(destinationFile)); + assertThat(sourceFile).hasSameBinaryContentAs(destinationFile); } diff --git a/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/certificate/PemAliasGeneratorTest.java b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/certificate/PemAliasGeneratorTest.java index bde23003..03989f6f 100644 --- a/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/certificate/PemAliasGeneratorTest.java +++ b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/certificate/PemAliasGeneratorTest.java @@ -37,7 +37,7 @@ class PemAliasGeneratorTest { //when String alias = pemAliasGenerator.getAlias(); //then - assertThat(alias.contains(PREFIX_ALIAS_NAME)).isTrue(); + assertThat(alias).contains(PREFIX_ALIAS_NAME); } @Test |