root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Update OrderComparatorTests based on clarified PriorityOrdered semantics 

See gh-23187
This commit is contained in:
Sam Brannen 2019-06-25 11:04:19 +03:00
parent b2dc4debde
commit 33fa55e658
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
spring-core/src/test/java/org/springframework/core/OrderComparatorTests.java
View File

@ -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