Do not parse {displayName} placeholder for @ParameterizedTest using MessageFormat

junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestNameFormatter.java

@@ -36,6 +36,7 @@ class ParameterizedTestNameFormatter {
 	private final String displayName;
 	private final ParameterizedTestMethodContext methodContext;
 	private final int argumentMaxLength;
+	private final String DISPLAY_NAME_TEMPORARY_PLACEHOLDER = "__DISPLAY_NAME__";
 
 	ParameterizedTestNameFormatter(String pattern, String displayName, ParameterizedTestMethodContext methodContext,
 			int argumentMaxLength) {
@@ -61,7 +62,8 @@ private String formatSafely(int invocationIndex, Object[] arguments) {
 		String pattern = prepareMessageFormatPattern(invocationIndex, namedArguments);
 		MessageFormat format = new MessageFormat(pattern);
 		Object[] humanReadableArguments = makeReadable(format, namedArguments);
-		return format.format(humanReadableArguments);
+		String formatted = format.format(humanReadableArguments);
+		return formatted.replace(DISPLAY_NAME_TEMPORARY_PLACEHOLDER, this.displayName);
 	}
 
 	private Object[] extractNamedArguments(Object[] arguments) {
@@ -72,7 +74,7 @@ private Object[] extractNamedArguments(Object[] arguments) {
 
 	private String prepareMessageFormatPattern(int invocationIndex, Object[] arguments) {
 		String result = pattern//
-				.replace(DISPLAY_NAME_PLACEHOLDER, this.displayName)//
+				.replace(DISPLAY_NAME_PLACEHOLDER, DISPLAY_NAME_TEMPORARY_PLACEHOLDER)//
 				.replace(INDEX_PLACEHOLDER, String.valueOf(invocationIndex));
 
 		if (result.contains(ARGUMENTS_WITH_NAMES_PLACEHOLDER)) {

junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestNameFormatterTests.java

@@ -60,6 +60,14 @@ void formatsDisplayName() {
 		assertEquals("enigma", formatter.format(2));
 	}
 
+	@Test
+	void formatsDisplayNameWithApostrophe() {
+		var formatter = formatter(DISPLAY_NAME_PLACEHOLDER, "display'Zero");
+
+		assertEquals("display'Zero", formatter.format(1));
+		assertEquals("display'Zero", formatter.format(2));
+	}
+
 	@Test
 	void formatsInvocationIndex() {
 		var formatter = formatter(INDEX_PLACEHOLDER, "enigma");

junit-jupiter-params/src/test/kotlin/ParameterizedTestNameFormatterIntegrationTests.kt

@@ -0,0 +1,75 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.MethodOrderer
+import org.junit.jupiter.api.TestInfo
+import org.junit.jupiter.api.TestMethodOrder
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.MethodSource
+
+@TestMethodOrder(MethodOrderer.MethodName::class)
+class ParameterizedTestNameFormatterIntegrationTests {
+
+    @MethodSource("methodSource")
+    @ParameterizedTest
+    fun `implicit'Name`(param: String, info: TestInfo) {
+        if (param.equals("foo")) {
+            Assertions.assertEquals("[1] foo", info.displayName)
+        } else {
+            Assertions.assertEquals("[2] bar", info.displayName)
+        }
+    }
+
+    @MethodSource("methodSource")
+    @ParameterizedTest(name = "{0}")
+    fun `zero'Only`(param: String, info: TestInfo) {
+        if (param.equals("foo")) {
+            Assertions.assertEquals("foo", info.displayName)
+        } else {
+            Assertions.assertEquals("bar", info.displayName)
+        }
+    }
+
+    @MethodSource("methodSource")
+    @ParameterizedTest(name = "{displayName}")
+    fun `displayName'Only`(param: String, info: TestInfo) {
+        Assertions.assertEquals("displayName'Only(String, TestInfo)", info.displayName)
+    }
+
+    @MethodSource("methodSource")
+    @ParameterizedTest(name = "{displayName} - {0}")
+    fun `displayName'Zero`(param: String, info: TestInfo) {
+        if (param.equals("foo")) {
+            Assertions.assertEquals("displayName'Zero(String, TestInfo) - foo", info.displayName)
+        } else {
+            Assertions.assertEquals("displayName'Zero(String, TestInfo) - bar", info.displayName)
+        }
+    }
+
+    @MethodSource("methodSource")
+    @ParameterizedTest(name = "{0} - {displayName}")
+    fun `zero'DisplayName`(param: String, info: TestInfo) {
+        if (param.equals("foo")) {
+            Assertions.assertEquals("foo - zero'DisplayName(String, TestInfo)", info.displayName)
+        } else {
+            Assertions.assertEquals("bar - zero'DisplayName(String, TestInfo)", info.displayName)
+        }
+    }
+
+    companion object {
+
+        @JvmStatic
+        private fun methodSource(): Array<String> =
+            arrayOf(
+                "foo",
+                "bar"
+            )
+    }
+}