Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

convert surefire plugin to new execute() 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163663 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-03-22 13:40:14 +00:00
parent 8a720065d5
commit c5d7cd804c
2 changed files with 51 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefireFailureResponse.java
View File

@ -1,33 +0,0 @@
package org.apache.maven.test;
import org.apache.maven.plugin.FailureResponse;
import java.util.List;
import java.util.Iterator;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
*/
public class SurefireFailureResponse
extends FailureResponse
{
private String LS = System.getProperty( "line.separator" );
private String message;
public SurefireFailureResponse( Object o )
{
super( o );
}
public String shortMessage()
{
return "There are some test failures.";
}
public String longMessage()
{
return shortMessage();
}
}

82
maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java
View File

@ -1,8 +1,23 @@
package org.apache.maven.test;
/*
* Copyright 2001-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import org.apache.maven.plugin.AbstractPlugin;
import org.apache.maven.plugin.PluginExecutionRequest;
import org.apache.maven.plugin.PluginExecutionResponse;
import org.apache.maven.plugin.PluginExecutionException;
import org.codehaus.surefire.SurefireBooter;
import java.io.File;
@ -76,36 +91,36 @@ import java.util.StringTokenizer;
public class SurefirePlugin
extends AbstractPlugin
{
public void execute( PluginExecutionRequest request, PluginExecutionResponse response )
throws Exception
private String mavenRepoLocal;
private String basedir;
private String classesDirectory;
private String testClassesDirectory;
private List classpathElements;
private String reportsDirectory;
private String test;
private List includes;
private List excludes;
public void execute()
throws PluginExecutionException
{
// ----------------------------------------------------------------------
//
// ----------------------------------------------------------------------
String mavenRepoLocal = (String) request.getParameter( "mavenRepoLocal" );
String basedir = (String) request.getParameter( "basedir" );
String classesDirectory = (String) request.getParameter( "classesDirectory" );
String testClassesDirectory = (String) request.getParameter( "testClassesDirectory" );
List testClasspathElements = (List) request.getParameter( "classpathElements" );
String reportsDirectory = (String) request.getParameter( "reportsDirectory" );
String test = (String) request.getParameter( "test" );
// ----------------------------------------------------------------------
// Setup the surefire booter
// ----------------------------------------------------------------------
SurefireBooter surefireBooter = new SurefireBooter();
System.out.println("Setting reports dir: " + reportsDirectory);
System.out.println( "Setting reports dir: " + reportsDirectory );
System.out.flush();
surefireBooter.setReportsDirectory( reportsDirectory );
// ----------------------------------------------------------------------
@ -133,10 +148,6 @@ public class SurefirePlugin
}
else
{
List includes = (List) request.getParameter( "includes" );
List excludes = (List) request.getParameter( "excludes" );
// defaults here, qdox doesn't like the end javadoc value
if ( includes == null )
{
@ -168,7 +179,7 @@ public class SurefirePlugin
surefireBooter.addClassPathUrl( new File( testClassesDirectory ).getPath() );
for ( Iterator i = testClasspathElements.iterator(); i.hasNext(); )
for ( Iterator i = classpathElements.iterator(); i.hasNext(); )
{
surefireBooter.addClassPathUrl( (String) i.next() );
}
@ -177,11 +188,20 @@ public class SurefirePlugin
surefireBooter.addReport( "org.codehaus.surefire.report.FileReporter" );
boolean success = surefireBooter.run();
boolean success = false;
try
{
success = surefireBooter.run();
}
catch ( Exception e )
{
// TODO: better handling
throw new PluginExecutionException( "Error executing surefire", e );
}
if ( !success )
{
response.setExecutionFailure( new SurefireFailureResponse( null ) );
throw new PluginExecutionException( "There are some test failures." );
}
}