Simplify unit tests for JRE version conditions

Issue: junit-team#1280
robstoll · Feb 8, 2018 · e3b01cb · e3b01cb
1 parent e822e21
commit e3b01cb
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 76 deletions.
diff --git a/...ter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java b/...ter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java
@@ -66,7 +66,7 @@ void missingJreDeclaration() {
 	@Test
 	void disabledOnAllJavaVersions() {
 		evaluateCondition();
-		assertDisabledOnCurrentJre();
+		assertDisabledOnCurrentJreIf(true);
 	}
 
 	/**
@@ -75,12 +75,7 @@ void disabledOnAllJavaVersions() {
 	@Test
 	void java8() {
 		evaluateCondition();
-		if (onJava8()) {
-			assertDisabledOnCurrentJre();
-		}
-		else {
-			assertEnabledOnCurrentJre();
-		}
+		assertDisabledOnCurrentJreIf(onJava8());
 	}
 
 	/**
@@ -89,12 +84,7 @@ void java8() {
 	@Test
 	void java9() {
 		evaluateCondition();
-		if (onJava9()) {
-			assertDisabledOnCurrentJre();
-		}
-		else {
-			assertEnabledOnCurrentJre();
-		}
+		assertDisabledOnCurrentJreIf(onJava9());
 	}
 
 	/**
@@ -103,12 +93,7 @@ void java9() {
 	@Test
 	void java10() {
 		evaluateCondition();
-		if (onJava10()) {
-			assertDisabledOnCurrentJre();
-		}
-		else {
-			assertEnabledOnCurrentJre();
-		}
+		assertDisabledOnCurrentJreIf(onJava10());
 	}
 
 	/**
@@ -117,12 +102,7 @@ void java10() {
 	@Test
 	void java11() {
 		evaluateCondition();
-		if (onJava11()) {
-			assertDisabledOnCurrentJre();
-		}
-		else {
-			assertEnabledOnCurrentJre();
-		}
+		assertDisabledOnCurrentJreIf(onJava11());
 	}
 
 	/**
@@ -131,22 +111,18 @@ void java11() {
 	@Test
 	void other() {
 		evaluateCondition();
-		if (onJava8() || onJava9() || onJava10() || onJava11()) {
-			assertEnabledOnCurrentJre();
+		assertDisabledOnCurrentJreIf(!(onJava8() || onJava9() || onJava10() || onJava11()));
+	}
+
+	private void assertDisabledOnCurrentJreIf(boolean condition) {
+		if (condition) {
+			assertDisabled();
+			assertReasonContains("Disabled on JRE version: " + System.getProperty("java.version"));
 		}
 		else {
-			assertDisabledOnCurrentJre();
+			assertEnabled();
+			assertReasonContains("Enabled on JRE version: " + System.getProperty("java.version"));
 		}
 	}
 
-	private void assertEnabledOnCurrentJre() {
-		assertEnabled();
-		assertReasonContains("Enabled on JRE version: " + System.getProperty("java.version"));
-	}
-
-	private void assertDisabledOnCurrentJre() {
-		assertDisabled();
-		assertReasonContains("Disabled on JRE version: " + System.getProperty("java.version"));
-	}
-
 }
diff --git a/...iter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java b/...iter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java
@@ -66,7 +66,7 @@ void missingJreDeclaration() {
 	@Test
 	void enabledOnAllJavaVersions() {
 		evaluateCondition();
-		assertEnabledOnCurrentJre();
+		assertEnabledOnCurrentJreIf(true);
 	}
 
 	/**
@@ -75,12 +75,7 @@ void enabledOnAllJavaVersions() {
 	@Test
 	void java8() {
 		evaluateCondition();
-		if (onJava8()) {
-			assertEnabledOnCurrentJre();
-		}
-		else {
-			assertDisabledOnCurrentJre();
-		}
+		assertEnabledOnCurrentJreIf(onJava8());
 	}
 
 	/**
@@ -89,12 +84,7 @@ void java8() {
 	@Test
 	void java9() {
 		evaluateCondition();
-		if (onJava9()) {
-			assertEnabledOnCurrentJre();
-		}
-		else {
-			assertDisabledOnCurrentJre();
-		}
+		assertEnabledOnCurrentJreIf(onJava9());
 	}
 
 	/**
@@ -103,12 +93,7 @@ void java9() {
 	@Test
 	void java10() {
 		evaluateCondition();
-		if (onJava10()) {
-			assertEnabledOnCurrentJre();
-		}
-		else {
-			assertDisabledOnCurrentJre();
-		}
+		assertEnabledOnCurrentJreIf(onJava10());
 	}
 
 	/**
@@ -117,12 +102,7 @@ void java10() {
 	@Test
 	void java11() {
 		evaluateCondition();
-		if (onJava11()) {
-			assertEnabledOnCurrentJre();
-		}
-		else {
-			assertDisabledOnCurrentJre();
-		}
+		assertEnabledOnCurrentJreIf(onJava11());
 	}
 
 	/**
@@ -131,22 +111,18 @@ void java11() {
 	@Test
 	void other() {
 		evaluateCondition();
-		if (onJava8() || onJava9() || onJava10() || onJava11()) {
-			assertDisabledOnCurrentJre();
+		assertEnabledOnCurrentJreIf(!(onJava8() || onJava9() || onJava10() || onJava11()));
+	}
+
+	private void assertEnabledOnCurrentJreIf(boolean condition) {
+		if (condition) {
+			assertEnabled();
+			assertReasonContains("Enabled on JRE version: " + System.getProperty("java.version"));
 		}
 		else {
-			assertEnabledOnCurrentJre();
+			assertDisabled();
+			assertReasonContains("Disabled on JRE version: " + System.getProperty("java.version"));
 		}
 	}
 
-	private void assertEnabledOnCurrentJre() {
-		assertEnabled();
-		assertReasonContains("Enabled on JRE version: " + System.getProperty("java.version"));
-	}
-
-	private void assertDisabledOnCurrentJre() {
-		assertDisabled();
-		assertReasonContains("Disabled on JRE version: " + System.getProperty("java.version"));
-	}
-
 }