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 ol...@apache.org on 2011/04/05 13:00:18 UTC
svn commit: r1088971 - in /maven/surefire/trunk:
surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/
surefire-integration-tests/src/test/resources/testng-method-pattern-after/
surefire-integration-tests/src/test/resources/testng-met...
Author: olamy
Date: Tue Apr 5 11:00:17 2011
New Revision: 1088971
URL: http://svn.apache.org/viewvc?rev=1088971&view=rev
Log:
[SUREFIRE-722] testng : using -Dtest=myClass#myMethod doesn't execute methods marked @Before* @After*
added it test for @After
ignore some idea files
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestMethodPatternAfterIT.java (with props)
maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-method-pattern-after/
- copied from r1088960, maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-method-pattern-before/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-method-pattern-after/pom.xml
- copied unchanged from r1088961, maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-method-pattern-before/pom.xml
maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-method-pattern-after/src/test/java/testng/BasicTest.java
- copied unchanged from r1088961, maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-method-pattern-before/src/test/java/testng/BasicTest.java
Modified:
maven/surefire/trunk/surefire-providers/common-junit3/ (props changed)
maven/surefire/trunk/surefire-providers/common-junit4/ (props changed)
maven/surefire/trunk/surefire-providers/surefire-junit3/ (props changed)
maven/surefire/trunk/surefire-providers/surefire-testng-utils/ (props changed)
maven/surefire/trunk/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java
maven/surefire/trunk/surefire-setup-integration-tests/ (props changed)
Added: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestMethodPatternAfterIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestMethodPatternAfterIT.java?rev=1088971&view=auto
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestMethodPatternAfterIT.java (added)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestMethodPatternAfterIT.java Tue Apr 5 11:00:17 2011
@@ -0,0 +1,44 @@
+package org.apache.maven.surefire.its;
+/*
+ * 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.
+ */
+
+
+/**
+ * Test project using -Dtest=mtClass#myMethod*
+ *
+ * @author <a href="mailto:olamy@apache.org">Olivier Lamy</a>
+ */
+public class TestNgTestMethodPatternAfterIT
+ extends AsbtractTestMethodPattern
+{
+ public TestNgTestMethodPatternAfterIT()
+ {
+ super( "/testng-method-pattern-after" );
+ }
+
+ public void testMethodPattern()
+ throws Exception
+ {
+ executeTest();
+ verifyErrorFreeLog();
+ verifyTextInLog( "Called tearDown" );
+ assertTestSuiteResults( 2, 0, 0, 0 );
+ }
+
+}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestMethodPatternAfterIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestMethodPatternAfterIT.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestMethodPatternAfterIT.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/surefire/trunk/surefire-providers/common-junit3/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Apr 5 11:00:17 2011
@@ -2,3 +2,4 @@ target
.classpath
.project
.settings
+*.iml
Propchange: maven/surefire/trunk/surefire-providers/common-junit4/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Apr 5 11:00:17 2011
@@ -2,3 +2,4 @@
target
.classpath
.project
+*.iml
Propchange: maven/surefire/trunk/surefire-providers/surefire-junit3/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Apr 5 11:00:17 2011
@@ -2,3 +2,4 @@
target
.classpath
.project
+*.iml
Propchange: maven/surefire/trunk/surefire-providers/surefire-testng-utils/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Apr 5 11:00:17 2011
@@ -2,3 +2,4 @@
target
.classpath
.project
+*.iml
Modified: maven/surefire/trunk/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java?rev=1088971&r1=1088970&r2=1088971&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java Tue Apr 5 11:00:17 2011
@@ -46,7 +46,6 @@ public class MethodSelector
public boolean includeMethod( IMethodSelectorContext context, ITestNGMethod testngMethod, boolean isTestMethod )
{
-
if ( testngMethod.isBeforeClassConfiguration() || testngMethod.isBeforeGroupsConfiguration()
|| testngMethod.isBeforeMethodConfiguration() || testngMethod.isBeforeSuiteConfiguration()
|| testngMethod.isBeforeTestConfiguration() )
Propchange: maven/surefire/trunk/surefire-setup-integration-tests/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Apr 5 11:00:17 2011
@@ -0,0 +1,6 @@
+target
+*.iml
+.classpath
+.project
+.settings
+build