svn commit: r399511 - in /maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd: CpdReportTest.java CpdViolationCheckMojoTest.java PmdReportTest.java PmdViolationCheckMojoTest.java

[oching]

Author: oching
Date: Wed May  3 19:17:28 2006
New Revision: 399511

URL: http://svn.apache.org/viewcvs?rev=399511&view=rev
Log:
PR: MPMD-26

Updated test conditions in test classes.

Modified:
    
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/CpdViolationCheckMojoTest.java
    
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdReportTest.java
    
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdViolationCheckMojoTest.java

Modified: 
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java
URL: 
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java?rev=399511&r1=399510&r2=399511&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
 Wed May  3 19:17:28 2006
@@ -35,6 +35,7 @@
         throws Exception
     {
         super.setUp();
+        FileUtils.deleteDirectory( new File( getBasedir(), "target/test/unit" 
) );
     }
 
     /**
@@ -163,4 +164,6 @@
 
         return str;
     }
+
+
 }

Modified: 
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdViolationCheckMojoTest.java
URL: 
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdViolationCheckMojoTest.java?rev=399511&r1=399510&r2=399511&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdViolationCheckMojoTest.java
 (original)
+++ 
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdViolationCheckMojoTest.java
 Wed May  3 19:17:28 2006
@@ -55,8 +55,14 @@
     public void testNotFailOnViolation()
         throws Exception
     {
+
         File testPom = new File( getBasedir(),
-                                 
"src/test/resources/unit/default-configuration/pmd-check-notfailonviolation-plugin-config.xml"
 );
+                                 
"src/test/resources/unit/default-configuration/cpd-default-configuration-plugin-config.xml"
 );
+        CpdReport mojo = (CpdReport) lookupMojo( "cpd", testPom );
+        mojo.execute();
+
+        testPom = new File( getBasedir(),
+                            
"src/test/resources/unit/default-configuration/pmd-check-notfailonviolation-plugin-config.xml"
 );
         CpdViolationCheckMojo cpdViolationMojo = (CpdViolationCheckMojo) 
lookupMojo( "cpd-check", testPom );
         cpdViolationMojo.execute();
 
@@ -86,5 +92,4 @@
     {
 
     }
-
 }

Modified: 
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdReportTest.java
URL: 
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdReportTest.java?rev=399511&r1=399510&r2=399511&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
 Wed May  3 19:17:28 2006
@@ -34,6 +34,7 @@
         throws Exception
     {
         super.setUp();
+        FileUtils.deleteDirectory( new File( getBasedir(), "target/test/unit" 
) );
     }
 
     public void testDefaultConfiguration()

Modified: 
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdViolationCheckMojoTest.java
URL: 
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdViolationCheckMojoTest.java?rev=399511&r1=399510&r2=399511&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdViolationCheckMojoTest.java
 (original)
+++ 
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdViolationCheckMojoTest.java
 Wed May  3 19:17:28 2006
@@ -55,11 +55,16 @@
         throws Exception
     {
         File testPom = new File( getBasedir(),
-                                 
"src/test/resources/unit/default-configuration/pmd-check-notfailonviolation-plugin-config.xml"
 );
+                                 
"src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml"
 );
+        PmdReport mojo = (PmdReport) lookupMojo( "pmd", testPom );
+        mojo.execute();
+
+        testPom = new File( getBasedir(),
+                            
"src/test/resources/unit/default-configuration/pmd-check-notfailonviolation-plugin-config.xml"
 );
         PmdViolationCheckMojo pmdViolationMojo = (PmdViolationCheckMojo) 
lookupMojo( "check", testPom );
         pmdViolationMojo.execute();
 
-        assertTrue( true );
+        assertTrue( true );        
     }
 
     public void testException()
@@ -86,4 +91,5 @@
     {
 
     }
+
 }