You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ah...@apache.org on 2008/08/06 16:40:30 UTC
svn commit: r683281 - in /maven/plugins/trunk/maven-eclipse-plugin: ./
src/test/java/org/apache/maven/plugin/eclipse/
src/test/java/org/apache/maven/plugin/eclipse/it/
Author: aheritier
Date: Wed Aug 6 07:40:29 2008
New Revision: 683281
URL: http://svn.apache.org/viewvc?rev=683281&view=rev
Log:
MECLIPSE-345 : Split unit tests and integration tests
MECLIPSE-349 : Move integration tests in the integration-tests profile
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java (contents, props changed)
- copied, changed from r683193, maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/AbstractEclipsePluginTestCase.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java (contents, props changed)
- copied, changed from r683193, maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginMasterProjectIT.java (contents, props changed)
- copied, changed from r683193, maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginMasterProjectTest.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipseWorkspaceIT.java (contents, props changed)
- copied, changed from r683193, maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipseWorkspaceTest.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/MyEclipsePluginIT.java (contents, props changed)
- copied, changed from r683193, maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/MyEclipsePluginTest.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/RadPluginIT.java (contents, props changed)
- copied, changed from r683193, maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/RadPluginTest.java
Removed:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/AbstractEclipsePluginTestCase.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginMasterProjectTest.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipseWorkspaceTest.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/MyEclipsePluginTest.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/RadPluginTest.java
Modified:
maven/plugins/trunk/maven-eclipse-plugin/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/TempEclipseWorkspace.java
Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=683281&r1=683280&r2=683281&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Wed Aug 6 07:40:29 2008
@@ -199,9 +199,8 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
- <exclude>**/Abstract*TestCase.java</exclude>
+ <exclude>**/Abstract*.java</exclude>
<exclude>**/InstallPluginsMojoTest.java</exclude>
- <exclude>**/projects/**</exclude>
</excludes>
<systemProperties>
<property>
@@ -212,20 +211,44 @@
<argLine>${maven.test.jvmargs}</argLine>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-plugin-plugin</artifactId>
- <executions>
- <!-- FIXME: Disable execution, makes IT preparation using maven-plugin-testing-tools fail (see target/test-build-logs/setup.build.log) -->
- <execution>
- <id>generated-helpmojo</id>
- <configuration>
- <extractors>
- <extractor/>
- </extractors>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>integration-tests</id>
+ <activation>
+ <property>
+ <name>skipTests</name>
+ <value>!true</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*IT.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <executions>
+ <!-- FIXME: Disable execution, makes IT preparation using maven-plugin-testing-tools fail (see target/test-build-logs/setup.build.log) -->
+ <execution>
+ <id>generated-helpmojo</id>
+ <configuration>
+ <extractors>
+ <extractor/>
+ </extractors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/TempEclipseWorkspace.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/TempEclipseWorkspace.java?rev=683281&r1=683280&r2=683281&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/TempEclipseWorkspace.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/TempEclipseWorkspace.java Wed Aug 6 07:40:29 2008
@@ -13,7 +13,7 @@
public class TempEclipseWorkspace
{
- File workspaceLocation;
+ public File workspaceLocation;
public TempEclipseWorkspace( String testWorkspaceName, boolean usePathToProject )
throws Exception
Copied: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java (from r683193, maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/AbstractEclipsePluginTestCase.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java?p2=maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java&p1=maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/AbstractEclipsePluginTestCase.java&r1=683193&r2=683281&rev=683281&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/AbstractEclipsePluginTestCase.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java Wed Aug 6 07:40:29 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.plugin.eclipse;
+package org.apache.maven.plugin.eclipse.it;
import java.io.BufferedReader;
import java.io.File;
@@ -32,6 +32,7 @@
import junit.framework.AssertionFailedError;
+import org.apache.maven.plugin.eclipse.ExecutionFailedException;
import org.apache.maven.plugin.eclipse.writers.workspace.EclipseWorkspaceWriter;
import org.apache.maven.plugin.ide.IdeUtils;
import org.apache.maven.project.MavenProject;
@@ -52,7 +53,7 @@
* @author <a href="mailto:fgiust@apache.org">Fabrizio Giustina</a>
* @version $Id$
*/
-public abstract class AbstractEclipsePluginTestCase
+public abstract class AbstractEclipsePluginIT
extends PlexusTestCase
{
@@ -128,7 +129,7 @@
System.setProperty( "MAVEN_TERMINATE_CMD", "on" );
- synchronized ( AbstractEclipsePluginTestCase.class )
+ synchronized ( AbstractEclipsePluginIT.class )
{
if ( !installed )
{
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java (from r683193, maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java?p2=maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java&p1=maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java&r1=683193&r2=683281&rev=683281&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java Wed Aug 6 07:40:29 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.plugin.eclipse;
+package org.apache.maven.plugin.eclipse.it;
import java.io.File;
import java.io.FileNotFoundException;
@@ -27,6 +27,7 @@
import java.util.Properties;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.eclipse.TempEclipseWorkspace;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -36,8 +37,8 @@
* @author <a href="mailto:fgiust@apache.org">Fabrizio Giustina</a>
* @version $Id$
*/
-public class EclipsePluginTest
- extends AbstractEclipsePluginTestCase
+public class EclipsePluginIT
+ extends AbstractEclipsePluginIT
{
protected void setUp()
throws Exception
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginMasterProjectIT.java (from r683193, maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginMasterProjectTest.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginMasterProjectIT.java?p2=maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginMasterProjectIT.java&p1=maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginMasterProjectTest.java&r1=683193&r2=683281&rev=683281&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginMasterProjectTest.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginMasterProjectIT.java Wed Aug 6 07:40:29 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.plugin.eclipse;
+package org.apache.maven.plugin.eclipse.it;
import java.io.File;
import java.io.FileInputStream;
@@ -64,14 +64,14 @@
* @author Fabrizio Giustina
* @version $Id$
*/
-public class EclipsePluginMasterProjectTest
- extends AbstractEclipsePluginTestCase
+public class EclipsePluginMasterProjectIT
+ extends AbstractEclipsePluginIT
{
protected File basedir;
/**
- * @see org.apache.maven.plugin.eclipse.AbstractEclipsePluginTestCase#setUp()
+ * @see org.apache.maven.plugin.eclipse.it.AbstractEclipsePluginIT#setUp()
*/
protected void setUp()
throws Exception
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginMasterProjectIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginMasterProjectIT.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginMasterProjectIT.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipseWorkspaceIT.java (from r683193, maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipseWorkspaceTest.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipseWorkspaceIT.java?p2=maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipseWorkspaceIT.java&p1=maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipseWorkspaceTest.java&r1=683193&r2=683281&rev=683281&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipseWorkspaceTest.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipseWorkspaceIT.java Wed Aug 6 07:40:29 2008
@@ -12,7 +12,7 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.maven.plugin.eclipse;
+package org.apache.maven.plugin.eclipse.it;
import java.io.File;
import java.io.FileInputStream;
@@ -25,8 +25,8 @@
/**
* @version $Id: $
*/
-public class EclipseWorkspaceTest
- extends AbstractEclipsePluginTestCase
+public class EclipseWorkspaceIT
+ extends AbstractEclipsePluginIT
{
private static final String ECLIPSE_JDT_CORE_PREFS_PATH =
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipseWorkspaceIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipseWorkspaceIT.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/MyEclipsePluginIT.java (from r683193, maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/MyEclipsePluginTest.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/MyEclipsePluginIT.java?p2=maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/MyEclipsePluginIT.java&p1=maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/MyEclipsePluginTest.java&r1=683193&r2=683281&rev=683281&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/MyEclipsePluginTest.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/MyEclipsePluginIT.java Wed Aug 6 07:40:29 2008
@@ -1,12 +1,12 @@
-package org.apache.maven.plugin.eclipse;
+package org.apache.maven.plugin.eclipse.it;
/**
* Unit Tests for MyEclipse plugin
*
* @author <a href="mailto:olivier.jacob@gmail.com">Olivier Jacob</a>
*/
-public class MyEclipsePluginTest
- extends AbstractEclipsePluginTestCase
+public class MyEclipsePluginIT
+ extends AbstractEclipsePluginIT
{
/**
* Web project, no spring/struts/hibernate capability, J2EE 1.3
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/MyEclipsePluginIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/MyEclipsePluginIT.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/MyEclipsePluginIT.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/RadPluginIT.java (from r683193, maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/RadPluginTest.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/RadPluginIT.java?p2=maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/RadPluginIT.java&p1=maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/RadPluginTest.java&r1=683193&r2=683281&rev=683281&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/RadPluginTest.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/RadPluginIT.java Wed Aug 6 07:40:29 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.plugin.eclipse;
+package org.apache.maven.plugin.eclipse.it;
import java.io.File;
import java.io.FileInputStream;
@@ -25,6 +25,7 @@
import java.util.List;
import java.util.Properties;
+import org.apache.maven.plugin.eclipse.Constants;
import org.apache.maven.plugin.ide.IdeUtils;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.FileUtils;
@@ -34,8 +35,8 @@
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
*/
-public class RadPluginTest
- extends AbstractEclipsePluginTestCase
+public class RadPluginIT
+ extends AbstractEclipsePluginIT
{
private static final String PROJECTS_BASEDIR = "target/test-classes/projects";
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/RadPluginIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/RadPluginIT.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/RadPluginIT.java
------------------------------------------------------------------------------
svn:mergeinfo =