You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2012/11/11 18:53:26 UTC
[1/2] git commit: [SUREFIRE-926] IT based on test project by Larry
Shatzer
Updated Branches:
refs/heads/master 48a70d49b -> 137aa1d32
[SUREFIRE-926] IT based on test project by Larry Shatzer
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/137aa1d3
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/137aa1d3
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/137aa1d3
Branch: refs/heads/master
Commit: 137aa1d3250726937c2c5f04200c5a07a015dc76
Parents: 53456de
Author: Kristian Rosenvold <kr...@gmail.com>
Authored: Sun Nov 11 18:36:11 2012 +0100
Committer: Kristian Rosenvold <kr...@gmail.com>
Committed: Sun Nov 11 18:36:11 2012 +0100
----------------------------------------------------------------------
.../jiras/Surefire926FailureWith2ProvidersIT.java | 36 +++++++++++++
.../surefire-926-2-provider-failure/pom.xml | 41 +++++++++++++++
.../src/test/java/com/company/JUnitTest.java | 12 ++++
.../src/test/java/com/company/TestNGTest.java | 12 ++++
4 files changed, 101 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/137aa1d3/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire926FailureWith2ProvidersIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire926FailureWith2ProvidersIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire926FailureWith2ProvidersIT.java
new file mode 100644
index 0000000..90d0a1d
--- /dev/null
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire926FailureWith2ProvidersIT.java
@@ -0,0 +1,36 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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.
+ */
+
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.TestFile;
+
+/**
+ * @author Kristian Rosenvold
+ */
+public class Surefire926FailureWith2ProvidersIT
+ extends SurefireIntegrationTestCase
+{
+ public void testBuildFailingWhenErrors()
+ {
+ unpack( "surefire-926-2-provider-failure" ).executeTestWithFailure();
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/137aa1d3/surefire-integration-tests/src/test/resources/surefire-926-2-provider-failure/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-926-2-provider-failure/pom.xml b/surefire-integration-tests/src/test/resources/surefire-926-2-provider-failure/pom.xml
new file mode 100644
index 0000000..eb634e7
--- /dev/null
+++ b/surefire-integration-tests/src/test/resources/surefire-926-2-provider-failure/pom.xml
@@ -0,0 +1,41 @@
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-testng</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit47</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.10</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>6.8</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/137aa1d3/surefire-integration-tests/src/test/resources/surefire-926-2-provider-failure/src/test/java/com/company/JUnitTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-926-2-provider-failure/src/test/java/com/company/JUnitTest.java b/surefire-integration-tests/src/test/resources/surefire-926-2-provider-failure/src/test/java/com/company/JUnitTest.java
new file mode 100644
index 0000000..434a95c
--- /dev/null
+++ b/surefire-integration-tests/src/test/resources/surefire-926-2-provider-failure/src/test/java/com/company/JUnitTest.java
@@ -0,0 +1,12 @@
+package com.company;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class JUnitTest {
+ @Test
+ public void test() {
+ //Assert.assertTrue(true);
+ Assert.assertTrue(false);
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/137aa1d3/surefire-integration-tests/src/test/resources/surefire-926-2-provider-failure/src/test/java/com/company/TestNGTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-926-2-provider-failure/src/test/java/com/company/TestNGTest.java b/surefire-integration-tests/src/test/resources/surefire-926-2-provider-failure/src/test/java/com/company/TestNGTest.java
new file mode 100644
index 0000000..480372d
--- /dev/null
+++ b/surefire-integration-tests/src/test/resources/surefire-926-2-provider-failure/src/test/java/com/company/TestNGTest.java
@@ -0,0 +1,12 @@
+package com.company;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+public class TestNGTest {
+ @Test
+ public void test() {
+ Assert.assertTrue(true);
+ //Assert.assertTrue(false);
+ }
+}