Author: adangel
Date: Fri Aug 5 13:24:52 2016
New Revision: 1755320
URL: http://svn.apache.org/viewvc?rev=1755320&view=rev
Log:
[MPMD-196] Do not rely in tests on toLowerCase but on toLowerCase(Locale.ROOT)
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/AbstractPmdReportTest.java
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdReportTest.java
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/AbstractPmdReportTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/AbstractPmdReportTest.java?rev=1755320&r1=1755319&r2=1755320&view=diff
==============================================================================
---
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/AbstractPmdReportTest.java
(original)
+++
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/AbstractPmdReportTest.java
Fri Aug 5 13:24:52 2016
@@ -72,4 +72,17 @@ public abstract class AbstractPmdReportT
IOUtil.close( writer );
}
}
+
+ /**
+ * Checks, whether the string <code>contained</code> is contained in
+ * the given <code>text</code> ignoring case.
+ *
+ * @param text the string in which the search is executed
+ * @param contained the string, the should be searched
+ * @return <code>true</code> if the string is contained, otherwise
<code>false</code>.
+ */
+ public static boolean lowerCaseContains( String text, String contains )
+ {
+ return text.toLowerCase( Locale.ROOT ).contains( contains.toLowerCase(
Locale.ROOT ) );
+ }
}
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java?rev=1755320&r1=1755319&r2=1755320&view=diff
==============================================================================
---
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java
(original)
+++
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java
Fri Aug 5 13:24:52 2016
@@ -26,7 +26,6 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import java.util.Locale;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -83,17 +82,16 @@ public class CpdReportTest
// check the contents of cpd.html
String str = readFile( new File( getBasedir(),
"target/test/unit/default-configuration/target/site/cpd.html" ) );
- assertTrue( str.toLowerCase().contains( "AppSample.java".toLowerCase()
) );
+ assertTrue( lowerCaseContains( str, "AppSample.java" ) );
str = readFile( new File( getBasedir(),
"target/test/unit/default-configuration/target/site/cpd.html" ) );
- assertTrue( str.toLowerCase().contains( "App.java".toLowerCase() ) );
+ assertTrue( lowerCaseContains( str, "App.java" ) );
str = readFile( new File( getBasedir(),
"target/test/unit/default-configuration/target/site/cpd.html" ) );
- assertTrue( str.toLowerCase().contains( "public String dup( String str
)".toLowerCase() ) );
+ assertTrue( lowerCaseContains( str, "public String dup( String str )"
) );
str = readFile( new File( getBasedir(),
"target/test/unit/default-configuration/target/site/cpd.html" ) );
- assertTrue( str.toLowerCase().contains( "tmp = tmp + str.substring( i,
i + 1);".toLowerCase() ) );
-
+ assertTrue( lowerCaseContains( str, "tmp = tmp + str.substring( i, i +
1);" ) );
}
/**
@@ -120,21 +118,20 @@ public class CpdReportTest
// Contents that should NOT be in the report
String str = readFile( new File( getBasedir(),
"target/test/unit/custom-configuration/target/site/cpd.html" ) );
- assertTrue( !str.toLowerCase().contains( "/Sample.java".toLowerCase()
) );
+ assertFalse( lowerCaseContains( str, "/Sample.java" ) );
str = readFile( new File( getBasedir(),
"target/test/unit/custom-configuration/target/site/cpd.html" ) );
- assertTrue( !str.toLowerCase().contains( "public void duplicateMethod(
int i )".toLowerCase() ) );
+ assertFalse( lowerCaseContains( str, "public void duplicateMethod( int
i )" ) );
// Contents that should be in the report
str = readFile( new File( getBasedir(),
"target/test/unit/custom-configuration/target/site/cpd.html" ) );
- assertTrue( str.toLowerCase().contains(
"AnotherSample.java".toLowerCase() ) );
+ assertTrue( lowerCaseContains( str, "AnotherSample.java" ) );
str = readFile( new File( getBasedir(),
"target/test/unit/custom-configuration/target/site/cpd.html" ) );
- assertTrue( str.toLowerCase().contains( "public static void main(
String[] args )".toLowerCase() ) );
+ assertTrue( lowerCaseContains( str, "public static void main( String[]
args )" ) );
str = readFile( new File( getBasedir(),
"target/test/unit/custom-configuration/target/site/cpd.html" ) );
- assertTrue( str.toLowerCase().contains( "private String
unusedMethod(".toLowerCase() ) );
-
+ assertTrue( lowerCaseContains( str, "private String unusedMethod(" ) );
}
/**
@@ -246,7 +243,7 @@ public class CpdReportTest
File generatedFile = new File( getBasedir(),
"target/test/unit/empty-report/target/site/cpd.html" );
assertTrue( FileUtils.fileExists( generatedFile.getAbsolutePath() ) );
String str = readFile( new File( getBasedir(),
"target/test/unit/empty-report/target/site/cpd.html" ) );
- assertTrue( !str.toLowerCase().contains( "Hello.java".toLowerCase() )
);
+ assertFalse( lowerCaseContains( str, "Hello.java" ) );
}
public void testCpdEncodingConfiguration()
@@ -267,7 +264,7 @@ public class CpdReportTest
File generatedFile = new File( getBasedir(),
"target/test/unit/default-configuration/target/cpd.xml" );
assertTrue( FileUtils.fileExists( generatedFile.getAbsolutePath()
) );
String str = readFile( generatedFile );
- assertTrue( str.toLowerCase().contains(
"AppSample.java".toLowerCase() ) );
+ assertTrue( lowerCaseContains( str, "AppSample.java" ) );
}
finally
{
@@ -287,8 +284,8 @@ public class CpdReportTest
File generatedFile = new File( getBasedir(),
"target/test/unit/default-configuration/target/cpd.xml" );
assertTrue( FileUtils.fileExists( generatedFile.getAbsolutePath()
) );
String str = readFile( generatedFile );
- assertTrue( str.toLowerCase(Locale.ROOT).contains(
"Sample.js".toLowerCase(Locale.ROOT) ) );
- assertTrue( str.toLowerCase(Locale.ROOT).contains(
"SampleDup.js".toLowerCase(Locale.ROOT) ) );
+ assertTrue( lowerCaseContains( str, "Sample.js" ) );
+ assertTrue( lowerCaseContains( str, "SampleDup.js" ) );
}
public void testCpdJspConfiguration()
@@ -303,8 +300,8 @@ public class CpdReportTest
File generatedFile = new File( getBasedir(),
"target/test/unit/default-configuration/target/cpd.xml" );
assertTrue( FileUtils.fileExists( generatedFile.getAbsolutePath()
) );
String str = readFile( generatedFile );
- assertTrue( str.toLowerCase(Locale.ROOT).contains(
"sample.jsp".toLowerCase(Locale.ROOT) ) );
- assertTrue( str.toLowerCase(Locale.ROOT).contains(
"sampleDup.jsp".toLowerCase(Locale.ROOT) ) );
+ assertTrue( lowerCaseContains( str, "sample.jsp" ) );
+ assertTrue( lowerCaseContains( str, "sampleDup.jsp" ) );
}
public static class MockCpd
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdReportTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdReportTest.java?rev=1755320&r1=1755319&r2=1755320&view=diff
==============================================================================
---
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdReportTest.java
(original)
+++
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdReportTest.java
Fri Aug 5 13:24:52 2016
@@ -222,18 +222,18 @@ public class PmdReportTest
// check if custom ruleset was applied
String str = readFile( new File( getBasedir(),
"target/test/unit/custom-configuration/target/site/pmd.html" ) );
- assertTrue( str.toLowerCase().contains( "Avoid using if statements
without curly braces".toLowerCase() ) );
+ assertTrue( lowerCaseContains( str, "Avoid using if statements without
curly braces" ) );
// Must be false as IfElseStmtsMustUseBraces is excluded!
- assertFalse( str.toLowerCase().contains( "Avoid using if...else
statements without curly braces".toLowerCase() ) );
+ assertFalse( lowerCaseContains( str, "Avoid using if...else statements
without curly braces" ) );
- assertTrue( "unnecessary constructor should not be triggered because
of low priority",
- !str.toLowerCase().contains( "Avoid unnecessary
constructors - the compiler will generate these for you".toLowerCase() ) );
+ assertFalse( "unnecessary constructor should not be triggered because
of low priority",
+ lowerCaseContains( str, "Avoid unnecessary constructors -
the compiler will generate these for you" ) );
// veryLongVariableNameWithViolation is really too long
- assertTrue( str.toLowerCase().contains(
"veryLongVariableNameWithViolation".toLowerCase() ) );
+ assertTrue( lowerCaseContains( str,
"veryLongVariableNameWithViolation" ) );
// notSoLongVariableName should not be reported
- assertFalse( str.toLowerCase().contains(
"notSoLongVariableName".toLowerCase() ) );
+ assertFalse( lowerCaseContains( str, "notSoLongVariableName" ) );
}
/**
@@ -283,7 +283,7 @@ public class PmdReportTest
File generatedFile = new File( getBasedir(),
"target/test/unit/empty-report/target/site/pmd.html" );
assertTrue( FileUtils.fileExists( generatedFile.getAbsolutePath() ) );
String str = readFile( new File( getBasedir(),
"target/test/unit/empty-report/target/site/pmd.html" ) );
- assertTrue( !str.toLowerCase().contains( "Hello.java".toLowerCase() )
);
+ assertFalse( lowerCaseContains( str, "Hello.java" ) );
}
public void testInvalidFormat()
