File tree 4 files changed +10
-25
lines changed
junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition
4 files changed +10
-25
lines changed Original file line number Diff line number Diff line change 21
21
import static org .junit .jupiter .api .condition .JavaVersionPredicates .onJava17 ;
22
22
import static org .junit .jupiter .api .condition .JavaVersionPredicates .onJava18 ;
23
23
import static org .junit .jupiter .api .condition .JavaVersionPredicates .onJava19 ;
24
- import static org .junit .jupiter .api .condition .JavaVersionPredicates .onJava20 ;
25
- import static org .junit .jupiter .api .condition .JavaVersionPredicates .onJava21 ;
26
- import static org .junit .jupiter .api .condition .JavaVersionPredicates .onJava22 ;
27
24
import static org .junit .jupiter .api .condition .JavaVersionPredicates .onJava8 ;
28
25
import static org .junit .jupiter .api .condition .JavaVersionPredicates .onJava9 ;
26
+ import static org .junit .jupiter .api .condition .JavaVersionPredicates .onKnownVersion ;
29
27
30
28
import org .junit .jupiter .api .Test ;
31
29
import org .junit .jupiter .api .extension .ExecutionCondition ;
@@ -115,9 +113,7 @@ void javaMin18() {
115
113
@ Test
116
114
void other () {
117
115
evaluateCondition ();
118
- assertDisabledOnCurrentJreIf (
119
- !(onJava8 () || onJava9 () || onJava10 () || onJava11 () || onJava12 () || onJava13 () || onJava14 () || onJava15 ()
120
- || onJava16 () || onJava17 () || onJava18 () || onJava19 () || onJava20 () || onJava21 () || onJava22 ()));
116
+ assertDisabledOnCurrentJreIf (!onKnownVersion ());
121
117
}
122
118
123
119
private void assertDisabledOnCurrentJreIf (boolean condition ) {
Original file line number Diff line number Diff line change 27
27
import static org .junit .jupiter .api .condition .JavaVersionPredicates .onJava17 ;
28
28
import static org .junit .jupiter .api .condition .JavaVersionPredicates .onJava18 ;
29
29
import static org .junit .jupiter .api .condition .JavaVersionPredicates .onJava19 ;
30
- import static org .junit .jupiter .api .condition .JavaVersionPredicates .onJava20 ;
31
- import static org .junit .jupiter .api .condition .JavaVersionPredicates .onJava21 ;
32
- import static org .junit .jupiter .api .condition .JavaVersionPredicates .onJava22 ;
33
30
import static org .junit .jupiter .api .condition .JavaVersionPredicates .onJava8 ;
34
31
import static org .junit .jupiter .api .condition .JavaVersionPredicates .onJava9 ;
32
+ import static org .junit .jupiter .api .condition .JavaVersionPredicates .onKnownVersion ;
35
33
36
34
import org .junit .jupiter .api .Disabled ;
37
35
import org .junit .jupiter .api .Test ;
@@ -83,9 +81,7 @@ void javaMin18() {
83
81
@ Test
84
82
@ DisabledForJreRange (min = OTHER , max = OTHER )
85
83
void other () {
86
- assertTrue (
87
- onJava8 () || onJava9 () || onJava10 () || onJava11 () || onJava12 () || onJava13 () || onJava14 () || onJava15 ()
88
- || onJava16 () || onJava17 () || onJava18 () || onJava19 () || onJava20 () || onJava21 () || onJava22 ());
84
+ assertTrue (onKnownVersion ());
89
85
}
90
86
91
87
}
Original file line number Diff line number Diff line change 21
21
import static org .junit .jupiter .api .condition .JavaVersionPredicates .onJava17 ;
22
22
import static org .junit .jupiter .api .condition .JavaVersionPredicates .onJava18 ;
23
23
import static org .junit .jupiter .api .condition .JavaVersionPredicates .onJava19 ;
24
- import static org .junit .jupiter .api .condition .JavaVersionPredicates .onJava20 ;
25
- import static org .junit .jupiter .api .condition .JavaVersionPredicates .onJava21 ;
26
- import static org .junit .jupiter .api .condition .JavaVersionPredicates .onJava22 ;
27
24
import static org .junit .jupiter .api .condition .JavaVersionPredicates .onJava8 ;
28
25
import static org .junit .jupiter .api .condition .JavaVersionPredicates .onJava9 ;
26
+ import static org .junit .jupiter .api .condition .JavaVersionPredicates .onKnownVersion ;
29
27
30
28
import org .junit .jupiter .api .Test ;
31
29
import org .junit .jupiter .api .extension .ExecutionCondition ;
@@ -114,9 +112,7 @@ void javaMin18() {
114
112
@ Test
115
113
void other () {
116
114
evaluateCondition ();
117
- assertEnabledOnCurrentJreIf (
118
- !(onJava8 () || onJava9 () || onJava10 () || onJava11 () || onJava12 () || onJava13 () || onJava14 () || onJava15 ()
119
- || onJava16 () || onJava17 () || onJava18 () || onJava19 () || onJava20 () || onJava21 () || onJava22 ()));
115
+ assertEnabledOnCurrentJreIf (!onKnownVersion ());
120
116
}
121
117
122
118
private void assertEnabledOnCurrentJreIf (boolean condition ) {
Original file line number Diff line number Diff line change 27
27
import static org .junit .jupiter .api .condition .JavaVersionPredicates .onJava17 ;
28
28
import static org .junit .jupiter .api .condition .JavaVersionPredicates .onJava18 ;
29
29
import static org .junit .jupiter .api .condition .JavaVersionPredicates .onJava19 ;
30
- import static org .junit .jupiter .api .condition .JavaVersionPredicates .onJava20 ;
31
- import static org .junit .jupiter .api .condition .JavaVersionPredicates .onJava21 ;
32
- import static org .junit .jupiter .api .condition .JavaVersionPredicates .onJava22 ;
33
30
import static org .junit .jupiter .api .condition .JavaVersionPredicates .onJava8 ;
34
31
import static org .junit .jupiter .api .condition .JavaVersionPredicates .onJava9 ;
32
+ import static org .junit .jupiter .api .condition .JavaVersionPredicates .onKnownVersion ;
35
33
36
34
import org .junit .jupiter .api .Disabled ;
37
35
import org .junit .jupiter .api .Test ;
@@ -79,16 +77,15 @@ void javaMax18() {
79
77
@ Test
80
78
@ EnabledForJreRange (min = JAVA_18 )
81
79
void javaMin18 () {
82
- assertTrue (onJava18 () || onJava19 () || onJava20 () || onJava21 () || onJava22 ());
80
+ assertTrue (onKnownVersion ());
81
+ assertTrue (JRE .currentVersion ().compareTo (JAVA_18 ) >= 0 );
83
82
assertFalse (onJava17 ());
84
83
}
85
84
86
85
@ Test
87
86
@ EnabledForJreRange (min = OTHER , max = OTHER )
88
87
void other () {
89
- assertFalse (
90
- onJava8 () || onJava9 () || onJava10 () || onJava11 () || onJava12 () || onJava13 () || onJava14 () || onJava15 ()
91
- || onJava16 () || onJava17 () || onJava18 () || onJava19 () || onJava20 () || onJava21 () || onJava22 ());
88
+ assertFalse (onKnownVersion ());
92
89
}
93
90
94
91
}
You can’t perform that action at this time.
0 commit comments