Fix test to allow Git origin URLs starting with git@ (#4152)

This occurred when using the SSH option to clone the repository.
junit-team · Nov 23, 2024 · 3d73144 · 3d73144
1 parent c96feb2
commit 3d73144
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/...est/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListenerTests.java b/...est/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListenerTests.java
@@ -24,6 +24,7 @@
 import java.net.URISyntaxException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.regex.Pattern;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
@@ -75,9 +76,9 @@ void writesValidXmlReport() throws Exception {
 				        <java:javaVersion>${xmlunit.ignore}</java:javaVersion>
 				        <java:fileEncoding>${xmlunit.ignore}</java:fileEncoding>
 				        <java:heapSize max="${xmlunit.isNumber}"/>
-				        <git:repository originUrl="${xmlunit.matchesRegex(https://.+)}"/>
+				        <git:repository originUrl="${xmlunit.matchesRegex#(git@|https://).+#}"/>
 				        <git:branch>${xmlunit.ignore}</git:branch>
-				        <git:commit>${xmlunit.matchesRegex([0-9a-f]{40})}</git:commit>
+				        <git:commit>${xmlunit.matchesRegex#[0-9a-f]{40}#}</git:commit>
 				        <git:status clean="${xmlunit.ignore}">${xmlunit.ignore}</git:status>
 				    </infrastructure>
 				    <e:started id="1" name="dummy" time="${xmlunit.isDateTime}">
@@ -104,7 +105,7 @@ void writesValidXmlReport() throws Exception {
 				    <e:finished id="2" time="${xmlunit.isDateTime}">
 				        <result status="FAILED">
 				            <java:throwable assertionError="true" type="org.opentest4j.AssertionFailedError">
-				                ${xmlunit.matchesRegex(org\\.opentest4j\\.AssertionFailedError: failure message)}
+				                ${xmlunit.matchesRegex#org\\.opentest4j\\.AssertionFailedError: failure message#}
 				            </java:throwable>
 				        </result>
 				    </e:finished>
@@ -115,7 +116,8 @@ void writesValidXmlReport() throws Exception {
 				""";
 
 		XmlAssert.assertThat(xmlFile).and(expected) //
-				.withDifferenceEvaluator(new PlaceholderDifferenceEvaluator()) //
+				.withDifferenceEvaluator(new PlaceholderDifferenceEvaluator(Pattern.quote("${"), Pattern.quote("}"),
+					Pattern.quote("#"), Pattern.quote("#"), ",")) //
 				.ignoreWhitespace() //
 				.areIdentical();
 	}

diff --git a/...orm-tooling-support-tests/src/test/java/platform/tooling/support/tests/XmlAssertions.java b/...orm-tooling-support-tests/src/test/java/platform/tooling/support/tests/XmlAssertions.java
@@ -14,6 +14,7 @@
 import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.regex.Pattern;
 
 import org.xmlunit.assertj3.XmlAssert;
 import org.xmlunit.placeholder.PlaceholderDifferenceEvaluator;
@@ -46,9 +47,9 @@ private static void verifyContent(Path xmlFile) {
 				            <java:javaVersion>${xmlunit.ignore}</java:javaVersion>
 				            <java:fileEncoding>${xmlunit.ignore}</java:fileEncoding>
 				            <java:heapSize max="${xmlunit.isNumber}"/>
-				            <git:repository originUrl="${xmlunit.matchesRegex(https://.+)}"/>
+				            <git:repository originUrl="${xmlunit.matchesRegex#(git@|https://).+#}"/>
 				            <git:branch>${xmlunit.ignore}</git:branch>
-				            <git:commit>${xmlunit.matchesRegex([0-9a-f]{40})}</git:commit>
+				            <git:commit>${xmlunit.matchesRegex#[0-9a-f]{40}#}</git:commit>
 				            <git:status clean="${xmlunit.ignore}">${xmlunit.ignore}</git:status>
 				          </infrastructure>
 				          <e:started id="1" name="JUnit Jupiter" time="${xmlunit.isDateTime}">
@@ -156,7 +157,8 @@ private static void verifyContent(Path xmlFile) {
 				""";
 
 		XmlAssert.assertThat(xmlFile).and(expected) //
-				.withDifferenceEvaluator(new PlaceholderDifferenceEvaluator()) //
+				.withDifferenceEvaluator(new PlaceholderDifferenceEvaluator(Pattern.quote("${"), Pattern.quote("}"),
+					Pattern.quote("#"), Pattern.quote("#"), ",")) //
 				.ignoreWhitespace() //
 				.areIdentical();
 	}