CPS Validator Changes

[cps.git] / cps-ri / src / test / groovy / org / onap / cps / spi / impl / utils / CpsValidatorSpec.groovy

diff --git a/cps-service/src/test/groovy/org/onap/cps/utils/CpsValidatorSpec.groovy b/cps-ri/src/test/groovy/org/onap/cps/spi/impl/utils/CpsValidatorSpec.groovy
similarity index 90%
rename from cps-service/src/test/groovy/org/onap/cps/utils/CpsValidatorSpec.groovy
rename to cps-ri/src/test/groovy/org/onap/cps/spi/impl/utils/CpsValidatorSpec.groovy
index ea7a5d6..ae2ff16 100644 (file)
--- a/cps-service/src/test/groovy/org/onap/cps/utils/CpsValidatorSpec.groovy
+++ b/cps-ri/src/test/groovy/org/onap/cps/spi/impl/utils/CpsValidatorSpec.groovy
@@ -18,23 +18,25 @@
  *  ============LICENSE_END=========================================================
  */
 
-package org.onap.cps.utils
+package org.onap.cps.spi.impl.utils
 
 import org.onap.cps.spi.exceptions.DataValidationException
 import spock.lang.Specification
 
 class CpsValidatorSpec extends Specification {
 
+    def objectUnderTest = new CpsValidatorImpl()
+
     def 'Validating a valid string.'() {
         when: 'the string is validated using a valid name'
-            CpsValidator.validateNameCharacters('name-with-no-spaces')
+            objectUnderTest.validateNameCharacters('name-with-no-spaces')
         then: 'no exception is thrown'
             noExceptionThrown()
     }
 
     def 'Validating an invalid string.'() {
         when: 'the string is validated using an invalid name'
-            CpsValidator.validateNameCharacters(name)
+            objectUnderTest.validateNameCharacters(name)
         then: 'a data validation exception is thrown'
             def exceptionThrown = thrown(DataValidationException)
         and: 'the error was encountered at the following index in #scenario'
@@ -44,5 +46,4 @@ class CpsValidatorSpec extends Specification {
             'position 5' | 'name with spaces' || 'name with spaces invalid token encountered at position 5'
             'position 9' | 'nameWith Space'   || 'nameWith Space invalid token encountered at position 9'
     }
-
 }