You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by kw...@apache.org on 2021/10/07 10:21:01 UTC
[jackrabbit-filevault-package-maven-plugin] 01/01: fix flaky test
on Windows
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch feature/asf-jenkinsfile
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault-package-maven-plugin.git
commit 7b4bf20458f036863748dde7231a6e4e463a3b0e
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Thu Oct 7 11:58:08 2021 +0200
fix flaky test on Windows
---
.../jackrabbit/filevault/maven/packaging/FormatDocviewXmlMojo.java | 4 ++--
.../apache/jackrabbit/filevault/maven/packaging/it/FormattingIT.java | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/FormatDocviewXmlMojo.java b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/FormatDocviewXmlMojo.java
index 692222e..3ce466c 100644
--- a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/FormatDocviewXmlMojo.java
+++ b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/FormatDocviewXmlMojo.java
@@ -147,9 +147,9 @@ public class FormatDocviewXmlMojo extends AbstractMojo {
malformedFiles.add(toCheck);
// emit violations for m2e (https://www.eclipse.org/m2e/documentation/m2e-making-maven-plugins-compat.html)
buildContext.addMessage(toCheck, 0, 0, MSG_MALFORMED_FILE + ". " + MSG_COUNTERMEASURE, BuildContext.SEVERITY_ERROR, null);
- log.error(MSG_MALFORMED_FILE + ":" + toCheck);
+ log.error(MSG_MALFORMED_FILE + ":" + toCheck.getCanonicalPath());
} else {
- log.info("Reformatted file '" + toCheck + "'.");
+ log.info("Reformatted file '" + toCheck.getCanonicalPath() + "'.");
}
} else {
buildContext.removeMessages(toCheck);
diff --git a/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/FormattingIT.java b/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/FormattingIT.java
index 77240a4..e71ed58 100644
--- a/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/FormattingIT.java
+++ b/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/FormattingIT.java
@@ -33,7 +33,8 @@ public class FormattingIT {
.build();
for (String formattedFile : formattedFiles) {
- String path = new File(builder.getTestProjectDir(), formattedFile).getAbsolutePath();
+ // use uppercase drive letter on Windows
+ String path = new File(builder.getTestProjectDir(), formattedFile).getCanonicalPath();
builder.verifyExpectedLogLines(path);
}
}