X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=common-app-api%2Fsrc%2Ftest%2Fjava%2Forg%2Fopenecomp%2Fsdc%2Fcommon%2Ftest%2FCommonUtilsTest.java;h=ca9cc0b068259d9b3512a8c23c85e0400568f747;hb=438650c3a958c9176db3720204ec1ff9af94fc3a;hp=50c2b79d63a145602767b38d49c530d12d8c3ce2;hpb=ed64b5edff15e702493df21aa3230b81593e6133;p=sdc.git

diff --git a/common-app-api/src/test/java/org/openecomp/sdc/common/test/CommonUtilsTest.java b/common-app-api/src/test/java/org/openecomp/sdc/common/test/CommonUtilsTest.java
index 50c2b79d63..ca9cc0b068 100644
--- a/common-app-api/src/test/java/org/openecomp/sdc/common/test/CommonUtilsTest.java
+++ b/common-app-api/src/test/java/org/openecomp/sdc/common/test/CommonUtilsTest.java
@@ -20,16 +20,6 @@
 
 package org.openecomp.sdc.common.test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.junit.Ignore;
 import org.junit.Test;
 import org.openecomp.sdc.common.api.Constants;
 import org.openecomp.sdc.common.util.GeneralUtility;
@@ -41,6 +31,13 @@ import org.slf4j.LoggerFactory;
 import org.yaml.snakeyaml.DumperOptions;
 import org.yaml.snakeyaml.Yaml;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.*;
+
 public class CommonUtilsTest {
 	private static Logger log = LoggerFactory.getLogger(CommonUtilsTest.class.getName());
 
@@ -86,16 +83,6 @@ public class CommonUtilsTest {
 
 	}
 
-	@Test
-	public void testFloatParsing() {
-		assertTrue(ValidationUtils.isFloatNumber("15555.45"));
-		assertTrue(ValidationUtils.isFloatNumber("0.5"));
-		assertFalse(ValidationUtils.isFloatNumber("15555"));
-		assertFalse(ValidationUtils.isFloatNumber("1"));
-		assertFalse(ValidationUtils.isFloatNumber("jk532"));
-		assertFalse(ValidationUtils.isFloatNumber("12..6"));
-
-	}
 
 	@Test
 	public void testValidateIconLength() {
@@ -139,35 +126,35 @@ public class CommonUtilsTest {
 	@Test
 	public void testRemoveHtml() {
 
-		assertTrue("gooboo".equals(ValidationUtils.removeHtmlTags("<b>goo<b></b></b><b>boo</b>")));
-		assertTrue("goo&lt;boo".equals(ValidationUtils.removeHtmlTags("<b>goo<b></b><</b><b>boo</b>")));
-		assertTrue("goo boo".equals(ValidationUtils.removeHtmlTags("goo boo")));
-		assertTrue("goo# . boo12".equals(ValidationUtils.removeHtmlTags("goo# . boo12")));
+        assertEquals("gooboo", ValidationUtils.removeHtmlTags("<b>goo<b></b></b><b>boo</b>"));
+        assertEquals("goo&lt;boo", ValidationUtils.removeHtmlTags("<b>goo<b></b><</b><b>boo</b>"));
+        assertEquals("goo boo", ValidationUtils.removeHtmlTags("goo boo"));
+        assertEquals("goo# . boo12", ValidationUtils.removeHtmlTags("goo# . boo12"));
 	}
 
 	@Test
 	public void testnormaliseWhitespace() {
 
-		assertTrue("goo boo".equals(ValidationUtils.normaliseWhitespace("goo boo")));
-		assertTrue("goo boo ".equals(ValidationUtils.normaliseWhitespace("goo boo	")));
-		assertTrue("goo boo".equals(ValidationUtils.normaliseWhitespace("goo    boo")));
+        assertEquals("goo boo", ValidationUtils.normaliseWhitespace("goo boo"));
+        assertEquals("goo boo ", ValidationUtils.normaliseWhitespace("goo boo   "));
+        assertEquals("goo boo", ValidationUtils.normaliseWhitespace("goo    boo"));
 	}
 
 	@Test
 	public void teststripOctets() {
-		assertTrue("goo boo".equals(ValidationUtils.stripOctets("goo%1F boo")));
-		assertTrue("goo boo ".equals(ValidationUtils.stripOctets("goo boo %1F")));
-		assertTrue("goo boo".equals(ValidationUtils.stripOctets("%1Fgoo boo")));
+        assertEquals("goo boo", ValidationUtils.stripOctets("goo%1F boo"));
+        assertEquals("goo boo ", ValidationUtils.stripOctets("goo boo %1F"));
+        assertEquals("goo boo", ValidationUtils.stripOctets("%1Fgoo boo"));
 	}
 
 	@Test
 	public void testRemoveNoneUtf8Chars() {
-		assertTrue("goo boo".equals(ValidationUtils.removeNoneUtf8Chars("goo boo")));
-		assertTrue("goo boo!!._".equals(ValidationUtils.removeNoneUtf8Chars("goo boo!!._")));
-		assertTrue("goo 	boo".equals(ValidationUtils.removeNoneUtf8Chars("goo 	boo")));
-		assertTrue("goo  bo123o".equals(ValidationUtils.removeNoneUtf8Chars("goo  bo123o")));
-		assertTrue("goo  bo123o".equals(ValidationUtils.removeNoneUtf8Chars("goo  קקbo123oגכקק")));
-		assertTrue("goo  bo123o".equals(ValidationUtils.removeNoneUtf8Chars("goo  bo1������23o")));
+        assertEquals("goo boo", ValidationUtils.removeNoneUtf8Chars("goo boo"));
+        assertEquals("goo boo!!._", ValidationUtils.removeNoneUtf8Chars("goo boo!!._"));
+        assertEquals("goo 	boo", ValidationUtils.removeNoneUtf8Chars("goo 	boo"));
+        assertEquals("goo  bo123o", ValidationUtils.removeNoneUtf8Chars("goo  bo123o"));
+        assertEquals("goo  bo123o", ValidationUtils.removeNoneUtf8Chars("goo  קקbo123oגכקק"));
+        assertEquals("goo  bo123o", ValidationUtils.removeNoneUtf8Chars("goo  bo1������23o"));
 	}
 
 	@Test
@@ -237,14 +224,6 @@ public class CommonUtilsTest {
 
 	}
 
-	@Test
-	public void validateStringNotEmptyTest() {
-		assertTrue(ValidationUtils.validateStringNotEmpty("fsdlfsdlk"));
-		assertFalse(ValidationUtils.validateStringNotEmpty(""));
-		assertFalse(!ValidationUtils.validateStringNotEmpty("  "));
-		assertFalse(!ValidationUtils.validateStringNotEmpty("	"));
-	}
-
 	@Test
 	public void validateVendorNameTest() {
 		assertTrue(ValidationUtils.validateVendorName("fsdlfsdlk"));
@@ -257,7 +236,7 @@ public class CommonUtilsTest {
 	@Test
 	public void validateVendorNameLengthTest() {
 		assertTrue(ValidationUtils.validateVendorNameLength("fsdlfsdlk.sdsd;"));
-		assertFalse(ValidationUtils.validateVendorNameLength("ddddddddddddddddddddddsdfs"));
+		assertFalse(ValidationUtils.validateVendorNameLength("ddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddsdfs"));
 	}
 
 	@Test
@@ -271,8 +250,8 @@ public class CommonUtilsTest {
 
 	@Test
 	public void validateVendorReleaseLengthTest() {
-		assertTrue(ValidationUtils.validateVendorNameLength("fsdlfsdlk.sdsd;"));
-		assertFalse(ValidationUtils.validateVendorNameLength("ddddddddddddddddddddddsdfs"));
+		assertTrue(ValidationUtils.validateVendorReleaseLength("fsdlfsdlk.sdsd;"));
+		assertFalse(ValidationUtils.validateVendorReleaseLength("ddddddddddddddddddddddsdfs"));
 	}
 
 	@Test
@@ -335,15 +314,15 @@ public class CommonUtilsTest {
 
 	@Test
 	public void normalizeFileNameTest() {
-		assertTrue("too.jpeg".equals(ValidationUtils.normalizeFileName("too.jpeg")));
-		assertTrue("too..jpeg".equals(ValidationUtils.normalizeFileName("too..jpeg")));
-		assertTrue("too..jpeg".equals(ValidationUtils.normalizeFileName("t*o:o..jpe<>g")));
-		assertTrue("goo.too..jpeg".equals(ValidationUtils.normalizeFileName("goo.t*o:o..jpe<>g")));
-		assertTrue("goo.too..jpeg".equals(ValidationUtils.normalizeFileName("   goo.t*o:o..jpe<>g  ")));
-		assertTrue("goo-too-mo.jpeg".equals(ValidationUtils.normalizeFileName("goo   too----mo.jpeg")));
-		assertTrue("goo-too-mo.jpeg".equals(ValidationUtils.normalizeFileName(".\\..\\goo   too----mo.jpeg")));
-		assertTrue("goo-too-mo.jpeg".equals(ValidationUtils.normalizeFileName("__--goo   too----mo.jpeg--__")));
-		assertTrue("goo-too-mo.jpeg".equals(ValidationUtils.normalizeFileName("_ -goo   too----mo.jpeg _--  _-")));
+        assertEquals("too.jpeg", ValidationUtils.normalizeFileName("too.jpeg"));
+        assertEquals("too..jpeg", ValidationUtils.normalizeFileName("too..jpeg"));
+        assertEquals("too..jpeg", ValidationUtils.normalizeFileName("t*o:o..jpe<>g"));
+        assertEquals("goo.too..jpeg", ValidationUtils.normalizeFileName("goo.t*o:o..jpe<>g"));
+        assertEquals("goo.too..jpeg", ValidationUtils.normalizeFileName("   goo.t*o:o..jpe<>g  "));
+        assertEquals("goo-too-mo.jpeg", ValidationUtils.normalizeFileName("goo   too----mo.jpeg"));
+        assertEquals("goo-too-mo.jpeg", ValidationUtils.normalizeFileName(".\\..\\goo   too----mo.jpeg"));
+        assertEquals("goo-too-mo.jpeg", ValidationUtils.normalizeFileName("__--goo   too----mo.jpeg--__"));
+        assertEquals("goo-too-mo.jpeg", ValidationUtils.normalizeFileName("_ -goo   too----mo.jpeg _--  _-"));
 
 	}
 
@@ -382,31 +361,6 @@ public class CommonUtilsTest {
 
 	}
 
-	@Test
-	public void validateConsumerNameTest() {
-		assertTrue(ValidationUtils.validateConsumerName("ab037cd"));
-		assertFalse(ValidationUtils.validateConsumerName(" "));
-		assertTrue(ValidationUtils.validateConsumerName("_dD.d9"));
-		assertTrue(ValidationUtils.validateConsumerName("_dd.G9-"));
-		assertFalse(ValidationUtils.validateConsumerName(".dA.d9-"));
-		assertFalse(ValidationUtils.validateConsumerName("-d"));
-		assertFalse(ValidationUtils.validateConsumerName("d?"));
-		assertTrue(ValidationUtils.validateConsumerName("9"));
-	}
-
-	@Test
-	public void validateConsumerPassSaltTest() {
-		assertTrue(ValidationUtils.validateConsumerPassSalt("ad35fg2"));
-		assertTrue(ValidationUtils.validateConsumerPassSalt("12s"));
-		assertTrue(ValidationUtils.validateConsumerPassSalt("9"));
-		assertFalse(ValidationUtils.validateConsumerPassSalt("dA.d9-"));
-		assertFalse(ValidationUtils.validateConsumerPassSalt("dASQe"));
-		assertFalse(ValidationUtils.validateConsumerPassSalt("_d"));
-		assertFalse(ValidationUtils.validateConsumerPassSalt("?"));
-		assertFalse(ValidationUtils.validateConsumerPassSalt(""));
-		assertFalse(ValidationUtils.validateConsumerPassSalt(" "));
-	}
-
 	@Test
 	public void validateCategoryNameFormatTest() {
 		assertTrue(ValidationUtils.validateCategoryDisplayNameFormat("Net           ele-2_3#456&+.'=:@@@@@#####"));
@@ -424,7 +378,7 @@ public class CommonUtilsTest {
 		assertTrue(ValidationUtils.validateCategoryDisplayNameLength("Netele-2_3#456&+.'=:@@@@@"));
 		assertTrue(ValidationUtils.validateCategoryDisplayNameLength("Nete"));
 		assertFalse(ValidationUtils.validateCategoryDisplayNameLength("Netele-2_3#456&+.'=:@@@@@1"));
-		assertFalse(ValidationUtils.validateCategoryDisplayNameLength("Net"));
+		assertFalse(ValidationUtils.validateCategoryDisplayNameLength("Ne"));
 		assertFalse(ValidationUtils.validateCategoryDisplayNameLength(null));
 	}
 
@@ -467,7 +421,7 @@ public class CommonUtilsTest {
 		options.setDefaultScalarStyle(DumperOptions.ScalarStyle.FOLDED);
 		Yaml yaml = new Yaml(options);
 
-		Map<String, Object> parameters = new HashMap<String, Object>();
+		Map<String, Object> parameters = new HashMap<>();
 		parameters.put("k1", "val");
 		parameters.put("k2", "\"val\"");
 
@@ -478,7 +432,7 @@ public class CommonUtilsTest {
 	@Test
 	public void yamlValidTest() {
 
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 		sb.append("key: \"!@;/?:&=+$,_.~*'()[]\"");
 		byte[] payload = sb.toString().getBytes();