From 33fa55e65841a68ff43a0273d84dbbea649a978f Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Tue, 25 Jun 2019 11:04:19 +0300 Subject: [PATCH] Update OrderComparatorTests based on clarified PriorityOrdered semantics See gh-23187 --- .../core/OrderComparatorTests.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/spring-core/src/test/java/org/springframework/core/OrderComparatorTests.java b/spring-core/src/test/java/org/springframework/core/OrderComparatorTests.java index 8d9eacdcfa0..f911e944632 100644 --- a/spring-core/src/test/java/org/springframework/core/OrderComparatorTests.java +++ b/spring-core/src/test/java/org/springframework/core/OrderComparatorTests.java @@ -85,23 +85,24 @@ public class OrderComparatorTests { assertThat(this.comparator.compare(new StubPriorityOrdered(982300), new StubPriorityOrdered(100))).isEqualTo(1); } + @Test + public void comparePriorityOrderedInstanceToStandardOrderedInstanceWithHigherPriority() { + assertThatPriorityOrderedAlwaysWins(new StubPriorityOrdered(200), new StubOrdered(100)); + } + @Test public void comparePriorityOrderedInstanceToStandardOrderedInstanceWithSamePriority() { - // PriorityOrdered wins in a tie. - assertThat(this.comparator.compare(new StubPriorityOrdered(100), new StubOrdered(100))).isEqualTo(-1); + assertThatPriorityOrderedAlwaysWins(new StubPriorityOrdered(100), new StubOrdered(100)); } @Test public void comparePriorityOrderedInstanceToStandardOrderedInstanceWithLowerPriority() { - // PriorityOrdered should not be taken into account. - assertThat(this.comparator.compare(new StubPriorityOrdered(100), new StubOrdered(200))).isEqualTo(-1); + assertThatPriorityOrderedAlwaysWins(new StubPriorityOrdered(100), new StubOrdered(200)); } - @Test - public void comparePriorityOrderedInstanceToStandardOrderedInstanceWithHigherPriority() { - // PriorityOrdered should probably not be taken into account, but it currently is. - // assertThat(this.comparator.compare(new StubPriorityOrdered(200), new StubOrdered(100))).isEqualTo(1); - assertThat(this.comparator.compare(new StubPriorityOrdered(200), new StubOrdered(100))).isEqualTo(-1); + private void assertThatPriorityOrderedAlwaysWins(StubPriorityOrdered priority, StubOrdered standard) { + assertThat(this.comparator.compare(priority, standard)).isEqualTo(-1); + assertThat(this.comparator.compare(standard, priority)).isEqualTo(1); } @Test