[TUT-39] 정렬 sore -> name으로 정렬하기

frankyoh · frankyoh · commit e6ad051bf09e · 2020-08-12T15:22:17.000+09:00
diff --git a/java-compare/src/main/java/com/advenoh/model/ComparablePlayer.java b/java-compare/src/main/java/com/advenoh/model/ComparablePlayer.java
@@ -11,7 +11,8 @@ public class ComparablePlayer implements Comparable<ComparablePlayer> {
 	private String name;
 	private int score;
 
-	@Override public int compareTo(ComparablePlayer o) {
-		return o.getScore() - getScore();
+	@Override
+	public int compareTo(ComparablePlayer o) {
+		return o.getScore() - this.getScore();
 	}
 }
diff --git a/java-compare/src/main/java/com/advenoh/model/ComparatorPlayer.java b/java-compare/src/main/java/com/advenoh/model/ComparatorPlayer.java
@@ -10,4 +10,12 @@
 public class ComparatorPlayer {
 	private String name;
 	private int score;
+
+	public static int compareByScoreThenName(ComparatorPlayer lhs, ComparatorPlayer rhs) {
+		if (lhs.getScore() == rhs.getScore()) {
+			return lhs.getName().compareTo(rhs.getName());
+		} else {
+			return lhs.getScore() - rhs.getScore();
+		}
+	}
 }
diff --git a/java-compare/src/test/java/com/advenoh/CompareTest.java b/java-compare/src/test/java/com/advenoh/CompareTest.java
@@ -2,6 +2,7 @@
 
 import com.advenoh.model.ComparablePlayer;
 import com.advenoh.model.ComparatorPlayer;
+import lombok.extern.slf4j.Slf4j;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -13,6 +14,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+@Slf4j
 public class CompareTest {
 	List<ComparablePlayer> comparablePlayers;
 
@@ -65,4 +67,22 @@ public void streamComparableSort() {
 
 		assertThat(sortedPlayers).isSorted();
 	}
+
+	@Test
+	public void sortByScoreThenName() {
+		List<ComparatorPlayer> players = new ArrayList<>();
+		players.add(new ComparatorPlayer("Chloe", 1090));
+		players.add(new ComparatorPlayer("Dale", 982));
+		players.add(new ComparatorPlayer("Alice", 899));
+		players.add(new ComparatorPlayer("Bob", 982));
+		players.add(new ComparatorPlayer("Eric", 1018));
+
+		List<ComparatorPlayer> sortedPlayers = players.stream()
+				//.sorted((a, b) -> ComparatorPlayer.compareByNameThenScore(a, b))
+				.sorted(ComparatorPlayer::compareByScoreThenName)
+				.collect(Collectors.toList());
+
+		assertThat(sortedPlayers).isSortedAccordingTo(ComparatorPlayer::compareByScoreThenName);
+
+	}
 }

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,8 @@ public class ComparablePlayer implements Comparable<ComparablePlayer> {`
`11`	`11`	`private String name;`
`12`	`12`	`private int score;`
`13`	`13`
`14`		`- @Override public int compareTo(ComparablePlayer o) {`
`15`		`- return o.getScore() - getScore();`
	`14`	`+ @Override`
	`15`	`+ public int compareTo(ComparablePlayer o) {`
	`16`	`+ return o.getScore() - this.getScore();`
`16`	`17`	`}`
`17`	`18`	`}`