Improve handling 'empty'/null string in Service fields

[sdc.git] / common-app-api / src / test / java / org / openecomp / sdc / common / util / ValidationUtilsTest.java

diff --git a/common-app-api/src/test/java/org/openecomp/sdc/common/util/ValidationUtilsTest.java b/common-app-api/src/test/java/org/openecomp/sdc/common/util/ValidationUtilsTest.java
index 467f1cf..3408c68 100644 (file)
--- a/common-app-api/src/test/java/org/openecomp/sdc/common/util/ValidationUtilsTest.java
+++ b/common-app-api/src/test/java/org/openecomp/sdc/common/util/ValidationUtilsTest.java
@@ -525,24 +525,6 @@ public class ValidationUtilsTest {
                assertFalse(result);
        }
 
-       @Test
-       public void checkValidateStringNotEmptyReturnsFalseIfStringIsNotEmpty() {
-               final String testString = "test";
-
-               boolean result = ValidationUtils.validateStringNotEmpty(testString);
-
-               assertTrue(result);
-       }
-
-       @Test
-       public void checkValidateStringNotEmptyReturnsFTrueIfStringIsEmpty() {
-               final String testString =  "";
-
-               boolean result = ValidationUtils.validateStringNotEmpty(testString);
-
-               assertFalse(result);
-       }
-
        @Test
        public void checkValidateVendorNameReturnsTrueIfNameFitsPattern() {
                final String testVendorName =  "testVendor";
@@ -723,6 +705,24 @@ public class ValidationUtilsTest {
                assertEquals(result, "test-File-Name");
        }
 
+       @Test
+       public void validateNormalizeFileNameFor3gppYangModule() {
+           final String testName = "_3gpptestfile";
+
+           String result = ValidationUtils.normalizeFileName(testName);
+
+           assertEquals(result, testName);
+       }
+
+       @Test
+       public void validateNormalizeFileNameStripLeadingUnderscore() {
+           final String testName = "_testfile";
+
+           String result = ValidationUtils.normalizeFileName(testName);
+
+           assertEquals(result, "testfile");
+       }
+
        @Test
        public void checkValidateUrlReturnsTrueIfURLIsValid() {
                final String testUrl = "http://test.co/valid/url/";
@@ -901,6 +901,11 @@ final String testArtifactDisplayName="test=notValid=Label";
                assertFalse(result);
        }
 
+       @Test
+       public void checkValidateArtifactLabelReturnsTrueWithAtSymbol() {
+               assertTrue(ValidationUtils.validateArtifactLabel("test@label"));
+       }
+
        @Test
        public void checkValidateConsumerNameReturnsTrueIfLabelIsValid() {
                final String testConsumerName = "testConsumerName";