diff --git a/core-java/src/main/java/com/baeldung/comparable/PlayerSorter.java b/core-java/src/main/java/com/baeldung/comparable/PlayerSorter.java index eeb2c7a883..a9b883f579 100644 --- a/core-java/src/main/java/com/baeldung/comparable/PlayerSorter.java +++ b/core-java/src/main/java/com/baeldung/comparable/PlayerSorter.java @@ -7,7 +7,7 @@ import java.util.List; public class PlayerSorter { public static void main(String[] args) { - + List footballTeam = new ArrayList(); Player player1 = new Player(59, "John", 20); Player player2 = new Player(67, "Roger", 22); @@ -15,11 +15,11 @@ public class PlayerSorter { footballTeam.add(player1); footballTeam.add(player2); footballTeam.add(player3); - + System.out.println("Before Sorting : " + footballTeam); Collections.sort(footballTeam); System.out.println("After Sorting : " + footballTeam); - + } } diff --git a/core-java/src/test/java/com/baeldung/comparable/ComparableUnitTest.java b/core-java/src/test/java/com/baeldung/comparable/ComparableUnitTest.java index 2b45dd0391..e8745884b8 100644 --- a/core-java/src/test/java/com/baeldung/comparable/ComparableUnitTest.java +++ b/core-java/src/test/java/com/baeldung/comparable/ComparableUnitTest.java @@ -9,7 +9,7 @@ import java.util.List; import org.junit.Test; public class ComparableUnitTest { - + @Test public void whenUsingComparable_thenSortedList() { List footballTeam = new ArrayList(); @@ -20,8 +20,10 @@ public class ComparableUnitTest { footballTeam.add(player2); footballTeam.add(player3); Collections.sort(footballTeam); - assertEquals(footballTeam.get(0).getName(), "Steven"); - assertEquals(footballTeam.get(2).getRanking(), 67); + assertEquals(footballTeam.get(0) + .getName(), "Steven"); + assertEquals(footballTeam.get(2) + .getRanking(), 67); } } diff --git a/core-java/src/test/java/com/baeldung/comparator/ComparatorUnitTest.java b/core-java/src/test/java/com/baeldung/comparator/ComparatorUnitTest.java index 769986edec..5b7ec3bfe4 100644 --- a/core-java/src/test/java/com/baeldung/comparator/ComparatorUnitTest.java +++ b/core-java/src/test/java/com/baeldung/comparator/ComparatorUnitTest.java @@ -10,11 +10,11 @@ import org.junit.Before; import org.junit.Test; public class ComparatorUnitTest { - + List footballTeam; - + @Before - public void setUp(){ + public void setUp() { footballTeam = new ArrayList(); Player player1 = new Player(59, "John", 20); Player player2 = new Player(67, "Roger", 22); @@ -23,21 +23,25 @@ public class ComparatorUnitTest { footballTeam.add(player2); footballTeam.add(player3); } - + @Test public void whenUsingRankingComparator_thenSortedList() { PlayerRankingComparator playerComparator = new PlayerRankingComparator(); Collections.sort(footballTeam, playerComparator); - assertEquals(footballTeam.get(0).getName(), "Steven"); - assertEquals(footballTeam.get(2).getRanking(), 67); + assertEquals(footballTeam.get(0) + .getName(), "Steven"); + assertEquals(footballTeam.get(2) + .getRanking(), 67); } - + @Test public void whenUsingAgeComparator_thenSortedList() { PlayerAgeComparator playerComparator = new PlayerAgeComparator(); Collections.sort(footballTeam, playerComparator); - assertEquals(footballTeam.get(0).getName(), "John"); - assertEquals(footballTeam.get(2).getRanking(), 45); + assertEquals(footballTeam.get(0) + .getName(), "John"); + assertEquals(footballTeam.get(2) + .getRanking(), 45); } } diff --git a/core-java/src/test/java/com/baeldung/comparator/Java8ComparatorUnitTest.java b/core-java/src/test/java/com/baeldung/comparator/Java8ComparatorUnitTest.java new file mode 100644 index 0000000000..b804573b51 --- /dev/null +++ b/core-java/src/test/java/com/baeldung/comparator/Java8ComparatorUnitTest.java @@ -0,0 +1,63 @@ +package com.baeldung.comparator; + +import static org.junit.Assert.assertEquals; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; + +import org.junit.Before; +import org.junit.Test; + +public class Java8ComparatorUnitTest { + + List footballTeam; + + @Before + public void setUp() { + footballTeam = new ArrayList(); + Player player1 = new Player(59, "John", 20); + Player player2 = new Player(67, "Roger", 22); + Player player3 = new Player(45, "Steven", 24); + footballTeam.add(player1); + footballTeam.add(player2); + footballTeam.add(player3); + } + + @Test + public void whenComparing_UsingJava8_thenSorted() { + System.out.println("************** Java 8 Comaparator **************"); + Comparator byRanking = new Comparator() { + + @Override + public int compare(Player player1, Player player2) { + return player1.getRanking() - player2.getRanking(); + } + }; + + System.out.println("Before Sorting : " + footballTeam); + Collections.sort(footballTeam, byRanking); + System.out.println("After Sorting : " + footballTeam); + assertEquals(footballTeam.get(0) + .getName(), "Steven"); + assertEquals(footballTeam.get(2) + .getRanking(), 67); + } + + @Test + public void whenComparing_UsingComparatorComparing_thenSorted() { + System.out.println("********* Comaparator.comparing method *********"); + Comparator byRanking = + (Player player1, Player player2)->player1.getRanking()-player2.getRanking(); + + System.out.println("Before Sorting : " + footballTeam); + Collections.sort(footballTeam, byRanking); + System.out.println("After Sorting : " + footballTeam); + assertEquals(footballTeam.get(0) + .getName(), "Steven"); + assertEquals(footballTeam.get(2) + .getRanking(), 67); + } + +}