You are viewing a plain text version of this content. The canonical link for it is here.
Posted to surefire-commits@maven.apache.org by be...@apache.org on 2009/07/12 20:11:15 UTC
svn commit: r793386 - in /maven/surefire/trunk:
maven-surefire-plugin/src/site/apt/examples/
maven-surefire-report-plugin/src/test/resources/test-reports/
surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/
surefire-integration-test...
Author: bentmann
Date: Sun Jul 12 18:11:15 2009
New Revision: 793386
URL: http://svn.apache.org/viewvc?rev=793386&view=rev
Log:
o Set svn:eol-style=native
Modified:
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/additional-classpath.apt (contents, props changed)
maven/surefire/trunk/maven-surefire-report-plugin/src/test/resources/test-reports/TEST-AntUnit.xml (contents, props changed)
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIT.java (contents, props changed)
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgSuiteXmlSingleTest.java (contents, props changed)
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestPlainOldJavaClasspath.java (contents, props changed)
maven/surefire/trunk/surefire-integration-tests/src/test/resources/plain-old-java-classpath/pom.xml (contents, props changed)
maven/surefire/trunk/surefire-integration-tests/src/test/resources/plain-old-java-classpath/src/test/java/plainOldJavaClasspath/BasicTest.java (contents, props changed)
maven/surefire/trunk/surefire-integration-tests/src/test/resources/webapp/pom.xml (contents, props changed)
maven/surefire/trunk/surefire-integration-tests/src/test/resources/webapp/src/main/webapp/WEB-INF/web.xml (props changed)
maven/surefire/trunk/surefire-integration-tests/src/test/resources/webapp/src/test/java/WebAppTest.java (contents, props changed)
Modified: maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/additional-classpath.apt
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/additional-classpath.apt?rev=793386&r1=793385&r2=793386&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/additional-classpath.apt (original)
+++ maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/additional-classpath.apt Sun Jul 12 18:11:15 2009
@@ -1,36 +1,36 @@
- ------
- Additional Classpath
- ------
- Pascal Lambert
- ------
- March 2008
- ------
-
-Additional Classpath Elements
-
- If you need to put more stuff in your classpath when Surefire executes (e.g some funky resources or a container special jar),
- we normally recommend you add it to your classpath as a dependency. Consider deploying shared jars to a private remote repository for your
- organization.
-
- But, if you must, you can use the <<<additionalClasspathElements>>> element to add custom resources/jars to your classpath.
-
-+---+
-<project>
- [...]
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <additionalClasspathElements>
- <additionalClasspathElement>path/to/additional/resources</additionalClasspathElement>
- <additionalClasspathElement>path/to/additional/jar</additionalClasspathElement>
- </additionalClasspathElements>
- </configuration>
- </plugin>
- </plugins>
- </build>
- [...]
-</project>
+ ------
+ Additional Classpath
+ ------
+ Pascal Lambert
+ ------
+ March 2008
+ ------
+
+Additional Classpath Elements
+
+ If you need to put more stuff in your classpath when Surefire executes (e.g some funky resources or a container special jar),
+ we normally recommend you add it to your classpath as a dependency. Consider deploying shared jars to a private remote repository for your
+ organization.
+
+ But, if you must, you can use the <<<additionalClasspathElements>>> element to add custom resources/jars to your classpath.
+
++---+
+<project>
+ [...]
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <additionalClasspathElements>
+ <additionalClasspathElement>path/to/additional/resources</additionalClasspathElement>
+ <additionalClasspathElement>path/to/additional/jar</additionalClasspathElement>
+ </additionalClasspathElements>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ [...]
+</project>
+---+
\ No newline at end of file
Propchange: maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/additional-classpath.apt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/surefire/trunk/maven-surefire-report-plugin/src/test/resources/test-reports/TEST-AntUnit.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/test/resources/test-reports/TEST-AntUnit.xml?rev=793386&r1=793385&r2=793386&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/src/test/resources/test-reports/TEST-AntUnit.xml (original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/src/test/resources/test-reports/TEST-AntUnit.xml Sun Jul 12 18:11:15 2009
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<testsuite buildFile="/home/pjanes/devel/maven/client/tools/tests/changebase.xml" hostname="merope" name="tests.changebase_xml" timestamp="2008-04-23T13:25:46">
- <testcase name="testNegativeValue">
- <time>0.378</time>
- </testcase>
- <tests>1</tests>
- <failures>0</failures>
- <errors>0</errors>
- <time>0.378</time>
-</testsuite>
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite buildFile="/home/pjanes/devel/maven/client/tools/tests/changebase.xml" hostname="merope" name="tests.changebase_xml" timestamp="2008-04-23T13:25:46">
+ <testcase name="testNegativeValue">
+ <time>0.378</time>
+ </testcase>
+ <tests>1</tests>
+ <failures>0</failures>
+ <errors>0</errors>
+ <time>0.378</time>
+</testsuite>
Propchange: maven/surefire/trunk/maven-surefire-report-plugin/src/test/resources/test-reports/TEST-AntUnit.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIT.java?rev=793386&r1=793385&r2=793386&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIT.java Sun Jul 12 18:11:15 2009
@@ -1,37 +1,37 @@
-package org.apache.maven.surefire.its;
-
-import java.util.ArrayList;
-
-import junit.framework.TestCase;
-
-import org.apache.maven.it.VerificationException;
-import org.apache.maven.it.Verifier;
-
-
-/**
- * Base class of all integration test cases. Mainly used to pickup surefire version
- * from system property
- * @author Dan T. Tran
- *
- */
-public abstract class AbstractSurefireIT
- extends TestCase
-{
- private String surefireVersion = System.getProperty( "surefire.version" );
-
- protected ArrayList getInitialGoals()
- {
- ArrayList goals = new ArrayList();
- goals.add( "-Dsurefire.version=" + surefireVersion );
- return goals;
- }
-
- protected void executeGoal( Verifier verifier, String goal )
- throws VerificationException
- {
- ArrayList goals = this.getInitialGoals();
- goals.add( goal );
- verifier.executeGoals( goals );
- }
-
-}
+package org.apache.maven.surefire.its;
+
+import java.util.ArrayList;
+
+import junit.framework.TestCase;
+
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+
+
+/**
+ * Base class of all integration test cases. Mainly used to pickup surefire version
+ * from system property
+ * @author Dan T. Tran
+ *
+ */
+public abstract class AbstractSurefireIT
+ extends TestCase
+{
+ private String surefireVersion = System.getProperty( "surefire.version" );
+
+ protected ArrayList getInitialGoals()
+ {
+ ArrayList goals = new ArrayList();
+ goals.add( "-Dsurefire.version=" + surefireVersion );
+ return goals;
+ }
+
+ protected void executeGoal( Verifier verifier, String goal )
+ throws VerificationException
+ {
+ ArrayList goals = this.getInitialGoals();
+ goals.add( goal );
+ verifier.executeGoals( goals );
+ }
+
+}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgSuiteXmlSingleTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgSuiteXmlSingleTest.java?rev=793386&r1=793385&r2=793386&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgSuiteXmlSingleTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgSuiteXmlSingleTest.java Sun Jul 12 18:11:15 2009
@@ -1,37 +1,37 @@
-package org.apache.maven.surefire.its;
-
-
-import java.io.File;
-import java.util.List;
-
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
-/**
- * Use -Dtest to run a single TestNG test, overriding the suite XML parameter.
- *
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- *
- */
-public class TestNgSuiteXmlSingleTest
- extends AbstractSurefireIT
-{
- public void testTestNGSuite()
- throws Exception
- {
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/testng-twoTestCaseSuite" );
-
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- List goals = this.getInitialGoals();
- goals.add( "test" );
- goals.add( "-Dtest=TestNGTestTwo" );
- verifier.executeGoals( goals );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
-
- List reports = HelperAssertions.extractReports( ( new File[] { testDir } ) );
- ITSuiteResults results = HelperAssertions.parseReportList( reports );
- HelperAssertions.assertTestSuiteResults( 1, 0, 0, 0, results );
- }
-
-}
+package org.apache.maven.surefire.its;
+
+
+import java.io.File;
+import java.util.List;
+
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+/**
+ * Use -Dtest to run a single TestNG test, overriding the suite XML parameter.
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ *
+ */
+public class TestNgSuiteXmlSingleTest
+ extends AbstractSurefireIT
+{
+ public void testTestNGSuite()
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/testng-twoTestCaseSuite" );
+
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ List goals = this.getInitialGoals();
+ goals.add( "test" );
+ goals.add( "-Dtest=TestNGTestTwo" );
+ verifier.executeGoals( goals );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ List reports = HelperAssertions.extractReports( ( new File[] { testDir } ) );
+ ITSuiteResults results = HelperAssertions.parseReportList( reports );
+ HelperAssertions.assertTestSuiteResults( 1, 0, 0, 0, results );
+ }
+
+}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgSuiteXmlSingleTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestPlainOldJavaClasspath.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestPlainOldJavaClasspath.java?rev=793386&r1=793385&r2=793386&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestPlainOldJavaClasspath.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestPlainOldJavaClasspath.java Sun Jul 12 18:11:15 2009
@@ -1,30 +1,30 @@
-package org.apache.maven.surefire.its;
-
-
-import java.io.File;
-
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
-/**
- * Test useManifestOnlyJar option
- *
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- *
- */
-public class TestPlainOldJavaClasspath
- extends AbstractSurefireIT
-{
- public void testPlainOldJavaClasspath ()
- throws Exception
- {
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/plain-old-java-classpath" );
-
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- this.executeGoal( verifier, "test" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
-
- HelperAssertions.assertTestSuiteResults( 1, 0, 0, 0, testDir );
- }
-}
+package org.apache.maven.surefire.its;
+
+
+import java.io.File;
+
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+/**
+ * Test useManifestOnlyJar option
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ *
+ */
+public class TestPlainOldJavaClasspath
+ extends AbstractSurefireIT
+{
+ public void testPlainOldJavaClasspath ()
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/plain-old-java-classpath" );
+
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ this.executeGoal( verifier, "test" );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ HelperAssertions.assertTestSuiteResults( 1, 0, 0, 0, testDir );
+ }
+}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestPlainOldJavaClasspath.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/plain-old-java-classpath/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/plain-old-java-classpath/pom.xml?rev=793386&r1=793385&r2=793386&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/plain-old-java-classpath/pom.xml (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/plain-old-java-classpath/pom.xml Sun Jul 12 18:11:15 2009
@@ -1,52 +1,52 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you 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.
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>plain-old-java-classpath</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for useManifestOnlyJar=false</name>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <useManifestOnlyJar>false</useManifestOnlyJar>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you 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.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>plain-old-java-classpath</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for useManifestOnlyJar=false</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <useManifestOnlyJar>false</useManifestOnlyJar>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/plain-old-java-classpath/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/plain-old-java-classpath/src/test/java/plainOldJavaClasspath/BasicTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/plain-old-java-classpath/src/test/java/plainOldJavaClasspath/BasicTest.java?rev=793386&r1=793385&r2=793386&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/plain-old-java-classpath/src/test/java/plainOldJavaClasspath/BasicTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/plain-old-java-classpath/src/test/java/plainOldJavaClasspath/BasicTest.java Sun Jul 12 18:11:15 2009
@@ -1,69 +1,69 @@
-package plainOldJavaClasspath;
-
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class BasicTest
- extends TestCase
-{
-
- private boolean setUpCalled = false;
-
- private static boolean tearDownCalled = false;
-
- public BasicTest( String name, String extraName )
- {
- super( name );
- }
-
- public static Test suite()
- {
- System.out.println("suite");
- TestSuite suite = new TestSuite();
- Test test = new BasicTest( "testSetUp", "dummy" );
- suite.addTest( test );
- TestSetup setup = new TestSetup( suite )
- {
-
- protected void setUp()
- {
- //oneTimeSetUp();
- }
-
- protected void tearDown()
- {
- oneTimeTearDown();
- }
-
- };
-
- return setup;
- }
-
- protected void setUp()
- {
- setUpCalled = true;
- tearDownCalled = false;
- System.out.println( "Called setUp" );
- }
-
- protected void tearDown()
- {
- setUpCalled = false;
- tearDownCalled = true;
- System.out.println( "Called tearDown" );
- }
-
- public void testSetUp()
- {
- assertTrue( "setUp was not called", setUpCalled );
- }
-
- public static void oneTimeTearDown()
- {
- assertTrue( "tearDown was not called", tearDownCalled );
- }
-
-}
+package plainOldJavaClasspath;
+
+import junit.extensions.TestSetup;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+public class BasicTest
+ extends TestCase
+{
+
+ private boolean setUpCalled = false;
+
+ private static boolean tearDownCalled = false;
+
+ public BasicTest( String name, String extraName )
+ {
+ super( name );
+ }
+
+ public static Test suite()
+ {
+ System.out.println("suite");
+ TestSuite suite = new TestSuite();
+ Test test = new BasicTest( "testSetUp", "dummy" );
+ suite.addTest( test );
+ TestSetup setup = new TestSetup( suite )
+ {
+
+ protected void setUp()
+ {
+ //oneTimeSetUp();
+ }
+
+ protected void tearDown()
+ {
+ oneTimeTearDown();
+ }
+
+ };
+
+ return setup;
+ }
+
+ protected void setUp()
+ {
+ setUpCalled = true;
+ tearDownCalled = false;
+ System.out.println( "Called setUp" );
+ }
+
+ protected void tearDown()
+ {
+ setUpCalled = false;
+ tearDownCalled = true;
+ System.out.println( "Called tearDown" );
+ }
+
+ public void testSetUp()
+ {
+ assertTrue( "setUp was not called", setUpCalled );
+ }
+
+ public static void oneTimeTearDown()
+ {
+ assertTrue( "tearDown was not called", tearDownCalled );
+ }
+
+}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/plain-old-java-classpath/src/test/java/plainOldJavaClasspath/BasicTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/webapp/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/webapp/pom.xml?rev=793386&r1=793385&r2=793386&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/webapp/pom.xml (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/webapp/pom.xml Sun Jul 12 18:11:15 2009
@@ -10,12 +10,12 @@
<finalName>webapp</finalName>
<plugins>
<plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
-
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ </plugin>
+
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.0</version>
@@ -84,8 +84,8 @@
<artifactId>commons-el</artifactId>
<version>1.0</version>
</dependency>
- </dependencies>
-
+ </dependencies>
+
<profiles>
<profile>
<id>default-tools.jar</id>
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/webapp/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/webapp/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/webapp/src/test/java/WebAppTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/webapp/src/test/java/WebAppTest.java?rev=793386&r1=793385&r2=793386&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/webapp/src/test/java/WebAppTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/webapp/src/test/java/WebAppTest.java Sun Jul 12 18:11:15 2009
@@ -1,37 +1,37 @@
-import java.io.InputStream;
-import java.net.URL;
-
-import junit.framework.TestCase;
-
-import org.mortbay.jetty.Server;
-
-
-public class WebAppTest extends TestCase {
- private Server server = null;
-
- public void setUp() throws Exception {
- System.setProperty("org.mortbay.xml.XmlParser.NotValidating", "true");
-
- server = new Server();
- String testPort = ":18080";
- server.addListener(testPort);
- server.addWebApplication("127.0.0.1", "/webapp", "target/webapp");
-
- server.start();
- }
-
- public void testBlah() throws Exception {
- URL url = new URL("http://127.0.0.1:18080/webapp/index.jsp");
- InputStream stream = url.openStream();
- StringBuffer sb = new StringBuffer();
- for (int i = stream.read(); i != -1; i = stream.read()) {
- sb.append((char)i);
- }
- String value = sb.toString();
- assertTrue(value, value.contains("Hello"));
- }
-
- public void tearDown() throws Exception {
- if (server != null) server.stop();
- }
-}
+import java.io.InputStream;
+import java.net.URL;
+
+import junit.framework.TestCase;
+
+import org.mortbay.jetty.Server;
+
+
+public class WebAppTest extends TestCase {
+ private Server server = null;
+
+ public void setUp() throws Exception {
+ System.setProperty("org.mortbay.xml.XmlParser.NotValidating", "true");
+
+ server = new Server();
+ String testPort = ":18080";
+ server.addListener(testPort);
+ server.addWebApplication("127.0.0.1", "/webapp", "target/webapp");
+
+ server.start();
+ }
+
+ public void testBlah() throws Exception {
+ URL url = new URL("http://127.0.0.1:18080/webapp/index.jsp");
+ InputStream stream = url.openStream();
+ StringBuffer sb = new StringBuffer();
+ for (int i = stream.read(); i != -1; i = stream.read()) {
+ sb.append((char)i);
+ }
+ String value = sb.toString();
+ assertTrue(value, value.contains("Hello"));
+ }
+
+ public void tearDown() throws Exception {
+ if (server != null) server.stop();
+ }
+}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/webapp/src/test/java/WebAppTest.java
------------------------------------------------------------------------------
svn:eol-style = native