srdo closed pull request #1040: NETBEANS-1752: Fix broken hyperlink in test
output when testing a Mav…
URL: https://github.com/apache/incubator-netbeans/pull/1040
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/java/maven/src/org/netbeans/modules/maven/output/TestOutputListenerProvider.java
b/java/maven/src/org/netbeans/modules/maven/output/TestOutputListenerProvider.java
index cb586c27ea..fc409469c5 100644
---
a/java/maven/src/org/netbeans/modules/maven/output/TestOutputListenerProvider.java
+++
b/java/maven/src/org/netbeans/modules/maven/output/TestOutputListenerProvider.java
@@ -87,7 +87,7 @@ public TestOutputListenerProvider() {
runningPattern = Pattern.compile("(?:\\[surefire\\] )?Running (.*)",
Pattern.DOTALL); //NOI18N
outDirPattern = Pattern.compile(".*(?:Surefire)?(?:Failsafe)? report
directory\\: (.*)", Pattern.DOTALL); //NOI18N
outDirPattern2 = Pattern.compile(".*Setting reports dir\\: (.*)",
Pattern.DOTALL); //NOI18N
- runningPattern2 =
Pattern.compile("^---\\smaven-surefire-plugin:\\d+\\.\\d+:test\\s.*$",
Pattern.DOTALL);
+ runningPattern2 =
Pattern.compile("^---\\smaven-surefire-plugin:(\\d+\\.)+\\d+:test\\s.*$",
Pattern.DOTALL);
}
public String[] getWatchedGoals() {
diff --git
a/java/maven/test/unit/src/org/netbeans/modules/maven/output/TestOutputListenerProviderTest.java
b/java/maven/test/unit/src/org/netbeans/modules/maven/output/TestOutputListenerProviderTest.java
index 9330f82fed..c007859443 100644
---
a/java/maven/test/unit/src/org/netbeans/modules/maven/output/TestOutputListenerProviderTest.java
+++
b/java/maven/test/unit/src/org/netbeans/modules/maven/output/TestOutputListenerProviderTest.java
@@ -19,11 +19,6 @@
package org.netbeans.modules.maven.output;
import junit.framework.*;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertNull;
-import static junit.framework.Assert.assertTrue;
import org.netbeans.modules.maven.api.output.OutputVisitor;
/**
@@ -98,7 +93,7 @@ public void testSeparateTestOuput() {
}
- public void testFailfafeSeparateTestOuput() {
+ public void testFailsafeSeparateTestOuput() {
OutputVisitor visitor = new OutputVisitor();
visitor.resetVisitor();
provider.sequenceStart("mojo-execute#failsafe:integration-test",
visitor);
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
