From 7194d8b84a78c62eb3ddbed06104eeb8007e0b15 Mon Sep 17 00:00:00 2001 From: eugenp Date: Wed, 30 Nov 2016 09:05:06 +0200 Subject: [PATCH] cleanup work --- .../baeldung/java/sorting/JavaSorting.java | 129 +++++++----------- 1 file changed, 47 insertions(+), 82 deletions(-) diff --git a/core-java/src/test/java/org/baeldung/java/sorting/JavaSorting.java b/core-java/src/test/java/org/baeldung/java/sorting/JavaSorting.java index 1ae7bcbbb0..72730aeb8b 100644 --- a/core-java/src/test/java/org/baeldung/java/sorting/JavaSorting.java +++ b/core-java/src/test/java/org/baeldung/java/sorting/JavaSorting.java @@ -17,64 +17,42 @@ import java.util.Map.Entry; import org.apache.commons.lang3.ArrayUtils; import org.junit.Before; import org.junit.Test; -import org.junit.runner.manipulation.Sortable; import com.google.common.primitives.Ints; public class JavaSorting { - - private int [] toSort; - private int [] sortedInts; - private int [] sortedRangeInts; -// private Integer [] integers; -// private Integer [] sortedIntegers; -// private List integersList; -// private List sortedIntegersList; + + private int[] toSort; + private int[] sortedInts; + private int[] sortedRangeInts; + // private Integer [] integers; + // private Integer [] sortedIntegers; + // private List integersList; + // private List sortedIntegersList; private Employee[] employees; private Employee[] employeesSorted; private Employee[] employeesSortedByAge; private HashMap map; - + @Before - public void initVariables () { - - toSort = new int[] - { 5, 1, 89, 255, 7, 88, 200, 123, 66 }; - sortedInts = new int[] - {1, 5, 7, 66, 88, 89, 123, 200, 255}; - sortedRangeInts = new int[] - {5, 1, 89, 7, 88, 200, 255, 123, 66}; - -// integers = new Integer[] -// { 5, 1, 89, 255, 7, 88, 200, 123, 66 }; -// sortedIntegers = new Integer[] -// {1, 5, 7, 66, 88, 89, 123, 200, 255}; -// -// integersList = Arrays.asList(new Integer[] { 5, 1, 89, 255, 7, 88, 200, 123, 66 }); -// sortedIntegersList = Arrays.asList(new Integer[] {1, 5, 7, 66, 88, 89, 123, 200, 255}); - - employees = new Employee[] { - new Employee("John", 23, 5000), - new Employee("Steve", 26, 6000), - new Employee("Frank", 33, 7000), - new Employee("Earl", 43, 10000), - new Employee("Jessica", 23, 4000), - new Employee("Pearl", 33, 6000)}; - employeesSorted = new Employee[] { - new Employee("Earl", 43, 10000), - new Employee("Frank", 33, 70000), - new Employee("Jessica", 23, 4000), - new Employee("John", 23, 5000), - new Employee("Pearl", 33, 4000), - new Employee("Steve", 26, 6000)}; - employeesSortedByAge = new Employee[] { - new Employee("John", 23, 5000), - new Employee("Jessica", 23, 4000), - new Employee("Steve", 26, 6000), - new Employee("Frank", 33, 70000), - new Employee("Pearl", 33, 4000), - new Employee("Earl", 43, 10000)}; - + public void initVariables() { + + toSort = new int[] { 5, 1, 89, 255, 7, 88, 200, 123, 66 }; + sortedInts = new int[] { 1, 5, 7, 66, 88, 89, 123, 200, 255 }; + sortedRangeInts = new int[] { 5, 1, 89, 7, 88, 200, 255, 123, 66 }; + + // integers = new Integer[] + // { 5, 1, 89, 255, 7, 88, 200, 123, 66 }; + // sortedIntegers = new Integer[] + // {1, 5, 7, 66, 88, 89, 123, 200, 255}; + // + // integersList = Arrays.asList(new Integer[] { 5, 1, 89, 255, 7, 88, 200, 123, 66 }); + // sortedIntegersList = Arrays.asList(new Integer[] {1, 5, 7, 66, 88, 89, 123, 200, 255}); + + employees = new Employee[] { new Employee("John", 23, 5000), new Employee("Steve", 26, 6000), new Employee("Frank", 33, 7000), new Employee("Earl", 43, 10000), new Employee("Jessica", 23, 4000), new Employee("Pearl", 33, 6000) }; + employeesSorted = new Employee[] { new Employee("Earl", 43, 10000), new Employee("Frank", 33, 70000), new Employee("Jessica", 23, 4000), new Employee("John", 23, 5000), new Employee("Pearl", 33, 4000), new Employee("Steve", 26, 6000) }; + employeesSortedByAge = new Employee[] { new Employee("John", 23, 5000), new Employee("Jessica", 23, 4000), new Employee("Steve", 26, 6000), new Employee("Frank", 33, 70000), new Employee("Pearl", 33, 4000), new Employee("Earl", 43, 10000) }; + HashMap map = new HashMap<>(); map.put(55, "John"); map.put(22, "Apple"); @@ -84,7 +62,7 @@ public class JavaSorting { map.put(6, "Rocky"); } - + @Test public void givenIntArray_whenUsingSort_thenSortedArray() { Arrays.sort(toSort); @@ -94,24 +72,24 @@ public class JavaSorting { @Test public void givenIntegerArray_whenUsingSort_thenSortedArray() { - Integer [] integers = ArrayUtils.toObject(toSort); + Integer[] integers = ArrayUtils.toObject(toSort); Arrays.sort(integers, new Comparator() { @Override public int compare(Integer a, Integer b) { return a - b; } }); - + assertTrue(Arrays.equals(integers, ArrayUtils.toObject(sortedInts))); } @Test public void givenArray_whenUsingSortWithLambdas_thenSortedArray() { - Integer [] integersToSort = ArrayUtils.toObject(toSort); + Integer[] integersToSort = ArrayUtils.toObject(toSort); Arrays.sort(integersToSort, (a, b) -> { return a - b; }); - + assertTrue(Arrays.equals(integersToSort, ArrayUtils.toObject(sortedInts))); } @@ -122,39 +100,35 @@ public class JavaSorting { assertTrue(Arrays.equals(employees, employeesSorted)); } - @Test public void givenIntArray_whenUsingRangeSort_thenRangeSortedArray() { Arrays.sort(toSort, 3, 7); - + assertTrue(Arrays.equals(toSort, sortedRangeInts)); } - - @Test - public void givenIntArray_whenUsingParallelSort_thenParallelSortedArray() { + + @Test + public void givenIntArray_whenUsingParallelSort_thenArraySorted() { Arrays.parallelSort(toSort); - + assertTrue(Arrays.equals(toSort, sortedInts)); } - - @Test public void givenArrayObjects_whenUsingComparing_thenSortedArrayObjects() { List employeesList = Arrays.asList(employees); - - employeesList.sort(Comparator.comparing(Employee::getAge));//.thenComparing(Employee::getName)); + + employeesList.sort(Comparator.comparing(Employee::getAge));// .thenComparing(Employee::getName)); assertTrue(Arrays.equals(employeesList.toArray(), employeesSortedByAge)); } - + @Test public void givenList_whenUsingSort_thenSortedList() { List toSortList = Ints.asList(toSort); Collections.sort(toSortList); - assertTrue(Arrays.equals(toSortList.toArray(), - ArrayUtils.toObject(sortedInts))); + assertTrue(Arrays.equals(toSortList.toArray(), ArrayUtils.toObject(sortedInts))); } @Test @@ -172,14 +146,13 @@ public class JavaSorting { for (Map.Entry entry : entries) { sortedMap.put(entry.getKey(), entry.getValue()); } - + assertTrue(Arrays.equals(sortedMap.keySet().toArray(), sortedKeys)); } @Test public void givenMap_whenSortingByValues_thenSortedMap() { - String[] sortedValues = new String[] - { "Apple", "Earl", "George", "John", "Pearl", "Rocky" }; + String[] sortedValues = new String[] { "Apple", "Earl", "George", "John", "Pearl", "Rocky" }; List> entries = new ArrayList<>(map.entrySet()); Collections.sort(entries, new Comparator>() { @@ -192,30 +165,22 @@ public class JavaSorting { for (Map.Entry entry : entries) { sortedMap.put(entry.getKey(), entry.getValue()); } - + assertTrue(Arrays.equals(sortedMap.values().toArray(), sortedValues)); } - - - - - @Test public void givenSet_whenUsingSort_thenSortedSet() { HashSet integersSet = new LinkedHashSet<>(Ints.asList(toSort)); - HashSet descSortedIntegersSet = new LinkedHashSet<>(Arrays.asList(new Integer[] - {255, 200, 123, 89, 88, 66, 7, 5, 1})); - + HashSet descSortedIntegersSet = new LinkedHashSet<>(Arrays.asList(new Integer[] { 255, 200, 123, 89, 88, 66, 7, 5, 1 })); + ArrayList list = new ArrayList(integersSet); Collections.sort(list, (i1, i2) -> { return i2 - i1; }); integersSet = new LinkedHashSet<>(list); - + assertTrue(Arrays.equals(integersSet.toArray(), descSortedIntegersSet.toArray())); } - - }