iSharkFly-Docs/java-tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup work

Browse Source
This commit is contained in:
eugenp 2016-11-30 09:05:06 +02:00
parent 5df4fa0181
commit 7194d8b84a
1 changed files with 47 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
core-java/src/test/java/org/baeldung/java/sorting/JavaSorting.java
View File

@ -17,7 +17,6 @@ import java.util.Map.Entry;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.manipulation.Sortable;
import com.google.common.primitives.Ints; import com.google.common.primitives.Ints;
@ -38,12 +37,9 @@ public class JavaSorting {
@Before @Before
public void initVariables() { public void initVariables() {
toSort = new int[] toSort = new int[] { 5, 1, 89, 255, 7, 88, 200, 123, 66 };
{ 5, 1, 89, 255, 7, 88, 200, 123, 66 }; sortedInts = new int[] { 1, 5, 7, 66, 88, 89, 123, 200, 255 };
sortedInts = new int[] sortedRangeInts = new int[] { 5, 1, 89, 7, 88, 200, 255, 123, 66 };
{1, 5, 7, 66, 88, 89, 123, 200, 255};
sortedRangeInts = new int[]
{5, 1, 89, 7, 88, 200, 255, 123, 66};
// integers = new Integer[] // integers = new Integer[]
// { 5, 1, 89, 255, 7, 88, 200, 123, 66 }; // { 5, 1, 89, 255, 7, 88, 200, 123, 66 };
@ -53,27 +49,9 @@ public class JavaSorting {
// integersList = Arrays.asList(new Integer[] { 5, 1, 89, 255, 7, 88, 200, 123, 66 }); // 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}); // sortedIntegersList = Arrays.asList(new Integer[] {1, 5, 7, 66, 88, 89, 123, 200, 255});
employees = new Employee[] { 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) };
new Employee("John", 23, 5000), 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) };
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) };
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<Integer, String> map = new HashMap<>(); HashMap<Integer, String> map = new HashMap<>();
map.put(55, "John"); map.put(55, "John");
@ -122,7 +100,6 @@ public class JavaSorting {
assertTrue(Arrays.equals(employees, employeesSorted)); assertTrue(Arrays.equals(employees, employeesSorted));
} }
@Test @Test
public void givenIntArray_whenUsingRangeSort_thenRangeSortedArray() { public void givenIntArray_whenUsingRangeSort_thenRangeSortedArray() {
Arrays.sort(toSort, 3, 7); Arrays.sort(toSort, 3, 7);
@ -131,14 +108,12 @@ public class JavaSorting {
} }
@Test @Test
public void givenIntArray_whenUsingParallelSort_thenParallelSortedArray() { public void givenIntArray_whenUsingParallelSort_thenArraySorted() {
Arrays.parallelSort(toSort); Arrays.parallelSort(toSort);
assertTrue(Arrays.equals(toSort, sortedInts)); assertTrue(Arrays.equals(toSort, sortedInts));
} }
@Test @Test
public void givenArrayObjects_whenUsingComparing_thenSortedArrayObjects() { public void givenArrayObjects_whenUsingComparing_thenSortedArrayObjects() {
List<Employee> employeesList = Arrays.asList(employees); List<Employee> employeesList = Arrays.asList(employees);
@ -153,8 +128,7 @@ public class JavaSorting {
List<Integer> toSortList = Ints.asList(toSort); List<Integer> toSortList = Ints.asList(toSort);
Collections.sort(toSortList); Collections.sort(toSortList);
assertTrue(Arrays.equals(toSortList.toArray(), assertTrue(Arrays.equals(toSortList.toArray(), ArrayUtils.toObject(sortedInts)));
ArrayUtils.toObject(sortedInts)));
} }
@Test @Test
@ -178,8 +152,7 @@ public class JavaSorting {
@Test @Test
public void givenMap_whenSortingByValues_thenSortedMap() { public void givenMap_whenSortingByValues_thenSortedMap() {
String[] sortedValues = new String[] String[] sortedValues = new String[] { "Apple", "Earl", "George", "John", "Pearl", "Rocky" };
{ "Apple", "Earl", "George", "John", "Pearl", "Rocky" };
List<Map.Entry<Integer, String>> entries = new ArrayList<>(map.entrySet()); List<Map.Entry<Integer, String>> entries = new ArrayList<>(map.entrySet());
Collections.sort(entries, new Comparator<Entry<Integer, String>>() { Collections.sort(entries, new Comparator<Entry<Integer, String>>() {
@ -196,16 +169,10 @@ public class JavaSorting {
assertTrue(Arrays.equals(sortedMap.values().toArray(), sortedValues)); assertTrue(Arrays.equals(sortedMap.values().toArray(), sortedValues));
} }
@Test @Test
public void givenSet_whenUsingSort_thenSortedSet() { public void givenSet_whenUsingSort_thenSortedSet() {
HashSet<Integer> integersSet = new LinkedHashSet<>(Ints.asList(toSort)); HashSet<Integer> integersSet = new LinkedHashSet<>(Ints.asList(toSort));
HashSet<Integer> descSortedIntegersSet = new LinkedHashSet<>(Arrays.asList(new Integer[] HashSet<Integer> descSortedIntegersSet = new LinkedHashSet<>(Arrays.asList(new Integer[] { 255, 200, 123, 89, 88, 66, 7, 5, 1 }));
{255, 200, 123, 89, 88, 66, 7, 5, 1}));
ArrayList<Integer> list = new ArrayList<Integer>(integersSet); ArrayList<Integer> list = new ArrayList<Integer>(integersSet);
Collections.sort(list, (i1, i2) -> { Collections.sort(list, (i1, i2) -> {
@ -216,6 +183,4 @@ public class JavaSorting {
assertTrue(Arrays.equals(integersSet.toArray(), descSortedIntegersSet.toArray())); assertTrue(Arrays.equals(integersSet.toArray(), descSortedIntegersSet.toArray()));
} }
} }