Skip to content

Commit f0236d0

Browse files
committed
Polishing
1 parent 4c90c62 commit f0236d0

File tree

4 files changed

+23
-8
lines changed

4 files changed

+23
-8
lines changed

junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@
3030
*/
3131
class DisabledOnJreIntegrationTests {
3232

33+
@Test
34+
@DisabledOnJre({ JAVA_8, JAVA_9, JAVA_10, JAVA_11, OTHER })
35+
void disabledOnAllJavaVersions() {
36+
fail("should be disabled");
37+
}
38+
3339
@Test
3440
@DisabledOnJre(JAVA_8)
3541
void java8() {
@@ -48,10 +54,4 @@ void java10() {
4854
assertFalse(onJava10());
4955
}
5056

51-
@Test
52-
@DisabledOnJre({ JAVA_8, JAVA_9, JAVA_10, JAVA_11, OTHER })
53-
void allVersions() {
54-
fail("Should always be ignored");
55-
}
56-
5757
}

junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnOsIntegrationTests.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
import static org.junit.jupiter.api.Assertions.assertFalse;
1414
import static org.junit.jupiter.api.Assertions.assertTrue;
15+
import static org.junit.jupiter.api.Assertions.fail;
1516
import static org.junit.jupiter.api.condition.EnabledOnOsIntegrationTests.onLinux;
1617
import static org.junit.jupiter.api.condition.EnabledOnOsIntegrationTests.onMac;
1718
import static org.junit.jupiter.api.condition.EnabledOnOsIntegrationTests.onSolaris;
@@ -36,6 +37,12 @@
3637
*/
3738
class DisabledOnOsIntegrationTests {
3839

40+
@Test
41+
@DisabledOnOs({ LINUX, MAC, WINDOWS, SOLARIS, OTHER })
42+
void disabledOnEveryOs() {
43+
fail("should be disabled");
44+
}
45+
3946
@Test
4047
@DisabledOnOs(LINUX)
4148
void linux() {

junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,15 @@
2424
*
2525
* @since 5.1
2626
*/
27-
@EnabledOnJre({ JAVA_8, JAVA_9, JAVA_10, JAVA_11, OTHER })
2827
class EnabledOnJreIntegrationTests {
2928

3029
private static final String JAVA_VERSION = System.getProperty("java.version");
3130

31+
@Test
32+
@EnabledOnJre({ JAVA_8, JAVA_9, JAVA_10, JAVA_11, OTHER })
33+
void enabledOnAllJavaVersions() {
34+
}
35+
3236
@Test
3337
@EnabledOnJre(JAVA_8)
3438
void java8() {

junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnOsIntegrationTests.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,15 @@
3131
*
3232
* @since 5.1
3333
*/
34-
@EnabledOnOs({ LINUX, MAC, WINDOWS, OTHER })
3534
class EnabledOnOsIntegrationTests {
3635

3736
private static final String OS_NAME = System.getProperty("os.name").toLowerCase(Locale.ENGLISH);
3837

38+
@Test
39+
@EnabledOnOs({ LINUX, MAC, WINDOWS, SOLARIS, OTHER })
40+
void enabledOnEveryOs() {
41+
}
42+
3943
@Test
4044
@EnabledOnOs(LINUX)
4145
void linux() {

0 commit comments

Comments
 (0)