maven-surefire-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From krosenv...@apache.org
Subject svn commit: r1102565 - in /maven/surefire/trunk: surefire-integration-tests/src/test/resources/ant-ignore/ surefire-integration-tests/src/test/resources/ant-ignore/src/ surefire-integration-tests/src/test/resources/ant-ignore/src/test/ surefire-integra...
Date Fri, 13 May 2011 05:42:14 GMT
Author: krosenvold
Date: Fri May 13 05:42:14 2011
New Revision: 1102565

URL: http://svn.apache.org/viewvc?rev=1102565&view=rev
Log:
o Added small ant project for misc ant testing

Added:
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/ant-ignore/
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/ant-ignore/.gitignore
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/ant-ignore/build.xml
  (with props)
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/ant-ignore/ivy.xml
  (with props)
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/ant-ignore/pom.xml
  (with props)
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/ant-ignore/src/
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/ant-ignore/src/ivy.xml
  (with props)
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/ant-ignore/src/test/
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/ant-ignore/src/test/java/
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/ant-ignore/src/test/java/antignore/
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/ant-ignore/src/test/java/antignore/BasicTest.java
  (with props)
Modified:
    maven/surefire/trunk/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnitTestSet.java

Added: maven/surefire/trunk/surefire-integration-tests/src/test/resources/ant-ignore/.gitignore
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/ant-ignore/.gitignore?rev=1102565&view=auto
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/ant-ignore/.gitignore
(added)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/ant-ignore/.gitignore
Fri May 13 05:42:14 2011
@@ -0,0 +1,3 @@
+*.jar
+TEST*
+

Added: maven/surefire/trunk/surefire-integration-tests/src/test/resources/ant-ignore/build.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/ant-ignore/build.xml?rev=1102565&view=auto
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/ant-ignore/build.xml
(added)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/ant-ignore/build.xml
Fri May 13 05:42:14 2011
@@ -0,0 +1,52 @@
+<project name="MyProject" xmlns:ivy="antlib:org.apache.ivy.ant" default="dist" basedir=".">
+    <description>
+        simple example build file
+    </description>
+  <!-- set global properties for this build -->
+  <property name="src" location="src/test"/>
+  <property name="build" location="build"/>
+  <property name="dist"  location="dist"/>
+
+
+    <target name="resolve" description="--> retrieve dependencies with ivy">
+        <ivy:retrieve />
+    </target>
+
+  <target name="init">
+    <!-- Create the time stamp -->
+    <tstamp/>
+    <!-- Create the build directory structure used by compile -->
+    <mkdir dir="${build}"/>
+  </target>
+
+  <target name="compile" depends="init, resolve"
+        description="compile the source " >
+    <javac srcdir="${src}" destdir="${build}" includeantruntime="true" classpath="lib/junit-4.8.1.jar"
/>
+  </target>
+
+  <target name="dist" depends="compile"
+        description="generate the distribution" >
+    <!-- Create the distribution directory -->
+    <mkdir dir="${dist}/lib"/>
+
+    <!-- Put everything in ${build} into the MyProject-${DSTAMP}.jar file -->
+    <jar jarfile="${dist}/lib/MyProject-${DSTAMP}.jar" basedir="${build}"/>
+  </target>
+
+  <target name="test" depends="compile">
+    <junit>
+      <classpath path="build:lib/junit-4.8.1.jar"/>
+      <formatter type="brief" usefile="true" />
+      <formatter type="xml" usefile="true" />
+      <test name="antignore.BasicTest" />
+    </junit>
+</target>
+
+  <target name="clean"
+        description="clean up" >
+    <!-- Delete the ${build} and ${dist} directory trees -->
+    <delete dir="${build}"/>
+    <delete dir="${dist}"/>
+  </target>
+
+</project>

Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/ant-ignore/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: maven/surefire/trunk/surefire-integration-tests/src/test/resources/ant-ignore/ivy.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/ant-ignore/ivy.xml?rev=1102565&view=auto
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/ant-ignore/ivy.xml
(added)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/ant-ignore/ivy.xml
Fri May 13 05:42:14 2011
@@ -0,0 +1,6 @@
+<ivy-module version="2.0">
+    <info organisation="org.apache" module="hello-ivy"/>
+    <dependencies>
+        <dependency org="junit" name="junit" rev="4.8.1"/>
+    </dependencies>
+</ivy-module>

Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/ant-ignore/ivy.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: maven/surefire/trunk/surefire-integration-tests/src/test/resources/ant-ignore/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/ant-ignore/pom.xml?rev=1102565&view=auto
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/ant-ignore/pom.xml
(added)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/ant-ignore/pom.xml
Fri May 13 05:42:14 2011
@@ -0,0 +1,58 @@
+<?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>ant-ignore</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <name>Test of @Ignore annotation, can be used side-by-side with maven and ant </name>
+
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.4</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>${surefire.version}</version>
+      </plugin>
+      
+    </plugins>
+  </build>
+
+</project>

Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/ant-ignore/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: maven/surefire/trunk/surefire-integration-tests/src/test/resources/ant-ignore/src/ivy.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/ant-ignore/src/ivy.xml?rev=1102565&view=auto
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/ant-ignore/src/ivy.xml
(added)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/ant-ignore/src/ivy.xml
Fri May 13 05:42:14 2011
@@ -0,0 +1,6 @@
+<ivy-module version="2.0">
+    <info organisation="org.apache" module="hello-ivy"/>
+    <dependencies>
+        <dependency org="junit" name="junit" rev="4.8.1"/>
+    </dependencies>
+</ivy-module>

Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/ant-ignore/src/ivy.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: maven/surefire/trunk/surefire-integration-tests/src/test/resources/ant-ignore/src/test/java/antignore/BasicTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/ant-ignore/src/test/java/antignore/BasicTest.java?rev=1102565&view=auto
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/ant-ignore/src/test/java/antignore/BasicTest.java
(added)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/ant-ignore/src/test/java/antignore/BasicTest.java
Fri May 13 05:42:14 2011
@@ -0,0 +1,23 @@
+package antignore;
+import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.Ignore;
+
+
+
+public class BasicTest
+{
+
+    @Ignore
+    public void testIgnorable()
+    {
+        Assert.fail("you should have ignored me!");
+    }
+
+    @Test
+    public void testSomethingElse(){
+
+    }
+
+}

Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/ant-ignore/src/test/java/antignore/BasicTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: maven/surefire/trunk/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnitTestSet.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnitTestSet.java?rev=1102565&r1=1102564&r2=1102565&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnitTestSet.java
(original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnitTestSet.java
Fri May 13 05:42:14 2011
@@ -22,6 +22,8 @@ package org.apache.maven.surefire.junit;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
+
+import junit.framework.TestSuite;
 import org.apache.maven.surefire.common.junit3.JUnit3Reflector;
 import org.apache.maven.surefire.report.RunListener;
 import org.apache.maven.surefire.testset.TestSetFailedException;



Mime
View raw message