You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2015/05/02 11:56:39 UTC
[05/10] maven-surefire git commit: Check that inherited tests in
suites are rerun correctly
Check that inherited tests in suites are rerun correctly
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/8cf6e575
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/8cf6e575
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/8cf6e575
Branch: refs/heads/master
Commit: 8cf6e57536eea65240d13114a8bcdd400f55770b
Parents: 62aa798
Author: Sean Flanigan <sf...@redhat.com>
Authored: Thu Apr 16 16:57:06 2015 +1000
Committer: Sean Flanigan <sf...@redhat.com>
Committed: Tue Apr 28 14:25:07 2015 +1000
----------------------------------------------------------------------
.../java/jiras/surefire1152/FlakyParent.java | 45 ++++++++++++++++++++
.../test/java/jiras/surefire1152/FlakyTest.java | 2 +-
.../java/jiras/surefire1152/FlakyTestSuite.java | 2 +-
3 files changed, 47 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8cf6e575/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyParent.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyParent.java b/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyParent.java
new file mode 100644
index 0000000..86a08db
--- /dev/null
+++ b/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyParent.java
@@ -0,0 +1,45 @@
+package jiras.surefire1152;
+
+/*
+ * 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.junit.Test;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import static org.junit.Assert.fail;
+
+public class FlakyParent
+{
+ // set of test classes which have previously invoked testFlakyParent
+ private static final Set<Class<?>> previouslyRun = new HashSet<Class<?>>();
+
+ @Test
+ public void testFlakyParent()
+ {
+ Class<?> clazz = getClass();
+ if ( !previouslyRun.contains( clazz ) )
+ {
+ previouslyRun.add( clazz );
+ fail( "deliberately flaky test (should pass the next time)" );
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8cf6e575/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyTest.java b/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyTest.java
index cab834c..ee20f9e 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyTest.java
+++ b/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyTest.java
@@ -23,7 +23,7 @@ import org.junit.Test;
import static org.junit.Assert.fail;
-public class FlakyTest
+public class FlakyTest extends FlakyParent
{
private static int n;
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8cf6e575/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyTestSuite.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyTestSuite.java b/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyTestSuite.java
index 85ec1b3..f4a7d67 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyTestSuite.java
+++ b/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyTestSuite.java
@@ -23,7 +23,7 @@ import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@RunWith( Suite.class )
-@Suite.SuiteClasses( { FlakyTest.class } )
+@Suite.SuiteClasses( { FlakyTest.class, FlakyParent.class } )
public class FlakyTestSuite
{
}