You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ad...@apache.org on 2017/01/30 20:06:19 UTC
svn commit: r1780978 - in /maven/plugins/trunk/maven-pmd-plugin: pom.xml
src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java
Author: adangel
Date: Mon Jan 30 20:06:19 2017
New Revision: 1780978
URL: http://svn.apache.org/viewvc?rev=1780978&view=rev
Log:
[MPMD-231] Upgrade to PMD 5.5.3
Modified:
maven/plugins/trunk/maven-pmd-plugin/pom.xml
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java
Modified: maven/plugins/trunk/maven-pmd-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/pom.xml?rev=1780978&r1=1780977&r2=1780978&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-pmd-plugin/pom.xml Mon Jan 30 20:06:19 2017
@@ -86,7 +86,7 @@ under the License.
<javaVersion>1.7</javaVersion>
<maven.compiler.source>${javaVersion}</maven.compiler.source>
<maven.compiler.target>${javaVersion}</maven.compiler.target>
- <pmdVersion>5.5.1</pmdVersion>
+ <pmdVersion>5.5.3</pmdVersion>
<sitePluginVersion>3.4</sitePluginVersion>
<projectInfoReportsPluginVersion>2.8</projectInfoReportsPluginVersion>
</properties>
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=1780978&r1=1780977&r2=1780978&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 Mon Jan 30 20:06:19 2017
@@ -30,11 +30,13 @@ import java.util.List;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+import net.sourceforge.pmd.PMD;
import net.sourceforge.pmd.cpd.CPD;
import net.sourceforge.pmd.cpd.CPDConfiguration;
import net.sourceforge.pmd.cpd.JavaLanguage;
import net.sourceforge.pmd.cpd.Mark;
import net.sourceforge.pmd.cpd.Match;
+import net.sourceforge.pmd.cpd.SourceCode;
import net.sourceforge.pmd.cpd.TokenEntry;
import org.apache.commons.lang3.StringUtils;
@@ -193,12 +195,21 @@ public class CpdReportTest
CpdReport mojo = (CpdReport) lookupMojo( "cpd", testPom );
assertNotNull( mojo );
- TokenEntry tFirstEntry = new TokenEntry( "public java", "MyClass.java", 34 );
- TokenEntry tSecondEntry = new TokenEntry( "public java", "MyClass3.java", 55 );
+ TokenEntry tFirstEntry = new TokenEntry( "public java", "MyClass.java", 2 );
+ TokenEntry tSecondEntry = new TokenEntry( "public java", "MyClass3.java", 2 );
+ String duplicatedCodeFragment = "// ----- duplicated code example -----";
+ SourceCode sourceCodeFirst = new SourceCode(new SourceCode.StringCodeLoader(
+ PMD.EOL + duplicatedCodeFragment + PMD.EOL, "MyClass.java"));
+ SourceCode sourceCodeSecond = new SourceCode(new SourceCode.StringCodeLoader(
+ PMD.EOL + duplicatedCodeFragment + PMD.EOL, "MyClass3.java"));
+
List<Match> tList = new ArrayList<>();
Mark tFirstMark = new Mark( tFirstEntry );
+ tFirstMark.setSourceCode(sourceCodeFirst);
+ tFirstMark.setLineCount(1);
Mark tSecondMark = new Mark( tSecondEntry );
- tFirstMark.setSoureCodeSlice( "// ----- ACCESSEURS avec �l�ments -----" );
+ tSecondMark.setSourceCode(sourceCodeSecond);
+ tSecondMark.setLineCount(1);
Match tMatch = new Match( 2, tFirstMark, tSecondMark );
tList.add( tMatch );
@@ -217,6 +228,11 @@ public class CpdReportTest
DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
Document pmdCpdDocument = builder.parse( tReport );
assertNotNull( pmdCpdDocument );
+
+ String str = readFile( new File( getBasedir(), "target/test/unit/default-configuration/target/cpd.xml" ) );
+ assertTrue( lowerCaseContains( str, "MyClass.java" ) );
+ assertTrue( lowerCaseContains( str, "MyClass3.java" ) );
+ assertTrue( lowerCaseContains( str, duplicatedCodeFragment ) );
}
public void testSkipEmptyReportConfiguration()