svn commit: r852409 - in /websites/production/maven/content/shared-archives/maven-shared-utils-0.3: dependencies.html pmd.xml surefire-report.html
Author: krosenvold Date: Thu Feb 28 15:08:02 2013 New Revision: 852409 Log: Site checkin for project Maven Shared Utils Modified: websites/production/maven/content/shared-archives/maven-shared-utils-0.3/dependencies.html websites/production/maven/content/shared-archives/maven-shared-utils-0.3/pmd.xml websites/production/maven/content/shared-archives/maven-shared-utils-0.3/surefire-report.html Modified: websites/production/maven/content/shared-archives/maven-shared-utils-0.3/dependencies.html == --- websites/production/maven/content/shared-archives/maven-shared-utils-0.3/dependencies.html (original) +++ websites/production/maven/content/shared-archives/maven-shared-utils-0.3/dependencies.html Thu Feb 28 15:08:02 2013 @@ -212,11 +212,11 @@ } } /script -a name=Dependency_Tree/adiv class=sectionh3Dependency Treea name=Dependency_Tree/a/h3ulliorg.apache.maven.shared:maven-shared-utils:jar:0.3 img id=_313072620 src=./images/icon_info_sml.gif alt=Information onclick=toggleDependencyDetail( '_355191800', '_313072620' ); style=cursor: pointer;vertical-align:text-bottom;/imgdiv id=_355191800 style=display:nonetable border=0 class=bodyTabletr class=athMaven Shared Utils/th/trtr class=btdpbDescription: /bShared utils without any further dependencies/ppbURL: /ba class=externalLink href=http://maven.apache.org/shared/maven-shared-utils/;http://maven.apache.org/shared/maven-shared-utils//a/ppbProject License: /ba class=externalLink href=http://www.apache.org/licenses/LICENSE-2.0.txt;The Apache Software License, Version 2.0/a/p/td/tr/table/divullijunit:junit:jar:4.9 (test) img id=_1442749813 src=./images/icon_info_sml. gif alt=Information onclick=toggleDependencyDetail( '_1314448061', '_1442749813' ); style=cursor: pointer;vertical-align:text-bottom;/imgdiv id=_1314448061 style=display:nonetable border=0 class=bodyTabletr class=athJUnit/th/trtr class=btdpbDescription: /bJUnit is a regression testing framework written by Erich Gamma and Kent Beck. -It is used by the developer who implements unit tests in Java./ppbURL: /ba class=externalLink href=http://junit.org;http://junit.org/a/ppbProject License: /ba class=externalLink href=http://www.opensource.org/licenses/cpl1.0.txt;Common Public License Version 1.0/a/p/td/tr/table/divulliorg.hamcrest:hamcrest-core:jar:1.1 (test) img id=_1615818798 src=./images/icon_info_sml.gif alt=Information onclick=toggleDependencyDetail( '_896981741', '_1615818798' ); style=cursor: pointer;vertical-align:text-bottom;/imgdiv id=_896981741 style=display:nonetable border=0 class=bodyTabletr class=athHamcrest Core/th/trtr class=btdpbDescription: /bThere is currently no description associated with this project./ppbProject License: /ba class=externalLink href=http://www.opensource.org/licenses/bsd-license.php;BSD style/a/p/td/tr/table/div/li/ul/lilicommons-io:common s-io:jar:2.2 (compile) img id=_296450465 src=./images/icon_info_sml.gif alt=Information onclick=toggleDependencyDetail( '_656164721', '_296450465' ); style=cursor: pointer;vertical-align:text-bottom;/imgdiv id=_656164721 style=display:nonetable border=0 class=bodyTabletr class=athCommons IO/th/trtr class=btdpbDescription: /bThe Commons IO library contains utility classes, stream implementations, file filters, -file comparators, endian transformation classes, and much more./ppbURL: /ba class=externalLink href=http://commons.apache.org/io/;http://commons.apache.org/io//a/ppbProject License: /ba class=externalLink href=http://www.apache.org/licenses/LICENSE-2.0.txt;The Apache Software License, Version 2.0/a/p/td/tr/table/div/liliorg.apache.commons:commons-lang3:jar:3.1 (test) img id=_2107856451 src=./images/icon_info_sml.gif alt=Information onclick=toggleDependencyDetail( '_912119143', '_2107856451' ); style=cursor: pointer;vertical-align:text-bottom;/imgdiv id=_912119143 style=display:nonetable border=0 class=bodyTabletr class=athCommons Lang/th/trtr class=btdpbDescription: /bCommons Lang, a package of Java utility classes for the +a name=Dependency_Tree/adiv class=sectionh3Dependency Treea name=Dependency_Tree/a/h3ulliorg.apache.maven.shared:maven-shared-utils:jar:0.3 img id=_243213618 src=./images/icon_info_sml.gif alt=Information onclick=toggleDependencyDetail( '_493617251', '_243213618' ); style=cursor: pointer;vertical-align:text-bottom;/imgdiv id=_493617251 style=display:nonetable border=0 class=bodyTabletr class=athMaven Shared Utils/th/trtr class=btdpbDescription: /bShared utils without any further dependencies/ppbURL: /ba class=externalLink href=http://maven.apache.org/shared/maven-shared-utils/;http://maven.apache.org/shared/maven-shared-utils//a/ppbProject License: /ba class=externalLink href=http://www.apache.org/licenses/LICENSE-2.0.txt;The Apache Software License, Version 2.0/a/p/td/tr/table/divullijunit:junit:jar:4.9 (test) img id
svn commit: r852411 - in /websites/production/maven/content/shared-archives/maven-shared-utils-0.3: dependencies.html pmd.xml surefire-report.html
Author: krosenvold Date: Thu Feb 28 15:10:58 2013 New Revision: 852411 Log: Site checkin for project Maven Shared Utils Modified: websites/production/maven/content/shared-archives/maven-shared-utils-0.3/dependencies.html websites/production/maven/content/shared-archives/maven-shared-utils-0.3/pmd.xml websites/production/maven/content/shared-archives/maven-shared-utils-0.3/surefire-report.html Modified: websites/production/maven/content/shared-archives/maven-shared-utils-0.3/dependencies.html == --- websites/production/maven/content/shared-archives/maven-shared-utils-0.3/dependencies.html (original) +++ websites/production/maven/content/shared-archives/maven-shared-utils-0.3/dependencies.html Thu Feb 28 15:10:58 2013 @@ -212,11 +212,11 @@ } } /script -a name=Dependency_Tree/adiv class=sectionh3Dependency Treea name=Dependency_Tree/a/h3ulliorg.apache.maven.shared:maven-shared-utils:jar:0.3 img id=_243213618 src=./images/icon_info_sml.gif alt=Information onclick=toggleDependencyDetail( '_493617251', '_243213618' ); style=cursor: pointer;vertical-align:text-bottom;/imgdiv id=_493617251 style=display:nonetable border=0 class=bodyTabletr class=athMaven Shared Utils/th/trtr class=btdpbDescription: /bShared utils without any further dependencies/ppbURL: /ba class=externalLink href=http://maven.apache.org/shared/maven-shared-utils/;http://maven.apache.org/shared/maven-shared-utils//a/ppbProject License: /ba class=externalLink href=http://www.apache.org/licenses/LICENSE-2.0.txt;The Apache Software License, Version 2.0/a/p/td/tr/table/divullijunit:junit:jar:4.9 (test) img id=_1327028461 src=./images/icon_info_sml. gif alt=Information onclick=toggleDependencyDetail( '_2079815464', '_1327028461' ); style=cursor: pointer;vertical-align:text-bottom;/imgdiv id=_2079815464 style=display:nonetable border=0 class=bodyTabletr class=athJUnit/th/trtr class=btdpbDescription: /bJUnit is a regression testing framework written by Erich Gamma and Kent Beck. -It is used by the developer who implements unit tests in Java./ppbURL: /ba class=externalLink href=http://junit.org;http://junit.org/a/ppbProject License: /ba class=externalLink href=http://www.opensource.org/licenses/cpl1.0.txt;Common Public License Version 1.0/a/p/td/tr/table/divulliorg.hamcrest:hamcrest-core:jar:1.1 (test) img id=_16495837 src=./images/icon_info_sml.gif alt=Information onclick=toggleDependencyDetail( '_1996468855', '_16495837' ); style=cursor: pointer;vertical-align:text-bottom;/imgdiv id=_1996468855 style=display:nonetable border=0 class=bodyTabletr class=athHamcrest Core/th/trtr class=btdpbDescription: /bThere is currently no description associated with this project./ppbProject License: /ba class=externalLink href=http://www.opensource.org/licenses/bsd-license.php;BSD style/a/p/td/tr/table/div/li/ul/lilicommons-io:commons- io:jar:2.2 (compile) img id=_443542743 src=./images/icon_info_sml.gif alt=Information onclick=toggleDependencyDetail( '_1534625850', '_443542743' ); style=cursor: pointer;vertical-align:text-bottom;/imgdiv id=_1534625850 style=display:nonetable border=0 class=bodyTabletr class=athCommons IO/th/trtr class=btdpbDescription: /bThe Commons IO library contains utility classes, stream implementations, file filters, -file comparators, endian transformation classes, and much more./ppbURL: /ba class=externalLink href=http://commons.apache.org/io/;http://commons.apache.org/io//a/ppbProject License: /ba class=externalLink href=http://www.apache.org/licenses/LICENSE-2.0.txt;The Apache Software License, Version 2.0/a/p/td/tr/table/div/liliorg.apache.commons:commons-lang3:jar:3.1 (test) img id=_991785041 src=./images/icon_info_sml.gif alt=Information onclick=toggleDependencyDetail( '_1844806380', '_991785041' ); style=cursor: pointer;vertical-align:text-bottom;/imgdiv id=_1844806380 style=display:nonetable border=0 class=bodyTabletr class=athCommons Lang/th/trtr class=btdpbDescription: /bCommons Lang, a package of Java utility classes for the +a name=Dependency_Tree/adiv class=sectionh3Dependency Treea name=Dependency_Tree/a/h3ulliorg.apache.maven.shared:maven-shared-utils:jar:0.3 img id=_782278991 src=./images/icon_info_sml.gif alt=Information onclick=toggleDependencyDetail( '_351249158', '_782278991' ); style=cursor: pointer;vertical-align:text-bottom;/imgdiv id=_351249158 style=display:nonetable border=0 class=bodyTabletr class=athMaven Shared Utils/th/trtr class=btdpbDescription: /bShared utils without any further dependencies/ppbURL: /ba class=externalLink href=http://maven.apache.org/shared/maven-shared-utils/;http://maven.apache.org/shared/maven-shared-utils//a/ppbProject License: /ba class=externalLink href=http://www.apache.org/licenses/LICENSE-2.0.txt;The Apache Software License, Version 2.0/a/p/td/tr/table/divullijunit:junit:jar:4.9 (test) img id
svn commit: r852412 - /websites/production/maven/content/shared-archives/maven-shared-utils-0.3/
Author: krosenvold Date: Thu Feb 28 15:11:44 2013 New Revision: 852412 Log: Trying to remove this to see if it helps Removed: websites/production/maven/content/shared-archives/maven-shared-utils-0.3/
svn commit: r852413 - /websites/production/maven/content/shared-archives/maven-shared-utils-0.3/
Author: krosenvold Date: Thu Feb 28 15:12:34 2013 New Revision: 852413 Log: Automatic svn path creation: https://svn.apache.org/repos/infra/websites/production/maven/content/shared-archives/maven-shared-utils-0.3 Added: websites/production/maven/content/shared-archives/maven-shared-utils-0.3/
svn commit: r852423 - in /websites/production/maven/content/shared-archives/maven-shared-utils-0.3: ./ apidocs/ apidocs/org/ apidocs/org/apache/ apidocs/org/apache/maven/ apidocs/org/apache/maven/shar
Author: krosenvold Date: Thu Feb 28 17:22:54 2013 New Revision: 852423 Log: Site checkin for project Maven Shared Utils [This commit notification would consist of 89 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
svn commit: r852425 - /websites/production/maven/content/shared-archives/maven-shared-utils-0.3/
Author: krosenvold Date: Thu Feb 28 17:43:15 2013 New Revision: 852425 Log: Trying again dammit Removed: websites/production/maven/content/shared-archives/maven-shared-utils-0.3/
svn commit: r852426 - /websites/production/maven/content/shared-archives/maven-shared-utils-0.3/
Author: krosenvold Date: Thu Feb 28 17:45:12 2013 New Revision: 852426 Log: Automatic svn path creation: https://svn.apache.org/repos/infra/websites/production/maven/content/shared-archives/maven-shared-utils-0.3 Added: websites/production/maven/content/shared-archives/maven-shared-utils-0.3/
svn commit: r1450897 - /maven/shared/trunk/maven-shared-utils/pom.xml
Author: krosenvold Date: Wed Feb 27 18:21:30 2013 New Revision: 1450897 URL: http://svn.apache.org/r1450897 Log: [maven-release-plugin] prepare release maven-shared-utils-0.3 Modified: maven/shared/trunk/maven-shared-utils/pom.xml Modified: maven/shared/trunk/maven-shared-utils/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/pom.xml?rev=1450897r1=1450896r2=1450897view=diff == --- maven/shared/trunk/maven-shared-utils/pom.xml (original) +++ maven/shared/trunk/maven-shared-utils/pom.xml Wed Feb 27 18:21:30 2013 @@ -28,7 +28,7 @@ /parent artifactIdmaven-shared-utils/artifactId - version0.3-SNAPSHOT/version + version0.3/version properties mavenVersion2.1.0/mavenVersion @@ -42,10 +42,10 @@ /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-utils/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-utils + connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-utils-0.3/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-utils-0.3 /developerConnection - urlhttp://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/url + urlhttp://svn.apache.org/viewvc/maven/shared/tags/maven-shared-utils-0.3/url /scm issueManagement systemjira/system
svn commit: r1450899 - /maven/shared/tags/maven-shared-utils-0.3/
Author: krosenvold Date: Wed Feb 27 18:21:39 2013 New Revision: 1450899 URL: http://svn.apache.org/r1450899 Log: [maven-release-plugin] copy for tag maven-shared-utils-0.3 Added: maven/shared/tags/maven-shared-utils-0.3/ - copied from r1450897, maven/shared/trunk/maven-shared-utils/
svn commit: r1450900 - /maven/shared/trunk/maven-shared-utils/pom.xml
Author: krosenvold Date: Wed Feb 27 18:21:47 2013 New Revision: 1450900 URL: http://svn.apache.org/r1450900 Log: [maven-release-plugin] prepare for next development iteration Modified: maven/shared/trunk/maven-shared-utils/pom.xml Modified: maven/shared/trunk/maven-shared-utils/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/pom.xml?rev=1450900r1=1450899r2=1450900view=diff == --- maven/shared/trunk/maven-shared-utils/pom.xml (original) +++ maven/shared/trunk/maven-shared-utils/pom.xml Wed Feb 27 18:21:47 2013 @@ -28,7 +28,7 @@ /parent artifactIdmaven-shared-utils/artifactId - version0.3/version + version0.4-SNAPSHOT/version properties mavenVersion2.1.0/mavenVersion @@ -42,10 +42,10 @@ /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-utils-0.3/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-utils-0.3 + connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-utils/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-utils /developerConnection - urlhttp://svn.apache.org/viewvc/maven/shared/tags/maven-shared-utils-0.3/url + urlhttp://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/url /scm issueManagement systemjira/system
git commit: o Upped m-s-u to 0.3 for release
Updated Branches: refs/heads/master 88f66f8c7 - ae6ccdc5b o Upped m-s-u to 0.3 for release Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/ae6ccdc5 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/ae6ccdc5 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/ae6ccdc5 Branch: refs/heads/master Commit: ae6ccdc5bfa4cbb94fb998312a22a48b5953248f Parents: 88f66f8 Author: Kristian Rosenvold kristian.rosenv...@gmail.com Authored: Wed Feb 27 20:12:25 2013 +0100 Committer: Kristian Rosenvold kristian.rosenv...@gmail.com Committed: Wed Feb 27 20:12:25 2013 +0100 -- pom.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/ae6ccdc5/pom.xml -- diff --git a/pom.xml b/pom.xml index 22ab636..654a67a 100644 --- a/pom.xml +++ b/pom.xml @@ -241,7 +241,7 @@ dependency groupIdorg.apache.maven.shared/groupId artifactIdmaven-shared-utils/artifactId -version0.3-SNAPSHOT/version +version0.3/version /dependency dependency groupIdorg.apache.maven.shared/groupId
git commit: [maven-release-plugin] prepare release surefire-2.14
Updated Branches: refs/heads/master ae6ccdc5b - 1d572f20c [maven-release-plugin] prepare release surefire-2.14 Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/1d572f20 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/1d572f20 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/1d572f20 Branch: refs/heads/master Commit: 1d572f20cf88d5741daee2da2595b287f7f25a69 Parents: ae6ccdc Author: Kristian Rosenvold kristian.rosenv...@gmail.com Authored: Wed Feb 27 20:44:58 2013 +0100 Committer: Kristian Rosenvold kristian.rosenv...@gmail.com Committed: Wed Feb 27 20:44:58 2013 +0100 -- maven-failsafe-plugin/pom.xml|2 +- maven-surefire-common/pom.xml|2 +- maven-surefire-plugin/pom.xml|2 +- maven-surefire-report-plugin/pom.xml |2 +- pom.xml |2 +- surefire-api/pom.xml |2 +- surefire-booter/pom.xml |2 +- surefire-grouper/pom.xml |2 +- surefire-integration-tests/pom.xml |2 +- surefire-providers/common-java5/pom.xml |2 +- surefire-providers/common-junit3/pom.xml |2 +- surefire-providers/common-junit4/pom.xml |2 +- surefire-providers/common-junit48/pom.xml|2 +- surefire-providers/pom.xml |2 +- surefire-providers/surefire-junit3/pom.xml |2 +- surefire-providers/surefire-junit4/pom.xml |2 +- surefire-providers/surefire-junit47/pom.xml |2 +- surefire-providers/surefire-testng-utils/pom.xml |2 +- surefire-providers/surefire-testng/pom.xml |2 +- surefire-report-parser/pom.xml |2 +- surefire-setup-integration-tests/pom.xml |2 +- surefire-shadefire/pom.xml |2 +- 22 files changed, 22 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/1d572f20/maven-failsafe-plugin/pom.xml -- diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml index 952aa66..fbebea8 100644 --- a/maven-failsafe-plugin/pom.xml +++ b/maven-failsafe-plugin/pom.xml @@ -24,7 +24,7 @@ parent groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId -version2.14-SNAPSHOT/version +version2.14/version relativePath../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/1d572f20/maven-surefire-common/pom.xml -- diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml index 85a8a22..534bf0b 100644 --- a/maven-surefire-common/pom.xml +++ b/maven-surefire-common/pom.xml @@ -24,7 +24,7 @@ parent groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId -version2.14-SNAPSHOT/version +version2.14/version relativePath../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/1d572f20/maven-surefire-plugin/pom.xml -- diff --git a/maven-surefire-plugin/pom.xml b/maven-surefire-plugin/pom.xml index 4039bb3..034e0fc 100644 --- a/maven-surefire-plugin/pom.xml +++ b/maven-surefire-plugin/pom.xml @@ -24,7 +24,7 @@ parent groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId -version2.14-SNAPSHOT/version +version2.14/version relativePath../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/1d572f20/maven-surefire-report-plugin/pom.xml -- diff --git a/maven-surefire-report-plugin/pom.xml b/maven-surefire-report-plugin/pom.xml index 3c2666b..7ffe7f3 100644 --- a/maven-surefire-report-plugin/pom.xml +++ b/maven-surefire-report-plugin/pom.xml @@ -24,7 +24,7 @@ parent groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId -version2.14-SNAPSHOT/version +version2.14/version relativePath../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/1d572f20/pom.xml -- diff --git a/pom.xml b/pom.xml index 654a67a..527bc9d 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId - version2.14-SNAPSHOT/version + version2.14/version packagingpom/packaging nameApache Maven Surefire/name
Git Push Summary
Updated Tags: refs/tags/surefire-2.14 [created] b190a5746
git commit: [maven-release-plugin] prepare for next development iteration
Updated Branches: refs/heads/master 1d572f20c - 348e203d6 [maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/348e203d Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/348e203d Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/348e203d Branch: refs/heads/master Commit: 348e203d6e86c5e5719bb779a6c376143ad20f25 Parents: 1d572f2 Author: Kristian Rosenvold kristian.rosenv...@gmail.com Authored: Wed Feb 27 20:45:07 2013 +0100 Committer: Kristian Rosenvold kristian.rosenv...@gmail.com Committed: Wed Feb 27 20:45:07 2013 +0100 -- maven-failsafe-plugin/pom.xml|2 +- maven-surefire-common/pom.xml|2 +- maven-surefire-plugin/pom.xml|2 +- maven-surefire-report-plugin/pom.xml |2 +- pom.xml |2 +- surefire-api/pom.xml |2 +- surefire-booter/pom.xml |2 +- surefire-grouper/pom.xml |2 +- surefire-integration-tests/pom.xml |2 +- surefire-providers/common-java5/pom.xml |2 +- surefire-providers/common-junit3/pom.xml |2 +- surefire-providers/common-junit4/pom.xml |2 +- surefire-providers/common-junit48/pom.xml|2 +- surefire-providers/pom.xml |2 +- surefire-providers/surefire-junit3/pom.xml |2 +- surefire-providers/surefire-junit4/pom.xml |2 +- surefire-providers/surefire-junit47/pom.xml |2 +- surefire-providers/surefire-testng-utils/pom.xml |2 +- surefire-providers/surefire-testng/pom.xml |2 +- surefire-report-parser/pom.xml |2 +- surefire-setup-integration-tests/pom.xml |2 +- surefire-shadefire/pom.xml |2 +- 22 files changed, 22 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/348e203d/maven-failsafe-plugin/pom.xml -- diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml index fbebea8..4a4ceed 100644 --- a/maven-failsafe-plugin/pom.xml +++ b/maven-failsafe-plugin/pom.xml @@ -24,7 +24,7 @@ parent groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId -version2.14/version +version2.15-SNAPSHOT/version relativePath../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/348e203d/maven-surefire-common/pom.xml -- diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml index 534bf0b..e5bb2aa 100644 --- a/maven-surefire-common/pom.xml +++ b/maven-surefire-common/pom.xml @@ -24,7 +24,7 @@ parent groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId -version2.14/version +version2.15-SNAPSHOT/version relativePath../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/348e203d/maven-surefire-plugin/pom.xml -- diff --git a/maven-surefire-plugin/pom.xml b/maven-surefire-plugin/pom.xml index 034e0fc..30c191a 100644 --- a/maven-surefire-plugin/pom.xml +++ b/maven-surefire-plugin/pom.xml @@ -24,7 +24,7 @@ parent groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId -version2.14/version +version2.15-SNAPSHOT/version relativePath../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/348e203d/maven-surefire-report-plugin/pom.xml -- diff --git a/maven-surefire-report-plugin/pom.xml b/maven-surefire-report-plugin/pom.xml index 7ffe7f3..918690e 100644 --- a/maven-surefire-report-plugin/pom.xml +++ b/maven-surefire-report-plugin/pom.xml @@ -24,7 +24,7 @@ parent groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId -version2.14/version +version2.15-SNAPSHOT/version relativePath../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/348e203d/pom.xml -- diff --git a/pom.xml b/pom.xml index 527bc9d..1465f17 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId - version2.14/version + version2.15-SNAPSHOT/version packagingpom/packaging nameApache Maven Surefire/name
svn commit: r852274 - /websites/production/maven/content/surefire-archives/maven-surefire-2.14/
Author: krosenvold Date: Wed Feb 27 20:03:14 2013 New Revision: 852274 Log: Automatic svn path creation: https://svn.apache.org/repos/infra/websites/production/maven/content/surefire-archives/maven-surefire-2.14 Added: websites/production/maven/content/surefire-archives/maven-surefire-2.14/
svn commit: r852279 - /websites/production/maven/content/shared-archives/maven-shared-utils-0.3/
Author: krosenvold Date: Wed Feb 27 20:38:57 2013 New Revision: 852279 Log: Automatic svn path creation: https://svn.apache.org/repos/infra/websites/production/maven/content/shared-archives/maven-shared-utils-0.3 Added: websites/production/maven/content/shared-archives/maven-shared-utils-0.3/
svn commit: r852281 - in /websites/production/maven/content/surefire-archives/maven-surefire-2.14: ./ css/ images/ images/logos/ images/profiles/ img/ js/ maven-failsafe-plugin/ maven-failsafe-plugin/
Author: krosenvold Date: Wed Feb 27 20:48:54 2013 New Revision: 852281 Log: Apache Maven Surefire site deployment [This commit notification would consist of 163 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
git commit: Reverted 1a1fe6d50802713d969ed08d6fa06dec53cf90e9 to make things workproperly on java5/windows
Updated Branches:
refs/heads/master 0645eb72f - 80e01fea5
Reverted 1a1fe6d50802713d969ed08d6fa06dec53cf90e9 to make things workproperly
on java5/windows
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/80e01fea
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/80e01fea
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/80e01fea
Branch: refs/heads/master
Commit: 80e01fea5bd87071b61519690a9529f079d0d45d
Parents: 0645eb7
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Wed Feb 27 07:27:43 2013 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Wed Feb 27 07:27:43 2013 +0100
--
.../artifact/resolver/DefaultArtifactResolver.java |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/80e01fea/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
--
diff --git
a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
index 5833d06..d9ab00f 100644
---
a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
+++
b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
@@ -115,7 +115,7 @@ public class DefaultArtifactResolver
else
{
executor =
-new ThreadPoolExecutor( 0, threads, 3, TimeUnit.SECONDS, new
LinkedBlockingQueueRunnable(),
+new ThreadPoolExecutor( threads, threads, 3, TimeUnit.SECONDS,
new LinkedBlockingQueueRunnable(),
new DaemonThreadCreator() );
}
}
svn commit: r1449899 - in /maven/shared/trunk/maven-shared-utils/src: main/java/org/apache/maven/shared/utils/cli/ test/java/org/apache/maven/shared/utils/cli/
Author: krosenvold
Date: Mon Feb 25 21:05:20 2013
New Revision: 1449899
URL: http://svn.apache.org/r1449899
Log:
o Removed exceptions that were used by pre-1.5 logic that used forks
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java?rev=1449899r1=1449898r2=1449899view=diff
==
---
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java
Mon Feb 25 21:05:20 2013
@@ -19,9 +19,10 @@ package org.apache.maven.shared.utils.cl
* under the License.
*/
-import java.io.IOException;
+import org.apache.maven.shared.utils.Os;
+import org.apache.maven.shared.utils.StringUtils;
+
import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
@@ -40,6 +41,7 @@ public abstract class CommandLineUtils
{
+@SuppressWarnings( UnusedDeclaration )
public static class StringStreamConsumer
implements StreamConsumer
{
@@ -77,12 +79,14 @@ public abstract class CommandLineUtils
}
+@SuppressWarnings( UnusedDeclaration )
public static int executeCommandLine( Commandline cl, StreamConsumer
systemOut, StreamConsumer systemErr )
throws CommandLineException
{
return executeCommandLine( cl, null, systemOut, systemErr, 0 );
}
+@SuppressWarnings( UnusedDeclaration )
public static int executeCommandLine( Commandline cl, StreamConsumer
systemOut, StreamConsumer systemErr,
int timeoutInSeconds )
throws CommandLineException
@@ -90,6 +94,7 @@ public abstract class CommandLineUtils
return executeCommandLine( cl, null, systemOut, systemErr,
timeoutInSeconds );
}
+@SuppressWarnings( UnusedDeclaration )
public static int executeCommandLine( Commandline cl, InputStream
systemIn, StreamConsumer systemOut,
StreamConsumer systemErr )
throws CommandLineException
@@ -284,12 +289,10 @@ public abstract class CommandLineUtils
* with case-insensitive environment variables like Windows, all variable
names will be normalized to upper case.
*
* @return The shell environment variables, can be empty but never
codenull/code.
- * @throws IOException If the environment variables could not be queried
from the shell.
* @see System#getenv() System.getenv() API, new in JDK 5.0, to get the
same result
* bsince 2.0.2 System#getenv() will be used if available in the
current running jvm./b
*/
public static Properties getSystemEnvVars()
-throws IOException
{
return getSystemEnvVars( !Os.isFamily( Os.FAMILY_WINDOWS ) );
}
@@ -300,33 +303,13 @@ public abstract class CommandLineUtils
*
* @param caseSensitive Whether environment variable keys should be
treated case-sensitively.
* @return Properties object of (possibly modified) envar keys mapped to
their values.
- * @throws IOException .
* @see System#getenv() System.getenv() API, new in JDK 5.0, to get the
same result
* bsince 2.0.2 System#getenv() will be used if available in the
current running jvm./b
*/
public static Properties getSystemEnvVars( boolean caseSensitive )
-throws IOException
{
-
-// check if it's 1.5+ run
-
-try
-{
-MapString, String envs = System.getenv();
-return ensureCaseSensitivity( envs, caseSensitive );
-}
-catch ( IllegalAccessException e )
-{
-throw new IOException( e.getMessage() );
-}
-catch ( IllegalArgumentException e )
-{
-throw new IOException( e.getMessage() );
-}
-catch ( InvocationTargetException e )
-{
-throw new IOException( e.getMessage() );
-}
+MapString, String envs = System.getenv();
+return ensureCaseSensitivity( envs, caseSensitive );
}
private static boolean isAlive( Process p )
@@ -457,7 +440,6 @@ public abstract class CommandLineUtils
}
static Properties ensureCaseSensitivity( MapString, String envs, boolean
preserveKeyCase
svn commit: r1449901 - /maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java
Author: krosenvold
Date: Mon Feb 25 21:10:56 2013
New Revision: 1449901
URL: http://svn.apache.org/r1449901
Log:
[SUREFIRE-950] Force jdk sax parser
Openjdk/sun jdk use hard coded value. All others autodetect.
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java?rev=1449901r1=1449900r2=1449901view=diff
==
---
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java
Mon Feb 25 21:10:56 2013
@@ -82,14 +82,10 @@ public class Xpp3DomBuilder
private static DocHandler parseSax( @Nonnull InputSource inputSource,
boolean trim )
throws XmlPullParserException
{
-
-String key = org.xml.sax.driver;
-String oldParser = System.getProperty( key );
-System.clearProperty( key ); // There's a slight problem with this an
parallel maven
try
{
DocHandler ch = new DocHandler( trim );
-XMLReader parser =
org.xml.sax.helpers.XMLReaderFactory.createXMLReader();
+XMLReader parser = createXmlReader();
parser.setContentHandler( ch );
parser.parse( inputSource );
return ch;
@@ -102,6 +98,26 @@ public class Xpp3DomBuilder
{
throw new XmlPullParserException( e );
}
+}
+
+
+private static XMLReader createXmlReader()
+throws SAXException
+{
+XMLReader comSunXmlReader = instantiate(
com.sun.org.apache.xerces.internal.parsers.SAXParser );
+if ( comSunXmlReader != null )
+{
+return comSunXmlReader;
+}
+
+String key = org.xml.sax.driver;
+String oldParser = System.getProperty( key );
+System.clearProperty( key ); // There's a slight problem with this
an parallel maven: It does not work ;)
+
+try
+{
+return org.xml.sax.helpers.XMLReaderFactory.createXMLReader();
+}
finally
{
if ( oldParser != null )
@@ -109,8 +125,30 @@ public class Xpp3DomBuilder
System.setProperty( key, oldParser );
}
}
+
+}
+
+private static XMLReader instantiate( String s ){
+try
+{
+Class? aClass = Class.forName( s );
+return (XMLReader) aClass.newInstance();
+}
+catch ( ClassNotFoundException e )
+{
+return null;
+}
+catch ( InstantiationException e )
+{
+return null;
+}
+catch ( IllegalAccessException e )
+{
+return null;
+}
}
+
private static class DocHandler
extends DefaultHandler
{
svn commit: r1446610 - /maven/plugins/trunk/maven-assembly-plugin/pom.xml
Author: krosenvold Date: Fri Feb 15 14:45:35 2013 New Revision: 1446610 URL: http://svn.apache.org/r1446610 Log: o p-a 2.3 posix tar support Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1446610r1=1446609r2=1446610view=diff == --- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Fri Feb 15 14:45:35 2013 @@ -105,7 +105,7 @@ under the License. dependency groupIdorg.codehaus.plexus/groupId artifactIdplexus-archiver/artifactId - version2.2/version + version2.3/version exclusions exclusion groupIdorg.codehaus.plexus/groupId
[2/2] git commit: Added gitattributes
Updated Branches: refs/heads/master 18ac0e26e - 9d4f083d0 Added gitattributes Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/9d4f083d Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/9d4f083d Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/9d4f083d Branch: refs/heads/master Commit: 9d4f083d0472640cccaf2ff381ada5a44720824f Parents: 7373de8 Author: Kristian Rosenvold krosenv...@apache.org Authored: Tue Jan 29 16:16:06 2013 +0100 Committer: Kristian Rosenvold krosenv...@apache.org Committed: Tue Jan 29 16:16:06 2013 +0100 -- .gitattributes |8 1 files changed, 8 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9d4f083d/.gitattributes -- diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000..3bb3b5e --- /dev/null +++ b/.gitattributes @@ -0,0 +1,8 @@ +# Auto detect text files and perform LF normalization +*text=auto + +*.java text diff=java +*.html text diff=html +*.csstext +*.js text +*.sqltext
[1/2] git commit: Fixed line endings
Fixed line endings
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/7373de82
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/7373de82
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/7373de82
Branch: refs/heads/master
Commit: 7373de82c552f17070801cfeb362acba48b828d9
Parents: 18ac0e2
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Tue Jan 29 16:15:20 2013 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Tue Jan 29 16:15:20 2013 +0100
--
.../lazytestprovider/TestProvidingInputStream.java | 248 +++---
.../maven/plugin/surefire/SurefirePluginTest.java | 226 +++---
2 files changed, 237 insertions(+), 237 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/7373de82/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestProvidingInputStream.java
--
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestProvidingInputStream.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestProvidingInputStream.java
index df14d35..7304435 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestProvidingInputStream.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestProvidingInputStream.java
@@ -1,125 +1,125 @@
-package org.apache.maven.plugin.surefire.booterclient.lazytestprovider;
-
-/*
- * 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 java.io.IOException;
-import java.io.InputStream;
-import java.util.Queue;
-import java.util.concurrent.Semaphore;
-
-/**
- * An {@link InputStream} that, when read, provides test class names out of a
queue.
- * p/
- * The Stream provides only one test at a time, but only after {@link
#provideNewTest()} has been invoked.
- * p/
- * After providing each test class name, followed by a newline character, a
flush is performed on the
- * {@link FlushReceiver} provided by the {@link FlushReceiverProvider} that
can be set using
- * {@link #setFlushReceiverProvider(FlushReceiverProvider)}.
- *
- * @author Andreas Gudian
- */
-public class TestProvidingInputStream
-extends InputStream
-{
-private final QueueString testItemQueue;
-
-private byte[] currentBuffer;
-
-private int currentPos;
-
-private Semaphore semaphore = new Semaphore( 0 );
-
-private FlushReceiverProvider flushReceiverProvider;
-
-private boolean closed = false;
-
-/**
- * C'tor
- *
- * @param testItemQueue source of the tests to be read from this stream
- */
-public TestProvidingInputStream( QueueString testItemQueue )
-{
-this.testItemQueue = testItemQueue;
-}
-
-/**
- * @param flushReceiverProvider the provider for a flush receiver.
- */
-public void setFlushReceiverProvider( FlushReceiverProvider
flushReceiverProvider )
-{
-this.flushReceiverProvider = flushReceiverProvider;
-}
-
-@Override
-public synchronized int read()
-throws IOException
-{
-if ( null == currentBuffer )
-{
-if ( null != flushReceiverProvider null !=
flushReceiverProvider.getFlushReceiver() )
-{
-flushReceiverProvider.getFlushReceiver().flush();
-}
-
-semaphore.acquireUninterruptibly();
-
-if ( closed )
-{
-return -1;
-}
-
-String currentElement = testItemQueue.poll();
-if ( null != currentElement )
-{
-currentBuffer = currentElement.getBytes();
-currentPos = 0;
-}
-else
-{
-return -1;
-}
-}
-
-if ( currentPos
git commit: make test more robust by removing some assertions that depend on current system load
Updated Branches:
refs/heads/master 9d4f083d0 - ae1899c34
make test more robust by removing some assertions that depend on current system
load
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/ae1899c3
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/ae1899c3
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/ae1899c3
Branch: refs/heads/master
Commit: ae1899c34d92c9568aae9aa8e32365a2130cf84e
Parents: 9d4f083
Author: Andreas Gudian andreas.gud...@gmail.com
Authored: Thu Jan 24 21:24:10 2013 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Thu Feb 14 13:47:18 2013 +0100
--
.../org/apache/maven/surefire/its/ForkModeIT.java |6 --
1 files changed, 0 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/ae1899c3/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java
--
diff --git
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java
index 35c53d7..5506caa 100644
---
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java
+++
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java
@@ -80,8 +80,6 @@ public class ForkModeIT
{
String[] pids = doTest( unpack( getProject()
).debugLogging().forkOncePerThread().threadCount( 2 ).addGoal(
-DsleepLength=1200 ) );
assertDifferentPids( pids, 2 );
-assertEndWith( pids, _1_1, 1);
-assertEndWith( pids, _2_2, 2);
assertFalse( pid 1 is not the same as the main process' pid,
pids[0].equals( getMyPID() ) );
}
@@ -113,8 +111,6 @@ public class ForkModeIT
{
String[] pids = doTest( unpack( getProject()
).debugLogging().forkCount( 2 ).reuseForks( false ).addGoal(
-DsleepLength=1200 ) );
assertDifferentPids( pids );
-assertEndWith( pids, _1_1, 1);
-assertEndWith( pids, _2_2, 2);
assertFalse( pid 1 is not the same as the main process' pid,
pids[0].equals( getMyPID() ) );
}
@@ -122,8 +118,6 @@ public class ForkModeIT
{
String[] pids = doTest( unpack( getProject()
).debugLogging().forkCount( 2 ).reuseForks( true ).addGoal(
-DsleepLength=1200 ) );
assertDifferentPids( pids, 2 );
-assertEndWith( pids, _1_1, 1);
-assertEndWith( pids, _2_2, 2);
assertFalse( pid 1 is not the same as the main process' pid,
pids[0].equals( getMyPID() ) );
}
svn commit: r1446282 - /maven/site/trunk/content/apt/developers/conventions/git.apt
Author: krosenvold Date: Thu Feb 14 17:51:55 2013 New Revision: 1446282 URL: http://svn.apache.org/r1446282 Log: Added info about the gitk context menu Modified: maven/site/trunk/content/apt/developers/conventions/git.apt Modified: maven/site/trunk/content/apt/developers/conventions/git.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/content/apt/developers/conventions/git.apt?rev=1446282r1=1446281r2=1446282view=diff == --- maven/site/trunk/content/apt/developers/conventions/git.apt (original) +++ maven/site/trunk/content/apt/developers/conventions/git.apt Thu Feb 14 17:51:55 2013 @@ -152,6 +152,8 @@ gitk --all to try to make some sense of it all. This is an important command to understand! (gitk may need to be installed additionally) +gitk also has a quite excellent context menu that is far more context sensitive than most people realize at first impression. Right-clicking on a commit in a github pull-request will allow you to cherry-pick straight in the gui. + If you're working on the master branch, you can do stuff like this:
git commit: Excluded test that is not 2.2.1 compatible from running with 2.2.1
Updated Branches:
refs/heads/master 0cd869cce - d7eb244b0
Excluded test that is not 2.2.1 compatible from running with 2.2.1
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/d7eb244b
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/d7eb244b
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/d7eb244b
Branch: refs/heads/master
Commit: d7eb244b048249e20ef22db4fa92ac60e7fa5bfc
Parents: 0cd869c
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Thu Feb 14 21:39:22 2013 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Thu Feb 14 21:39:31 2013 +0100
--
.../maven/surefire/its/ForkModeMultiModuleIT.java | 20 ++
1 files changed, 14 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/d7eb244b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeMultiModuleIT.java
--
diff --git
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeMultiModuleIT.java
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeMultiModuleIT.java
index 6d972ad..b00430e 100644
---
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeMultiModuleIT.java
+++
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeMultiModuleIT.java
@@ -19,26 +19,29 @@ package org.apache.maven.surefire.its;
* under the License.
*/
+import org.apache.maven.surefire.its.fixture.*;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import java.io.File;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.apache.maven.surefire.its.fixture.HelperAssertions;
-import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.apache.maven.surefire.its.fixture.TestFile;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
/**
* Test forkMode in a multi module project with parallel maven builds
*
* @author Andreas Gudian
*/
+@Category( Not2xCompatible.class )
public class ForkModeMultiModuleIT
-extends SurefireIntegrationTestCase
+extends SurefireJUnit4IntegrationTestCase
{
+@Test
public void testForkCountOneNoReuse()
{
ListString pids = doTest( unpack( getProject() ).forkCount( 1
).reuseForks( false ) );
@@ -50,6 +53,8 @@ public class ForkModeMultiModuleIT
assertEquals( No other forkNumbers than 1 and 2 have been used, 6,
matchesOne + matchesTwo);
}
+
+@Test
public void testForkCountOneReuse()
{
ListString pids = doTest( unpack( getProject() ).forkCount( 1
).reuseForks( true ) );
@@ -58,6 +63,7 @@ public class ForkModeMultiModuleIT
assertEndWith( pids, _2_2, 3 );
}
+@Test
public void testForkCountTwoNoReuse()
{
ListString pids = doTest( unpack( getProject() ).forkCount( 2
).reuseForks( false ) );
@@ -73,6 +79,7 @@ public class ForkModeMultiModuleIT
assertEquals( No other forkNumbers than 1, 2, 3, or 4 have been
used, 6, matchesOne + matchesTwo + matchesThree + matchesFour );
}
+@Test
public void testForkCountTwoReuse()
{
ListString pids =
@@ -153,4 +160,5 @@ public class ForkModeMultiModuleIT
return fork-mode-multimodule;
}
+
}
[1/3] Ported all ITs to JUnit4
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire812Log4JClassLoaderIT.java
--
diff --git
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire812Log4JClassLoaderIT.java
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire812Log4JClassLoaderIT.java
index fc49322..065ec19 100644
---
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire812Log4JClassLoaderIT.java
+++
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire812Log4JClassLoaderIT.java
@@ -19,14 +19,16 @@ package org.apache.maven.surefire.its.jiras;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.Test;
/**
* @author Kristian Rosenvold
*/
public class Surefire812Log4JClassLoaderIT
-extends SurefireIntegrationTestCase
+extends SurefireJUnit4IntegrationTestCase
{
+@Test
public void testJunit3ParallelBuildResultCount()
{
executeErrorFreeTest( surefire-812-log4j-classloader, 1 );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire818NpeIgnoresTestsIT.java
--
diff --git
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire818NpeIgnoresTestsIT.java
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire818NpeIgnoresTestsIT.java
index 0fa1692..1bf4c8d 100644
---
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire818NpeIgnoresTestsIT.java
+++
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire818NpeIgnoresTestsIT.java
@@ -19,7 +19,8 @@ package org.apache.maven.surefire.its.jiras;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.Test;
/**
* SUREFIRE-818
@@ -27,8 +28,9 @@ import
org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
* @author Kristian Rosenvold
*/
public class Surefire818NpeIgnoresTestsIT
-extends SurefireIntegrationTestCase
+extends SurefireJUnit4IntegrationTestCase
{
+@Test
public void testBuildFailingWhenErrors()
{
unpack( surefire-818-ignored-tests-on-npe
).maven().withFailure().executeTest().assertTestSuiteResults( 2, 0,
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire828EmptyGroupExprIT.java
--
diff --git
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire828EmptyGroupExprIT.java
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire828EmptyGroupExprIT.java
index 5fd6a13..b59bc6a 100644
---
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire828EmptyGroupExprIT.java
+++
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire828EmptyGroupExprIT.java
@@ -19,13 +19,15 @@ package org.apache.maven.surefire.its.jiras;
*/
import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
public class Surefire828EmptyGroupExprIT
-extends SurefireIntegrationTestCase
+extends SurefireJUnit4IntegrationTestCase
{
// !CategoryC
+@Test
public void testJUnitRunEmptyGroups()
{
OutputValidator validator = unpackJUnit().sysProp( profile,
emptyGroups ).executeTest();
@@ -39,6 +41,7 @@ public class Surefire828EmptyGroupExprIT
}
// CategoryA CategoryB
+@Test
public void testJUnitRunEmptyExcludeGroups()
{
OutputValidator validator = unpackJUnit().sysProp( profile,
emptyExcludedGroups ).executeTest();
@@ -54,6 +57,7 @@ public class Surefire828EmptyGroupExprIT
}
// CategoryA CategoryB
+@Test
public void testTestNGRunEmptyExcludeGroups()
{
OutputValidator validator = unpackTestNG().sysProp( profile,
emptyExcludedGroups ).executeTest();
@@ -64,6 +68,7 @@ public class Surefire828EmptyGroupExprIT
}
// !CategoryC
+@Test
public void testTestNGRunEmptyGroups()
{
git commit: Fixed line feeds, added .gitattributes
Updated Branches:
refs/heads/master 2f97f96fb - 176a85f43
Fixed line feeds, added .gitattributes
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/176a85f4
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/176a85f4
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/176a85f4
Branch: refs/heads/master
Commit: 176a85f43c6a69b042024f2daebff25376930ce2
Parents: 2f97f96
Author: Kristian Rosenvold kristian.rosenv...@gmail.com
Authored: Tue Jan 29 16:26:35 2013 +0100
Committer: Kristian Rosenvold kristian.rosenv...@gmail.com
Committed: Tue Jan 29 16:27:02 2013 +0100
--
.gitattributes | 10 +-
.../internal/AbstractRepositoryTestCase.java | 152 ++--
.../internal/DefaultVersionResolverTest.java | 192 +++---
.../07.20.3-SNAPSHOT/maven-metadata.xml| 96
maven-core/src/site/apt/artifact-handlers.apt | 82 +++---
.../artifact/handler/ArtifactHandlerTest.java | 178 +++---
.../exception/DefaultExceptionHandlerTest.java | 120 +-
pom.xml|2 +-
src/site/site.xml | 146 ++--
9 files changed, 492 insertions(+), 486 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/176a85f4/.gitattributes
--
diff --git a/.gitattributes b/.gitattributes
index 225f8f1..3bb3b5e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,8 @@
-*.jar -text -crlf
-*.graffle -text -crlf
+# Auto detect text files and perform LF normalization
+*text=auto
+
+*.java text diff=java
+*.html text diff=html
+*.csstext
+*.js text
+*.sqltext
http://git-wip-us.apache.org/repos/asf/maven/blob/176a85f4/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/AbstractRepositoryTestCase.java
--
diff --git
a/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/AbstractRepositoryTestCase.java
b/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/AbstractRepositoryTestCase.java
index 2ad80f8..3b2f379 100644
---
a/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/AbstractRepositoryTestCase.java
+++
b/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/AbstractRepositoryTestCase.java
@@ -1,76 +1,76 @@
-package org.apache.maven.repository.internal;
-
-/*
- * 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 java.net.MalformedURLException;
-
-import org.apache.maven.repository.internal.util.ConsoleRepositoryListener;
-import org.apache.maven.repository.internal.util.ConsoleTransferListener;
-import org.codehaus.plexus.PlexusTestCase;
-import org.sonatype.aether.RepositorySystem;
-import org.sonatype.aether.RepositorySystemSession;
-import org.sonatype.aether.repository.LocalRepository;
-import org.sonatype.aether.repository.RemoteRepository;
-
-public abstract class AbstractRepositoryTestCase
-extends PlexusTestCase
-{
-protected RepositorySystem system;
-
-protected RepositorySystemSession session;
-
-@Override
-protected void setUp()
-throws Exception
-{
-super.setUp();
-system = lookup( RepositorySystem.class );
-session = newMavenRepositorySystemSession( system );
-}
-
-@Override
-protected void tearDown()
-throws Exception
-{
-session = null;
-system = null;
-super.tearDown();
-}
-
-public static RepositorySystemSession newMavenRepositorySystemSession(
RepositorySystem system )
-{
-MavenRepositorySystemSession session = new
MavenRepositorySystemSession( true );
-
-LocalRepository localRepo = new LocalRepository( target/local-repo );
-session.setLocalRepositoryManager( system.newLocalRepositoryManager(
localRepo ) );
-
-
git commit: Added .gitattributes
Updated Branches: refs/heads/master 8e90d7f87 - 5e7fb012f Added .gitattributes Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/5e7fb012 Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/5e7fb012 Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/5e7fb012 Branch: refs/heads/master Commit: 5e7fb012ff342e67f99684d690c0fcf0c513a715 Parents: 8e90d7f Author: Kristian Rosenvold kristian.rosenv...@gmail.com Authored: Tue Jan 29 16:35:46 2013 +0100 Committer: Kristian Rosenvold kristian.rosenv...@gmail.com Committed: Tue Jan 29 16:35:46 2013 +0100 -- .gitattributes |8 1 files changed, 8 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5e7fb012/.gitattributes -- diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000..3bb3b5e --- /dev/null +++ b/.gitattributes @@ -0,0 +1,8 @@ +# Auto detect text files and perform LF normalization +*text=auto + +*.java text diff=java +*.html text diff=html +*.csstext +*.js text +*.sqltext
git commit: Added .gitattributes
Updated Branches: refs/heads/master 7d32dc123 - 8cc30fb19 Added .gitattributes Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/8cc30fb1 Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/8cc30fb1 Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/8cc30fb1 Branch: refs/heads/master Commit: 8cc30fb193c070c0d56104eb43a33877c21b9f7b Parents: 7d32dc1 Author: Kristian Rosenvold kristian.rosenv...@gmail.com Authored: Tue Jan 29 16:37:43 2013 +0100 Committer: Kristian Rosenvold kristian.rosenv...@gmail.com Committed: Tue Jan 29 16:38:54 2013 +0100 -- .gitattributes | 10 +- 1 files changed, 9 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/8cc30fb1/.gitattributes -- diff --git a/.gitattributes b/.gitattributes index 1b722c5..3145ebe 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,9 @@ -*.jar -text -crlf +# Auto detect text files and perform LF normalization +*.jar-text -crlf +*text=auto + +*.java text diff=java +*.html text diff=html +*.csstext +*.js text +*.sqltext
git commit: Added m-c-p for 2.2.1
Updated Branches: refs/heads/master 0eced625b - 18ac0e26e Added m-c-p for 2.2.1 Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/18ac0e26 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/18ac0e26 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/18ac0e26 Branch: refs/heads/master Commit: 18ac0e26e64294e98c67333d975757b4342fc6f0 Parents: 0eced62 Author: Kristian Rosenvold krosenv...@apache.org Authored: Fri Jan 25 07:23:46 2013 +0100 Committer: Kristian Rosenvold krosenv...@apache.org Committed: Fri Jan 25 07:24:23 2013 +0100 -- .../surefire-946-self-destruct-plugin/pom.xml |9 +++-- 1 files changed, 7 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/18ac0e26/surefire-integration-tests/src/test/resources/surefire-946-self-destruct-plugin/pom.xml -- diff --git a/surefire-integration-tests/src/test/resources/surefire-946-self-destruct-plugin/pom.xml b/surefire-integration-tests/src/test/resources/surefire-946-self-destruct-plugin/pom.xml index 91823a7..8994838 100644 --- a/surefire-integration-tests/src/test/resources/surefire-946-self-destruct-plugin/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-946-self-destruct-plugin/pom.xml @@ -1,5 +1,5 @@ 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; + xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd; modelVersion4.0.0/modelVersion groupIdorg.apache.maven.plugins.surefire/groupId @@ -33,7 +33,7 @@ plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-plugin-plugin/artifactId -version2.5.1/version +version2.9/version configuration goalPrefixmaven-selfdestruct-plugin/goalPrefix /configuration @@ -46,6 +46,11 @@ /execution /executions /plugin + plugin +groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-compiler-plugin/artifactId +version2.5.1/version + /plugin /plugins /build /project
[2/2] git commit: fix test (parenthesis were missing in the computation)
Updated Branches: refs/heads/master 9a3996262 - 0eced625b fix test (parenthesis were missing in the computation) Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/0eced625 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/0eced625 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/0eced625 Branch: refs/heads/master Commit: 0eced625b5046bb502b1d6884f885c6ba6aeeb99 Parents: 01f5ddb Author: Andreas Gudian andreas.gud...@gmail.com Authored: Mon Jan 21 20:55:11 2013 +0100 Committer: Kristian Rosenvold krosenv...@apache.org Committed: Tue Jan 22 09:26:45 2013 +0100 -- .../maven/plugin/surefire/SurefirePluginTest.java |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/0eced625/maven-surefire-plugin/src/test/java/org/apache/maven/plugin/surefire/SurefirePluginTest.java -- diff --git a/maven-surefire-plugin/src/test/java/org/apache/maven/plugin/surefire/SurefirePluginTest.java b/maven-surefire-plugin/src/test/java/org/apache/maven/plugin/surefire/SurefirePluginTest.java index 11abd51..8d97ffc 100644 --- a/maven-surefire-plugin/src/test/java/org/apache/maven/plugin/surefire/SurefirePluginTest.java +++ b/maven-surefire-plugin/src/test/java/org/apache/maven/plugin/surefire/SurefirePluginTest.java @@ -52,7 +52,7 @@ public class SurefirePluginTest int availableProcessors = Runtime.getRuntime().availableProcessors(); assertForkCount( surefirePlugin, 3*availableProcessors, 3C ); -assertForkCount( surefirePlugin, (int) 2.5*availableProcessors, 2.5C ); +assertForkCount( surefirePlugin, (int) ( 2.5*availableProcessors ), 2.5C ); assertForkCount( surefirePlugin, availableProcessors, 1.0001 C ); }
[1/2] git commit: [SUREFIRE-949] add forkCount parameter, making the inconsitent forkMode parameter deprecated.
[SUREFIRE-949] add forkCount parameter, making the inconsitent forkMode
parameter deprecated.
- All defaulting works as in the previous versions, with the exception of
reuseForks (introduced in the last release). It's now true by default.
- forkCount supports C notation as in -T of maven-core
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/01f5ddbc
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/01f5ddbc
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/01f5ddbc
Branch: refs/heads/master
Commit: 01f5ddbcfe5db33e5518c36199ababc60228e90a
Parents: 9a39962
Author: Andreas Gudian andreas.gud...@gmail.com
Authored: Fri Jan 18 21:15:09 2013 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Mon Jan 21 20:08:45 2013 +0100
--
.../plugin/surefire/AbstractSurefireMojo.java | 141 +--
.../surefire/booterclient/ForkConfiguration.java |4 +-
.../plugin/surefire/booterclient/ForkStarter.java | 26 ++-
.../maven/plugin/surefire/SurefirePluginTest.java | 192 +--
.../org/apache/maven/surefire/its/ForkModeIT.java | 84 ++-
.../surefire/its/fixture/SurefireLauncher.java | 18 +-
6 files changed, 337 insertions(+), 128 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/01f5ddbc/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
--
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
index fd00d5f..bc8eb0b 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
@@ -329,10 +329,12 @@ public abstract class AbstractSurefireMojo
protected Boolean failIfNoTests;
/**
+ * strongDEPRECATED/strong since version 2.14. Use
codeforkCount/code and codereuseForks/code instead.br/
+ * br/
* Option to specify the forking mode. Can be never, once, always,
perthread. none and pertest are also accepted
- * for backwards compatibility. always forks for each test-class.
perthread will create threadCount parallel forks, each executing one
test-class, see also parameter reuseForks.br/
+ * for backwards compatibility. always forks for each test-class.
perthread will create codethreadCount/code parallel forks, each executing
one test-class, see also parameter codereuseForks/code.br/
* The system properties and the argLine of the forked processes may
contain the place holder string code${surefire.threadNumber}/code,
- * which is replaced with a fixed number for each thread, ranging from 1
to threadCount.
+ * which is replaced with a fixed number for each thread, ranging from 1
to codethreadCount/code.
*
* @since 2.1
*/
@@ -433,8 +435,8 @@ public abstract class AbstractSurefireMojo
protected String testNGArtifactName;
/**
- * (forkMode=perthread or TestNG/JUnit 4.7 provider) The attribute
thread-count allows you to specify how many threads should be
- * allocated for this execution. Only makes sense to use in conjunction
with the codeparallel/code parameter or with forkMode=perthread.
+ * (TestNG/JUnit 4.7 provider) The attribute thread-count allows you to
specify how many threads should be
+ * allocated for this execution. Only makes sense to use in conjunction
with the codeparallel/code parameter.
*
* @since 2.2
*/
@@ -443,13 +445,28 @@ public abstract class AbstractSurefireMojo
/**
- * Indicates if forks can be reused. Currently only meaningful
- * when forking N parallel forks
+ * Option to specify the number of VMs to fork in parallel in order to
execute the tests.
+ * When terminated with C, the number part is multiplied with the number
of CPU cores. Floating point value are only accepted together with C.
+ * If set to 0, no VM is forked and all tests are executed within the
main process.br/
+ * br/
+ * Example values: 1.5C, 4br/
+ * br/
+ * The system properties and the codeargLine/code of the forked
processes may contain the place holder string
code${surefire.forkNumber}/code,
+ * which is replaced with a fixed number for each of the parallel forks,
ranging from code1/code to the effective value of codeforkCount/code.
+ *
+ * @since 2.14
+ */
+@Parameter( property = forkCount, defaultValue=1)
+private String forkCount;
+
+/**
+ * Indicates if forked VMs can be reused. If
svn commit: r1436551 - /maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java
Author: krosenvold
Date: Mon Jan 21 18:53:53 2013
New Revision: 1436551
URL: http://svn.apache.org/viewvc?rev=1436551view=rev
Log:
[SUREFIRE-946] Allow execution of a callback after the process finished, or the
timeout ran up.
The callback is invoked, before calling waitForPumpers, allowing clients to
release possible locks on or in the in/out streams.
Patch by Andreas Gudian, applied unmodified
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java?rev=1436551r1=1436550r2=1436551view=diff
==
---
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java
Mon Jan 21 18:53:53 2013
@@ -28,6 +28,7 @@ import java.util.Locale;
import java.util.Map;
import java.util.Properties;
import java.util.StringTokenizer;
+
import org.apache.maven.shared.utils.Os;
import org.apache.maven.shared.utils.StringUtils;
@@ -110,8 +111,28 @@ public abstract class CommandLineUtils
StreamConsumer systemErr, int
timeoutInSeconds )
throws CommandLineException
{
+return executeCommandLine( cl, systemIn, systemOut, systemErr,
timeoutInSeconds, null );
+}
+
+/**
+ * @param cl The command line to execute
+ * @param systemIn The input to read from, must be thread safe
+ * @param systemOutA consumer that receives output, must be thread
safe
+ * @param systemErrA consumer that receives system error stream
output, must be thread safe
+ * @param timeoutInSeconds Positive integer to specify timeout, zero and
negative integers for no timeout.
+ * @param runAfterProcessTermination Optional callback to run after the
process terminated or the the timeout was
+ * exceeded, but before waiting on the stream feeder and pumpers to
finish.
+ * @return A return value, see {@link Process#exitValue()}
+ * @throws CommandLineException or CommandLineTimeOutException if time out
occurs
+ * @noinspection ThrowableResultOfMethodCallIgnored
+ */
+public static int executeCommandLine( Commandline cl, InputStream
systemIn, StreamConsumer systemOut,
+ StreamConsumer systemErr, int
timeoutInSeconds,
+ Runnable runAfterProcessTermination )
+throws CommandLineException
+{
final CommandLineCallable future =
-executeCommandLineAsCallable( cl, systemIn, systemOut, systemErr,
timeoutInSeconds );
+executeCommandLineAsCallable( cl, systemIn, systemOut, systemErr,
timeoutInSeconds, runAfterProcessTermination );
return future.call();
}
@@ -123,6 +144,7 @@ public abstract class CommandLineUtils
* @param systemOutA consumer that receives output, must be thread
safe
* @param systemErrA consumer that receives system error stream
output, must be thread safe
* @param timeoutInSeconds Positive integer to specify timeout, zero and
negative integers for no timeout.
+ * @param runAfterProcessTermination Optional callback to run after the
process terminated or the the timeout was
* @return A CommandLineCallable that provides the process return value,
see {@link Process#exitValue()}. call must be called on
* this to be sure the forked process has terminated, no
guarantees is made about
* any internal state before after the completion of the call
statements
@@ -132,7 +154,8 @@ public abstract class CommandLineUtils
private static CommandLineCallable executeCommandLineAsCallable( final
Commandline cl, final InputStream systemIn,
final
StreamConsumer systemOut,
final
StreamConsumer systemErr,
-final int
timeoutInSeconds )
+final int
timeoutInSeconds,
+final
Runnable runAfterProcessTermination )
throws CommandLineException
{
if ( cl == null )
@@ -191,6 +214,11 @@ public abstract class CommandLineUtils
returnValue = p.exitValue();
}
+if ( runAfterProcessTermination != null
[2/2] git commit: Use ShutdownHookUtils
Updated Branches:
refs/heads/master 9cd2acb3e - 9a3996262
Use ShutdownHookUtils
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/9a399626
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/9a399626
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/9a399626
Branch: refs/heads/master
Commit: 9a39962623a5c7325c495b2e85813a0476b28683
Parents: 463f37b
Author: agudian andreas.gud...@gmail.com
Authored: Sun Jan 13 17:16:56 2013 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Mon Jan 21 19:57:27 2013 +0100
--
.../plugin/surefire/booterclient/ForkStarter.java | 39 +-
1 files changed, 3 insertions(+), 36 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9a399626/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
--
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
index 164f8c7..6a2adea 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
@@ -51,6 +51,7 @@ import
org.apache.maven.plugin.surefire.report.DefaultReporterFactory;
import org.apache.maven.shared.utils.cli.CommandLineException;
import org.apache.maven.shared.utils.cli.CommandLineTimeOutException;
import org.apache.maven.shared.utils.cli.CommandLineUtils;
+import org.apache.maven.shared.utils.cli.ShutdownHookUtils;
import org.apache.maven.surefire.booter.Classpath;
import org.apache.maven.surefire.booter.ClasspathConfiguration;
import org.apache.maven.surefire.booter.KeyValueSource;
@@ -419,7 +420,7 @@ public class ForkStarter
testProvidingInputStream.setFlushReceiverProvider( cli );
inputStreamCloser = new InputStreamCloser(
testProvidingInputStream );
inputStreamCloserHook = new Thread( inputStreamCloser );
-addShutDownHook( inputStreamCloserHook );
+ShutdownHookUtils.addShutDownHook( inputStreamCloserHook );
}
else
{
@@ -470,7 +471,7 @@ public class ForkStarter
if ( inputStreamCloser != null )
{
inputStreamCloser.run();
-removeShutdownHook( inputStreamCloserHook );
+ShutdownHookUtils.removeShutdownHook( inputStreamCloserHook );
}
if ( runResult == null )
{
@@ -524,38 +525,4 @@ public class ForkStarter
throw new SurefireBooterForkException( Unable to create
classloader to find test suites, e );
}
}
-
-// TODO use ShutdownHookUtils, once it's public again
-public static void addShutDownHook( Thread hook )
-{
-try
-{
-Runtime.getRuntime().addShutdownHook( hook );
-}
-catch ( IllegalStateException ignore )
-{
-// ignore
-}
-catch ( AccessControlException ignore )
-{
-// ignore
-}
-}
-
-// TODO use ShutdownHookUtils, once it's public again
-public static void removeShutdownHook( Thread hook )
-{
-try
-{
-Runtime.getRuntime().removeShutdownHook( hook );
-}
-catch ( IllegalStateException ignore )
-{
-// ignore
-}
-catch ( AccessControlException ignore )
-{
-// ignore
-}
-}
}
[1/2] git commit: [SUREFIRE-946] prevent hanging main process if forked process was killed (softly)
[SUREFIRE-946] prevent hanging main process if forked process was killed
(softly)
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/463f37b3
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/463f37b3
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/463f37b3
Branch: refs/heads/master
Commit: 463f37b30dcc59de7c8550774c4dff19c96112fa
Parents: 9cd2acb
Author: agudian andreas.gud...@gmail.com
Authored: Sat Jan 5 21:13:12 2013 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Mon Jan 21 18:10:36 2013 +0100
--
.../plugin/surefire/booterclient/ForkStarter.java | 20 +-
.../lazytestprovider/TestProvidingInputStream.java | 248 +++---
.../surefire/booterclient/output/ForkClient.java | 12 -
pom.xml|2 +-
.../maven/surefire/booter/ForkingRunListener.java |2 -
.../apache/maven/surefire/booter/ForkedBooter.java | 74 +
.../maven/surefire/its/CrashDetectionIT.java |5 +
.../maven/surefire/its/fixture/MavenLauncher.java |6 +-
.../surefire/its/fixture/SurefireLauncher.java |7 +-
...Surefire946KillMainProcessInReusableForkIT.java | 71
.../test/java/junit44/environment/BasicTest.java |8 +-
.../pom.xml| 64
.../test/java/junit44/environment/Basic01Test.java | 26 ++
.../test/java/junit44/environment/Basic02Test.java | 26 ++
.../test/java/junit44/environment/Basic03Test.java | 26 ++
.../test/java/junit44/environment/Basic04Test.java | 26 ++
.../test/java/junit44/environment/Basic05Test.java | 26 ++
.../test/java/junit44/environment/Basic06Test.java | 26 ++
.../test/java/junit44/environment/Basic07Test.java | 26 ++
.../test/java/junit44/environment/Basic08Test.java | 26 ++
.../test/java/junit44/environment/Basic09Test.java | 26 ++
.../test/java/junit44/environment/Basic10Test.java | 26 ++
.../surefire-946-self-destruct-plugin/pom.xml | 51 +++
.../surefire/selfdestruct/SelfDestructMojo.java| 142
24 files changed, 761 insertions(+), 211 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/463f37b3/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
--
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
index 892c6a9..164f8c7 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
@@ -86,7 +86,7 @@ public class ForkStarter
* Closes an InputStream
*/
private final class InputStreamCloser
-extends Thread
+implements Runnable
{
private InputStream testProvidingInputStream;
@@ -95,8 +95,7 @@ public class ForkStarter
this.testProvidingInputStream = testProvidingInputStream;
}
-@Override
-public void run()
+public synchronized void run()
{
if ( testProvidingInputStream != null )
{
@@ -108,6 +107,7 @@ public class ForkStarter
{
// ignore
}
+testProvidingInputStream = null;
}
}
}
@@ -412,16 +412,18 @@ public class ForkStarter
startupConfiguration.getClassLoaderConfiguration(),
startupConfiguration.isShadefire(), threadNumber );
-final InputStreamCloser inputStreamCloserHook;
+final InputStreamCloser inputStreamCloser;
+final Thread inputStreamCloserHook;
if ( testProvidingInputStream != null )
{
testProvidingInputStream.setFlushReceiverProvider( cli );
-
-inputStreamCloserHook = new InputStreamCloser(
testProvidingInputStream );
+inputStreamCloser = new InputStreamCloser(
testProvidingInputStream );
+inputStreamCloserHook = new Thread( inputStreamCloser );
addShutDownHook( inputStreamCloserHook );
}
else
{
+inputStreamCloser = null;
inputStreamCloserHook = null;
}
@@ -446,7 +448,7 @@ public class ForkStarter
final int timeout = forkedProcessTimeoutInSeconds 0 ?
forkedProcessTimeoutInSeconds : 0;
final int result =
CommandLineUtils.executeCommandLine( cli,
svn commit: r1432249 - /maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java
Author: krosenvold
Date: Fri Jan 11 19:49:42 2013
New Revision: 1432249
URL: http://svn.apache.org/viewvc?rev=1432249view=rev
Log:
[SUREFIRE-950] Wrong parser instantiated
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java?rev=1432249r1=1432248r2=1432249view=diff
==
---
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java
Fri Jan 11 19:49:42 2013
@@ -27,6 +27,7 @@ import org.xml.sax.helpers.DefaultHandle
import javax.annotation.Nonnull;
import javax.annotation.WillClose;
+
import java.io.*;
import java.util.ArrayList;
import java.util.List;
@@ -65,7 +66,7 @@ public class Xpp3DomBuilder
}
public static Xpp3Dom build( @WillClose Reader reader, boolean trim )
-throws XmlPullParserException
+throws XmlPullParserException
{
try
{
@@ -82,6 +83,9 @@ public class Xpp3DomBuilder
throws XmlPullParserException
{
+String key = org.xml.sax.driver;
+String oldParser = System.getProperty( key );
+System.clearProperty( key ); // There's a slight problem with this an
parallel maven
try
{
DocHandler ch = new DocHandler( trim );
@@ -98,6 +102,13 @@ public class Xpp3DomBuilder
{
throw new XmlPullParserException( e );
}
+finally
+{
+if ( oldParser != null )
+{
+System.setProperty( key, oldParser );
+}
+}
}
private static class DocHandler
@@ -109,7 +120,9 @@ public class Xpp3DomBuilder
// Todo: Use these for something smart !
private final ListSAXParseException warnings = new
ArrayListSAXParseException();
+
private final ListSAXParseException errors = new
ArrayListSAXParseException();
+
private final ListSAXParseException fatals = new
ArrayListSAXParseException();
git commit: o Made plexus.requirements voliatile
Updated Branches:
refs/heads/master 1695739cd - 5a8ebba79
o Made plexus.requirements voliatile
Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/5a8ebba7
Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/5a8ebba7
Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/5a8ebba7
Branch: refs/heads/master
Commit: 5a8ebba79f2b588b120397ada4f0baf59d64c3c8
Parents: 1695739
Author: Kristian Rosenvold kristian.rosenv...@gmail.com
Authored: Thu Jan 10 22:51:40 2013 +0100
Committer: Kristian Rosenvold kristian.rosenv...@gmail.com
Committed: Thu Jan 10 22:52:14 2013 +0100
--
.../wagon/providers/http/LightweightHttpWagon.java |2 +-
.../apache/maven/wagon/providers/scm/ScmWagon.java |2 +-
.../interactive/ConsoleInteractiveUserInfo.java|2 +-
.../providers/ssh/jsch/AbstractJschWagon.java |6 +++---
.../interactive/PrompterUIKeyboardInteractive.java |2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5a8ebba7/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java
--
diff --git
a/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java
b/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java
index 58e2f4a..b15d059 100644
---
a/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java
+++
b/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java
@@ -86,7 +86,7 @@ public class LightweightHttpWagon
/**
* @plexus.requirement
*/
-private LightweightHttpWagonAuthenticator authenticator;
+private volatile LightweightHttpWagonAuthenticator authenticator;
/**
* Builds a complete URL string from the repository URL and the relative
path passed.
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5a8ebba7/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java
--
diff --git
a/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java
b/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java
index 877cc81..8124939 100644
---
a/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java
+++
b/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java
@@ -77,7 +77,7 @@ public class ScmWagon
/**
* @plexus.requirement
*/
-private ScmManager scmManager;
+private volatile ScmManager scmManager;
/**
* The SCM version, if any.
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5a8ebba7/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/ConsoleInteractiveUserInfo.java
--
diff --git
a/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/ConsoleInteractiveUserInfo.java
b/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/ConsoleInteractiveUserInfo.java
index f4ef249..a8f3c52 100644
---
a/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/ConsoleInteractiveUserInfo.java
+++
b/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/ConsoleInteractiveUserInfo.java
@@ -39,7 +39,7 @@ public class ConsoleInteractiveUserInfo
/**
* @plexus.requirement role-hint=default
*/
-private Prompter prompter;
+private volatile Prompter prompter;
public ConsoleInteractiveUserInfo()
{
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5a8ebba7/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java
--
diff --git
a/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java
b/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java
index c0cc53a..3dfd604 100644
---
a/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java
+++
b/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java
@@ -83,17 +83,17 @@
svn commit: r1431685 - /maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
Author: krosenvold Date: Thu Jan 10 21:57:08 2013 New Revision: 1431685 URL: http://svn.apache.org/viewvc?rev=1431685view=rev Log: [MASSEMBLY-639] Set recomressZippedFiles default back to true Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java?rev=1431685r1=1431684r2=1431685view=diff == --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java Thu Jan 10 21:57:08 2013 @@ -298,7 +298,7 @@ public abstract class AbstractAssemblyMo * * @since 2.4 */ -@Parameter( defaultValue = false ) +@Parameter( defaultValue = true ) private boolean recompressZippedFiles; /**
svn commit: r1431687 - /maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
Author: krosenvold Date: Thu Jan 10 21:59:08 2013 New Revision: 1431687 URL: http://svn.apache.org/viewvc?rev=1431687view=rev Log: [MWAR-297] Change default for recompressZippedFiles back to true Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java?rev=1431687r1=1431686r2=1431687view=diff == --- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java (original) +++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java Thu Jan 10 21:59:08 2013 @@ -311,7 +311,7 @@ public abstract class AbstractWarMojo * * @since 2.3 */ -@Parameter( defaultValue = false ) +@Parameter( defaultValue = true ) private boolean recompressZippedFiles; /**
git commit: o Made sleep timeout configurable in forkModeIt for testing SUREFIRE-946
Updated Branches:
refs/heads/master 4dfdb08cc - 350dd6fd7
o Made sleep timeout configurable in forkModeIt for testing SUREFIRE-946
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/350dd6fd
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/350dd6fd
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/350dd6fd
Branch: refs/heads/master
Commit: 350dd6fd745f82dcdf071ff910665d8b388dfe7b
Parents: 4dfdb08
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Wed Jan 9 18:20:50 2013 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Wed Jan 9 18:21:09 2013 +0100
--
.../fork-mode/src/test/java/forkMode/Test1.java|4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/350dd6fd/surefire-integration-tests/src/test/resources/fork-mode/src/test/java/forkMode/Test1.java
--
diff --git
a/surefire-integration-tests/src/test/resources/fork-mode/src/test/java/forkMode/Test1.java
b/surefire-integration-tests/src/test/resources/fork-mode/src/test/java/forkMode/Test1.java
index ca5af55..8dd3307 100644
---
a/surefire-integration-tests/src/test/resources/fork-mode/src/test/java/forkMode/Test1.java
+++
b/surefire-integration-tests/src/test/resources/fork-mode/src/test/java/forkMode/Test1.java
@@ -17,9 +17,9 @@ public class Test1
public void test1()
throws IOException, InterruptedException
{
-Thread.sleep( 750 );
+int sleepLength = Integer.valueOf( System.getProperty( sleepLength,
750 ));
+Thread.sleep(sleepLength);
dumpPidFile( this );
-
}
public static void dumpPidFile( TestCase test )
git commit: [SUREFIRE-946] prevent hanging main process if forked process was killed (softly)
Updated Branches:
refs/heads/master 350dd6fd7 - e54dbd810
[SUREFIRE-946] prevent hanging main process if forked process was killed
(softly)
Fixed with extended IT
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/e54dbd81
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/e54dbd81
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/e54dbd81
Branch: refs/heads/master
Commit: e54dbd810f62fe723800f11279b881bff244b707
Parents: 350dd6f
Author: agudian andreas.gud...@gmail.com
Authored: Sat Jan 5 21:13:12 2013 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Wed Jan 9 18:24:38 2013 +0100
--
.../plugin/surefire/booterclient/ForkStarter.java | 140 +++
.../lazytestprovider/TestProvidingInputStream.java | 29 ++-
.../surefire/booterclient/output/ForkClient.java | 22 ++-
.../maven/surefire/booter/ForkingRunListener.java |3 +
.../apache/maven/surefire/booter/ForkedBooter.java | 74 ++--
.../maven/surefire/its/CrashDetectionIT.java |7 +-
6 files changed, 215 insertions(+), 60 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e54dbd81/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
--
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
index 620dfd4..892c6a9 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
@@ -21,6 +21,8 @@ package org.apache.maven.plugin.surefire.booterclient;
import java.io.File;
import java.io.IOException;
+import java.io.InputStream;
+import java.security.AccessControlException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -36,6 +38,7 @@ import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
+
import org.apache.maven.plugin.surefire.AbstractSurefireMojo;
import org.apache.maven.plugin.surefire.CommonReflector;
import org.apache.maven.plugin.surefire.StartupReportConfiguration;
@@ -63,14 +66,13 @@ import org.apache.maven.surefire.report.StackTraceWriter;
import org.apache.maven.surefire.suite.RunResult;
import org.apache.maven.surefire.util.DefaultScanResult;
-
/**
* Starts the fork or runs in-process.
* p/
* Lives only on the plugin-side (not present in remote vms)
* p/
* Knows how to fork new vms and also how to delegate non-forking invocation
to SurefireStarter directly
- *
+ *
* @author Jason van Zyl
* @author Emmanuel Venisse
* @author Brett Porter
@@ -80,6 +82,36 @@ import org.apache.maven.surefire.util.DefaultScanResult;
*/
public class ForkStarter
{
+/**
+ * Closes an InputStream
+ */
+private final class InputStreamCloser
+extends Thread
+{
+private InputStream testProvidingInputStream;
+
+public InputStreamCloser( InputStream testProvidingInputStream )
+{
+this.testProvidingInputStream = testProvidingInputStream;
+}
+
+@Override
+public void run()
+{
+if ( testProvidingInputStream != null )
+{
+try
+{
+testProvidingInputStream.close();
+}
+catch ( IOException e )
+{
+// ignore
+}
+}
+}
+}
+
private final int forkedProcessTimeoutInSeconds;
private final ProviderConfiguration providerConfiguration;
@@ -105,7 +137,6 @@ public class ForkStarter
}
};
-
public ForkStarter( ProviderConfiguration providerConfiguration,
StartupConfiguration startupConfiguration,
ForkConfiguration forkConfiguration, int
forkedProcessTimeoutInSeconds,
StartupReportConfiguration startupReportConfiguration )
@@ -167,8 +198,9 @@ public class ForkStarter
{
ArrayListFutureRunResult results = new
ArrayListFutureRunResult( forkCount );
-ExecutorService executorService = new ThreadPoolExecutor( forkCount,
forkCount, 60, TimeUnit.SECONDS,
- new
ArrayBlockingQueueRunnable( forkCount ) );
+ExecutorService executorService =
+new ThreadPoolExecutor( forkCount,
git commit: o Removed warning
Updated Branches:
refs/heads/master e54dbd810 - 230c46a26
o Removed warning
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/230c46a2
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/230c46a2
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/230c46a2
Branch: refs/heads/master
Commit: 230c46a26eaffcb0da57fd317e6a7611ba2c8e96
Parents: e54dbd8
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Wed Jan 9 19:03:30 2013 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Wed Jan 9 19:03:30 2013 +0100
--
.../apache/maven/surefire/booter/ForkedBooter.java |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/230c46a2/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
--
diff --git
a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
index 4b04a99..5f711f4 100644
---
a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
+++
b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
@@ -72,7 +72,7 @@ public class ForkedBooter
{
originalIn.close();
}
-catch ( IOException e )
+catch ( IOException ignore )
{
}
[1/6] o Fixed testcase on windows. o Fixed 2.2.1 tests by splitting report parser to separate module
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4dfdb08c/surefire-report-parser/src/test/resources/test-reports/TEST-com.shape.PointTest.xml -- diff --git a/surefire-report-parser/src/test/resources/test-reports/TEST-com.shape.PointTest.xml b/surefire-report-parser/src/test/resources/test-reports/TEST-com.shape.PointTest.xml new file mode 100644 index 000..7dda584 --- /dev/null +++ b/surefire-report-parser/src/test/resources/test-reports/TEST-com.shape.PointTest.xml @@ -0,0 +1,142 @@ +?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. + -- + +testsuite errors=0 tests=3 time=0.01 failures=1 name=com.shape.PointTest + properties +property value=Java(TM) 2 Runtime Environment, Standard Edition name=java.runtime.name/ +property value=c:\japps\jdk1.5.0_04\jre\bin name=sun.boot.library.path/ +property value=1.5.0_04-b05 name=java.vm.version/ +property value=Sun Microsystems Inc. name=java.vm.vendor/ +property value=http://java.sun.com/; name=java.vendor.url/ +property value=; name=path.separator/ +property value=Java HotSpot(TM) Client VM name=java.vm.name/ +property value=sun.io name=file.encoding.pkg/ +property value=US name=user.country/ +property value=Service Pack 2 name=sun.os.patch.level/ +property value=Java Virtual Machine Specification name=java.vm.specification.name/ +property value=C:\JAppsCode\mergere-maven\plugins\sample-projects\junit-report-tester name=user.dir/ +property value=1.5.0_04-b05 name=java.runtime.version/ +property value=sun.awt.Win32GraphicsEnvironment name=java.awt.graphicsenv/ +property value=C:\JAppsCode\mergere-maven\plugins\sample-projects\junit-report-tester name=basedir/ +property value=c:\japps\jdk1.5.0_04\jre\lib\endorsed name=java.endorsed.dirs/ +property value=x86 name=os.arch/ +property value=C:\DOCUME~1\Jontri\LOCALS~1\Temp\ name=java.io.tmpdir/ +property value= + name=line.separator/ +property value=Sun Microsystems Inc. name=java.vm.specification.vendor/ +property value= name=user.variant/ +property value=Windows XP name=os.name/ +property value=C:\JApps\maven-2.0-beta-1\bin\m2.conf name=classworlds.conf/ +property value=Cp1252 name=sun.jnu.encoding/ +property + value=c:\japps\jdk1.5.0_04\bin;.;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\Program Files\ATI Technologies\ATI Control Panel;C:\JApps\maven-2.0-beta-1\bin;C:\JApps\maven-1.0.2\bin;c:\BatchFile;C:\Program Files\cvsnt;C:\JApps\svn-1.1.4\bin;C:\JApps\ant-1.6.2\bin; +name=java.library.path/ +property value=Java Platform API Specification name=java.specification.name/ +property value=49.0 name=java.class.version/ +property value=HotSpot Client Compiler name=sun.management.compiler/ +property value=5.1 name=os.version/ +property value=C:\Documents and Settings\Jontri name=user.home/ +property value=Asia/Shanghai name=user.timezone/ +property value=sun.awt.windows.WPrinterJob name=java.awt.printerjob/ +property value=Cp1252 name=file.encoding/ +property value=1.5 name=java.specification.version/ +property value=Jontri name=user.name/ +property value=C:\JApps\maven-2.0-beta-1\core\boot\classworlds-1.1-alpha-2.jar name=java.class.path/ +property value=1.0 name=java.vm.specification.version/ +property value=32 name=sun.arch.data.model/ +property value=c:\japps\jdk1.5.0_04\jre name=java.home/ +property value=Sun Microsystems Inc. name=java.specification.vendor/ +property value=en name=user.language/ +property value=sun.awt.windows.WToolkit name=awt.toolkit/ +property value=mixed mode, sharing name=java.vm.info/ +property value=1.5.0_04 name=java.version/ +property value=c:\japps\jdk1.5.0_04\jre\lib\ext name=java.ext.dirs/ +property +
git commit: Initial draft of a new examples page explaining the fork and parallel options
Updated Branches:
refs/heads/master 12b7012a3 - 44e006ace
Initial draft of a new examples page explaining the fork and parallel options
Signed-off-by: Kristian Rosenvold krosenv...@apache.org
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/44e006ac
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/44e006ac
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/44e006ac
Branch: refs/heads/master
Commit: 44e006ace699e35a04f4aa71f49ace83e817912a
Parents: 12b7012
Author: agudian andreas.gud...@gmail.com
Authored: Fri Jan 4 00:05:33 2013 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Fri Jan 4 11:20:15 2013 +0100
--
.../fork-options-and-parallel-execution.apt.vm | 161 +++
maven-surefire-plugin/src/site/site.xml|1 +
2 files changed, 162 insertions(+), 0 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/44e006ac/maven-surefire-plugin/src/site/apt/examples/fork-options-and-parallel-execution.apt.vm
--
diff --git
a/maven-surefire-plugin/src/site/apt/examples/fork-options-and-parallel-execution.apt.vm
b/maven-surefire-plugin/src/site/apt/examples/fork-options-and-parallel-execution.apt.vm
new file mode 100644
index 000..d44f90f
--- /dev/null
+++
b/maven-surefire-plugin/src/site/apt/examples/fork-options-and-parallel-execution.apt.vm
@@ -0,0 +1,161 @@
+ --
+ Fork Options and Parallel Test Execution
+ --
+ Andreas Gudian
+ --
+ 2013-01-03
+ --
+
+ ~~ 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.
+
+ ~~ NOTE: For help with the syntax of this file, see:
+ ~~ http://maven.apache.org/doxia/references/apt-format.html
+
+Fork Options and Parallel Test Execution
+
+ Choosing the right forking strategy and parallel execution settings can have
+ substantial impact on the memory requirements and the execution time of your
+ build system.
+
+ Surefire offers a variety of options to execute tests in parallel, allowing
+ you to make best use of the hardware at your disposal. But forking in
+ particular can also help keeping the memory requirements low.
+
+ This page shall give you some ideas of how you can configure the test
+ execution in a way best suitable for your environment.
+
+* Parallel Test Execution
+
+ Basically, there are two ways in Surefire to achieve parallel test execution.
+ The most obvious one is by using the parallel parameter. The possible
+ values depend on the test provider used. For JUnit 4.7 and onwards, this may
+ be methods, classes, or both.
+
+ See the example pages for {{{./junit.html#Running_tests_in_parallel}JUnit}}
+ and {{{./testng.html#Running_tests_in_parallel}TestNG}} for details.
+
+ The extent of the parallelism is configured using the parameters
+ threadCount, and optionally perCoreThreadCount, or
+ useUnlimitedThreads.
+
+ The important thing to remember with the parallel option is: the
+ concurrency happens within the same JVM process. That is efficient in terms
of
+ memory and execution time, but you may be more vulnerable towards race
+ conditions or other unexpected and hard to reproduce behavior.
+
+ The other possibility for parallel test execution is
forkMode=perthread.
+ It spawns up to threadCount new JVM processes concurrently to execute
+ the tests. The next section covers the details about this and the other
+ forkMode settings.
+
+* Forked Test Execution
+
+ The default setting is forkMode=once, which means that Surefire creates
+ one new JVM process to execute all tests in one maven module.
+
+ Using forkMode=never disables forking and executes the tests within
+ the main maven process. This avoids the additional startup and warm-up time
+ of your JVM, but also means that you might have to account for higher memory
+ requirements, especially PermGen.
+
+ forkMode=always executes each test class in its own JVM process, one
+ after another. It creates
git commit: o Added more tests, preparing for XmlWriter impl
Updated Branches: refs/heads/master 5bfd27173 - 14f8995d5 o Added more tests, preparing for XmlWriter impl Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/14f8995d Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/14f8995d Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/14f8995d Branch: refs/heads/master Commit: 14f8995d5152e829de4e33afa4b2b2e1b9002ad6 Parents: 5bfd271 Author: Kristian Rosenvold krosenv...@apache.org Authored: Wed Jan 2 13:48:31 2013 +0100 Committer: Kristian Rosenvold krosenv...@apache.org Committed: Wed Jan 2 13:52:23 2013 +0100 -- .../surefire/report/StatelessXmlReporter.java | 608 +++--- .../surefire/report/StatelessXmlReporter2.java | 304 +++ .../maven/surefire/report/RunStatistics.java | 290 .../surefire/report/StatelessXMLReporterTest.java | 64 ++- 4 files changed, 816 insertions(+), 450 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/14f8995d/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java -- diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java index c306b1d..680a21d 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java @@ -1,304 +1,304 @@ -package org.apache.maven.plugin.surefire.report; - -/* - * 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 java.io.BufferedWriter; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.OutputStreamWriter; -import java.io.PrintWriter; -import java.io.UnsupportedEncodingException; -import java.util.Enumeration; -import java.util.Properties; -import java.util.StringTokenizer; -import org.apache.maven.shared.utils.io.IOUtil; -import org.apache.maven.shared.utils.xml.Xpp3Dom; -import org.apache.maven.shared.utils.xml.Xpp3DomWriter; -import org.apache.maven.surefire.report.ReportEntry; -import org.apache.maven.surefire.report.ReporterException; -import org.apache.maven.surefire.report.SafeThrowable; - -/** - * XML format reporter writing to codeTEST-ireportName/i[-isuffix/i].xml/code file like written and read - * by Ant's a href=http://ant.apache.org/manual/Tasks/junit.html;codelt;junitgt;/code/a and - * a href=http://ant.apache.org/manual/Tasks/junitreport.html;codelt;junitreportgt;/code/a tasks, - * then supported by many tools like CI servers. - * p/ - * prelt;?xml version=1.0 encoding=UTF-8? - * lt;testsuite name=isuite name/i [group=igroup/i] tests=i0/i failures=i0/i errors=i0/i skipped=i0/i time=i0,###.###/i - * lt;properties - *lt;property name=iname/i value=ivalue/i/ - *[...] - * lt;/properties - * lt;testcase time=i0,###.###/i name=itest name/i [classname=iclass name/i] [group=igroup/i]/ - * lt;testcase time=i0,###.###/i name=itest name/i [classname=iclass name/i] [group=igroup/i] - *lt;berror/b message=imessage/i type=iexception class name/iistacktrace/ilt;/error - *lt;system-outisystem out content (present only if not empty)/ilt;/system-out - *lt;system-errisystem err content (present only if not empty)/ilt;/system-err - * lt;/testcase - * lt;testcase time=i0,###.###/i name=itest name/i [classname=iclass name/i] [group=igroup/i] - *lt;bfailure/b message=imessage/i type=iexception class name/iistacktrace/ilt;/failure - *lt;system-outisystem out content (present only if not empty)/ilt;/system-out - *lt;system-errisystem err content (present only if not empty)/ilt;/system-err - * lt;/testcase - * lt;testcase time=i0,###.###/i name=itest name/i [classname=iclass name/i]
git commit: o Locked down compiler plugin version to make things work on maven 221
Updated Branches: refs/heads/master 14f8995d5 - f7db177c9 o Locked down compiler plugin version to make things work on maven 221 Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/f7db177c Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/f7db177c Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/f7db177c Branch: refs/heads/master Commit: f7db177c99010ac268665c6fd55daf22fc0a2d93 Parents: 14f8995 Author: Kristian Rosenvold krosenv...@apache.org Authored: Wed Jan 2 15:58:17 2013 +0100 Committer: Kristian Rosenvold krosenv...@apache.org Committed: Wed Jan 2 15:58:17 2013 +0100 -- .../resources/surefire-943-report-content/pom.xml |9 +++-- 1 files changed, 7 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f7db177c/surefire-integration-tests/src/test/resources/surefire-943-report-content/pom.xml -- diff --git a/surefire-integration-tests/src/test/resources/surefire-943-report-content/pom.xml b/surefire-integration-tests/src/test/resources/surefire-943-report-content/pom.xml index ccdea72..01fb7b3 100644 --- a/surefire-integration-tests/src/test/resources/surefire-943-report-content/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-943-report-content/pom.xml @@ -27,8 +27,13 @@ /dependency /dependencies /plugin - /plugins - /pluginManagement + plugin +groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-compiler-plugin/artifactId +version2.5.1/version + /plugin +/plugins + /pluginManagement /build dependencies
git commit: o Replaced Xpp3Dom with XmlWriter. First steps toward no memory bindings in xml
Updated Branches:
refs/heads/master f7db177c9 - 06415dee0
o Replaced Xpp3Dom with XmlWriter. First steps toward no memory bindings in xml
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/06415dee
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/06415dee
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/06415dee
Branch: refs/heads/master
Commit: 06415dee0ab1b98523ee0b237066c5aeebac9352
Parents: f7db177
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Wed Jan 2 16:14:35 2013 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Wed Jan 2 16:14:35 2013 +0100
--
.../surefire/report/StatelessXmlReporter.java | 156
.../surefire/report/StatelessXmlReporter2.java | 304 ---
.../surefire/report/StatelessXMLReporterTest.java |4 +-
3 files changed, 79 insertions(+), 385 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/06415dee/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
--
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
index 680a21d..57778bb 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
@@ -19,19 +19,14 @@ package org.apache.maven.plugin.surefire.report;
* under the License.
*/
-import java.io.BufferedWriter;
import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
+import java.io.FileWriter;
+import java.io.IOException;
import java.util.Enumeration;
import java.util.Properties;
import java.util.StringTokenizer;
import org.apache.maven.shared.utils.io.IOUtil;
-import org.apache.maven.shared.utils.xml.Xpp3Dom;
-import org.apache.maven.shared.utils.xml.Xpp3DomWriter;
+import org.apache.maven.shared.utils.xml.XMLWriter;
import org.apache.maven.surefire.report.ReportEntry;
import org.apache.maven.surefire.report.ReporterException;
import org.apache.maven.surefire.report.SafeThrowable;
@@ -64,7 +59,6 @@ import org.apache.maven.surefire.report.SafeThrowable;
* lt;/testcase
* [...]/pre
*
- * @author a href=mailto:jr...@exist.com;Johnny R. Ruiz III/a
* @author Kristian Rosenvold
* @see a
href=http://wiki.apache.org/ant/Proposals/EnhancedTestReports;Ant's format
enhancement proposal/a
* (not yet implemented by Ant 1.8.2)
@@ -90,61 +84,61 @@ public class StatelessXmlReporter
throws ReporterException
{
-Xpp3Dom testSuite = createTestSuiteElement( testSetReportEntry,
testSetStats, reportNameSuffix );
+FileWriter fw = getFileOutputStream( testSetReportEntry );
-showProperties( testSuite );
+org.apache.maven.shared.utils.xml.XMLWriter ppw =
+new org.apache.maven.shared.utils.xml.PrettyPrintXMLWriter( fw );
+ppw.setEncoding( UTF-8 );
-testSuite.setAttribute( tests, String.valueOf(
testSetStats.getCompletedCount() ) );
+createTestSuiteElement( ppw, testSetReportEntry, testSetStats,
reportNameSuffix );
-testSuite.setAttribute( errors, String.valueOf(
testSetStats.getErrors() ) );
+showProperties( ppw );
-testSuite.setAttribute( skipped, String.valueOf(
testSetStats.getSkipped() ) );
-
-testSuite.setAttribute( failures, String.valueOf(
testSetStats.getFailures() ) );
for ( WrappedReportEntry entry : testSetStats.getReportEntries() )
{
if ( ReportEntryType.success.equals( entry.getReportEntryType() ) )
{
-testSuite.addChild( createTestElement( entry, reportNameSuffix
) );
+startTestElement( ppw, entry, reportNameSuffix );
+ppw.endElement();
}
else
{
-testSuite.addChild( getTestProblems( entry, trimStackTrace,
reportNameSuffix ) );
+getTestProblems( ppw, entry, trimStackTrace, reportNameSuffix
);
}
}
-File reportFile = getReportFile( testSetReportEntry, reportsDirectory,
reportNameSuffix );
+ppw.endElement(); // TestSuite
-File reportDir = reportFile.getParentFile();
-//noinspection ResultOfMethodCallIgnored
-reportDir.mkdirs();
-
-PrintWriter writer = null;
git commit: o Rearranged try/catch and renamed a method
Updated Branches:
refs/heads/master 06415dee0 - 12b7012a3
o Rearranged try/catch and renamed a method
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/12b7012a
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/12b7012a
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/12b7012a
Branch: refs/heads/master
Commit: 12b7012a334509b2ae6eb3662fb243375edc6d7c
Parents: 06415de
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Wed Jan 2 16:21:59 2013 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Wed Jan 2 16:21:59 2013 +0100
--
.../surefire/report/StatelessXmlReporter.java | 51 +++
1 files changed, 23 insertions(+), 28 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/12b7012a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
--
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
index 57778bb..ec150b6 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
@@ -65,7 +65,6 @@ import org.apache.maven.surefire.report.SafeThrowable;
*/
public class StatelessXmlReporter
{
-private static final String LS = System.getProperty( line.separator );
private final File reportsDirectory;
@@ -84,37 +83,32 @@ public class StatelessXmlReporter
throws ReporterException
{
-FileWriter fw = getFileOutputStream( testSetReportEntry );
-
-org.apache.maven.shared.utils.xml.XMLWriter ppw =
-new org.apache.maven.shared.utils.xml.PrettyPrintXMLWriter( fw );
-ppw.setEncoding( UTF-8 );
-
-createTestSuiteElement( ppw, testSetReportEntry, testSetStats,
reportNameSuffix );
-
-showProperties( ppw );
-
-
-for ( WrappedReportEntry entry : testSetStats.getReportEntries() )
+FileWriter fw = getFileWriter( testSetReportEntry );
+try
{
-if ( ReportEntryType.success.equals( entry.getReportEntryType() ) )
-{
-startTestElement( ppw, entry, reportNameSuffix );
-ppw.endElement();
-}
-else
-{
-getTestProblems( ppw, entry, trimStackTrace, reportNameSuffix
);
-}
-}
+org.apache.maven.shared.utils.xml.XMLWriter ppw =
+new org.apache.maven.shared.utils.xml.PrettyPrintXMLWriter( fw
);
+ppw.setEncoding( UTF-8 );
-ppw.endElement(); // TestSuite
+createTestSuiteElement( ppw, testSetReportEntry, testSetStats,
reportNameSuffix );
+showProperties( ppw );
+for ( WrappedReportEntry entry : testSetStats.getReportEntries() )
+{
+if ( ReportEntryType.success.equals(
entry.getReportEntryType() ) )
+{
+startTestElement( ppw, entry, reportNameSuffix );
+ppw.endElement();
+}
+else
+{
+getTestProblems( ppw, entry, trimStackTrace,
reportNameSuffix );
+}
-try
-{
+}
+ppw.endElement(); // TestSuite
}
finally
@@ -123,7 +117,7 @@ public class StatelessXmlReporter
}
}
-private FileWriter getFileOutputStream( WrappedReportEntry
testSetReportEntry )
+private FileWriter getFileWriter( WrappedReportEntry testSetReportEntry )
{
File reportFile = getReportFile( testSetReportEntry, reportsDirectory,
reportNameSuffix );
@@ -205,7 +199,8 @@ public class StatelessXmlReporter
}
-private void getTestProblems( XMLWriter ppw, WrappedReportEntry report,
boolean trimStackTrace, String reportNameSuffix )
+private void getTestProblems( XMLWriter ppw, WrappedReportEntry report,
boolean trimStackTrace,
+ String reportNameSuffix )
{
startTestElement( ppw, report, reportNameSuffix );
git commit: [SUREFIRE-943] fix test name in XML report
Updated Branches:
refs/heads/master 49eedd6d0 - 5bfd27173
[SUREFIRE-943] fix test name in XML report
Added an integration test for the issue
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/5bfd2717
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/5bfd2717
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/5bfd2717
Branch: refs/heads/master
Commit: 5bfd2717377ae52bb1a2e0be65f94723ca011b83
Parents: 49eedd6
Author: agudian andreas.gud...@gmail.com
Authored: Sun Dec 30 00:30:13 2012 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Mon Dec 31 11:50:02 2012 +0100
--
.../its/jiras/Surefire943ReportContentIT.java | 76 +++
.../resources/surefire-943-report-content/pom.xml | 42
.../src/test/java/org/sample/module/My1Test.java | 23 +
.../src/test/java/org/sample/module/My2Test.java | 22
.../src/test/java/org/sample/module/My3Test.java | 22
.../junitcore/NonConcurrentRunListener.java| 15 ++--
6 files changed, 193 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5bfd2717/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire943ReportContentIT.java
--
diff --git
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire943ReportContentIT.java
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire943ReportContentIT.java
new file mode 100644
index 000..8e68d28
--- /dev/null
+++
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire943ReportContentIT.java
@@ -0,0 +1,76 @@
+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 java.io.FileNotFoundException;
+import org.apache.maven.shared.utils.xml.Xpp3Dom;
+import org.apache.maven.shared.utils.xml.Xpp3DomBuilder;
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class Surefire943ReportContentIT
+extends SurefireJUnit4IntegrationTestCase
+{
+
+@Test
+public void test()
+throws Exception
+{
+OutputValidator validator = unpack( surefire-943-report-content
).maven().withFailure().executeTest();
+validator.assertTestSuiteResults( 6, 0, 3, 0 );
+
+validate( validator, org.sample.module.My1Test );
+validate( validator, org.sample.module.My2Test );
+validate( validator, org.sample.module.My3Test );
+}
+
+private void validate( OutputValidator validator, String className )
+throws FileNotFoundException
+{
+Xpp3Dom testResult =
+Xpp3DomBuilder.build( validator.getSurefireReportsFile( TEST- +
className + .xml ).getFileInputStream(),
+ UTF-8 );
+Xpp3Dom[] children = testResult.getChildren( testcase );
+
+Assert.assertEquals( 2, children.length );
+
+for ( Xpp3Dom child : children )
+{
+Assert.assertEquals( className, child.getAttribute( classname )
);
+
+if ( alwaysSuccessful.equals( child.getAttribute( name ) ) )
+{
+Assert.assertEquals( Expected no failures for method
alwaysSuccessful for + className, 0,
+ child.getChildCount() );
+}
+else
+{
+Assert.assertEquals( Expected methods \alwaysSuccessful\
and \fails\ in + className, fails,
+ child.getAttribute( name ) );
+Assert.assertEquals( Expected failure description for method
\fails\ in + className, 1,
+ child.getChildren( failure ).length );
+}
+}
+}
+
svn commit: r1426374 - /maven/site/trunk/content/apt/plugins/index.apt
Author: krosenvold
Date: Fri Dec 28 01:27:07 2012
New Revision: 1426374
URL: http://svn.apache.org/viewvc?rev=1426374view=rev
Log:
o Surefire 2.13
Modified:
maven/site/trunk/content/apt/plugins/index.apt
Modified: maven/site/trunk/content/apt/plugins/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/plugins/index.apt?rev=1426374r1=1426373r2=1426374view=diff
==
--- maven/site/trunk/content/apt/plugins/index.apt (original)
+++ maven/site/trunk/content/apt/plugins/index.apt Fri Dec 28 01:27:07 2012
@@ -71,7 +71,7 @@ Available Plugins
*--++--++--+++
| {{{/plugins/maven-deploy-plugin/} deploy}} | B |
2.7 | 2011-08-24 | Deploy the built artifact to the remote repository.
|
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-deploy-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MDEPLOY}JIRA}}
*--++--++--+++
-| {{{/surefire/maven-failsafe-plugin/} failsafe}}| B |
2.12.4 | 2012-09-27 | Run the JUnit integration tests in an isolated
classloader. |
{{{https://git-wip-us.apache.org/repos/asf/maven-surefire.git}GIT}} |
{{{http://jira.codehaus.org/browse/SUREFIRE}JIRA}}
+| {{{/surefire/maven-failsafe-plugin/} failsafe}}| B |
2.13 | 2012-12-27 | Run the JUnit integration tests in an isolated
classloader. |
{{{https://git-wip-us.apache.org/repos/asf/maven-surefire.git}GIT}} |
{{{http://jira.codehaus.org/browse/SUREFIRE}JIRA}}
*--++--++--+++
| {{{/plugins/maven-install-plugin/} install}} | B |
2.4 | 2012-09-06 | Install the built artifact into the local
repository. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-install-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MINSTALL}JIRA}}
*--++--++--+++
@@ -81,7 +81,7 @@ Available Plugins
*--++--++--+++
| {{{/plugins/maven-site-plugin/} site}} for Maven 2 3 | B |
3.2 | 2012-10-14 | Generate a site for the current project. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-site-plugin/}SVN}}
| {{{http://jira.codehaus.org/browse/MSITE}JIRA}}
*--++--++--+++
-| {{{/surefire/maven-surefire-plugin/} surefire}}| B |
2.12.4 | 2012-09-27 | Run the JUnit unit tests in an isolated
classloader. |
{{{https://git-wip-us.apache.org/repos/asf/maven-surefire.git}GIT}} |
{{{http://jira.codehaus.org/browse/SUREFIRE}JIRA}}
+| {{{/surefire/maven-surefire-plugin/} surefire}}| B |
2.13 | 2012-12-27 | Run the JUnit unit tests in an isolated
classloader. |
{{{https://git-wip-us.apache.org/repos/asf/maven-surefire.git}GIT}} |
{{{http://jira.codehaus.org/browse/SUREFIRE}JIRA}}
*--++--++--+++
| {{{/plugins/maven-verifier-plugin/} verifier}} | B |
1.0 | 2010-01-30 | Useful for integration tests - verifies the
existence of certain conditions. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-verifier-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MVERIFIER}JIRA}}
*--++--++--+++
@@ -123,7 +123,7 @@ Available Plugins
*--++--++--+++
| {{{/plugins/maven-project-info-reports-plugin/} project-info-reports}}
| R | 2.6 | 2012-10-28 | Generate standard project reports. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-project-info-reports-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MPIR}JIRA
git commit: [SUREFIRE-942] Added testcase
Updated Branches:
refs/heads/master 8750ff1e5 - 8ca4a0ddf
[SUREFIRE-942] Added testcase
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/8ca4a0dd
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/8ca4a0dd
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/8ca4a0dd
Branch: refs/heads/master
Commit: 8ca4a0ddf1ebb3ea6f79073ae72dd95397e19345
Parents: 8750ff1
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Wed Dec 26 01:46:17 2012 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Wed Dec 26 01:49:07 2012 +0100
--
.../resources/surefire-942-testngSuite/pom.xml | 37 +++
.../src/test/java/org/BasicTest.java | 48 +++
.../src/test/resources/config.xml |8 +++
3 files changed, 93 insertions(+), 0 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8ca4a0dd/surefire-integration-tests/src/test/resources/surefire-942-testngSuite/pom.xml
--
diff --git
a/surefire-integration-tests/src/test/resources/surefire-942-testngSuite/pom.xml
b/surefire-integration-tests/src/test/resources/surefire-942-testngSuite/pom.xml
new file mode 100644
index 000..2a0fac5
--- /dev/null
+++
b/surefire-integration-tests/src/test/resources/surefire-942-testngSuite/pom.xml
@@ -0,0 +1,37 @@
+?xml version=1.0 encoding=UTF-8?
+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;
+ modelVersion4.0.0/modelVersion
+
+ groupIdsurefire-testng/groupId
+ artifactIdsurefire-testng/artifactId
+ version1.0-SNAPSHOT/version
+
+ properties
+surefire.version2.12.4/surefire.version
+ /properties
+
+ dependencies
+dependency
+ groupIdorg.testng/groupId
+ artifactIdtestng/artifactId
+ version5.14/version
+ scopetest/scope
+/dependency
+ /dependencies
+
+ build
+plugins
+ plugin
+artifactIdmaven-surefire-plugin/artifactId
+version${surefire.version}/version
+configuration
+ suiteXmlFiles
+suiteXmlFilesrc/test/resources/config.xml/suiteXmlFile
+ /suiteXmlFiles
+/configuration
+ /plugin
+/plugins
+ /build
+/project
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8ca4a0dd/surefire-integration-tests/src/test/resources/surefire-942-testngSuite/src/test/java/org/BasicTest.java
--
diff --git
a/surefire-integration-tests/src/test/resources/surefire-942-testngSuite/src/test/java/org/BasicTest.java
b/surefire-integration-tests/src/test/resources/surefire-942-testngSuite/src/test/java/org/BasicTest.java
new file mode 100644
index 000..a663ac5
--- /dev/null
+++
b/surefire-integration-tests/src/test/resources/surefire-942-testngSuite/src/test/java/org/BasicTest.java
@@ -0,0 +1,48 @@
+package org;
+
+import org.testng.annotations.*;
+import org.testng.Assert;
+
+public class BasicTest
+{
+
+private boolean setUpCalled = false;
+
+
+@BeforeTest
+public void setUp()
+{
+setUpCalled = true;
+}
+
+@AfterTest
+public void tearDown()
+{
+setUpCalled = false;
+}
+
+@Test
+public void testSetUp()
+{
+Assert.assertTrue( setUpCalled );
+}
+
+@Test
+public void testSuccessOne()
+{
+Assert.assertTrue( true );
+}
+
+@Test
+public void testSuccessTwo()
+{
+Assert.assertTrue( true );
+}
+
+@AfterClass
+public static void oneTimeTearDown()
+{
+
+}
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8ca4a0dd/surefire-integration-tests/src/test/resources/surefire-942-testngSuite/src/test/resources/config.xml
--
diff --git
a/surefire-integration-tests/src/test/resources/surefire-942-testngSuite/src/test/resources/config.xml
b/surefire-integration-tests/src/test/resources/surefire-942-testngSuite/src/test/resources/config.xml
new file mode 100644
index 000..a92872b
--- /dev/null
+++
b/surefire-integration-tests/src/test/resources/surefire-942-testngSuite/src/test/resources/config.xml
@@ -0,0 +1,8 @@
+?xml version=1.0 encoding=UTF-8?
+suite name=tests verbose=0
+ test name=tests
+packages
+ package name=org.*/
+/packages
+ /test
+/suite
git commit: o Added testcase for report parser when hitting incorrect files
Updated Branches:
refs/heads/master 4f65754ba - dd13e351d
o Added testcase for report parser when hitting incorrect files
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/dd13e351
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/dd13e351
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/dd13e351
Branch: refs/heads/master
Commit: dd13e351d580e92ec62fbf59f52e3a2c2691e942
Parents: 4f65754
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Sat Dec 22 16:00:35 2012 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Sat Dec 22 16:24:44 2012 +0100
--
.../surefire/report/TestSuiteXmlParser.java| 22 +-
.../surefire/report/TestSuiteXmlParserTest.java| 11 +++
.../testsuitexmlparser/failsafe-summary-old.xml|8 +
.../testsuitexmlparser/failsafe-summary.xml|8 +
.../testsuitexmlparser/failsafe-summary-old.xml|8 -
.../testsuitexmlparser/failsafe-summary.xml|8 -
6 files changed, 47 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/dd13e351/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java
--
diff --git
a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java
b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java
index 49e7c15..acc0256 100644
---
a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java
+++
b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java
@@ -62,6 +62,8 @@ public class TestSuiteXmlParser
private ReportTestCase testCase;
+private boolean valid = true;
+
public CollectionReportTestSuite parse( String xmlPath )
throws ParserConfigurationException, SAXException, IOException
{
@@ -108,6 +110,10 @@ public class TestSuiteXmlParser
public void startElement( String uri, String localName, String qName,
Attributes attributes )
throws SAXException
{
+if ( !valid )
+{
+return;
+}
try
{
if ( testsuite.equals( qName ) )
@@ -169,7 +175,7 @@ public class TestSuiteXmlParser
String timeAsString = attributes.getValue( time );
-Number time = new Integer( 0 );
+Number time = 0;
if ( timeAsString != null )
{
@@ -199,6 +205,10 @@ public class TestSuiteXmlParser
testCase.addFailure( message != null ? message : skipped,
skipped );
currentSuite.setNumberOfSkipped( 1 +
currentSuite.getNumberOfSkipped() );
}
+else if ( failsafe-summary.equals( qName ) )
+{
+valid = false;
+}
}
catch ( ParseException e )
{
@@ -249,6 +259,10 @@ public class TestSuiteXmlParser
public void characters( char[] ch, int start, int length )
throws SAXException
{
+if ( !valid )
+{
+return;
+}
String s = new String( ch, start, length );
if ( !.equals( s.trim() ) )
@@ -273,7 +287,7 @@ public class TestSuiteXmlParser
{
String lineString = stringTokenizer.nextToken().trim();
parsedDetail.add( lineString );
-if ( lineString.indexOf( compareTo ) = 0 )
+if ( lineString.contains( compareTo ) )
{
break;
}
@@ -282,4 +296,8 @@ public class TestSuiteXmlParser
return parsedDetail;
}
+public boolean isValid()
+{
+return valid;
+}
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/dd13e351/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParserTest.java
--
diff --git
a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParserTest.java
b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParserTest.java
index 27e4a53..344eb02 100644
---
a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParserTest.java
+++
b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParserTest.java
@@ -96,4 +96,15 @@ public class TestSuiteXmlParserTest
}
+public void
Git Push Summary
Updated Tags: refs/tags/surefire-2.13 [deleted] 3321aa338
git commit: o Reset state, upped testcase
Updated Branches:
refs/heads/master dd13e351d - 886501d6d
o Reset state, upped testcase
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/886501d6
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/886501d6
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/886501d6
Branch: refs/heads/master
Commit: 886501d6dc5db4e23d08e01468df089ab714587a
Parents: dd13e35
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Sat Dec 22 16:43:20 2012 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Sat Dec 22 16:43:20 2012 +0100
--
.../surefire/report/TestSuiteXmlParser.java|4 +++-
.../surefire/report/TestSuiteXmlParserTest.java|7 ++-
2 files changed, 9 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/886501d6/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java
--
diff --git
a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java
b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java
index acc0256..c2d8ee5 100644
---
a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java
+++
b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java
@@ -62,7 +62,7 @@ public class TestSuiteXmlParser
private ReportTestCase testCase;
-private boolean valid = true;
+private boolean valid;
public CollectionReportTestSuite parse( String xmlPath )
throws ParserConfigurationException, SAXException, IOException
@@ -89,6 +89,8 @@ public class TestSuiteXmlParser
SAXParser saxParser = factory.newSAXParser();
+valid = true;
+
classesToSuites = new HashMapString, ReportTestSuite();
saxParser.parse( stream, this );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/886501d6/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParserTest.java
--
diff --git
a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParserTest.java
b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParserTest.java
index 344eb02..0b8c871 100644
---
a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParserTest.java
+++
b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParserTest.java
@@ -96,7 +96,7 @@ public class TestSuiteXmlParserTest
}
-public void testParserHitsSum()
+public void testParserHitsFailsafeSummary()
throws IOException, SAXException, ParserConfigurationException
{
TestSuiteXmlParser parser = new TestSuiteXmlParser();
@@ -104,6 +104,11 @@ public class TestSuiteXmlParserTest
parser.parse(
src/test/resources/fixture/testsuitexmlparser/failsafe-summary.xml );
assertFalse( parser.isValid() );
+
+parser.parse(
+
src/test/resources/fixture/testsuitexmlparser/TEST-org.apache.maven.surefire.test.FailingTest.xml
);
+
+assertTrue( parser.isValid() );
}
git commit: [maven-release-plugin] prepare release surefire-2.13
Updated Branches: refs/heads/master 886501d6d - fe3c7d105 [maven-release-plugin] prepare release surefire-2.13 Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/fe3c7d10 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/fe3c7d10 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/fe3c7d10 Branch: refs/heads/master Commit: fe3c7d105c35c47585ccb925b3ba662f322f9f49 Parents: 886501d Author: Kristian Rosenvold kristian.rosenv...@gmail.com Authored: Sat Dec 22 17:04:34 2012 +0100 Committer: Kristian Rosenvold kristian.rosenv...@gmail.com Committed: Sat Dec 22 17:04:34 2012 +0100 -- maven-failsafe-plugin/pom.xml|2 +- maven-surefire-common/pom.xml|2 +- maven-surefire-plugin/pom.xml|2 +- maven-surefire-report-plugin/pom.xml |2 +- pom.xml |2 +- surefire-api/pom.xml |2 +- surefire-booter/pom.xml |2 +- surefire-grouper/pom.xml |2 +- surefire-integration-tests/pom.xml |2 +- surefire-providers/common-java5/pom.xml |2 +- surefire-providers/common-junit3/pom.xml |2 +- surefire-providers/common-junit4/pom.xml |2 +- surefire-providers/common-junit48/pom.xml|2 +- surefire-providers/pom.xml |2 +- surefire-providers/surefire-junit3/pom.xml |2 +- surefire-providers/surefire-junit4/pom.xml |2 +- surefire-providers/surefire-junit47/pom.xml |2 +- surefire-providers/surefire-testng-utils/pom.xml |2 +- surefire-providers/surefire-testng/pom.xml |2 +- surefire-setup-integration-tests/pom.xml |2 +- surefire-shadefire/pom.xml |2 +- 21 files changed, 21 insertions(+), 21 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fe3c7d10/maven-failsafe-plugin/pom.xml -- diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml index 952aa66..16eadc4 100644 --- a/maven-failsafe-plugin/pom.xml +++ b/maven-failsafe-plugin/pom.xml @@ -24,7 +24,7 @@ parent groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId -version2.14-SNAPSHOT/version +version2.13/version relativePath../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fe3c7d10/maven-surefire-common/pom.xml -- diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml index 85a8a22..0477680 100644 --- a/maven-surefire-common/pom.xml +++ b/maven-surefire-common/pom.xml @@ -24,7 +24,7 @@ parent groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId -version2.14-SNAPSHOT/version +version2.13/version relativePath../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fe3c7d10/maven-surefire-plugin/pom.xml -- diff --git a/maven-surefire-plugin/pom.xml b/maven-surefire-plugin/pom.xml index 4039bb3..0b279b9 100644 --- a/maven-surefire-plugin/pom.xml +++ b/maven-surefire-plugin/pom.xml @@ -24,7 +24,7 @@ parent groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId -version2.14-SNAPSHOT/version +version2.13/version relativePath../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fe3c7d10/maven-surefire-report-plugin/pom.xml -- diff --git a/maven-surefire-report-plugin/pom.xml b/maven-surefire-report-plugin/pom.xml index 34c6094..05f89d3 100644 --- a/maven-surefire-report-plugin/pom.xml +++ b/maven-surefire-report-plugin/pom.xml @@ -24,7 +24,7 @@ parent groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId -version2.14-SNAPSHOT/version +version2.13/version relativePath../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fe3c7d10/pom.xml -- diff --git a/pom.xml b/pom.xml index 2fea7e3..1500103 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId - version2.14-SNAPSHOT/version + version2.13/version packagingpom/packaging nameApache Maven Surefire/name
Git Push Summary
Updated Tags: refs/tags/surefire-2.13 [created] 12d8ea774
git commit: [maven-release-plugin] prepare for next development iteration
Updated Branches: refs/heads/master fe3c7d105 - 8750ff1e5 [maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/8750ff1e Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/8750ff1e Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/8750ff1e Branch: refs/heads/master Commit: 8750ff1e5654c0c637be528a26416941bb710923 Parents: fe3c7d1 Author: Kristian Rosenvold kristian.rosenv...@gmail.com Authored: Sat Dec 22 17:04:48 2012 +0100 Committer: Kristian Rosenvold kristian.rosenv...@gmail.com Committed: Sat Dec 22 17:04:48 2012 +0100 -- maven-failsafe-plugin/pom.xml|2 +- maven-surefire-common/pom.xml|2 +- maven-surefire-plugin/pom.xml|2 +- maven-surefire-report-plugin/pom.xml |2 +- pom.xml |2 +- surefire-api/pom.xml |2 +- surefire-booter/pom.xml |2 +- surefire-grouper/pom.xml |2 +- surefire-integration-tests/pom.xml |2 +- surefire-providers/common-java5/pom.xml |2 +- surefire-providers/common-junit3/pom.xml |2 +- surefire-providers/common-junit4/pom.xml |2 +- surefire-providers/common-junit48/pom.xml|2 +- surefire-providers/pom.xml |2 +- surefire-providers/surefire-junit3/pom.xml |2 +- surefire-providers/surefire-junit4/pom.xml |2 +- surefire-providers/surefire-junit47/pom.xml |2 +- surefire-providers/surefire-testng-utils/pom.xml |2 +- surefire-providers/surefire-testng/pom.xml |2 +- surefire-setup-integration-tests/pom.xml |2 +- surefire-shadefire/pom.xml |2 +- 21 files changed, 21 insertions(+), 21 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8750ff1e/maven-failsafe-plugin/pom.xml -- diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml index 16eadc4..952aa66 100644 --- a/maven-failsafe-plugin/pom.xml +++ b/maven-failsafe-plugin/pom.xml @@ -24,7 +24,7 @@ parent groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId -version2.13/version +version2.14-SNAPSHOT/version relativePath../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8750ff1e/maven-surefire-common/pom.xml -- diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml index 0477680..85a8a22 100644 --- a/maven-surefire-common/pom.xml +++ b/maven-surefire-common/pom.xml @@ -24,7 +24,7 @@ parent groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId -version2.13/version +version2.14-SNAPSHOT/version relativePath../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8750ff1e/maven-surefire-plugin/pom.xml -- diff --git a/maven-surefire-plugin/pom.xml b/maven-surefire-plugin/pom.xml index 0b279b9..4039bb3 100644 --- a/maven-surefire-plugin/pom.xml +++ b/maven-surefire-plugin/pom.xml @@ -24,7 +24,7 @@ parent groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId -version2.13/version +version2.14-SNAPSHOT/version relativePath../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8750ff1e/maven-surefire-report-plugin/pom.xml -- diff --git a/maven-surefire-report-plugin/pom.xml b/maven-surefire-report-plugin/pom.xml index 05f89d3..34c6094 100644 --- a/maven-surefire-report-plugin/pom.xml +++ b/maven-surefire-report-plugin/pom.xml @@ -24,7 +24,7 @@ parent groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId -version2.13/version +version2.14-SNAPSHOT/version relativePath../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8750ff1e/pom.xml -- diff --git a/pom.xml b/pom.xml index 1500103..2fea7e3 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId - version2.13/version + version2.14-SNAPSHOT/version packagingpom/packaging nameApache Maven Surefire/name
[2/2] git commit: o Re-added log message
o Re-added log message
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/f26cb08f
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/f26cb08f
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/f26cb08f
Branch: refs/heads/master
Commit: f26cb08f6a09b4e9063b3b25bd7d4feb627b20e3
Parents: f7cb5fd
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Fri Dec 21 10:10:36 2012 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Fri Dec 21 10:11:18 2012 +0100
--
.../surefire/junitcore/ConcurrentRunListener.java |2 +-
.../surefire/junitcore/JUnitCoreProvider.java |3 +++
2 files changed, 4 insertions(+), 1 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f26cb08f/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentRunListener.java
--
diff --git
a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentRunListener.java
b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentRunListener.java
index 7f1099b..91abb21 100644
---
a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentRunListener.java
+++
b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentRunListener.java
@@ -42,7 +42,7 @@ public abstract class ConcurrentRunListener
{
private final MapString, TestSet classMethodCounts;
-private final ThreadLocalRunListener reporterManagerThreadLocal; // =
new ThreadLocalRunListener();
+private final ThreadLocalRunListener reporterManagerThreadLocal;
private final boolean reportImmediately;
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f26cb08f/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java
--
diff --git
a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java
b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java
index 7ab2d56..55d0edf 100644
---
a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java
+++
b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java
@@ -110,9 +110,12 @@ public class JUnitCoreProvider
public RunResult invoke( Object forkTestSet )
throws TestSetFailedException, ReporterException
{
+final String message = jUnitCoreParameters.toString() + \n;
+
final ReporterFactory reporterFactory =
providerParameters.getReporterFactory();
final ConsoleLogger consoleLogger =
providerParameters.getConsoleLogger();
+consoleLogger.info( message );
Filter filter = jUnit48Reflector.isJUnit48Available() ?
createJUnit48Filter() : null;
[1/2] git commit: o Verifier 1.4
Updated Branches:
refs/heads/master f7cb5fd4b - 63fc2b433
o Verifier 1.4
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/63fc2b43
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/63fc2b43
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/63fc2b43
Branch: refs/heads/master
Commit: 63fc2b433a58548ec72e2944135715b3c8e840d9
Parents: f26cb08
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Fri Dec 21 10:12:16 2012 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Fri Dec 21 10:12:16 2012 +0100
--
pom.xml |5 +
surefire-integration-tests/pom.xml |1 -
surefire-setup-integration-tests/pom.xml |4 ++--
3 files changed, 7 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/63fc2b43/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 0d3d386..4be0e51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -234,6 +234,11 @@
version0.2/version
/dependency
dependency
+groupIdorg.apache.maven.shared/groupId
+artifactIdmaven-verifier/artifactId
+version1.4/version
+ /dependency
+ dependency
groupIdjmock/groupId
artifactIdjmock/artifactId
version1.0.1/version
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/63fc2b43/surefire-integration-tests/pom.xml
--
diff --git a/surefire-integration-tests/pom.xml
b/surefire-integration-tests/pom.xml
index 55191dd..4d70ac3 100644
--- a/surefire-integration-tests/pom.xml
+++ b/surefire-integration-tests/pom.xml
@@ -46,7 +46,6 @@
dependency
groupIdorg.apache.maven.shared/groupId
artifactIdmaven-verifier/artifactId
- version1.4-SNAPSHOT/version
/dependency
dependency
groupIdorg.apache.maven/groupId
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/63fc2b43/surefire-setup-integration-tests/pom.xml
--
diff --git a/surefire-setup-integration-tests/pom.xml
b/surefire-setup-integration-tests/pom.xml
index 328120b..4c1ec33 100644
--- a/surefire-setup-integration-tests/pom.xml
+++ b/surefire-setup-integration-tests/pom.xml
@@ -88,11 +88,11 @@
artifactIdsurefire-junit47/artifactId
version${project.version}/version
/dependency
-dependency
+!-- dependency
groupIdorg.apache.maven.shared/groupId
artifactIdmaven-verifier/artifactId
version1.3/version
-/dependency
+/dependency --
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-settings/artifactId
git commit: o Updated docs on junit run listening, renamed classes in test
Updated Branches:
refs/heads/master 63fc2b433 - 4b09fd133
o Updated docs on junit run listening, renamed classes in test
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/4b09fd13
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/4b09fd13
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/4b09fd13
Branch: refs/heads/master
Commit: 4b09fd133419de4b7c9354e8a9cb57a42b5a8c3b
Parents: 63fc2b4
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Fri Dec 21 10:40:29 2012 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Fri Dec 21 10:40:29 2012 +0100
--
.../src/test/java/junit/ignore/BasicTest.java | 18 ---
.../java/junit/ignore/ClassLevelIgnore1Test.java | 17 ---
.../java/junit/ignore/ClassLevelIgnore2Test.java | 17 ---
.../java/junit/ignore/IgnoreWithMessagesTest.java | 38 ---
.../surefire/junitcore/ConcurrentRunListener.java |1 +
.../surefire/junitcore/JUnitCoreRunListener.java | 10
6 files changed, 11 insertions(+), 90 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4b09fd13/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/BasicTest.java
--
diff --git
a/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/BasicTest.java
b/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/BasicTest.java
deleted file mode 100644
index b7d55b2..000
---
a/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/BasicTest.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package junit.ignore;
-
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-@Ignore( ignore this test )
-public class BasicTest
-{
-
-@Ignore( ignore this test )
-@Test
-public void testIgnorable()
-{
-Assert.fail( you should have ignored me! );
-}
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4b09fd13/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassLevelIgnore1Test.java
--
diff --git
a/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassLevelIgnore1Test.java
b/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassLevelIgnore1Test.java
deleted file mode 100644
index ca00609..000
---
a/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassLevelIgnore1Test.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package junit.ignore;
-
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-@Ignore( ignore this test )
-public class ClassLevelIgnore1Test
-{
-
-@Test
-public void testIgnorable()
-{
-Assert.fail( you should have ignored me! );
-}
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4b09fd13/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassLevelIgnore2Test.java
--
diff --git
a/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassLevelIgnore2Test.java
b/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassLevelIgnore2Test.java
deleted file mode 100644
index c460f49..000
---
a/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassLevelIgnore2Test.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package junit.ignore;
-
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-@Ignore( ignore this test )
-public class ClassLevelIgnore2Test
-{
-
-@Test
-public void testIgnorable()
-{
-Assert.fail( you should have ignored me! );
-}
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4b09fd13/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/IgnoreWithMessagesTest.java
--
diff --git
a/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/IgnoreWithMessagesTest.java
b/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/IgnoreWithMessagesTest.java
deleted file mode 100644
index 06c18f3..000
---
a/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/IgnoreWithMessagesTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package junit.ignore;
-
-import org.junit.Assume;
-import
git commit: o Added test on runlistener with multiple iignores
Updated Branches:
refs/heads/master 4b09fd133 - ab4eea7e0
o Added test on runlistener with multiple iignores
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/ab4eea7e
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/ab4eea7e
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/ab4eea7e
Branch: refs/heads/master
Commit: ab4eea7e0d4cb9920014a4955d38d4e5e081151c
Parents: 4b09fd1
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Fri Dec 21 11:40:41 2012 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Fri Dec 21 11:40:41 2012 +0100
--
.../src/test/resources/junit-ignore/pom.xml|4 +-
.../ClassAndMethodIgnoreNothingToRunTest.java | 18 +++
...lassLevelIgnore1WithMethodThatIsNormalTest.java | 17 +++
...lassLevelIgnore2WithMethodThatIsNormalTest.java | 17 +++
...reeIgnoredMethodsAnd1AssumptionFailureTest.java | 38 +++
.../surefire/junitcore/JUnitCoreRunListener.java | 26 +-
.../junitcore/JUnitCoreRunListenerTest.java| 22
7 files changed, 129 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/ab4eea7e/surefire-integration-tests/src/test/resources/junit-ignore/pom.xml
--
diff --git a/surefire-integration-tests/src/test/resources/junit-ignore/pom.xml
b/surefire-integration-tests/src/test/resources/junit-ignore/pom.xml
index c62fabd..a40b986 100644
--- a/surefire-integration-tests/src/test/resources/junit-ignore/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit-ignore/pom.xml
@@ -31,6 +31,7 @@
properties
junit.version4.4/junit.version
surefire.parallel/surefire.parallel
+surefire.threadcount3/surefire.threadcount
/properties
dependencies
@@ -57,7 +58,8 @@
version${surefire.version}/version
configuration
parallel${surefire.parallel}/parallel
- threadCount3/threadCount
+ perCoreThreadCountfalse/perCoreThreadCount
+ threadCount${surefire.threadcount}/threadCount
/configuration
/plugin
/plugins
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/ab4eea7e/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassAndMethodIgnoreNothingToRunTest.java
--
diff --git
a/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassAndMethodIgnoreNothingToRunTest.java
b/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassAndMethodIgnoreNothingToRunTest.java
new file mode 100644
index 000..15f05f9
--- /dev/null
+++
b/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassAndMethodIgnoreNothingToRunTest.java
@@ -0,0 +1,18 @@
+package junit.ignore;
+
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+@Ignore( ignore this test )
+public class ClassAndMethodIgnoreNothingToRunTest
+{
+
+@Ignore( ignore this test )
+@Test
+public void testIgnorable()
+{
+Assert.fail( you should have ignored me! );
+}
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/ab4eea7e/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassLevelIgnore1WithMethodThatIsNormalTest.java
--
diff --git
a/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassLevelIgnore1WithMethodThatIsNormalTest.java
b/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassLevelIgnore1WithMethodThatIsNormalTest.java
new file mode 100644
index 000..7570f7f
--- /dev/null
+++
b/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassLevelIgnore1WithMethodThatIsNormalTest.java
@@ -0,0 +1,17 @@
+package junit.ignore;
+
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+@Ignore( ignore this test )
+public class ClassLevelIgnore1WithMethodThatIsNormalTest
+{
+
+@Test
+public void testIgnorable()
+{
+Assert.fail( you should have ignored me! );
+}
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/ab4eea7e/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassLevelIgnore2WithMethodThatIsNormalTest.java
--
diff --git
git commit: o Activated embedded mode by default for maven3. Make sure you have enough permgen: 420MB or so in Maven opts
Updated Branches:
refs/heads/master ab4eea7e0 - 0d6f4f921
o Activated embedded mode by default for maven3. Make sure you have enough
permgen: 420MB or so in Maven opts
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/0d6f4f92
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/0d6f4f92
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/0d6f4f92
Branch: refs/heads/master
Commit: 0d6f4f9210cf1619d7c98e6a516a2470dead4aba
Parents: ab4eea7
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Fri Dec 21 12:15:16 2012 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Fri Dec 21 12:15:16 2012 +0100
--
surefire-integration-tests/pom.xml |8 +++-
1 files changed, 7 insertions(+), 1 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/0d6f4f92/surefire-integration-tests/pom.xml
--
diff --git a/surefire-integration-tests/pom.xml
b/surefire-integration-tests/pom.xml
index 4d70ac3..32aeb84 100644
--- a/surefire-integration-tests/pom.xml
+++ b/surefire-integration-tests/pom.xml
@@ -187,13 +187,19 @@
profile
idembedded/id
+ activation
+file
+ !-- This employs that the basedir expression is only recognized by
Maven 3.x (see MNG-2363) --
+ exists${basedir}/exists
+/file
+ /activation
properties
verifier.forkModeauto/verifier.forkMode
/properties
/profile
profile
-idmaven-2.2.1/id
+ idmaven-2.2.1/id
properties
mavenHomeUsed${project.build.directory}/maven-extract/apache-maven-2.2.1/mavenHomeUsed
/properties
Git Push Summary
Updated Tags: refs/tags/surefire-2.13 [created] 87afe715b
git commit: [maven-release-plugin] prepare for next development iteration
Updated Branches: refs/heads/master 0d6f4f921 - 9c93c69da [maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/9c93c69d Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/9c93c69d Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/9c93c69d Branch: refs/heads/master Commit: 9c93c69dab2f24f5e01a7590ccaf9bdcd3dcc6a7 Parents: 0d6f4f9 Author: Kristian Rosenvold kristian.rosenv...@gmail.com Authored: Fri Dec 21 12:46:08 2012 +0100 Committer: Kristian Rosenvold kristian.rosenv...@gmail.com Committed: Fri Dec 21 12:46:08 2012 +0100 -- maven-failsafe-plugin/pom.xml|5 ++--- maven-surefire-common/pom.xml|5 ++--- maven-surefire-plugin/pom.xml|5 ++--- maven-surefire-report-plugin/pom.xml |5 ++--- pom.xml | 11 +-- surefire-api/pom.xml |5 ++--- surefire-booter/pom.xml |5 ++--- surefire-grouper/pom.xml |5 ++--- surefire-integration-tests/pom.xml |5 ++--- surefire-providers/common-java5/pom.xml |5 ++--- surefire-providers/common-junit3/pom.xml |5 ++--- surefire-providers/common-junit4/pom.xml |5 ++--- surefire-providers/common-junit48/pom.xml|5 ++--- surefire-providers/pom.xml |5 ++--- surefire-providers/surefire-junit3/pom.xml |5 ++--- surefire-providers/surefire-junit4/pom.xml |5 ++--- surefire-providers/surefire-junit47/pom.xml |5 ++--- surefire-providers/surefire-testng-utils/pom.xml |5 ++--- surefire-providers/surefire-testng/pom.xml |5 ++--- surefire-setup-integration-tests/pom.xml |5 ++--- surefire-shadefire/pom.xml |5 ++--- 21 files changed, 45 insertions(+), 66 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9c93c69d/maven-failsafe-plugin/pom.xml -- diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml index 1933e0e..952aa66 100644 --- a/maven-failsafe-plugin/pom.xml +++ b/maven-failsafe-plugin/pom.xml @@ -18,14 +18,13 @@ ~ 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/xsd/maven-4.0.0.xsd; +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; modelVersion4.0.0/modelVersion parent groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId -version2.13-SNAPSHOT/version +version2.14-SNAPSHOT/version relativePath../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9c93c69d/maven-surefire-common/pom.xml -- diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml index a6a03ca..85a8a22 100644 --- a/maven-surefire-common/pom.xml +++ b/maven-surefire-common/pom.xml @@ -18,14 +18,13 @@ ~ 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/xsd/maven-4.0.0.xsd; +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; modelVersion4.0.0/modelVersion parent groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId -version2.13-SNAPSHOT/version +version2.14-SNAPSHOT/version relativePath../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9c93c69d/maven-surefire-plugin/pom.xml -- diff --git a/maven-surefire-plugin/pom.xml b/maven-surefire-plugin/pom.xml index 5abeb40..4039bb3 100644 --- a/maven-surefire-plugin/pom.xml +++ b/maven-surefire-plugin/pom.xml @@ -18,14 +18,13 @@ ~ 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/xsd/maven-4.0.0.xsd; +project
git commit: o Removed offline option
Updated Branches:
refs/heads/master 9c93c69da - 269396990
o Removed offline option
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/26939699
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/26939699
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/26939699
Branch: refs/heads/master
Commit: 269396990c12341d4d5f34c5194c525c1d043393
Parents: 9c93c69
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Fri Dec 21 15:47:37 2012 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Fri Dec 21 15:48:16 2012 +0100
--
.../surefire/its/fixture/SurefireLauncher.java |1 -
1 files changed, 0 insertions(+), 1 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/26939699/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
--
diff --git
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
index 1d3d983..84ea8b9 100755
---
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
+++
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
@@ -166,7 +166,6 @@ public class SurefireLauncher
public OutputValidator executeTest()
{
-mavenLauncher.addCliOption( -o );
return mavenLauncher.execute( test );
}
Git Push Summary
Updated Tags: refs/tags/surefire-2.13 [deleted] 87afe715b
git commit: [maven-release-plugin] prepare release surefire-2.13
Updated Branches: refs/heads/master 269396990 - 72dfaa7a2 [maven-release-plugin] prepare release surefire-2.13 Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/72dfaa7a Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/72dfaa7a Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/72dfaa7a Branch: refs/heads/master Commit: 72dfaa7a230cc29e94e4fdac11b6de08cc1887be Parents: 2693969 Author: Kristian Rosenvold kristian.rosenv...@gmail.com Authored: Fri Dec 21 16:36:13 2012 +0100 Committer: Kristian Rosenvold kristian.rosenv...@gmail.com Committed: Fri Dec 21 16:36:13 2012 +0100 -- maven-failsafe-plugin/pom.xml|2 +- maven-surefire-common/pom.xml|2 +- maven-surefire-plugin/pom.xml|2 +- maven-surefire-report-plugin/pom.xml |2 +- pom.xml |2 +- surefire-api/pom.xml |2 +- surefire-booter/pom.xml |2 +- surefire-grouper/pom.xml |2 +- surefire-integration-tests/pom.xml |2 +- surefire-providers/common-java5/pom.xml |2 +- surefire-providers/common-junit3/pom.xml |2 +- surefire-providers/common-junit4/pom.xml |2 +- surefire-providers/common-junit48/pom.xml|2 +- surefire-providers/pom.xml |2 +- surefire-providers/surefire-junit3/pom.xml |2 +- surefire-providers/surefire-junit4/pom.xml |2 +- surefire-providers/surefire-junit47/pom.xml |2 +- surefire-providers/surefire-testng-utils/pom.xml |2 +- surefire-providers/surefire-testng/pom.xml |2 +- surefire-setup-integration-tests/pom.xml |2 +- surefire-shadefire/pom.xml |2 +- 21 files changed, 21 insertions(+), 21 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/72dfaa7a/maven-failsafe-plugin/pom.xml -- diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml index 952aa66..16eadc4 100644 --- a/maven-failsafe-plugin/pom.xml +++ b/maven-failsafe-plugin/pom.xml @@ -24,7 +24,7 @@ parent groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId -version2.14-SNAPSHOT/version +version2.13/version relativePath../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/72dfaa7a/maven-surefire-common/pom.xml -- diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml index 85a8a22..0477680 100644 --- a/maven-surefire-common/pom.xml +++ b/maven-surefire-common/pom.xml @@ -24,7 +24,7 @@ parent groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId -version2.14-SNAPSHOT/version +version2.13/version relativePath../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/72dfaa7a/maven-surefire-plugin/pom.xml -- diff --git a/maven-surefire-plugin/pom.xml b/maven-surefire-plugin/pom.xml index 4039bb3..0b279b9 100644 --- a/maven-surefire-plugin/pom.xml +++ b/maven-surefire-plugin/pom.xml @@ -24,7 +24,7 @@ parent groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId -version2.14-SNAPSHOT/version +version2.13/version relativePath../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/72dfaa7a/maven-surefire-report-plugin/pom.xml -- diff --git a/maven-surefire-report-plugin/pom.xml b/maven-surefire-report-plugin/pom.xml index 34c6094..05f89d3 100644 --- a/maven-surefire-report-plugin/pom.xml +++ b/maven-surefire-report-plugin/pom.xml @@ -24,7 +24,7 @@ parent groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId -version2.14-SNAPSHOT/version +version2.13/version relativePath../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/72dfaa7a/pom.xml -- diff --git a/pom.xml b/pom.xml index c2ac28d..a756e47 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId - version2.14-SNAPSHOT/version + version2.13/version packagingpom/packaging nameApache Maven Surefire/name
Git Push Summary
Updated Tags: refs/tags/surefire-2.13 [created] 3321aa338
git commit: [maven-release-plugin] prepare for next development iteration
Updated Branches: refs/heads/master 72dfaa7a2 - fe5c0331b [maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/fe5c0331 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/fe5c0331 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/fe5c0331 Branch: refs/heads/master Commit: fe5c0331b7382628c59fc6773dfee825cdafd449 Parents: 72dfaa7 Author: Kristian Rosenvold kristian.rosenv...@gmail.com Authored: Fri Dec 21 16:38:57 2012 +0100 Committer: Kristian Rosenvold kristian.rosenv...@gmail.com Committed: Fri Dec 21 16:38:57 2012 +0100 -- maven-failsafe-plugin/pom.xml|2 +- maven-surefire-common/pom.xml|2 +- maven-surefire-plugin/pom.xml|2 +- maven-surefire-report-plugin/pom.xml |2 +- pom.xml |2 +- surefire-api/pom.xml |2 +- surefire-booter/pom.xml |2 +- surefire-grouper/pom.xml |2 +- surefire-integration-tests/pom.xml |2 +- surefire-providers/common-java5/pom.xml |2 +- surefire-providers/common-junit3/pom.xml |2 +- surefire-providers/common-junit4/pom.xml |2 +- surefire-providers/common-junit48/pom.xml|2 +- surefire-providers/pom.xml |2 +- surefire-providers/surefire-junit3/pom.xml |2 +- surefire-providers/surefire-junit4/pom.xml |2 +- surefire-providers/surefire-junit47/pom.xml |2 +- surefire-providers/surefire-testng-utils/pom.xml |2 +- surefire-providers/surefire-testng/pom.xml |2 +- surefire-setup-integration-tests/pom.xml |2 +- surefire-shadefire/pom.xml |2 +- 21 files changed, 21 insertions(+), 21 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fe5c0331/maven-failsafe-plugin/pom.xml -- diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml index 16eadc4..952aa66 100644 --- a/maven-failsafe-plugin/pom.xml +++ b/maven-failsafe-plugin/pom.xml @@ -24,7 +24,7 @@ parent groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId -version2.13/version +version2.14-SNAPSHOT/version relativePath../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fe5c0331/maven-surefire-common/pom.xml -- diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml index 0477680..85a8a22 100644 --- a/maven-surefire-common/pom.xml +++ b/maven-surefire-common/pom.xml @@ -24,7 +24,7 @@ parent groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId -version2.13/version +version2.14-SNAPSHOT/version relativePath../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fe5c0331/maven-surefire-plugin/pom.xml -- diff --git a/maven-surefire-plugin/pom.xml b/maven-surefire-plugin/pom.xml index 0b279b9..4039bb3 100644 --- a/maven-surefire-plugin/pom.xml +++ b/maven-surefire-plugin/pom.xml @@ -24,7 +24,7 @@ parent groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId -version2.13/version +version2.14-SNAPSHOT/version relativePath../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fe5c0331/maven-surefire-report-plugin/pom.xml -- diff --git a/maven-surefire-report-plugin/pom.xml b/maven-surefire-report-plugin/pom.xml index 05f89d3..34c6094 100644 --- a/maven-surefire-report-plugin/pom.xml +++ b/maven-surefire-report-plugin/pom.xml @@ -24,7 +24,7 @@ parent groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId -version2.13/version +version2.14-SNAPSHOT/version relativePath../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fe5c0331/pom.xml -- diff --git a/pom.xml b/pom.xml index a756e47..c2ac28d 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId - version2.13/version + version2.14-SNAPSHOT/version packagingpom/packaging nameApache Maven Surefire/name
svn commit: r843386 - /websites/production/maven/content/surefire-archives/surefire-2.13/
Author: krosenvold Date: Fri Dec 21 16:28:21 2012 New Revision: 843386 Log: Automatic svn path creation: https://svn.apache.org/repos/infra/websites/production/maven/content/surefire-archives/surefire-2.13 Added: websites/production/maven/content/surefire-archives/surefire-2.13/
svn commit: r843406 - in /websites/production/maven/content/surefire-archives/surefire-2.13: ./ maven-failsafe-plugin/ maven-failsafe-plugin/css/ maven-failsafe-plugin/images/ maven-failsafe-plugin/im
Author: krosenvold Date: Fri Dec 21 19:18:35 2012 New Revision: 843406 Log: Apache Maven Surefire site deployment [This commit notification would consist of 104 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
git commit: o Revised compact stacktrce format again.
Updated Branches: refs/heads/master 71f44f611 - 93beca951 o Revised compact stacktrce format again. Colon rules ;) Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/93beca95 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/93beca95 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/93beca95 Branch: refs/heads/master Commit: 93beca951ced6946295fba350af703f667c36f5f Parents: 71f44f6 Author: Kristian Rosenvold krosenv...@apache.org Authored: Thu Dec 20 15:18:34 2012 +0100 Committer: Kristian Rosenvold krosenv...@apache.org Committed: Thu Dec 20 15:18:34 2012 +0100 -- .../src/site/markdown/newerrorsummary.md | 48 +-- .../surefire/report/SmartStackTraceParser.java | 42 +--- .../surefire/report/SmartStackTraceParserTest.java | 17 ++--- 3 files changed, 53 insertions(+), 54 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/93beca95/maven-surefire-plugin/src/site/markdown/newerrorsummary.md -- diff --git a/maven-surefire-plugin/src/site/markdown/newerrorsummary.md b/maven-surefire-plugin/src/site/markdown/newerrorsummary.md index f33a2d6..98491ea 100644 --- a/maven-surefire-plugin/src/site/markdown/newerrorsummary.md +++ b/maven-surefire-plugin/src/site/markdown/newerrorsummary.md @@ -8,38 +8,20 @@ report of the run or the files on disk. ### Example output: Failed tests: - Test1#assertion1(59) Bending maths expected:[123] but was:[312] - Test1#assertion2(64) True is false + Test1.assertion1:59 Bending maths expected:[123] but was:[312] + Test1.assertion2:64 True is false Tests in error: - Test1#nullPointerInLibrary(38) NullPointerException - Test1#failInNestedLibInMethod(54).nestedLibFailure(72) NullPointerException - Test1#failInLibInMethod(48) NullPointerException - Test1#failInMethod(43).innerFailure(68) NullPointerException Fail here - Test2#test6281(33) RuntimeException FailHere - -The format of the report is quite packed, so some explanation is required, there are three different formats: - - -### Format 1, assertion failure. - Class#method(line number)...methodN(lineN) Assertion failure message - -Test1#assertion2(64) True is false -Test1#assertion1(59) Bending maths expected:[123] but was:[312] - -### Format 2, Exception in test. - Class#method(line number)...methodN(lineN) Exception Message -In this case the exception was actually thrown on the line in question. - -Test1#failInMethod(43).innerFailure(68) NullPointerException Fail here -Test2#test6281(33) RuntimeException FailHere - -### Format 3: Exception in code called by test. - Same format as 2 but added before exception -In this case the exception is thrown inside some code that was called from this line of the -test. We do not show where the actual exception happened, only which line(s) of the test -that were involved in the call. - -Test1#failInLibInMethod(48) NullPointerException -Test1#failInNestedLibInMethod(54).nestedLibFailure(72) NullPointerException - + Test1.nullPointerInLibrary:38 » NullPointer + Test1.failInMethod:43-innerFailure:68 NullPointer Fail here + Test1.failInLibInMethod:48 » NullPointer + Test1.failInNestedLibInMethod:54-nestedLibFailure:72 » NullPointer + Test2.test6281:33 Runtime FailHere + +The main rules of the format are: + * Assertion failures only show the message + * Exception/Error is stripped from the Exception name to save space. + * The exception message is trimmed to an approximate 80 chars. + * The » symbol means that the exception happened below the method shown (in library code called by test) + * Methods in superclasses are normally shown as SuperClassName.methodName + * If the first method in the stacktrace is in a a superclass it will be show as this: TestClassSuperclass.method http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/93beca95/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java -- diff --git a/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java b/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java index 74b5c71..ebdfa40 100644 --- a/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java +++ b/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java @@ -22,6 +22,7 @@ package org.apache.maven.surefire.report; import
git commit: o Improved junit3 support
Updated Branches:
refs/heads/master 93beca951 - 6085acec2
o Improved junit3 support
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/6085acec
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/6085acec
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/6085acec
Branch: refs/heads/master
Commit: 6085acec29d8912786734bcc67d382a23d0ffc38
Parents: 93beca9
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Thu Dec 20 15:53:23 2012 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Thu Dec 20 15:53:46 2012 +0100
--
.../surefire/report/SmartStackTraceParser.java | 15 -
.../surefire/report/SmartStackTraceParserTest.java | 45 +++
2 files changed, 58 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/6085acec/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
--
diff --git
a/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
b/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
index ebdfa40..754494f 100644
---
a/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
+++
b/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
@@ -111,7 +111,14 @@ public class SmartStackTraceParser
result.deleteCharAt( result.length() - 1 );
result.deleteCharAt( result.length() - 1 );
-if ( throwable.getTarget() instanceof AssertionError )
+Throwable target = throwable.getTarget();
+if ( target instanceof AssertionError )
+{
+result.append( );
+result.append( throwable.getMessage() );
+}
+else if ( junit.framework.AssertiponFailedError.equals(
target.getClass().getName() )
+|| junit.framework.ComparisonFailure.equals(
target.getClass().getName() ) )
{
result.append( );
result.append( throwable.getMessage() );
@@ -119,7 +126,7 @@ public class SmartStackTraceParser
else
{
result.append( rootIsInclass() ? : » );
-result.append( getMinimalThrowableMiniMessage(
throwable.getTarget() ) );
+result.append( getMinimalThrowableMiniMessage( target ) );
result.append( getTruncatedMessage( 77 - result.length() ) );
}
return result.toString();
@@ -182,6 +189,10 @@ public class SmartStackTraceParser
private static boolean isInSupers( Class testClass, String lookFor )
{
+if ( lookFor.startsWith( junit.framework. ) )
+{
+return false;
+}
while ( !testClass.getName().equals( lookFor )
testClass.getSuperclass() != null )
{
testClass = testClass.getSuperclass();
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/6085acec/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/SmartStackTraceParserTest.java
--
diff --git
a/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/SmartStackTraceParserTest.java
b/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/SmartStackTraceParserTest.java
index b8c6c0e..03dd5e4 100644
---
a/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/SmartStackTraceParserTest.java
+++
b/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/SmartStackTraceParserTest.java
@@ -21,8 +21,10 @@ package org.apache.maven.surefire.report;
import java.util.List;
import junit.framework.Assert;
+import junit.framework.ComparisonFailure;
import junit.framework.TestCase;
+@SuppressWarnings( ThrowableResultOfMethodCallIgnored )
public class SmartStackTraceParserTest
extends TestCase
{
@@ -129,6 +131,22 @@ public class SmartStackTraceParserTest
}
}
+public void testClassThatWillFail()
+throws Exception
+{
+CaseThatWillFail aTestClass = new CaseThatWillFail();
+try
+{
+aTestClass.testThatWillFail();
+}
+catch ( ComparisonFailure e )
+{
+SmartStackTraceParser smartStackTraceParser = new
SmartStackTraceParser( CaseThatWillFail.class, e );
+String res = smartStackTraceParser.getString();
+assertEquals(
SmartStackTraceParserTest$CaseThatWillFail.testThatWillFail:170 expected:abc
but was:def, res );
+
git commit: o Made class more reformatting-proof
Updated Branches:
refs/heads/master 6085acec2 - c8a1b8145
o Made class more reformatting-proof
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/c8a1b814
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/c8a1b814
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/c8a1b814
Branch: refs/heads/master
Commit: c8a1b8145c42f69e99ed378bbe85368a773811af
Parents: 6085ace
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Thu Dec 20 16:20:20 2012 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Thu Dec 20 16:20:20 2012 +0100
--
.../surefire/report/SmartStackTraceParserTest.java | 158 ---
1 files changed, 83 insertions(+), 75 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/c8a1b814/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/SmartStackTraceParserTest.java
--
diff --git
a/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/SmartStackTraceParserTest.java
b/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/SmartStackTraceParserTest.java
index 03dd5e4..d332fd2 100644
---
a/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/SmartStackTraceParserTest.java
+++
b/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/SmartStackTraceParserTest.java
@@ -28,6 +28,76 @@ import junit.framework.TestCase;
public class SmartStackTraceParserTest
extends TestCase
{
+
+static class AssertionNoMessage
+extends TestCase
+{
+public void testThrowSomething()
+{
+assertEquals( abc, xyz );
+}
+}
+
+static class ADifferen0tTestClass
+{
+static class InnerATestClass
+{
+public static void testFake()
+{
+innerMethod();
+}
+
+private static void innerMethod()
+{
+Assert.assertTrue( false );
+}
+}
+}
+
+static class CaseThatWillFail
+extends TestCase
+{
+public void testThatWillFail()
+{
+assertEquals( abc, def );
+}
+}
+
+static class TestClass2
+{
+static class InnerCTestClass
+{
+public static void cThrows()
+throws Exception
+{
+throw new Exception( Hey ho, hey ho, a throwable we throw! );
+}
+}
+}
+
+static class TestClass1
+{
+static class InnerBTestClass
+{
+public static void throwSomething()
+{
+innerThrowSomething();
+}
+
+public static void innerThrowSomething()
+{
+try
+{
+TestClass2.InnerCTestClass.cThrows();
+}
+catch ( Exception e )
+{
+throw new RuntimeException( e );
+}
+}
+}
+}
+
public void testGetString()
throws Exception
{
@@ -143,67 +213,8 @@ public class SmartStackTraceParserTest
{
SmartStackTraceParser smartStackTraceParser = new
SmartStackTraceParser( CaseThatWillFail.class, e );
String res = smartStackTraceParser.getString();
-assertEquals(
SmartStackTraceParserTest$CaseThatWillFail.testThatWillFail:170 expected:abc
but was:def, res );
-}
-}
-
-static class ADifferen0tTestClass
-{
-static class InnerATestClass
-{
-public static void testFake()
-{
-innerMethod();
-}
-
-private static void innerMethod()
-{
-Assert.assertTrue( false );
-}
-}
-}
-
-static class CaseThatWillFail
-extends TestCase
-{
-public void testThatWillFail()
-{
-assertEquals( abc, def );
-}
-}
-
-static class TestClass2
-{
-static class InnerCTestClass
-{
-public static void cThrows()
-throws Exception
-{
-throw new Exception( Hey ho, hey ho, a throwable we throw! );
-}
-}
-}
-
-static class TestClass1
-{
-static class InnerBTestClass
-{
-public static void throwSomething()
-{
-innerThrowSomething();
-}
-
-public static void innerThrowSomething()
-{
-try
-{
-
git commit: o Removed msdos line endings
Updated Branches:
refs/heads/master c8a1b8145 - 12c37d634
o Removed msdos line endings
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/12c37d63
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/12c37d63
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/12c37d63
Branch: refs/heads/master
Commit: 12c37d6347a345838952f6c01e7fc86e70248b7f
Parents: c8a1b81
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Thu Dec 20 16:28:44 2012 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Thu Dec 20 16:28:44 2012 +0100
--
.../maven/surefire/util/DefaultScanResult.java | 282 ++--
.../apache/maven/surefire/util/LazyTestsToRun.java | 366 +++---
.../org/apache/maven/surefire/util/ScanResult.java | 78 ++--
.../apache/maven/surefire/util/ScanResultTest.java | 96 ++--
4 files changed, 411 insertions(+), 411 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/12c37d63/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultScanResult.java
--
diff --git
a/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultScanResult.java
b/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultScanResult.java
index b009f34..f8cb61d 100644
---
a/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultScanResult.java
+++
b/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultScanResult.java
@@ -1,141 +1,141 @@
-package org.apache.maven.surefire.util;
-
-/*
- * 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 java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Properties;
-
-/**
- * @author Kristian Rosenvold
- */
-public class DefaultScanResult
-implements ScanResult
-{
-private final List files;
-
-private static final String scanResultNo = tc.;
-
-public DefaultScanResult( List files )
-{
-this.files = files;
-}
-
-public int size()
-{
-return files.size();
-}
-
-public String getClassName( int index )
-{
-return (String) files.get( index );
-}
-
-public void writeTo( Properties properties )
-{
-int size = files.size();
-for ( int i = 0; i size; i++ )
-{
-properties.setProperty( scanResultNo + i, (String) files.get( i )
);
-}
-}
-
-public static DefaultScanResult from( Properties properties )
-{
-List result = new ArrayList();
-int i = 0;
-while ( true )
-{
-String item = properties.getProperty( scanResultNo + ( i++ ) );
-if ( item == null )
-{
-return new DefaultScanResult( result );
-}
-result.add( item );
-}
-}
-
-public boolean isEmpty()
-{
-return files.isEmpty();
-}
-
-public List getFiles()
-{
-return Collections.unmodifiableList( files );
-}
-
-public TestsToRun applyFilter( ScannerFilter scannerFilter, ClassLoader
testClassLoader )
-{
-List result = new ArrayList();
-
-int size = size();
-for ( int i = 0; i size; i++ )
-{
-String className = getClassName( i );
-
-Class testClass = loadClass( testClassLoader, className );
-
-if ( scannerFilter == null || scannerFilter.accept( testClass ) )
-{
-result.add( testClass );
-}
-}
-
-return new TestsToRun( result );
-}
-
-public List getClassesSkippedByValidation( ScannerFilter scannerFilter,
ClassLoader testClassLoader )
-{
-List result = new ArrayList();
-
-int size = size();
-for ( int i = 0; i size; i++ )
-{
-String className = getClassName( i );
-
-Class testClass = loadClass( testClassLoader, className );
-
-if (
git commit: o Fixed typo and olamys buffer underflow
Updated Branches:
refs/heads/master 12c37d634 - bc2b31f90
o Fixed typo and olamys buffer underflow
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/bc2b31f9
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/bc2b31f9
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/bc2b31f9
Branch: refs/heads/master
Commit: bc2b31f90580e3e8ac3f4a3200ba4ec2bb407836
Parents: 12c37d6
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Fri Dec 21 01:37:46 2012 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Fri Dec 21 01:42:46 2012 +0100
--
.../surefire/report/SmartStackTraceParser.java |9 +++-
.../surefire/report/SmartStackTraceParserTest.java | 31 ++-
2 files changed, 35 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/bc2b31f9/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
--
diff --git
a/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
b/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
index 754494f..a668806 100644
---
a/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
+++
b/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
@@ -108,8 +108,11 @@ public class SmartStackTraceParser
result.append( - );
}
-result.deleteCharAt( result.length() - 1 );
-result.deleteCharAt( result.length() - 1 );
+if ( result.length() = 2 )
+{
+result.deleteCharAt( result.length() - 1 );
+result.deleteCharAt( result.length() - 1 );
+}
Throwable target = throwable.getTarget();
if ( target instanceof AssertionError )
@@ -117,7 +120,7 @@ public class SmartStackTraceParser
result.append( );
result.append( throwable.getMessage() );
}
-else if ( junit.framework.AssertiponFailedError.equals(
target.getClass().getName() )
+else if ( junit.framework.AssertionFailedError.equals(
target.getClass().getName() )
|| junit.framework.ComparisonFailure.equals(
target.getClass().getName() ) )
{
result.append( );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/bc2b31f9/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/SmartStackTraceParserTest.java
--
diff --git
a/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/SmartStackTraceParserTest.java
b/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/SmartStackTraceParserTest.java
index d332fd2..e7cc854 100644
---
a/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/SmartStackTraceParserTest.java
+++
b/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/SmartStackTraceParserTest.java
@@ -20,7 +20,9 @@ package org.apache.maven.surefire.report;
import java.util.List;
+import com.sun.deploy.uitoolkit.impl.text.TextWindowFactory;
import junit.framework.Assert;
+import junit.framework.AssertionFailedError;
import junit.framework.ComparisonFailure;
import junit.framework.TestCase;
@@ -98,6 +100,15 @@ public class SmartStackTraceParserTest
}
}
+static class FailWithFail
+extends TestCase
+{
+public void testThatWillFail()
+{
+fail( abc );
+}
+}
+
public void testGetString()
throws Exception
{
@@ -213,7 +224,7 @@ public class SmartStackTraceParserTest
{
SmartStackTraceParser smartStackTraceParser = new
SmartStackTraceParser( CaseThatWillFail.class, e );
String res = smartStackTraceParser.getString();
-assertEquals(
SmartStackTraceParserTest$CaseThatWillFail.testThatWillFail:62 expected:abc
but was:def,
+assertEquals(
SmartStackTraceParserTest$CaseThatWillFail.testThatWillFail:64 expected:abc
but was:def,
res );
}
}
@@ -256,7 +267,23 @@ public class SmartStackTraceParserTest
SmartStackTraceParser smartStackTraceParser = new
SmartStackTraceParser( AssertionNoMessage.class, e );
String res = smartStackTraceParser.getString();
assertEquals(
-
SmartStackTraceParserTest$AssertionNoMessage.testThrowSomething:37
expected:abc but was:xyz,
+
svn commit: r843298 [1/8] - in /websites/production/maven/content/shared-archives/maven-verifier-1.4: ./ apidocs/ apidocs/org/apache/maven/it/ apidocs/org/apache/maven/it/class-use/ apidocs/org/apache
Author: krosenvold Date: Fri Dec 21 01:24:02 2012 New Revision: 843298 Log: Maven Verifier Component site deployment Modified: websites/production/maven/content/shared-archives/maven-verifier-1.4/apidocs/allclasses-frame.html websites/production/maven/content/shared-archives/maven-verifier-1.4/apidocs/allclasses-noframe.html websites/production/maven/content/shared-archives/maven-verifier-1.4/apidocs/constant-values.html websites/production/maven/content/shared-archives/maven-verifier-1.4/apidocs/deprecated-list.html websites/production/maven/content/shared-archives/maven-verifier-1.4/apidocs/help-doc.html websites/production/maven/content/shared-archives/maven-verifier-1.4/apidocs/index-all.html websites/production/maven/content/shared-archives/maven-verifier-1.4/apidocs/index.html websites/production/maven/content/shared-archives/maven-verifier-1.4/apidocs/org/apache/maven/it/VerificationException.html websites/production/maven/content/shared-archives/maven-verifier-1.4/apidocs/org/apache/maven/it/Verifier.html websites/production/maven/content/shared-archives/maven-verifier-1.4/apidocs/org/apache/maven/it/class-use/VerificationException.html websites/production/maven/content/shared-archives/maven-verifier-1.4/apidocs/org/apache/maven/it/class-use/Verifier.html websites/production/maven/content/shared-archives/maven-verifier-1.4/apidocs/org/apache/maven/it/package-frame.html websites/production/maven/content/shared-archives/maven-verifier-1.4/apidocs/org/apache/maven/it/package-summary.html websites/production/maven/content/shared-archives/maven-verifier-1.4/apidocs/org/apache/maven/it/package-tree.html websites/production/maven/content/shared-archives/maven-verifier-1.4/apidocs/org/apache/maven/it/package-use.html websites/production/maven/content/shared-archives/maven-verifier-1.4/apidocs/org/apache/maven/it/util/ResourceExtractor.html websites/production/maven/content/shared-archives/maven-verifier-1.4/apidocs/org/apache/maven/it/util/class-use/ResourceExtractor.html websites/production/maven/content/shared-archives/maven-verifier-1.4/apidocs/org/apache/maven/it/util/package-frame.html websites/production/maven/content/shared-archives/maven-verifier-1.4/apidocs/org/apache/maven/it/util/package-summary.html websites/production/maven/content/shared-archives/maven-verifier-1.4/apidocs/org/apache/maven/it/util/package-tree.html websites/production/maven/content/shared-archives/maven-verifier-1.4/apidocs/org/apache/maven/it/util/package-use.html websites/production/maven/content/shared-archives/maven-verifier-1.4/apidocs/overview-frame.html websites/production/maven/content/shared-archives/maven-verifier-1.4/apidocs/overview-summary.html websites/production/maven/content/shared-archives/maven-verifier-1.4/apidocs/overview-tree.html websites/production/maven/content/shared-archives/maven-verifier-1.4/apidocs/serialized-form.html websites/production/maven/content/shared-archives/maven-verifier-1.4/checkstyle-aggregate.html websites/production/maven/content/shared-archives/maven-verifier-1.4/checkstyle.html websites/production/maven/content/shared-archives/maven-verifier-1.4/checkstyle.rss websites/production/maven/content/shared-archives/maven-verifier-1.4/cobertura/frame-sourcefiles-org.apache.maven.it.html websites/production/maven/content/shared-archives/maven-verifier-1.4/cobertura/frame-sourcefiles.html websites/production/maven/content/shared-archives/maven-verifier-1.4/cobertura/frame-summary-org.apache.maven.it.html websites/production/maven/content/shared-archives/maven-verifier-1.4/cobertura/frame-summary-org.apache.maven.it.util.html websites/production/maven/content/shared-archives/maven-verifier-1.4/cobertura/frame-summary.html websites/production/maven/content/shared-archives/maven-verifier-1.4/cobertura/org.apache.maven.it.Classpath3xLauncher.html websites/production/maven/content/shared-archives/maven-verifier-1.4/cobertura/org.apache.maven.it.Embedded3xLauncher.html websites/production/maven/content/shared-archives/maven-verifier-1.4/cobertura/org.apache.maven.it.ForkedLauncher.html websites/production/maven/content/shared-archives/maven-verifier-1.4/cobertura/org.apache.maven.it.LauncherException.html websites/production/maven/content/shared-archives/maven-verifier-1.4/cobertura/org.apache.maven.it.MavenLauncher.html websites/production/maven/content/shared-archives/maven-verifier-1.4/cobertura/org.apache.maven.it.VerificationException.html websites/production/maven/content/shared-archives/maven-verifier-1.4/cobertura/org.apache.maven.it.Verifier.html websites/production/maven/content/shared-archives/maven-verifier-1.4/cobertura/org.apache.maven.it.util.ResourceExtractor.html websites/production/maven/content/shared-archives/maven-verifier-1.4/cpd.html websites/production
svn commit: r843298 [8/8] - in /websites/production/maven/content/shared-archives/maven-verifier-1.4: ./ apidocs/ apidocs/org/apache/maven/it/ apidocs/org/apache/maven/it/class-use/ apidocs/org/apache
Modified: websites/production/maven/content/shared-archives/maven-verifier-1.4/xref/org/apache/maven/it/package-frame.html == --- websites/production/maven/content/shared-archives/maven-verifier-1.4/xref/org/apache/maven/it/package-frame.html (original) +++ websites/production/maven/content/shared-archives/maven-verifier-1.4/xref/org/apache/maven/it/package-frame.html Fri Dec 21 01:24:02 2012 @@ -16,7 +16,7 @@ ul li - a href=Classpath3xLauncher.html target=classFrame/a + a href=Embedded3xLauncher.html target=classFrame/a /li li a href=Classpath3xLauncher.html target=classFrameClasspath3xLauncher/a Modified: websites/production/maven/content/shared-archives/maven-verifier-1.4/xref/org/apache/maven/it/package-summary.html == --- websites/production/maven/content/shared-archives/maven-verifier-1.4/xref/org/apache/maven/it/package-summary.html (original) +++ websites/production/maven/content/shared-archives/maven-verifier-1.4/xref/org/apache/maven/it/package-summary.html Fri Dec 21 01:24:02 2012 @@ -37,7 +37,7 @@ tbody tr td - a href=Classpath3xLauncher.html target=classFrame/a + a href=Embedded3xLauncher.html target=classFrame/a /td /tr tr
svn commit: r843298 [6/8] - in /websites/production/maven/content/shared-archives/maven-verifier-1.4: ./ apidocs/ apidocs/org/apache/maven/it/ apidocs/org/apache/maven/it/class-use/ apidocs/org/apache
Modified: websites/production/maven/content/shared-archives/maven-verifier-1.4/testapidocs/deprecated-list.html == --- websites/production/maven/content/shared-archives/maven-verifier-1.4/testapidocs/deprecated-list.html (original) +++ websites/production/maven/content/shared-archives/maven-verifier-1.4/testapidocs/deprecated-list.html Fri Dec 21 01:24:02 2012 @@ -2,7 +2,7 @@ !--NewPage-- HTML HEAD -!-- Generated by javadoc (build 1.5.0_19) on Thu Dec 13 22:48:45 GMT+01:00 2012 -- +!-- Generated by javadoc (build 1.5.0_19) on Fri Dec 21 02:21:56 CET 2012 -- META http-equiv=Content-Type content=text/html; charset=UTF-8 TITLE Deprecated List (Maven Verifier Component 1.4 Test API) Modified: websites/production/maven/content/shared-archives/maven-verifier-1.4/testapidocs/help-doc.html == --- websites/production/maven/content/shared-archives/maven-verifier-1.4/testapidocs/help-doc.html (original) +++ websites/production/maven/content/shared-archives/maven-verifier-1.4/testapidocs/help-doc.html Fri Dec 21 01:24:02 2012 @@ -2,7 +2,7 @@ !--NewPage-- HTML HEAD -!-- Generated by javadoc (build 1.5.0_19) on Thu Dec 13 22:48:45 GMT+01:00 2012 -- +!-- Generated by javadoc (build 1.5.0_19) on Fri Dec 21 02:21:56 CET 2012 -- META http-equiv=Content-Type content=text/html; charset=UTF-8 TITLE API Help (Maven Verifier Component 1.4 Test API) Modified: websites/production/maven/content/shared-archives/maven-verifier-1.4/testapidocs/index-all.html == --- websites/production/maven/content/shared-archives/maven-verifier-1.4/testapidocs/index-all.html (original) +++ websites/production/maven/content/shared-archives/maven-verifier-1.4/testapidocs/index-all.html Fri Dec 21 01:24:02 2012 @@ -2,7 +2,7 @@ !--NewPage-- HTML HEAD -!-- Generated by javadoc (build 1.5.0_19) on Thu Dec 13 22:48:45 GMT+01:00 2012 -- +!-- Generated by javadoc (build 1.5.0_19) on Fri Dec 21 02:21:56 CET 2012 -- META http-equiv=Content-Type content=text/html; charset=UTF-8 TITLE Index (Maven Verifier Component 1.4 Test API) @@ -86,6 +86,9 @@ function windowTitle() DTA HREF=./org/apache/maven/it/VerifierTest.html#testExtractMavenVersion()BtestExtractMavenVersion()/B/A - Method in class org.apache.maven.it.A HREF=./org/apache/maven/it/VerifierTest.html title=class in org.apache.maven.itVerifierTest/A DDnbsp; +DTA HREF=./org/apache/maven/it/VerifierTest.html#testFileInJarPresent()BtestFileInJarPresent()/B/A - +Method in class org.apache.maven.it.A HREF=./org/apache/maven/it/VerifierTest.html title=class in org.apache.maven.itVerifierTest/A +DDnbsp; /DL HR A NAME=_V_!-- --/AH2 Modified: websites/production/maven/content/shared-archives/maven-verifier-1.4/testapidocs/index.html == --- websites/production/maven/content/shared-archives/maven-verifier-1.4/testapidocs/index.html (original) +++ websites/production/maven/content/shared-archives/maven-verifier-1.4/testapidocs/index.html Fri Dec 21 01:24:02 2012 @@ -2,7 +2,7 @@ !--NewPage-- HTML HEAD -!-- Generated by javadoc on Thu Dec 13 22:48:45 GMT+01:00 2012-- +!-- Generated by javadoc on Fri Dec 21 02:21:56 CET 2012-- META http-equiv=Content-Type content=text/html; charset=UTF-8 TITLE Maven Verifier Component 1.4 Test API Modified: websites/production/maven/content/shared-archives/maven-verifier-1.4/testapidocs/org/apache/maven/it/VerifierTest.html == --- websites/production/maven/content/shared-archives/maven-verifier-1.4/testapidocs/org/apache/maven/it/VerifierTest.html (original) +++ websites/production/maven/content/shared-archives/maven-verifier-1.4/testapidocs/org/apache/maven/it/VerifierTest.html Fri Dec 21 01:24:02 2012 @@ -2,7 +2,7 @@ !--NewPage-- HTML HEAD -!-- Generated by javadoc (build 1.5.0_19) on Thu Dec 13 22:48:45 GMT+01:00 2012 -- +!-- Generated by javadoc (build 1.5.0_19) on Fri Dec 21 02:21:55 CET 2012 -- META http-equiv=Content-Type content=text/html; charset=UTF-8 TITLE VerifierTest (Maven Verifier Component 1.4 Test API) @@ -139,6 +139,14 @@ Class VerifierTest/H2 BR nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;/TD /TR +TR BGCOLOR=white CLASS=TableRowColor +TD ALIGN=right VALIGN=top WIDTH=1%FONT SIZE=-1 +CODEnbsp;void/CODE/FONT/TD +TDCODEBA HREF=../../../../org/apache/maven/it/VerifierTest.html#testFileInJarPresent()testFileInJarPresent/A/B()/CODE + +BR +nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;/TD +/TR /TABLE nbsp;A NAME=methods_inherited_from_class_junit.framework.TestCase!-- --/A TABLE BORDER=1 WIDTH=100% CELLPADDING=3 CELLSPACING=0 SUMMARY= @@ -206,6 +214,20 @@ public void BtestExtractMavenVersion/ /DL
git commit: o Extracted test classes to separate files to stabilize line numbers
Updated Branches:
refs/heads/master fbeb76e98 - f7cb5fd4b
o Extracted test classes to separate files to stabilize line numbers
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/f7cb5fd4
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/f7cb5fd4
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/f7cb5fd4
Branch: refs/heads/master
Commit: f7cb5fd4bec3e0005c33085f85e809c7e323edde
Parents: fbeb76e
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Fri Dec 21 02:37:06 2012 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Fri Dec 21 02:37:06 2012 +0100
--
.../surefire/report/ADifferen0tTestClass.java | 25
.../maven/surefire/report/AssertionNoMessage.java | 31 +
.../maven/surefire/report/CaseThatWillFail.java| 31 +
.../apache/maven/surefire/report/FailWithFail.java | 31 +
.../maven/surefire/report/InnerATestClass.java | 42 +++
.../surefire/report/SmartStackTraceParserTest.java | 90 +--
.../apache/maven/surefire/report/TestClass1.java | 42 +++
.../apache/maven/surefire/report/TestClass2.java | 31 +
8 files changed, 239 insertions(+), 84 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f7cb5fd4/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/ADifferen0tTestClass.java
--
diff --git
a/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/ADifferen0tTestClass.java
b/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/ADifferen0tTestClass.java
new file mode 100644
index 000..3b58a81
--- /dev/null
+++
b/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/ADifferen0tTestClass.java
@@ -0,0 +1,25 @@
+package org.apache.maven.surefire.report;
+
+/*
+ * 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.
+ */
+
+
+class ADifferen0tTestClass
+{
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f7cb5fd4/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/AssertionNoMessage.java
--
diff --git
a/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/AssertionNoMessage.java
b/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/AssertionNoMessage.java
new file mode 100644
index 000..7c1e3a3
--- /dev/null
+++
b/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/AssertionNoMessage.java
@@ -0,0 +1,31 @@
+package org.apache.maven.surefire.report;
+
+/*
+ * 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 junit.framework.TestCase;
+
+class AssertionNoMessage
+extends TestCase
+{
+public void testThrowSomething()
+{
+assertEquals( abc, xyz );
+}
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f7cb5fd4/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/CaseThatWillFail.java
--
diff --git
svn commit: r1424786 - /maven/site/trunk/content/apt/shared/index.apt
Author: krosenvold
Date: Fri Dec 21 01:45:45 2012
New Revision: 1424786
URL: http://svn.apache.org/viewvc?rev=1424786view=rev
Log:
m-s-u and m-v
Modified:
maven/site/trunk/content/apt/shared/index.apt
Modified: maven/site/trunk/content/apt/shared/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/shared/index.apt?rev=1424786r1=1424785r2=1424786view=diff
==
--- maven/site/trunk/content/apt/shared/index.apt (original)
+++ maven/site/trunk/content/apt/shared/index.apt Fri Dec 21 01:45:45 2012
@@ -47,15 +47,15 @@ Shared Components
*+--+---+--++-+
| {{{/shared/maven-shared-resources/} maven-shared-resources}} |
1| 2011-05-07| This is a collection of templates that are
specific to the Maven project. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-resources/}SVN}}
| {{{http://jira.codehaus.org/browse/MSHARED/component/14715}JIRA}}
*+--+---+--++-+
-| {{{/shared/maven-verifier/} maven-verifier}} |
1.2 | 2009-09-22| Used to run Maven builds as part of tests. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-verifier/}SVN}} |
{{{http://jira.codehaus.org/browse/MSHARED/component/13281}JIRA}}
+| {{{/shared/maven-verifier/} maven-verifier}} |
1.4 | 2012-12-21| Used to run Maven builds as part of tests. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-verifier/}SVN}} |
{{{http://jira.codehaus.org/browse/MSHARED/component/13281}JIRA}}
*+--+---+--++-+
| {{{/shared/maven-script-interpreter/} maven-script-interpreter}} |
1.1 | 2012-08-13| Utilities to interpret/execute some scripts
for various implementations: groovy or beanshell. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-script-interpreter/}SVN}}
| {{{http://jira.codehaus.org/browse/MSHARED/component/15256}JIRA}}
*+--+---+--++-+
| {{{/shared/maven-jarsigner/} maven-jarsigner}} |
1.0 | 2011-11-21| This component provides some utilities to
sign/verify jars/files in your Mojos. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-jarsigner/}SVN}} |
{{{http://jira.codehaus.org/browse/MSHARED/component/15255}JIRA}}
*+--+---+--++-+
-| {{{/shared/maven-shared-utils/} maven-shared-utils}} |
0.1 | 2012-11-01| Utilities functions for use within maven. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-utils/}SVN}}
| {{{http://jira.codehaus.org/browse/MSHARED/component/15606}JIRA}}
+| {{{/shared/maven-shared-utils/} maven-shared-utils}} |
0.2 | 2012-12-17| Utilities functions for use within maven. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-utils/}SVN}}
| {{{http://jira.codehaus.org/browse/MSHARED/component/15606}JIRA}}
*+--+---+--++-+
| {{{/shared/maven-shared-incremental/} maven-shared-incremental}} |
1.0 | 2012-11-19| Various utility classes and plexus
components for supporting incremental build functionality in maven plugins. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-incremental/}SVN}}
| {{{http://jira.codehaus.org/browse/MSHARED/component/15650}JIRA}}
*+--+---+--++-+
- Archived version of shared libraries are located here
{{{http://maven.apache.org/shared-archives/}http://maven.apache.org/shared-archives/}}
\ No newline at end of file
+ Archived version of shared libraries are located here
{{{http://maven.apache.org/shared-archives/}http://maven.apache.org/shared-archives/}}
svn commit: r843313 [6/15] - in /websites/production/maven/content/shared/maven-verifier: ./ apidocs/ apidocs/org/apache/maven/it/ apidocs/org/apache/maven/it/class-use/ apidocs/org/apache/maven/it/ut
Modified:
websites/production/maven/content/shared/maven-verifier/cobertura/org.apache.maven.it.Classpath3xLauncher.html
==
---
websites/production/maven/content/shared/maven-verifier/cobertura/org.apache.maven.it.Classpath3xLauncher.html
(original)
+++
websites/production/maven/content/shared/maven-verifier/cobertura/org.apache.maven.it.Classpath3xLauncher.html
Fri Dec 21 04:49:06 2012
@@ -12,7 +12,7 @@
div class=separatornbsp;/div
table class=report
theadtr td class=headingClasses in this File/td td
class=headinga class=dfn href=help.html
onclick=popupwindow('help.html'); return false;Line Coverage/a/td td
class=headinga class=dfn href=help.html
onclick=popupwindow('help.html'); return false;Branch Coverage/a/td td
class=headinga class=dfn href=help.html
onclick=popupwindow('help.html'); return
false;Complexity/a/td/tr/thead
- trtda
href=org.apache.maven.it.Classpath3xLauncher.htmlClasspath3xLauncher/a/tdtdtable
cellpadding=0px cellspacing=0px class=percentgraphtr
class=percentgraphtd align=right class=percentgraph
width=400%/tdtd class=percentgraphdiv class=percentgraphdiv
class=greenbar style=width:0pxspan
class=text0/33/span/div/div/td/tr/table/tdtdtable
cellpadding=0px cellspacing=0px class=percentgraphtr
class=percentgraphtd align=right class=percentgraph
width=400%/tdtd class=percentgraphdiv class=percentgraphdiv
class=greenbar style=width:0pxspan
class=text0/12/span/div/div/td/tr/table/tdtd
class=valuespan class=hidden8.0;/span8/td/tr
+ trtda
href=org.apache.maven.it.Classpath3xLauncher.htmlClasspath3xLauncher/a/tdtdtable
cellpadding=0px cellspacing=0px class=percentgraphtr
class=percentgraphtd align=right class=percentgraph
width=400%/tdtd class=percentgraphdiv class=percentgraphdiv
class=greenbar style=width:0pxspan
class=text0/33/span/div/div/td/tr/table/tdtdtable
cellpadding=0px cellspacing=0px class=percentgraphtr
class=percentgraphtd align=right class=percentgraph
width=400%/tdtd class=percentgraphdiv class=percentgraphdiv
class=greenbar style=width:0pxspan
class=text0/4/span/div/div/td/tr/table/tdtd
class=valuespan class=hidden8.5;/span8.5/td/tr
/table
div class=separatornbsp;/div
@@ -82,7 +82,7 @@
tr td class=numLinenbsp;32/td td class=nbHitsnbsp;/td
td class=srcpre class=srcnbsp;span class=comment * be present
on the class path./span/pre/td/tr
tr td class=numLinenbsp;33/td td class=nbHitsnbsp;/td
- td class=srcpre class=srcnbsp;span class=comment *
/span/pre/td/tr
+ td class=srcpre class=srcnbsp;span class=comment
*/span/pre/td/tr
tr td class=numLinenbsp;34/td td class=nbHitsnbsp;/td
td class=srcpre class=srcnbsp;span class=comment * @author
Benjamin Bentmann/span/pre/td/tr
tr td class=numLinenbsp;35/td td class=nbHitsnbsp;/td
@@ -121,7 +121,7 @@
tr td class=numLineCovernbsp;53/td td
class=nbHitsUncoverednbsp;0/td td class=srcpre class=srcspan
class=srcUncoverednbsp;mavenCli =
cliClass.newInstance();/span/pre/td/tr
tr td class=numLinenbsp;54/td td class=nbHitsnbsp;/td
td class=srcpre class=srcnbsp;/pre/td/tr
-tr td class=numLineCovernbsp;55/td td class=nbHitsUncovereda
title=Line 55: Conditional coverage 0% (0/8) [each condition: 0%, 0%, 0%,
0%].nbsp;0/a/td td class=srcpre class=srcspan
class=srcUncoverednbsp;a title=Line 55: Conditional coverage 0% (0/8)
[each condition: 0%, 0%, 0%, 0%].Class[] parameterTypes = {
String[].span class=keywordclass/span, String.span
class=keywordclass/span, PrintStream.span class=keywordclass/span,
PrintStream.span class=keywordclass/span };/a/span/pre/td/tr
+tr td class=numLineCovernbsp;55/td td
class=nbHitsUncoverednbsp;0/td td class=srcpre class=srcspan
class=srcUncoverednbsp;Class[] parameterTypes = {
String[].span class=keywordclass/span, String.span
class=keywordclass/span, PrintStream.span class=keywordclass/span,
PrintStream.span class=keywordclass/span };/span/pre/td/tr
tr td class=numLineCovernbsp;56/td td
class=nbHitsUncoverednbsp;0/td td class=srcpre class=srcspan
class=srcUncoverednbsp;doMain = cliClass.getMethod( span
class=stringdoMain/span, parameterTypes );/span/pre/td/tr
tr td class=numLinenbsp;57/td td class=nbHitsnbsp;/td
td class=srcpre class=srcnbsp;}/pre/td/tr
@@ -174,7 +174,7 @@
td class=srcpre class=srcnbsp;span
class=keywordtry/span/pre/td/tr
tr td class=numLinenbsp;90/td td class=nbHitsnbsp;/td
td class=srcpre class=srcnbsp;{/pre/td/tr
-tr td class=numLineCovernbsp;91/td td
class=nbHitsUncoverednbsp;0/td td class=srcpre class=srcspan
class=srcUncoverednbsp;Object result = doMain.invoke(
mavenCli, span class=keywordnew/span Object[] { cliArgs,
workingDirectory, out, out } );/span/pre/td/tr
+tr td class=numLineCovernbsp;91/td td
class=nbHitsUncoverednbsp;0/td td class=srcpre class=srcspan
class=srcUncoverednbsp;
[1/2] git commit: o Fixed bug reported by olamy where tests in superclasses were nameless
Updated Branches:
refs/heads/master efd554f78 - e7a18cb2c
o Fixed bug reported by olamy where tests in superclasses were nameless
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/e7a18cb2
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/e7a18cb2
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/e7a18cb2
Branch: refs/heads/master
Commit: e7a18cb2c5ff7031da26d4387e87583bcc765462
Parents: 3fb7247
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Thu Dec 20 04:04:45 2012 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Thu Dec 20 04:04:45 2012 +0100
--
.../surefire/report/SmartStackTraceParser.java | 35 ++-
.../surefire/report/SmartStackTraceParserTest.java |3 +-
2 files changed, 25 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e7a18cb2/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
--
diff --git
a/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
b/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
index 4f46ac7..74b5c71 100644
---
a/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
+++
b/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
@@ -22,7 +22,6 @@ package org.apache.maven.surefire.report;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.maven.shared.utils.StringUtils;
/**
* @author Kristian Rosenvold
@@ -69,22 +68,34 @@ public class SmartStackTraceParser
}
-private static String getSimpleName(String className){
+private static String getSimpleName( String className )
+{
int i = className.lastIndexOf( . );
-return className.substring( i + 1 );
+return className.substring( i + 1 );
}
+
@SuppressWarnings( ThrowableResultOfMethodCallIgnored )
public String getString()
{
StringBuilder result = new StringBuilder();
-result.append( simpleName );
-result.append( # );
ListStackTraceElement stackTraceElements = focusOnClass( stackTrace,
testClass );
Collections.reverse( stackTraceElements );
-for ( StackTraceElement stackTraceElement : stackTraceElements )
+StackTraceElement stackTraceElement;
+for ( int i = 0; i stackTraceElements.size(); i++ )
{
-if (!stackTraceElement.getClassName().equals( testClassName )){
-result.append( ).append( getSimpleName(
stackTraceElement.getClassName() )); // Add the name of the superclas
+stackTraceElement = stackTraceElements.get( i );
+if ( i == 0 )
+{
+result.append( simpleName );
+result.append( # );
+}
+if ( !stackTraceElement.getClassName().equals( testClassName ) )
+{
+if ( i 0 )
+{
+result.append( );
+}
+result.append( getSimpleName( stackTraceElement.getClassName()
) ); // Add the name of the superclas
result.append( # );
}
result.append( stackTraceElement.getMethodName() ).append( (
).append(
@@ -140,10 +151,12 @@ public class SmartStackTraceParser
ListStackTraceElement result = new ArrayListStackTraceElement();
for ( StackTraceElement element : stackTrace )
{
-if ( isInSupers( clazz, element.getClassName() ) ) {
-result.add( element );
+if ( isInSupers( clazz, element.getClassName() ) )
+{
+result.add( element );
+}
}
-} return result;
+return result;
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e7a18cb2/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/SmartStackTraceParserTest.java
--
diff --git
a/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/SmartStackTraceParserTest.java
b/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/SmartStackTraceParserTest.java
index cb4f658..9affc79 100644
---
a/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/SmartStackTraceParserTest.java
+++
[2/2] git commit: o Added support for smart-stacktrace in base class2
o Added support for smart-stacktrace in base class2
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/3fb72473
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/3fb72473
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/3fb72473
Branch: refs/heads/master
Commit: 3fb724733f35ade8431a066f45de84801353bb93
Parents: efd554f
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Wed Dec 19 17:06:45 2012 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Wed Dec 19 17:06:45 2012 +0100
--
.../surefire/report/ConsoleOutputCapture.java |1 +
.../surefire/report/SmartStackTraceParser.java | 53 ---
.../apache/maven/surefire/report/ABaseClass.java | 29
.../apache/maven/surefire/report/ASubClass.java| 24 +++
.../surefire/report/SmartStackTraceParserTest.java | 17 +
5 files changed, 114 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/3fb72473/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java
--
diff --git
a/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java
b/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java
index 9f237fd..342fee9 100644
---
a/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java
+++
b/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java
@@ -53,6 +53,7 @@ public class ConsoleOutputCapture
public void write( byte[] buf, int off, int len )
{
+System.out.println( buf = + buf );
target.writeTestOutput( buf, off, len, isStdout );
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/3fb72473/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
--
diff --git
a/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
b/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
index e3245a6..4f46ac7 100644
---
a/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
+++
b/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
@@ -22,6 +22,7 @@ package org.apache.maven.surefire.report;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.apache.maven.shared.utils.StringUtils;
/**
* @author Kristian Rosenvold
@@ -38,30 +39,54 @@ public class SmartStackTraceParser
private String testClassName;
+private final Class testClass;
+
public SmartStackTraceParser( Class testClass, Throwable throwable )
{
this( testClass.getName(), throwable );
}
-public SmartStackTraceParser( String testClass, Throwable throwable )
+public SmartStackTraceParser( String testClassName, Throwable throwable )
{
-this.testClassName = testClass;
-this.simpleName = testClassName.substring( testClassName.lastIndexOf(
. ) + 1 );
+this.testClassName = testClassName;
+this.testClass = getClass( testClassName );
+this.simpleName = this.testClassName.substring(
this.testClassName.lastIndexOf( . ) + 1 );
this.throwable = new SafeThrowable( throwable );
stackTrace = throwable.getStackTrace();
}
+private static Class getClass( String name )
+{
+try
+{
+return Class.forName( name );
+}
+catch ( ClassNotFoundException e )
+{
+throw new RuntimeException( e );
+}
+}
+
+
+private static String getSimpleName(String className){
+int i = className.lastIndexOf( . );
+return className.substring( i + 1 );
+}
@SuppressWarnings( ThrowableResultOfMethodCallIgnored )
public String getString()
{
StringBuilder result = new StringBuilder();
result.append( simpleName );
result.append( # );
-ListStackTraceElement stackTraceElements = focusOnClass( stackTrace,
testClassName );
+ListStackTraceElement stackTraceElements = focusOnClass( stackTrace,
testClass );
Collections.reverse( stackTraceElements );
for ( StackTraceElement stackTraceElement : stackTraceElements )
{
+if (!stackTraceElement.getClassName().equals( testClassName )){
+result.append( ).append( getSimpleName(
git commit: o Removed inadvertent soutv that actually broke IT's
Updated Branches:
refs/heads/master e7a18cb2c - 71f44f611
o Removed inadvertent soutv that actually broke IT's
This is a clear disadvantage of working with a 1.2Ghz laptop under a tropical
palm tree; running IT's prior to commits tends to be given a lower priority.
If I had a drink while running tests this would probably further impair
code quality, so this tradeoff is not entirely clear-cut
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/71f44f61
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/71f44f61
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/71f44f61
Branch: refs/heads/master
Commit: 71f44f611fc314742adc8f377d1226607c946ad8
Parents: e7a18cb
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Thu Dec 20 06:33:30 2012 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Thu Dec 20 06:33:30 2012 +0100
--
.../surefire/report/ConsoleOutputCapture.java |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/71f44f61/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java
--
diff --git
a/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java
b/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java
index 342fee9..c7c6069 100644
---
a/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java
+++
b/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java
@@ -53,7 +53,8 @@ public class ConsoleOutputCapture
public void write( byte[] buf, int off, int len )
{
-System.out.println( buf = + buf );
+// Note: At this point the supplied buf instance is reused,
which means
+// data must be copied out of the buffer
target.writeTestOutput( buf, off, len, isStdout );
}
git commit: o Added documentation about the new brief summary format
Updated Branches:
refs/heads/master 24eff24de - faae29c22
o Added documentation about the new brief summary format
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/faae29c2
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/faae29c2
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/faae29c2
Branch: refs/heads/master
Commit: faae29c22a2ef18b4169b2a61007388521b17632
Parents: 24eff24
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Tue Dec 18 16:43:20 2012 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Tue Dec 18 16:43:20 2012 +0100
--
.../src/site/markdown/newerrorsummary.md | 45 +++
maven-surefire-plugin/src/site/site.xml|1 +
pom.xml|5 ++
3 files changed, 51 insertions(+), 0 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/faae29c2/maven-surefire-plugin/src/site/markdown/newerrorsummary.md
--
diff --git a/maven-surefire-plugin/src/site/markdown/newerrorsummary.md
b/maven-surefire-plugin/src/site/markdown/newerrorsummary.md
new file mode 100644
index 000..f33a2d6
--- /dev/null
+++ b/maven-surefire-plugin/src/site/markdown/newerrorsummary.md
@@ -0,0 +1,45 @@
+The 1-line error summary
+
+
+Surefire 2.13 introduced a compact one-line format for quickly being able to
locate test failures. This format
+is intended to give an overview and does necessarily lose some details, which
can be found in the main
+report of the run or the files on disk.
+
+### Example output:
+
+Failed tests:
+ Test1#assertion1(59) Bending maths expected:[123] but was:[312]
+ Test1#assertion2(64) True is false
+
+Tests in error:
+ Test1#nullPointerInLibrary(38) NullPointerException
+ Test1#failInNestedLibInMethod(54).nestedLibFailure(72)
NullPointerException
+ Test1#failInLibInMethod(48) NullPointerException
+ Test1#failInMethod(43).innerFailure(68) NullPointerException Fail here
+ Test2#test6281(33) RuntimeException FailHere
+
+The format of the report is quite packed, so some explanation is required,
there are three different formats:
+
+
+### Format 1, assertion failure.
+ Class#method(line number)...methodN(lineN) Assertion failure message
+
+Test1#assertion2(64) True is false
+Test1#assertion1(59) Bending maths expected:[123] but was:[312]
+
+### Format 2, Exception in test.
+ Class#method(line number)...methodN(lineN) Exception Message
+In this case the exception was actually thrown on the line in question.
+
+Test1#failInMethod(43).innerFailure(68) NullPointerException Fail here
+Test2#test6281(33) RuntimeException FailHere
+
+### Format 3: Exception in code called by test.
+ Same format as 2 but added before exception
+In this case the exception is thrown inside some code that was called from
this line of the
+test. We do not show where the actual exception happened, only which line(s)
of the test
+that were involved in the call.
+
+Test1#failInLibInMethod(48) NullPointerException
+Test1#failInNestedLibInMethod(54).nestedLibFailure(72)
NullPointerException
+
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/faae29c2/maven-surefire-plugin/src/site/site.xml
--
diff --git a/maven-surefire-plugin/src/site/site.xml
b/maven-surefire-plugin/src/site/site.xml
index 78db8d6..aa4b476 100644
--- a/maven-surefire-plugin/src/site/site.xml
+++ b/maven-surefire-plugin/src/site/site.xml
@@ -47,6 +47,7 @@
item name=System Properties href=examples/system-properties.html/
item name=Configuring the Classpath
href=examples/configuring-classpath.html/
item name=Selecting providers href=examples/providers.html/
+ item name=New error summary href=newerrorsummary.html/
/menu
/body
/project
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/faae29c2/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 5079ce8..0d3d386 100644
--- a/pom.xml
+++ b/pom.xml
@@ -375,6 +375,11 @@
artifactIdsurefire-shadefire/artifactId
version${project.version}/version
/dependency
+dependency
+ groupIdorg.apache.maven.doxia/groupId
+ artifactIddoxia-module-markdown/artifactId
+ version1.3/version
+/dependency
/dependencies
/plugin
/plugins
git commit: o Temporarily reverted to the boring verifier 1.3 to allow release now
Updated Branches:
refs/heads/master faae29c22 - cd35301a0
o Temporarily reverted to the boring verifier 1.3 to allow release now
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/cd35301a
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/cd35301a
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/cd35301a
Branch: refs/heads/master
Commit: cd35301a0affe10ee73acd37f3704cae901fe3eb
Parents: faae29c
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Tue Dec 18 17:12:46 2012 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Tue Dec 18 17:12:46 2012 +0100
--
surefire-integration-tests/pom.xml |2 +-
.../maven/surefire/its/fixture/MavenLauncher.java |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/cd35301a/surefire-integration-tests/pom.xml
--
diff --git a/surefire-integration-tests/pom.xml
b/surefire-integration-tests/pom.xml
index 55191dd..a0ab513 100644
--- a/surefire-integration-tests/pom.xml
+++ b/surefire-integration-tests/pom.xml
@@ -46,7 +46,7 @@
dependency
groupIdorg.apache.maven.shared/groupId
artifactIdmaven-verifier/artifactId
- version1.4-SNAPSHOT/version
+ version1.3/version
/dependency
dependency
groupIdorg.apache.maven/groupId
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/cd35301a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
--
diff --git
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
index bbf910c..dd6f587 100755
---
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
+++
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
@@ -404,7 +404,7 @@ public class MavenLauncher
try
{
FileUtils.deleteDirectory( testDir );
-File file = ResourceExtractor.extractResourceToDestination( cl,
resourcePath, tempDir, true );
+File file = ResourceExtractor.extractResourcePath( cl,
resourcePath, tempDir, true );
return file.getCanonicalFile();
}
catch ( IOException e )
[1/2] git commit: Revert o Temporarily reverted to the boring verifier 1.3 to allow release now
Updated Branches:
refs/heads/master cd35301a0 - 349cff263
Revert o Temporarily reverted to the boring verifier 1.3 to allow release now
Reverting wasnt as easy as I thought, just wait for verifier 1.4 to pass vote.
This reverts commit cd35301a0affe10ee73acd37f3704cae901fe3eb.
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/349cff26
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/349cff26
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/349cff26
Branch: refs/heads/master
Commit: 349cff26392b425e2d1753b3e036efd593feb989
Parents: 02d0964
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Wed Dec 19 03:13:07 2012 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Wed Dec 19 03:13:07 2012 +0100
--
surefire-integration-tests/pom.xml |2 +-
.../maven/surefire/its/fixture/MavenLauncher.java |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/349cff26/surefire-integration-tests/pom.xml
--
diff --git a/surefire-integration-tests/pom.xml
b/surefire-integration-tests/pom.xml
index a0ab513..55191dd 100644
--- a/surefire-integration-tests/pom.xml
+++ b/surefire-integration-tests/pom.xml
@@ -46,7 +46,7 @@
dependency
groupIdorg.apache.maven.shared/groupId
artifactIdmaven-verifier/artifactId
- version1.3/version
+ version1.4-SNAPSHOT/version
/dependency
dependency
groupIdorg.apache.maven/groupId
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/349cff26/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
--
diff --git
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
index dd6f587..bbf910c 100755
---
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
+++
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
@@ -404,7 +404,7 @@ public class MavenLauncher
try
{
FileUtils.deleteDirectory( testDir );
-File file = ResourceExtractor.extractResourcePath( cl,
resourcePath, tempDir, true );
+File file = ResourceExtractor.extractResourceToDestination( cl,
resourcePath, tempDir, true );
return file.getCanonicalFile();
}
catch ( IOException e )
[2/2] git commit: o Removed incorrect comment
o Removed incorrect comment Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/02d09642 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/02d09642 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/02d09642 Branch: refs/heads/master Commit: 02d09642c5cde263cd8ebf671335d5e62906b36f Parents: cd35301 Author: Kristian Rosenvold krosenv...@apache.org Authored: Wed Dec 19 03:12:46 2012 +0100 Committer: Kristian Rosenvold krosenv...@apache.org Committed: Wed Dec 19 03:12:46 2012 +0100 -- surefire-setup-integration-tests/pom.xml |1 - 1 files changed, 0 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/02d09642/surefire-setup-integration-tests/pom.xml -- diff --git a/surefire-setup-integration-tests/pom.xml b/surefire-setup-integration-tests/pom.xml index 2fad52f..328120b 100644 --- a/surefire-setup-integration-tests/pom.xml +++ b/surefire-setup-integration-tests/pom.xml @@ -184,7 +184,6 @@ extraArtifactjunit:junit-dep:4.8/extraArtifact extraArtifactjunit:junit-dep:4.7/extraArtifact extraArtifactjunit:junit-dep:4.4/extraArtifact -!--- W00t! This is for the WorkingDirectoryInvalid test that will use mavens default surefire version -- extraArtifactorg.apache.maven.plugins:maven-surefire-plugin:2.10/extraArtifact extraArtifactorg.apache.maven.surefire:surefire-junit3:2.10/extraArtifact extraArtifactorg.codehaus.plexus:plexus-utils:1.0.4/extraArtifact
git commit: o Simplified concurrent code to try to isolate intermittent problem
Updated Branches:
refs/heads/master 318f8a9a4 - ab0cc7a84
o Simplified concurrent code to try to isolate intermittent problem
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/ab0cc7a8
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/ab0cc7a8
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/ab0cc7a8
Branch: refs/heads/master
Commit: ab0cc7a8477d2c8428882e58153c4486f8a23eb9
Parents: 318f8a9
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Mon Dec 17 17:22:48 2012 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Mon Dec 17 17:26:14 2012 +0100
--
.../junitcore/ConcurrentReporterManager.java | 55 +++
.../maven/surefire/junitcore/TestMethod.java | 11 +++-
.../apache/maven/surefire/junitcore/TestSet.java |5 +-
.../maven/surefire/junitcore/TestMethodTest.java |4 +-
4 files changed, 41 insertions(+), 34 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/ab0cc7a8/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManager.java
--
diff --git
a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManager.java
b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManager.java
index 777f50b..69367f5 100644
---
a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManager.java
+++
b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManager.java
@@ -42,7 +42,7 @@ public abstract class ConcurrentReporterManager
{
private final MapString, TestSet classMethodCounts;
-private final ThreadLocalRunListener reporterManagerThreadLocal = new
ThreadLocalRunListener();
+private final ThreadLocalRunListener reporterManagerThreadLocal; // =
new ThreadLocalRunListener();
private final boolean reportImmediately;
@@ -58,6 +58,15 @@ public abstract class ConcurrentReporterManager
this.reporterFactory = reporterFactory;
this.classMethodCounts = classMethodCounts;
this.consoleLogger = consoleLogger;
+
+this.reporterManagerThreadLocal = new ThreadLocalRunListener()
+{
+@Override
+protected RunListener initialValue()
+{
+return
ConcurrentReporterManager.this.reporterFactory.createReporter();
+}
+};
}
public void testSetStarting( ReportEntry description )
@@ -71,54 +80,52 @@ public abstract class ConcurrentReporterManager
{
testSet.replay( reporterManager );
}
-detachTestMethodFromThread();
reporterManagerThreadLocal.remove();
}
public void testFailed( ReportEntry failure )
{
-final TestMethod testMethod = getOrCreateTestMethod( failure );
+final TestMethod testMethod = getOrCreateThreadAttachedTestMethod(
failure );
if ( testMethod != null )
{
testMethod.testFailure( failure );
+testMethod.detachFromCurrentThread();
}
-detachTestMethodFromThread();
}
public void testError( ReportEntry failure )
{
-final TestMethod testMethod = getOrCreateTestMethod( failure );
+final TestMethod testMethod = getOrCreateThreadAttachedTestMethod(
failure );
if ( testMethod != null )
{
testMethod.testError( failure );
+testMethod.detachFromCurrentThread();
}
-detachTestMethodFromThread();
}
public void testSkipped( ReportEntry description )
{
TestSet testSet = getTestSet( description );
-TestMethod testMethod = getTestSet( description ).createTestMethod(
description );
+TestMethod testMethod = testSet.createThreadAttachedTestMethod(
description );
testMethod.testIgnored( description );
testSet.incrementFinishedTests( getRunListener(), reportImmediately );
-detachTestMethodFromThread();
+testMethod.detachFromCurrentThread();
}
public void testAssumptionFailure( ReportEntry failure )
{
-final TestMethod testMethod = getOrCreateTestMethod( failure );
+final TestMethod testMethod = getOrCreateThreadAttachedTestMethod(
failure );
if ( testMethod != null )
{
testMethod.testIgnored( failure );
+testMethod.detachFromCurrentThread();
}
-detachTestMethodFromThread();
}
public void testStarting( ReportEntry description )
git commit: o Reduced likelyhood that a single thread will steal all the testcases, effectively failing the test
Updated Branches:
refs/heads/master ab0cc7a84 - d9fdcf8dc
o Reduced likelyhood that a single thread will steal all the testcases,
effectively failing the test
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/d9fdcf8d
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/d9fdcf8d
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/d9fdcf8d
Branch: refs/heads/master
Commit: d9fdcf8dc3ee59de9a200dae813f9213bdabf9fd
Parents: ab0cc7a
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Mon Dec 17 17:59:53 2012 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Mon Dec 17 17:59:53 2012 +0100
--
.../src/test/resources/fork-mode/pom.xml |1 +
.../fork-mode/src/test/java/forkMode/Test1.java|4 +++-
2 files changed, 4 insertions(+), 1 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/d9fdcf8d/surefire-integration-tests/src/test/resources/fork-mode/pom.xml
--
diff --git a/surefire-integration-tests/src/test/resources/fork-mode/pom.xml
b/surefire-integration-tests/src/test/resources/fork-mode/pom.xml
index aa37e2c..ca7d365 100644
--- a/surefire-integration-tests/src/test/resources/fork-mode/pom.xml
+++ b/surefire-integration-tests/src/test/resources/fork-mode/pom.xml
@@ -43,6 +43,7 @@
configuration
forkMode${forkMode}/forkMode
threadCount${threadCount}/threadCount
+ runOrderalphabetical/runOrder
/configuration
/plugin
/plugins
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/d9fdcf8d/surefire-integration-tests/src/test/resources/fork-mode/src/test/java/forkMode/Test1.java
--
diff --git
a/surefire-integration-tests/src/test/resources/fork-mode/src/test/java/forkMode/Test1.java
b/surefire-integration-tests/src/test/resources/fork-mode/src/test/java/forkMode/Test1.java
index 01f1151..ca5af55 100644
---
a/surefire-integration-tests/src/test/resources/fork-mode/src/test/java/forkMode/Test1.java
+++
b/surefire-integration-tests/src/test/resources/fork-mode/src/test/java/forkMode/Test1.java
@@ -15,9 +15,11 @@ public class Test1
private static final Random RANDOM = new Random();
public void test1()
-throws IOException
+throws IOException, InterruptedException
{
+Thread.sleep( 750 );
dumpPidFile( this );
+
}
public static void dumpPidFile( TestCase test )
git commit: o m-s-u 0.2
Updated Branches: refs/heads/master d9fdcf8dc - 24eff24de o m-s-u 0.2 Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/24eff24d Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/24eff24d Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/24eff24d Branch: refs/heads/master Commit: 24eff24dead36615c8b9566a9c2ddc17e98a1593 Parents: d9fdcf8 Author: Kristian Rosenvold krosenv...@apache.org Authored: Mon Dec 17 18:01:35 2012 +0100 Committer: Kristian Rosenvold krosenv...@apache.org Committed: Mon Dec 17 18:01:35 2012 +0100 -- pom.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/24eff24d/pom.xml -- diff --git a/pom.xml b/pom.xml index 60e5243..5079ce8 100644 --- a/pom.xml +++ b/pom.xml @@ -231,7 +231,7 @@ dependency groupIdorg.apache.maven.shared/groupId artifactIdmaven-shared-utils/artifactId -version0.2-SNAPSHOT/version +version0.2/version /dependency dependency groupIdjmock/groupId
git commit: o Stabilized IT by adding runOrder alphabetical to get deterministic runOrder
Updated Branches:
refs/heads/master 2ac80139e - 3b34e06ca
o Stabilized IT by adding runOrder alphabetical to get deterministic runOrder
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/3b34e06c
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/3b34e06c
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/3b34e06c
Branch: refs/heads/master
Commit: 3b34e06ca282361c13b5ef8c6f404c9d70b2f033
Parents: 2ac8013
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Sun Dec 16 16:17:37 2012 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Sun Dec 16 16:17:37 2012 +0100
--
.../test/resources/junit47-redirect-output/pom.xml |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/3b34e06c/surefire-integration-tests/src/test/resources/junit47-redirect-output/pom.xml
--
diff --git
a/surefire-integration-tests/src/test/resources/junit47-redirect-output/pom.xml
b/surefire-integration-tests/src/test/resources/junit47-redirect-output/pom.xml
index 289b2dc..7cdb0a1 100644
---
a/surefire-integration-tests/src/test/resources/junit47-redirect-output/pom.xml
+++
b/surefire-integration-tests/src/test/resources/junit47-redirect-output/pom.xml
@@ -43,6 +43,7 @@
redirectTestOutputToFile${redirect.to.file}/redirectTestOutputToFile
threadCount2/threadCount
parallel${parallel}/parallel
+ runOrderalphabetical/runOrder
includes
include**/Test*.java/include
/includes
git commit: o Removed printStackTrace in unit test
Updated Branches:
refs/heads/master 3b34e06ca - b80783fa9
o Removed printStackTrace in unit test
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/b80783fa
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/b80783fa
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/b80783fa
Branch: refs/heads/master
Commit: b80783fa9e2b0edd49a57a4cef5fdc5570f22825
Parents: 3b34e06
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Sun Dec 16 16:23:25 2012 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Sun Dec 16 16:23:25 2012 +0100
--
.../surefire/report/SmartStackTraceParserTest.java |1 -
1 files changed, 0 insertions(+), 1 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b80783fa/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/SmartStackTraceParserTest.java
--
diff --git
a/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/SmartStackTraceParserTest.java
b/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/SmartStackTraceParserTest.java
index 5a87484..a3fd02c 100644
---
a/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/SmartStackTraceParserTest.java
+++
b/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/SmartStackTraceParserTest.java
@@ -184,7 +184,6 @@ public class SmartStackTraceParserTest
{
Throwable aThrownException = getAThrownException();
-aThrownException.printStackTrace();
ListStackTraceElement innerMost =
SmartStackTraceParser.focusInsideClass(
aThrownException.getCause().getStackTrace(),
TestClass1.InnerBTestClass.class.getName() );
svn commit: r1422614 - /maven/shared/trunk/maven-shared-utils/src/site/apt/index.apt
Author: krosenvold Date: Sun Dec 16 16:18:27 2012 New Revision: 1422614 URL: http://svn.apache.org/viewvc?rev=1422614view=rev Log: o Removed bits about unclean code Modified: maven/shared/trunk/maven-shared-utils/src/site/apt/index.apt Modified: maven/shared/trunk/maven-shared-utils/src/site/apt/index.apt URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/site/apt/index.apt?rev=1422614r1=1422613r2=1422614view=diff == --- maven/shared/trunk/maven-shared-utils/src/site/apt/index.apt (original) +++ maven/shared/trunk/maven-shared-utils/src/site/apt/index.apt Sun Dec 16 16:18:27 2012 @@ -37,9 +37,8 @@ Apache Maven Shared Utils Why ? - plexus-utils consisted mostly of code that was forked from various apache projects. From a licensing - perspective this code became unclean when it was forked to codehaus. maven-shared-utils is - based on the original from the apache sources. + plexus-utils consisted mostly of code that was forked from various apache projects. + maven-shared-utils is based on the original from the apache sources. Why not commons ? We would prefer code to use commons-* code where appropriate, but the plexus-utils became
git commit: [SUREFIRE-937] Intermittent incorrect testcount in parallel junit provider
Updated Branches:
refs/heads/master b80783fa9 - 5b56fe700
[SUREFIRE-937] Intermittent incorrect testcount in parallel junit provider
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/5b56fe70
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/5b56fe70
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/5b56fe70
Branch: refs/heads/master
Commit: 5b56fe7002eb0671ef2035cd39adfb7a89bba5a5
Parents: b80783f
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Sun Dec 16 16:52:39 2012 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Sun Dec 16 17:08:52 2012 +0100
--
.../junitcore/ConcurrentReporterManager.java |5 +
1 files changed, 5 insertions(+), 0 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5b56fe70/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManager.java
--
diff --git
a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManager.java
b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManager.java
index 9429310..777f50b 100644
---
a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManager.java
+++
b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManager.java
@@ -71,6 +71,7 @@ public abstract class ConcurrentReporterManager
{
testSet.replay( reporterManager );
}
+detachTestMethodFromThread();
reporterManagerThreadLocal.remove();
}
@@ -81,6 +82,7 @@ public abstract class ConcurrentReporterManager
{
testMethod.testFailure( failure );
}
+detachTestMethodFromThread();
}
public void testError( ReportEntry failure )
@@ -90,6 +92,7 @@ public abstract class ConcurrentReporterManager
{
testMethod.testError( failure );
}
+detachTestMethodFromThread();
}
public void testSkipped( ReportEntry description )
@@ -98,6 +101,7 @@ public abstract class ConcurrentReporterManager
TestMethod testMethod = getTestSet( description ).createTestMethod(
description );
testMethod.testIgnored( description );
testSet.incrementFinishedTests( getRunListener(), reportImmediately );
+detachTestMethodFromThread();
}
public void testAssumptionFailure( ReportEntry failure )
@@ -107,6 +111,7 @@ public abstract class ConcurrentReporterManager
{
testMethod.testIgnored( failure );
}
+detachTestMethodFromThread();
}
public void testStarting( ReportEntry description )
git commit: o Removed unused code
Updated Branches:
refs/heads/master 5b56fe700 - 38f1c75f9
o Removed unused code
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/38f1c75f
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/38f1c75f
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/38f1c75f
Branch: refs/heads/master
Commit: 38f1c75f9af70d49cc97ccc88db4e5341cf3cfdc
Parents: 5b56fe7
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Sun Dec 16 17:35:18 2012 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Sun Dec 16 17:35:18 2012 +0100
--
.../util/internal/FunkyTwoThreadBlockingQueue.java | 102
.../util/internal/TwoThreadBlockingQueue.java | 104
.../util/internal/TwoThreadBlockingQueueTest.java | 182 ---
3 files changed, 0 insertions(+), 388 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/38f1c75f/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/FunkyTwoThreadBlockingQueue.java
--
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/FunkyTwoThreadBlockingQueue.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/FunkyTwoThreadBlockingQueue.java
deleted file mode 100644
index 2d619f6..000
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/FunkyTwoThreadBlockingQueue.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package org.apache.maven.plugin.surefire.util.internal;
-
-/*
- * 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.
- */
-
-/**
- * A producer/consumer queue that is optimized for *one* producer thread
- * and *one* consumer thread, and solely optimized for efficient inserts
- * by the producer, minimizing producer locking for hand-off to
- * a second consumer.
- * p/
- * TwoThreadBlockingQueue insert 500 elements in = 52
- * FunkyTwoThreadBlockingQueue insert 500 elements in = 42
- * TwoThreadBlockingQueue produced and taken 500 elements in = 104
- * LinkedBlockingQueue insert 500 elements in = 1815
- * LinkedBlockingDeque insert 500 elements in = 113
- * ArrayList insert 500 elements in = 18
- * LinkedList insert 500 elements in = 334
- * p/
- * Todo: Determine if this design actually works ;)
- *
- * @author Kristian Rosenvold
- */
-public class FunkyTwoThreadBlockingQueue
-implements BlockingQueue
-{
-final int chunkSize = 100;
-
-private Chunk takeChunk = new Chunk();
-
-private int takePos = 0;
-
-private Chunk insertChunk = takeChunk;
-
-private int insertPos = 0;
-
-private volatile boolean memoryModelGuard;
-
-
-public void put( String object )
-{
-insertChunk.elements[insertPos] = object;
-if ( ++insertPos == chunkSize )
-{
-Chunk newChunk = new Chunk();
-insertChunk.next = newChunk;
-insertChunk = newChunk;
-insertPos = 0;
-}
-memoryModelGuard = true;
-}
-
-public void add( String object )
-{
-put( object );
-}
-
-
-public String take()
-throws InterruptedException
-{
-if ( takePos = chunkSize )
-{
-takeChunk = takeChunk.next;
-takePos = 0;
-}
-
-boolean fud = memoryModelGuard;
-String next = takeChunk.elements[takePos];
-while ( next == null )
-{
-Thread.sleep( 1 );
-fud = memoryModelGuard;
-next = takeChunk.elements[takePos];
-}
-takePos++;
-return next;
-}
-
-final class Chunk
-{
-final String[] elements = new String[chunkSize];
-
-volatile Chunk next;
-}
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/38f1c75f/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/TwoThreadBlockingQueue.java
git commit: [SUREFIRE-933] repair parallel=classes
Updated Branches:
refs/heads/master 38f1c75f9 - 435ef473b
[SUREFIRE-933] repair parallel=classes
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/435ef473
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/435ef473
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/435ef473
Branch: refs/heads/master
Commit: 435ef473be35f69dbb0c3187ecf7b54e3f87f49a
Parents: 38f1c75
Author: agudian andreas.gud...@gmail.com
Authored: Sat Dec 15 21:42:09 2012 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Sun Dec 16 17:55:00 2012 +0100
--
.../apache/maven/surefire/util/LazyTestsToRun.java |7 ++
.../org/apache/maven/surefire/util/TestsToRun.java |9 ++
.../maven/surefire/junitcore/JUnitCoreWrapper.java | 79 +--
.../surefire/testng/TestNGDirectoryTestSuite.java |2 +-
4 files changed, 67 insertions(+), 30 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/435ef473/surefire-api/src/main/java/org/apache/maven/surefire/util/LazyTestsToRun.java
--
diff --git
a/surefire-api/src/main/java/org/apache/maven/surefire/util/LazyTestsToRun.java
b/surefire-api/src/main/java/org/apache/maven/surefire/util/LazyTestsToRun.java
index 3a6dba7..996797c 100644
---
a/surefire-api/src/main/java/org/apache/maven/surefire/util/LazyTestsToRun.java
+++
b/surefire-api/src/main/java/org/apache/maven/surefire/util/LazyTestsToRun.java
@@ -173,4 +173,11 @@ public class LazyTestsToRun
return sb.toString();
}
+/* (non-Javadoc)
+ * @see org.apache.maven.surefire.util.TestsToRun#allowEagerReading()
+ */
+public boolean allowEagerReading() {
+return false;
+}
+
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/435ef473/surefire-api/src/main/java/org/apache/maven/surefire/util/TestsToRun.java
--
diff --git
a/surefire-api/src/main/java/org/apache/maven/surefire/util/TestsToRun.java
b/surefire-api/src/main/java/org/apache/maven/surefire/util/TestsToRun.java
index 86e43d9..02224ab 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/util/TestsToRun.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/util/TestsToRun.java
@@ -116,4 +116,13 @@ public class TestsToRun
return containsAtLeast( it, items ) !it.hasNext();
}
+/**
+ * @return {@code true}, if the classes may be read eagerly. {@code false},
+ * if the classes must only be read lazy.
+ */
+public boolean allowEagerReading()
+{
+return true;
+}
+
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/435ef473/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreWrapper.java
--
diff --git
a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreWrapper.java
b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreWrapper.java
index 0608ab4..c834e6f 100644
---
a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreWrapper.java
+++
b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreWrapper.java
@@ -19,6 +19,7 @@ package org.apache.maven.surefire.junitcore;
* under the License.
*/
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.concurrent.ExecutionException;
@@ -26,7 +27,6 @@ import java.util.concurrent.ExecutionException;
import org.apache.maven.surefire.common.junit4.JUnit4RunListener;
import org.apache.maven.surefire.testset.TestSetFailedException;
import org.apache.maven.surefire.util.TestsToRun;
-
import org.junit.runner.Computer;
import org.junit.runner.JUnitCore;
import org.junit.runner.Request;
@@ -77,39 +77,18 @@ class JUnitCoreWrapper
Computer computer = getComputer( jUnitCoreParameters );
JUnitCore junitCore = createJUnitCore( listeners );
-/*
-Request req = Request.classes( computer,
testsToRun.getLocatedClasses() );
-if ( filter != null )
-{
-req = req.filterWith( filter );
-}
-
-try
-{
-final Result run = junitCore.run( req );
-JUnit4RunListener.rethrowAnyTestMechanismFailures( run );
-}
- */
try
{
-// in order to support LazyTestsToRun, the iterator must be used
-Iterator classIter = testsToRun.iterator();
-while ( classIter.hasNext() )
+if (
git commit: o Added reuseForks parameters instead of forkmode = onceperthread
Updated Branches:
refs/heads/master 435ef473b - 318f8a9a4
o Added reuseForks parameters instead of forkmode = onceperthread
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/318f8a9a
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/318f8a9a
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/318f8a9a
Branch: refs/heads/master
Commit: 318f8a9a465319c63aef20e5c89a64073579a631
Parents: 435ef47
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Fri Dec 14 20:00:08 2012 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Mon Dec 17 03:30:58 2012 +0100
--
.../plugin/surefire/AbstractSurefireMojo.java | 38 --
.../surefire/booterclient/ForkConfiguration.java | 16 --
.../plugin/surefire/booterclient/ForkStarter.java | 13 +++--
.../booterclient/ForkConfigurationTest.java|6 +--
.../org/apache/maven/surefire/util/TestsToRun.java | 18 ++-
.../apache/maven/surefire/util/TestsToRunTest.java | 25 +++---
surefire-integration-tests/pom.xml |2 +-
.../surefire/its/fixture/SurefireLauncher.java |4 +-
.../Surefire907PerThreadWithoutThreadCountIT.java |2 +-
.../surefire/junitcore/JUnitCoreParameters.java|9
.../surefire/junitcore/JUnitCoreProvider.java |2 +-
.../maven/surefire/junitcore/JUnitCoreWrapper.java | 38 +--
12 files changed, 105 insertions(+), 68 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/318f8a9a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
--
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
index 9636017..fd00d5f 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
@@ -329,9 +329,8 @@ public abstract class AbstractSurefireMojo
protected Boolean failIfNoTests;
/**
- * Option to specify the forking mode. Can be never, once, always,
perthread or onceperthread. none and pertest are also accepted
- * for backwards compatibility. always forks for each test-class.
perthread will create threadCount parallel forks, each executing one
test-class.
- * onceperthread will fork threadCount processes that each execute a
1/threadCount of all test-classes.br/
+ * Option to specify the forking mode. Can be never, once, always,
perthread. none and pertest are also accepted
+ * for backwards compatibility. always forks for each test-class.
perthread will create threadCount parallel forks, each executing one
test-class, see also parameter reuseForks.br/
* The system properties and the argLine of the forked processes may
contain the place holder string code${surefire.threadNumber}/code,
* which is replaced with a fixed number for each thread, ranging from 1
to threadCount.
*
@@ -434,15 +433,25 @@ public abstract class AbstractSurefireMojo
protected String testNGArtifactName;
/**
- * (forkMode=perthread, forkmode=onceperthread or TestNG/JUnit 4.7
provider) The attribute thread-count allows you to specify how many threads
should be
- * allocated for this execution. Only makes sense to use in conjunction
with the codeparallel/code parameter or with forkMode=perthread
- * or forkmode=onceperthread.
+ * (forkMode=perthread or TestNG/JUnit 4.7 provider) The attribute
thread-count allows you to specify how many threads should be
+ * allocated for this execution. Only makes sense to use in conjunction
with the codeparallel/code parameter or with forkMode=perthread.
*
* @since 2.2
*/
@Parameter( property = threadCount )
protected int threadCount;
+
+/**
+ * Indicates if forks can be reused. Currently only meaningful
+ * when forking N parallel forks
+ *
+ * @since 2.13
+ */
+
+@Parameter( property = reuseForks, defaultValue = false )
+private boolean reuseForks;
+
/**
* (JUnit 4.7 provider) Indicates that threadCount is per cpu core.
*
@@ -783,8 +792,7 @@ public abstract class AbstractSurefireMojo
try
{
ForkStarter forkStarter =
-createForkStarter( provider, forkConfiguration,
classLoaderConfiguration, runOrderParameters,
- effectiveProperties );
+createForkStarter( provider,
