[OOM cert-service-client] Add validation of email, ip and domain name

[oom/platform/cert-service.git] / certServiceClient / src / test / java / org / onap / oom / certservice / client / configuration / validation / csr / CommonNameValidatorTest.java

diff --git a/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/validation/ValidatorsFactoryTest.java b/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/validation/csr/CommonNameValidatorTest.java
similarity index 69%
rename from certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/validation/ValidatorsFactoryTest.java
rename to certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/validation/csr/CommonNameValidatorTest.java
index 3c14d30..deb02cf 100644 (file)
--- a/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/validation/ValidatorsFactoryTest.java
+++ b/certServiceClient/src/test/java/org/onap/oom/certservice/client/configuration/validation/csr/CommonNameValidatorTest.java
@@ -18,39 +18,27 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.certservice.client.configuration.validation;
+package org.onap.oom.certservice.client.configuration.validation.csr;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
-class ValidatorsFactoryTest {
+class CommonNameValidatorTest {
 
-    ValidatorsFactory cut = new ValidatorsFactory();
-
-    @ParameterizedTest
-    @ValueSource(strings = {"JKS", "P12", "PEM"})
-    void shouldAcceptValidOutputType(String outputType) {
-        assertThat(cut.outputTypeValidator().test(outputType)).isTrue();
-    }
-
-    @ParameterizedTest
-    @ValueSource(strings = {"jks", "p12", "pem", "", "pass", "!@$#pp"})
-    void shouldRejectInvalidOutputType(String outputType) {
-        assertThat(cut.outputTypeValidator().test(outputType)).isFalse();
-    }
+    CommonNameValidator cut = new CommonNameValidator();
 
     @ParameterizedTest
     @ValueSource(strings = {"example.com", "www.example.com"})
     void shouldAcceptValidCommonName(String commonName) {
-        assertThat(cut.commonNameValidator().test(commonName)).isTrue();
+        assertThat(cut.test(commonName)).isTrue();
     }
 
     @ParameterizedTest
     @ValueSource(strings = {"https://example.com", "http://example.com", "example.com:8080", "0.0.0.0", "@#$%.com"})
     void shouldRejectInvalidCommonName(String commonName) {
-        assertThat(cut.commonNameValidator().test(commonName)).isFalse();
+        assertThat(cut.test(commonName)).isFalse();
     }
 
 }