You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2016/06/05 09:43:31 UTC
svn commit: r1746888 - in /maven/shared/trunk/maven-verifier/src:
main/java/org/apache/maven/it/Verifier.java
test/java/org/apache/maven/it/VerifierTest.java
Author: hboutemy
Date: Sun Jun 5 09:43:31 2016
New Revision: 1746888
URL: http://svn.apache.org/viewvc?rev=1746888&view=rev
Log:
[MSHARED-547] added support for colorized output checks (ignoring ANSI escape codes)
Modified:
maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java
maven/shared/trunk/maven-verifier/src/test/java/org/apache/maven/it/VerifierTest.java
Modified: maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java?rev=1746888&r1=1746887&r2=1746888&view=diff
==============================================================================
--- maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java (original)
+++ maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java Sun Jun 5 09:43:31 2016
@@ -281,7 +281,7 @@ public class Verifier
for ( String line : lines )
{
// A hack to keep stupid velocity resource loader errors from triggering failure
- if ( line.contains( "[ERROR]" ) && !isVelocityError( line ) )
+ if ( stripAnsi( line ).contains( "[ERROR]" ) && !isVelocityError( line ) )
{
throw new VerificationException( "Error in execution: " + line );
}
@@ -314,7 +314,7 @@ public class Verifier
boolean result = false;
for ( String line : lines )
{
- if ( line.contains( text ) )
+ if ( stripAnsi( line ).contains( text ) )
{
result = true;
break;
@@ -326,6 +326,11 @@ public class Verifier
}
}
+ static String stripAnsi( String msg )
+ {
+ return msg.replaceAll( "\u001B\\[[;\\d]*[ -/]*[@-~]", "" );
+ }
+
public Properties loadProperties( String filename )
throws VerificationException
{
Modified: maven/shared/trunk/maven-verifier/src/test/java/org/apache/maven/it/VerifierTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-verifier/src/test/java/org/apache/maven/it/VerifierTest.java?rev=1746888&r1=1746887&r2=1746888&view=diff
==============================================================================
--- maven/shared/trunk/maven-verifier/src/test/java/org/apache/maven/it/VerifierTest.java (original)
+++ maven/shared/trunk/maven-verifier/src/test/java/org/apache/maven/it/VerifierTest.java Sun Jun 5 09:43:31 2016
@@ -67,4 +67,10 @@ public class VerifierTest
verifier.assertFileNotPresent( "mshared104.jar!/fud.xml" );
}
+ public void testStripAnsi()
+ {
+ assertEquals( "--- plugin:version:goal (id) @ artifactId ---",
+ Verifier.stripAnsi( "\u001B[1m--- \u001B[0;32mplugin:version:goal\u001B[0;1m (id)\u001B[m @ "
+ + "\u001B[36martifactId\u001B[0;1m ---\u001B[m" ) );
+ }
}