Author: olamy
Date: Tue Oct 22 01:02:25 2013
New Revision: 1534440
URL: http://svn.apache.org/r1534440
Log:
upgrade verifier version, refactor to make it more extensible
Modified:
tomcat/maven-plugin/trunk/pom.xml
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractDeployWarOnlyProjectIT.java
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractDeployWarProjectIT.java
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractSimpleWarProjectIT.java
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractTomcatRunMultiConfigIT.java
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractUsageContextpathIT.java
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java
Modified: tomcat/maven-plugin/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1534440&r1=1534439&r2=1534440&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/pom.xml (original)
+++ tomcat/maven-plugin/trunk/pom.xml Tue Oct 22 01:02:25 2013
@@ -592,7 +592,7 @@
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-verifier</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
Modified:
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractDeployWarOnlyProjectIT.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractDeployWarOnlyProjectIT.java?rev=1534440&r1=1534439&r2=1534440&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractDeployWarOnlyProjectIT.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractDeployWarOnlyProjectIT.java
Tue Oct 22 01:02:25 2013
@@ -36,7 +36,6 @@ import static org.junit.Assert.assertTru
public abstract class AbstractDeployWarOnlyProjectIT
extends AbstractWarProjectIT
{
- private static final Logger LOG = LoggerFactory.getLogger(
AbstractDeployWarOnlyProjectIT.class );
@Override
protected String getWebappUrl()
@@ -60,7 +59,7 @@ public abstract class AbstractDeployWarO
assertTrue( "Tomcat folder should exist in target folder of project at
" + webappHome,
new File( webappHome, "target/tomcat" ).exists() );
- LOG.info( "Error Free Log check" );
+ logger.info( "Error Free Log check" );
verifier.verifyErrorFreeLog();
}
Modified:
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractDeployWarProjectIT.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractDeployWarProjectIT.java?rev=1534440&r1=1534439&r2=1534440&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractDeployWarProjectIT.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractDeployWarProjectIT.java
Tue Oct 22 01:02:25 2013
@@ -36,7 +36,6 @@ import static org.junit.Assert.assertTru
public abstract class AbstractDeployWarProjectIT
extends AbstractWarProjectIT
{
- private static final Logger LOG = LoggerFactory.getLogger(
AbstractDeployWarProjectIT.class );
@Override
protected String getWebappUrl()
@@ -60,7 +59,7 @@ public abstract class AbstractDeployWarP
assertTrue( "Tomcat folder should exist in target folder of project at
" + webappHome,
new File( webappHome, "target/tomcat" ).exists() );
- LOG.info( "Error Free Log check" );
+ logger.info( "Error Free Log check" );
verifier.verifyErrorFreeLog();
}
Modified:
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractSimpleWarProjectIT.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractSimpleWarProjectIT.java?rev=1534440&r1=1534439&r2=1534440&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractSimpleWarProjectIT.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractSimpleWarProjectIT.java
Tue Oct 22 01:02:25 2013
@@ -37,7 +37,7 @@ import static org.junit.Assert.assertTru
public abstract class AbstractSimpleWarProjectIT
extends AbstractWarProjectIT
{
- private static final Logger LOG = LoggerFactory.getLogger(
AbstractSimpleWarProjectIT.class );
+ protected Logger logger = LoggerFactory.getLogger( getClass() );
@Override
protected String getWebappUrl()
@@ -62,7 +62,7 @@ public abstract class AbstractSimpleWarP
assertTrue( "Tomcat folder should exist in target folder of project at
" + webappHome,
new File( webappHome, "target/tomcat" ).exists() );
- LOG.info( "Error Free Log check" );
+ logger.info( "Error Free Log check" );
verifier.verifyErrorFreeLog();
verifyConnectorsStarted();
}
Modified:
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractTomcatRunMultiConfigIT.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractTomcatRunMultiConfigIT.java?rev=1534440&r1=1534439&r2=1534440&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractTomcatRunMultiConfigIT.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractTomcatRunMultiConfigIT.java
Tue Oct 22 01:02:25 2013
@@ -41,7 +41,6 @@ import static org.junit.Assert.assertTru
public abstract class AbstractTomcatRunMultiConfigIT
extends AbstractWarProjectIT
{
- private static final Logger LOG = LoggerFactory.getLogger(
AbstractTomcatRunMultiConfigIT.class );
private static final String URL_QUERY = "\u3053\u3093\u306b\u3061\u306f";
@@ -60,7 +59,7 @@ public abstract class AbstractTomcatRunM
}
catch ( URISyntaxException e )
{
- LOG.error( "An exception occurred.", e );
+ logger.error( "An exception occurred.", e );
return "http://localhost:"; + getHttpItPort() + "/multi-config";
}
}
@@ -89,7 +88,7 @@ public abstract class AbstractTomcatRunM
"File \"" + emptyLocation.getAbsolutePath() + "\" should have been
copied from tcconf to tomcat/conf",
emptyLocation.exists() );
- LOG.info( "Error Free Log check" );
+ logger.info( "Error Free Log check" );
verifier.verifyErrorFreeLog();
verifyConnectorsStarted();
Modified:
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractUsageContextpathIT.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractUsageContextpathIT.java?rev=1534440&r1=1534439&r2=1534440&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractUsageContextpathIT.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractUsageContextpathIT.java
Tue Oct 22 01:02:25 2013
@@ -35,7 +35,6 @@ import static org.junit.Assert.assertNot
public class AbstractUsageContextpathIT
extends AbstractWarProjectIT
{
- private static final Logger LOG = LoggerFactory.getLogger(
AbstractUsageContextpathIT.class );
private static final String WEBAPP_URL = "http://localhost:"; +
getHttpItPort() + "/lorem/index.html";
@@ -64,7 +63,7 @@ public class AbstractUsageContextpathIT
assertNotNull( "Received message body must not be null.", responseBody
);
assertContains( "Response must match expected content.", "Success!",
responseBody );
- LOG.info( "Error Free Log check" );
+ logger.info( "Error Free Log check" );
verifier.verifyErrorFreeLog();
}
Modified:
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java?rev=1534440&r1=1534439&r2=1534440&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java
Tue Oct 22 01:02:25 2013
@@ -38,6 +38,8 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
/**
* Base class for all tests which have a war-project using the
tomcat-maven-plugin below project-resources.
@@ -46,7 +48,7 @@ import java.io.IOException;
*/
public abstract class AbstractWarProjectIT
{
- private static final Logger LOG = LoggerFactory.getLogger(
AbstractWarProjectIT.class );
+ protected Logger logger = LoggerFactory.getLogger( getClass() );
/**
* This URL will be queried for content. It will also be used to wait for
the startup of the webapp.
@@ -131,7 +133,12 @@ public abstract class AbstractWarProject
thread.start();
- LOG.info( "Executing verify on " + webappHome.getAbsolutePath() );
+ logger.info( "Executing verify on " + webappHome.getAbsolutePath() );
+
+ verifier.setCliOptions( getCliOptions() );
+
+ verifier.setLogFileName( "foo.log" );
+
verifier.executeGoal( getGoal() );
verifier.displayStreamBuffers();
@@ -141,11 +148,17 @@ public abstract class AbstractWarProject
return responseBodies[0];
}
+
protected String getGoal()
{
return "verify";
}
+ protected List<String> getCliOptions()
+ {
+ return Collections.emptyList();
+ }
+
private String getResponseBody( int timeout )
{
String responseBody = null;
@@ -156,27 +169,27 @@ public abstract class AbstractWarProject
{
while ( pingUrl() != 200 && currentTime < endTime )
{
- LOG.debug( "Ping..." );
+ logger.debug( "Ping..." );
Thread.sleep( 500 );
currentTime = System.currentTimeMillis();
}
if ( currentTime < endTime )
{
responseBody = getResponseBody();
- LOG.debug( "Received: " + responseBody );
+ logger.debug( "Received: " + responseBody );
}
else
{
- LOG.error( "Timeout met while trying to access web
application." );
+ logger.error( "Timeout met while trying to access web
application." );
}
}
catch ( IOException e )
{
- LOG.error( "Exception while trying to access web application.", e
);
+ logger.error( "Exception while trying to access web application.",
e );
}
catch ( InterruptedException e )
{
- LOG.error( "Exception while trying to access web application.", e
);
+ logger.error( "Exception while trying to access web application.",
e );
}
return responseBody;
}
@@ -199,7 +212,7 @@ public abstract class AbstractWarProject
}
catch ( IOException e )
{
- LOG.debug( "Ignoring exception while pinging URL " +
httpHead.getURI(), e );
+ logger.debug( "Ignoring exception while pinging URL " +
httpHead.getURI(), e );
return -1;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
