Merge branch 'work'

Conflicts:
	src/com.gluster.storage.management.core/junit/com/gluster/storage/management/core/utils/StringUtilTest.java

1 files changed, 17 insertions, 36 deletions

diff --git a/src/com.gluster.storage.management.core/junit/com/gluster/storage/management/core/utils/StringUtilTest.java b/src/com.gluster.storage.management.core/junit/com/gluster/storage/management/core/utils/StringUtilTest.java
index 15cdbcaa..dc8c6c80 100644
--- a/src/com.gluster.storage.management.core/junit/com/gluster/storage/management/core/utils/StringUtilTest.java
+++ b/src/com.gluster.storage.management.core/junit/com/gluster/storage/management/core/utils/StringUtilTest.java
@@ -77,6 +77,23 @@ public class StringUtilTest {
 		String result = StringUtil.collectionToString(string, delimiter);
 		assertEquals("test ## string##java world", result);
 	}
+	
+	/**
+	 * Run the String collectionToString(Collection<? extends Object>,String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 21/9/11 4:53 PM
+	 */
+	@Test
+	public void testCollectionToString_4()
+		throws Exception {
+		List<String> string = new ArrayList<String>();
+		String delimiter = "";
+
+		String result = StringUtil.collectionToString(string, delimiter);
+		assertEquals("", result);
+	}
 
 	/**
 	 * Run the List<String> enumToArray(T[]) method test.
@@ -234,42 +251,6 @@ public class StringUtilTest {
 	}
 
 	/**
-	 * Run the String formatNumber(Double,int) method test.
-	 *
-	 * @throws Exception
-	 *
-	 * @generatedBy CodePro at 21/9/11 4:53 PM
-	 */
-	@Test
-	public void testFormatNumber_1()
-		throws Exception {
-		Double number = new Double(1.0);
-		int dec = 1;
-
-		String result = StringUtil.formatNumber(number, dec);
-
-		assertEquals("1", result);
-	}
-	
-	/**
-	 * Run the String formatNumber(Double,int) method test.
-	 *
-	 * @throws Exception
-	 *
-	 * @generatedBy CodePro at 21/9/11 4:53 PM
-	 */
-	@Test
-	public void testFormatNumber_2()
-		throws Exception {
-		Double number = new Double(105.87);
-		int dec = 1;
-
-		String result = StringUtil.formatNumber(number, dec);
-
-		assertEquals("105.9", result);
-	}
-
-	/**
 	 * Run the String removeSpaces(String) method test.
 	 *
 	 * @throws Exception