From 379d7af98e85c33bf2cee8209401d4217fd4e433 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 10 Sep 2018 21:51:29 +0200
Subject: [PATCH] Upgrade to opentest4j 1.1.1

---
 gradle.properties                                    |  2 +-
 .../org/junit/jupiter/api/AssertionTestUtils.java    |  6 +++---
 .../org/junit/jupiter/api/FailAssertionsTests.java   | 12 ++++++------
 .../junit/jupiter/api/KotlinFailAssertionsTests.kt   | 10 +++++-----
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index f567be3843f..b9040343bec 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,7 +25,7 @@ jmhVersion          = 1.21
 junit4Version       = 4.12
 log4jVersion        = 2.11.0
 mockitoVersion      = 2.21.0
-ota4jVersion        = 1.1.1-SNAPSHOT
+ota4jVersion        = 1.1.1
 surefireVersion     = 2.22.0
 
 defaultBuiltBy      = JUnit Team
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertionTestUtils.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertionTestUtils.java
index 894f02d21d1..9c430dc62a6 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertionTestUtils.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertionTestUtils.java
@@ -26,9 +26,9 @@ static void expectAssertionFailedError() {
 		throw new AssertionError("Should have thrown an " + AssertionFailedError.class.getName());
 	}
 
-	static void assertNullMessage(Throwable ex) throws AssertionError {
-		if (ex.getMessage() != null) {
-			throw new AssertionError("Exception message should be null, but was [" + ex.getMessage() + "].");
+	static void assertEmptyMessage(Throwable ex) throws AssertionError {
+		if (!ex.getMessage().isEmpty()) {
+			throw new AssertionError("Exception message should be empty, but was [" + ex.getMessage() + "].");
 		}
 	}
 
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/FailAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/FailAssertionsTests.java
index 75c5151b14e..eed954c93f2 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/FailAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/FailAssertionsTests.java
@@ -10,9 +10,9 @@
 
 package org.junit.jupiter.api;
 
+import static org.junit.jupiter.api.AssertionTestUtils.assertEmptyMessage;
 import static org.junit.jupiter.api.AssertionTestUtils.assertMessageContains;
 import static org.junit.jupiter.api.AssertionTestUtils.assertMessageEquals;
-import static org.junit.jupiter.api.AssertionTestUtils.assertNullMessage;
 import static org.junit.jupiter.api.AssertionTestUtils.expectAssertionFailedError;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
@@ -36,7 +36,7 @@ void failWithoutArgument() {
 			expectAssertionFailedError();
 		}
 		catch (AssertionFailedError ex) {
-			assertNullMessage(ex);
+			assertEmptyMessage(ex);
 		}
 	}
 
@@ -69,7 +69,7 @@ void failWithNullString() {
 			expectAssertionFailedError();
 		}
 		catch (AssertionFailedError ex) {
-			assertNullMessage(ex);
+			assertEmptyMessage(ex);
 		}
 	}
 
@@ -80,7 +80,7 @@ void failWithNullMessageSupplier() {
 			expectAssertionFailedError();
 		}
 		catch (AssertionFailedError ex) {
-			assertNullMessage(ex);
+			assertEmptyMessage(ex);
 		}
 	}
 
@@ -104,7 +104,7 @@ void failWithThrowable() {
 			expectAssertionFailedError();
 		}
 		catch (AssertionFailedError ex) {
-			assertNullMessage(ex);
+			assertEmptyMessage(ex);
 			Throwable cause = ex.getCause();
 			assertMessageContains(cause, "cause");
 		}
@@ -131,7 +131,7 @@ void failWithNullStringAndThrowable() {
 			expectAssertionFailedError();
 		}
 		catch (AssertionFailedError ex) {
-			assertNullMessage(ex);
+			assertEmptyMessage(ex);
 			Throwable cause = ex.getCause();
 			assertMessageContains(cause, "cause");
 		}
diff --git a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinFailAssertionsTests.kt b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinFailAssertionsTests.kt
index b6f94174008..8a90f8dc806 100644
--- a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinFailAssertionsTests.kt
+++ b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinFailAssertionsTests.kt
@@ -12,7 +12,7 @@ package org.junit.jupiter.api
 import org.junit.jupiter.api.AssertEquals.assertEquals
 import org.junit.jupiter.api.AssertionTestUtils.assertMessageContains
 import org.junit.jupiter.api.AssertionTestUtils.assertMessageEquals
-import org.junit.jupiter.api.AssertionTestUtils.assertNullMessage
+import org.junit.jupiter.api.AssertionTestUtils.assertEmptyMessage
 import org.opentest4j.AssertionFailedError
 import java.util.stream.Stream
 
@@ -41,7 +41,7 @@ class KotlinFailAssertionsTests {
         val ex = assertThrows<AssertionFailedError> {
             fail(null as String?)
         }
-        assertNullMessage(ex)
+        assertEmptyMessage(ex)
     }
 
     @Test
@@ -49,7 +49,7 @@ class KotlinFailAssertionsTests {
         val ex = assertThrows<AssertionFailedError> {
             fail(null as (() -> String)?)
         }
-        assertNullMessage(ex)
+        assertEmptyMessage(ex)
     }
 
     @Test
@@ -70,7 +70,7 @@ class KotlinFailAssertionsTests {
         val ex = assertThrows<AssertionFailedError> {
             fail(Throwable(throwableCause))
         }
-        assertNullMessage(ex)
+        assertEmptyMessage(ex)
         val cause = ex.cause
         assertMessageContains(cause, throwableCause)
     }
@@ -93,7 +93,7 @@ class KotlinFailAssertionsTests {
         val ex = assertThrows<AssertionFailedError> {
             fail(null, Throwable(throwableCause))
         }
-        assertNullMessage(ex)
+        assertEmptyMessage(ex)
         val cause = ex.cause
         assertMessageContains(cause, throwableCause)
     }