Moving common method to utils class

Author: deepak-malik

Diff for: src/com/deepak/algorithms/Library/ArrayUtils.java

@@ -0,0 +1,27 @@
+/**
+ * Algorithms-In-Java
+ * ArrayUtils.java
+ */
+package com.deepak.algorithms.Library;
+
+/**
+ * Utility class for array related operations
+ * 
+ * @author Deepak
+ */
+public abstract class ArrayUtils {
+
+	/**
+	 * Method to swap values in a array when two indexes are given
+	 * 
+	 * @param values
+	 * @param index1
+	 * @param index2
+	 */
+	public static <T> void swap(T[] values, int index1, int index2) {
+		T temp = values[index1];
+		values[index1] = values[index2];
+		values[index2] = temp;
+	}
+
+}

Diff for: src/com/deepak/algorithms/Sorting/BubbleSort.java

@@ -1,27 +1,17 @@
 /**
- * Algorithms-in-Java
+ * Algorithms-In-Java
  * BubbleSort.java
  */
 package com.deepak.algorithms.Sorting;
 
-import java.util.Arrays;
+import com.deepak.algorithms.Library.ArrayUtils;
 
 /**
  * Class for BubbleSort implementation
  * @author Deepak
  */
 public class BubbleSort {
 
-	/**
-	 * Main method to start the flow of program
-	 * @param args
-	 */
-	public static void main(String[] args) {
-		int[] valuesToBeSorted = {7, 10, 47, 40, 83, 84, 65, 61, 32, 55, 49, 46, 25, 20, 93, 63, 54, 10};
-		System.out.println("******************* BUBBLE - SORT *******************");
-		performBubbleSort(valuesToBeSorted);
-	}
-
 	/**
 	 * Bubble Sort implementation
 	 * <p> Question - When will you consider a list of items to be sorted?
@@ -48,27 +38,15 @@ public static void main(String[] args) {
 	 * 
 	 * @param listOfValues - List of values passed in the request
 	 */
-	private static void performBubbleSort(int[] listOfValues) {
+	public static Integer[] performBubbleSort(Integer[] listOfValues) {
 		for (int i = 0; i < listOfValues.length; i++) {
 			for (int j = 1; j < (listOfValues.length - i); j++) {
 				if (listOfValues[j - 1] > listOfValues[j]) {
-					swap(listOfValues, j - 1, j);
+					ArrayUtils.swap(listOfValues, j - 1, j);
 				}
 			}
 		}
-		Arrays.stream(listOfValues).forEach(System.out::println);
-	}
-
-	/**
-	 * Method to swap 2 values
-	 * @param values
-	 * @param firstValue
-	 * @param secondValue
-	 */
-	private static void swap(int[] values, int firstValue, int secondValue) {
-		int tempValue = values[firstValue];
-		values[firstValue] = values[secondValue];
-		values[secondValue] = tempValue;
+		return listOfValues;
 	}
 
 }

Diff for: src/com/deepak/algorithms/Sorting/InsertionSort.java

@@ -4,6 +4,8 @@
  */
 package com.deepak.algorithms.Sorting;
 
+import com.deepak.algorithms.Library.ArrayUtils;
+
 /**
  * Insertion sort implementation
  * 
@@ -37,28 +39,15 @@ public class InsertionSort {
 	 * 
 	 * @param listOfValues - List of values passed in the request
 	 */
-	public static int[] performInsertionSort(int[] listOfValues) {
+	public static Integer[] performInsertionSort(Integer[] listOfValues) {
 		for (int i = 1; i < listOfValues.length; i++) {
 			for (int j = i; j > 0; j--) {
 				if (listOfValues[j] < listOfValues[j - 1]) {
-					swap(listOfValues, j, j - 1);
+					ArrayUtils.swap(listOfValues, j, j - 1);
 				}
 			}
 		}
 		return listOfValues;
 	}
 
-	/**
-	 * Method to swap values at any two indexes
-	 * 
-	 * @param values
-	 * @param index1
-	 * @param index2
-	 */
-	private static void swap(int[] values, int index1, int index2) {
-		int tempValue = values[index1];
-		values[index1] = values[index2];
-		values[index2] = tempValue;
-	}
-
 }

Diff for: src/com/deepak/algorithms/Sorting/SelectionSort.java

@@ -4,6 +4,8 @@
  */
 package com.deepak.algorithms.Sorting;
 
+import com.deepak.algorithms.Library.ArrayUtils;
+
 /**
  * Selection Sort implementation
  * 
@@ -37,30 +39,17 @@ public class SelectionSort {
 	 * 
 	 * @param listOfValues - List of values passed in the request
 	 */
-	public static int[] performSelectionSort(int[] listOfValues) {
+	public static Integer[] performSelectionSort(Integer[] listOfValues) {
 		for (int i = 0; i < listOfValues.length - 1; i++) {
 			int minValue = listOfValues[i];
 			for (int j = i + 1; j < listOfValues.length; j++) {
 				if (listOfValues[j] < minValue) {
 					minValue = listOfValues[j];
-					swap(listOfValues, i, j);
+					ArrayUtils.swap(listOfValues, i, j);
 				}
 			}
 		}
 		return listOfValues;
 	}
 
-	/**
-	 * Method to swap values at any two indexes
-	 * 
-	 * @param values
-	 * @param index1
-	 * @param index2
-	 */
-	private static void swap(int[] values, int index1, int index2) {
-		int tempValue = values[index1];
-		values[index1] = values[index2];
-		values[index2] = tempValue;
-	}
-
 }

Diff for: test/com/deepak/algorithms/Sorting/BubbleSort_Test.java

@@ -0,0 +1,29 @@
+/**
+ * Algorithms-In-Java
+ * BubbleSort_Test.java
+ */
+package com.deepak.algorithms.Sorting;
+
+import java.util.Arrays;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * Test cases for Bubble sort
+ * 
+ * @author Deepak
+ */
+public class BubbleSort_Test {
+	
+	/**
+	 * Test case for bubble sort
+	 */
+	@Test
+	public void testBubbleSort() {
+		Integer[] valuesToBeSorted = {7, 10, 47, 40, 83, 84, 65, 61, 32, 55, 49, 46, 25, 20, 93, 63, 54, 10};
+		Assert.assertEquals(Arrays.toString(valuesToBeSorted), "[7, 10, 47, 40, 83, 84, 65, 61, 32, 55, 49, 46, 25, 20, 93, 63, 54, 10]");
+		Assert.assertEquals(Arrays.toString(BubbleSort.performBubbleSort(valuesToBeSorted)), "[7, 10, 10, 20, 25, 32, 40, 46, 47, 49, 54, 55, 61, 63, 65, 83, 84, 93]");
+	}
+
+}

Diff for: test/com/deepak/algorithms/Sorting/InsertionSort_Test.java

@@ -21,7 +21,7 @@ public class InsertionSort_Test {
 	 */
 	@Test
 	public void testInsertionSort() {
-		int[] valuesToBeSorted = {7, 10, 47, 40, 83, 84, 65, 61, 32, 55, 49, 46, 25, 20, 93, 63, 54, 10};
+		Integer[] valuesToBeSorted = {7, 10, 47, 40, 83, 84, 65, 61, 32, 55, 49, 46, 25, 20, 93, 63, 54, 10};
 		Assert.assertEquals(Arrays.toString(valuesToBeSorted), "[7, 10, 47, 40, 83, 84, 65, 61, 32, 55, 49, 46, 25, 20, 93, 63, 54, 10]");
 		Assert.assertEquals(InsertionSort.performInsertionSort(valuesToBeSorted), "[7, 10, 10, 20, 25, 32, 40, 46, 47, 49, 54, 55, 61, 63, 65, 83, 84, 93]");
 	}

Diff for: test/com/deepak/algorithms/Sorting/SelectionSort_Test.java

@@ -21,7 +21,7 @@ public class SelectionSort_Test {
 	 */
 	@Test
 	public void testSelectionSort() {
-		int[] valuesToBeSorted = {7, 10, 47, 40, 83, 84, 65, 61, 32, 55, 49, 46, 25, 20, 93, 63, 54, 10};
+		Integer[] valuesToBeSorted = {7, 10, 47, 40, 83, 84, 65, 61, 32, 55, 49, 46, 25, 20, 93, 63, 54, 10};
 		Assert.assertEquals(Arrays.toString(valuesToBeSorted), "[7, 10, 47, 40, 83, 84, 65, 61, 32, 55, 49, 46, 25, 20, 93, 63, 54, 10]");
 		Assert.assertEquals(Arrays.toString(SelectionSort.performSelectionSort(valuesToBeSorted)), "[7, 10, 10, 20, 25, 32, 40, 46, 47, 49, 54, 55, 61, 63, 65, 83, 84, 93]");
 	}