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 e9f607b..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
@@ -19,6 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
+
 package org.openecomp.sdc.common.util;
 
 import com.google.common.collect.Lists;
@@ -524,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";
@@ -722,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/";
@@ -802,10 +803,10 @@ public class ValidationUtilsTest {
        }
 
        @Test
-       public void validateIsUTF8StrReturnsFalseIfGivenStringContainsUtf8Character() {
-               final String testString = "testקString";
+       public void validateIsUTF8StrReturnsFalseIfGivenStringContainsUtf8Character(){
+final String testString="testקString";
 
-               boolean result = ValidationUtils.isUTF8Str(testString);
+               boolean result=ValidationUtils.isUTF8Str(testString);
 
                assertFalse(result);
        }
@@ -892,14 +893,19 @@ public class ValidationUtilsTest {
        }
 
        @Test
-       public void checkValidateArtifactLabelReturnsFalseIfLabelIsNotValid() {
-               final String testArtifactDisplayName = "test=notValid=Label";
+       public void checkValidateArtifactLabelReturnsFalseIfLabelIsNotValid(){
+final String testArtifactDisplayName="test=notValid=Label";
 
-               boolean result = ValidationUtils.validateArtifactLabel(testArtifactDisplayName);
+               boolean result=ValidationUtils.validateArtifactLabel(testArtifactDisplayName);
 
                assertFalse(result);
        }
 
+       @Test
+       public void checkValidateArtifactLabelReturnsTrueWithAtSymbol() {
+               assertTrue(ValidationUtils.validateArtifactLabel("test@label"));
+       }
+
        @Test
        public void checkValidateConsumerNameReturnsTrueIfLabelIsValid() {
                final String testConsumerName = "testConsumerName";
@@ -910,13 +916,13 @@ public class ValidationUtilsTest {
        }
 
        @Test
-       public void checkValidateConsumerNameReturnsFalseIfLabelIsNotValid() {
-               final String testConsumerName = "test=notValid=ConsumerName";
+       public void checkValidateConsumerNameReturnsFalseIfLabelIsNotValid(){
+final String testConsumerName="test=notValid=ConsumerName";
 
-               boolean result = ValidationUtils.validateConsumerName(testConsumerName);
+               boolean result=ValidationUtils.validateConsumerName(testConsumerName);
 
                assertFalse(result);
-       }
+               }
 
        @Test
        public void checkValidateConsumerPassSaltReturnsTrueIfLabelIsValid() {