[4/5] maven-surefire git commit: [SUREFIRE-1490] Change header of the Failsafe Report
[SUREFIRE-1490] Change header of the Failsafe Report Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/be4e4c0c Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/be4e4c0c Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/be4e4c0c Branch: refs/heads/SUREFIRE-1498 Commit: be4e4c0c773e47fafe598b5cb11473f89b35f3fc Parents: bcd27b7 Author: Tibor17 Authored: Wed Mar 7 02:43:37 2018 +0100 Committer: Tibor17 Committed: Sat Mar 17 17:28:47 2018 +0100 -- .../report/AbstractSurefireReportMojo.java | 22 ++-- .../surefire/report/FailsafeReportMojo.java | 59 +- .../surefire/report/LocalizedProperties.java| 116 +++ .../report/SurefireReportGenerator.java | 90 ++ .../surefire/report/SurefireReportMojo.java | 33 ++ .../main/resources/surefire-report.properties | 3 +- .../resources/surefire-report_de.properties | 1 + .../resources/surefire-report_sv.properties | 1 + .../surefire/report/Surefire597Test.java| 10 +- .../Surefire1490ReportTitleDescriptionIT.java | 93 +++ .../src/test/resources/surefire-1490/pom.xml| 97 .../src/test/java/it/Surefire1490IT.java| 31 + .../src/test/java/it/Surefire1490Test.java | 31 + 13 files changed, 484 insertions(+), 103 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/be4e4c0c/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java -- diff --git a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java index b6d4a9d..7c78936 100644 --- a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java +++ b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java @@ -24,7 +24,6 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Locale; -import java.util.ResourceBundle; import org.apache.maven.model.ReportPlugin; import org.apache.maven.plugin.surefire.log.api.ConsoleLogger; import org.apache.maven.plugins.annotations.Parameter; @@ -36,7 +35,6 @@ import org.apache.maven.shared.utils.PathTool; import static java.util.Collections.addAll; import static org.apache.maven.plugins.surefire.report.SurefireReportParser.hasReportFiles; import static org.apache.maven.shared.utils.StringUtils.isEmpty; -import static org.apache.maven.shared.utils.StringUtils.isNotEmpty; /** * Abstract base class for reporting test results using Surefire. @@ -136,7 +134,7 @@ public abstract class AbstractSurefireReportMojo } new SurefireReportGenerator( getReportsDirectories(), locale, showSuccess, determineXrefLocation(), - getConsoleLogger(), isNotEmpty( getTitle() ) ? getTitle() : null ) + getConsoleLogger() ) .doGenerateReport( getBundle( locale ), getSink() ); } @@ -311,9 +309,7 @@ public abstract class AbstractSurefireReportMojo @Override public String getName( Locale locale ) { -return isEmpty( getTitle() ) -? getBundle( locale ).getString( "report.surefire.name" ) -: getTitle(); +return getBundle( locale ).getReportName(); } /** @@ -322,9 +318,7 @@ public abstract class AbstractSurefireReportMojo @Override public String getDescription( Locale locale ) { -return isEmpty( getDescription() ) -? getBundle( locale ).getString( "report.surefire.description" ) -: getDescription(); +return getBundle( locale ).getReportDescription(); } /** @@ -333,13 +327,15 @@ public abstract class AbstractSurefireReportMojo @Override public abstract String getOutputName(); -private ResourceBundle getBundle( Locale locale ) -{ -return ResourceBundle.getBundle( "surefire-report", locale, getClass().getClassLoader() ); -} +protected abstract LocalizedProperties getBundle( Locale locale, ClassLoader resourceBundleClassLoader ); protected final ConsoleLogger getConsoleLogger() { return new PluginConsoleLogger( getLog() ); } + +final LocalizedProperties getBundle( Locale locale ) +{ +return getBundle( locale, getClass().getClassLoader() ); +} } http://git-wip-us.apac
maven-surefire git commit: [SUREFIRE-1490] Change header of the Failsafe Report
Repository: maven-surefire Updated Branches: refs/heads/master bcd27b7f2 -> be4e4c0c7 [SUREFIRE-1490] Change header of the Failsafe Report Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/be4e4c0c Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/be4e4c0c Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/be4e4c0c Branch: refs/heads/master Commit: be4e4c0c773e47fafe598b5cb11473f89b35f3fc Parents: bcd27b7 Author: Tibor17 Authored: Wed Mar 7 02:43:37 2018 +0100 Committer: Tibor17 Committed: Sat Mar 17 17:28:47 2018 +0100 -- .../report/AbstractSurefireReportMojo.java | 22 ++-- .../surefire/report/FailsafeReportMojo.java | 59 +- .../surefire/report/LocalizedProperties.java| 116 +++ .../report/SurefireReportGenerator.java | 90 ++ .../surefire/report/SurefireReportMojo.java | 33 ++ .../main/resources/surefire-report.properties | 3 +- .../resources/surefire-report_de.properties | 1 + .../resources/surefire-report_sv.properties | 1 + .../surefire/report/Surefire597Test.java| 10 +- .../Surefire1490ReportTitleDescriptionIT.java | 93 +++ .../src/test/resources/surefire-1490/pom.xml| 97 .../src/test/java/it/Surefire1490IT.java| 31 + .../src/test/java/it/Surefire1490Test.java | 31 + 13 files changed, 484 insertions(+), 103 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/be4e4c0c/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java -- diff --git a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java index b6d4a9d..7c78936 100644 --- a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java +++ b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java @@ -24,7 +24,6 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Locale; -import java.util.ResourceBundle; import org.apache.maven.model.ReportPlugin; import org.apache.maven.plugin.surefire.log.api.ConsoleLogger; import org.apache.maven.plugins.annotations.Parameter; @@ -36,7 +35,6 @@ import org.apache.maven.shared.utils.PathTool; import static java.util.Collections.addAll; import static org.apache.maven.plugins.surefire.report.SurefireReportParser.hasReportFiles; import static org.apache.maven.shared.utils.StringUtils.isEmpty; -import static org.apache.maven.shared.utils.StringUtils.isNotEmpty; /** * Abstract base class for reporting test results using Surefire. @@ -136,7 +134,7 @@ public abstract class AbstractSurefireReportMojo } new SurefireReportGenerator( getReportsDirectories(), locale, showSuccess, determineXrefLocation(), - getConsoleLogger(), isNotEmpty( getTitle() ) ? getTitle() : null ) + getConsoleLogger() ) .doGenerateReport( getBundle( locale ), getSink() ); } @@ -311,9 +309,7 @@ public abstract class AbstractSurefireReportMojo @Override public String getName( Locale locale ) { -return isEmpty( getTitle() ) -? getBundle( locale ).getString( "report.surefire.name" ) -: getTitle(); +return getBundle( locale ).getReportName(); } /** @@ -322,9 +318,7 @@ public abstract class AbstractSurefireReportMojo @Override public String getDescription( Locale locale ) { -return isEmpty( getDescription() ) -? getBundle( locale ).getString( "report.surefire.description" ) -: getDescription(); +return getBundle( locale ).getReportDescription(); } /** @@ -333,13 +327,15 @@ public abstract class AbstractSurefireReportMojo @Override public abstract String getOutputName(); -private ResourceBundle getBundle( Locale locale ) -{ -return ResourceBundle.getBundle( "surefire-report", locale, getClass().getClassLoader() ); -} +protected abstract LocalizedProperties getBundle( Locale locale, ClassLoader resourceBundleClassLoader ); protected final ConsoleLogger getConsoleLogger() { return new PluginConsoleLogger( getLog() ); } + +final LocalizedProperties getBundle( Locale locale ) +{ +return
[2/2] maven-surefire git commit: [SUREFIRE-1490] Change header of the Failsafe Report
[SUREFIRE-1490] Change header of the Failsafe Report Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/be4e4c0c Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/be4e4c0c Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/be4e4c0c Branch: refs/heads/SUREFIRE-1490 Commit: be4e4c0c773e47fafe598b5cb11473f89b35f3fc Parents: bcd27b7 Author: Tibor17 Authored: Wed Mar 7 02:43:37 2018 +0100 Committer: Tibor17 Committed: Sat Mar 17 17:28:47 2018 +0100 -- .../report/AbstractSurefireReportMojo.java | 22 ++-- .../surefire/report/FailsafeReportMojo.java | 59 +- .../surefire/report/LocalizedProperties.java| 116 +++ .../report/SurefireReportGenerator.java | 90 ++ .../surefire/report/SurefireReportMojo.java | 33 ++ .../main/resources/surefire-report.properties | 3 +- .../resources/surefire-report_de.properties | 1 + .../resources/surefire-report_sv.properties | 1 + .../surefire/report/Surefire597Test.java| 10 +- .../Surefire1490ReportTitleDescriptionIT.java | 93 +++ .../src/test/resources/surefire-1490/pom.xml| 97 .../src/test/java/it/Surefire1490IT.java| 31 + .../src/test/java/it/Surefire1490Test.java | 31 + 13 files changed, 484 insertions(+), 103 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/be4e4c0c/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java -- diff --git a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java index b6d4a9d..7c78936 100644 --- a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java +++ b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java @@ -24,7 +24,6 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Locale; -import java.util.ResourceBundle; import org.apache.maven.model.ReportPlugin; import org.apache.maven.plugin.surefire.log.api.ConsoleLogger; import org.apache.maven.plugins.annotations.Parameter; @@ -36,7 +35,6 @@ import org.apache.maven.shared.utils.PathTool; import static java.util.Collections.addAll; import static org.apache.maven.plugins.surefire.report.SurefireReportParser.hasReportFiles; import static org.apache.maven.shared.utils.StringUtils.isEmpty; -import static org.apache.maven.shared.utils.StringUtils.isNotEmpty; /** * Abstract base class for reporting test results using Surefire. @@ -136,7 +134,7 @@ public abstract class AbstractSurefireReportMojo } new SurefireReportGenerator( getReportsDirectories(), locale, showSuccess, determineXrefLocation(), - getConsoleLogger(), isNotEmpty( getTitle() ) ? getTitle() : null ) + getConsoleLogger() ) .doGenerateReport( getBundle( locale ), getSink() ); } @@ -311,9 +309,7 @@ public abstract class AbstractSurefireReportMojo @Override public String getName( Locale locale ) { -return isEmpty( getTitle() ) -? getBundle( locale ).getString( "report.surefire.name" ) -: getTitle(); +return getBundle( locale ).getReportName(); } /** @@ -322,9 +318,7 @@ public abstract class AbstractSurefireReportMojo @Override public String getDescription( Locale locale ) { -return isEmpty( getDescription() ) -? getBundle( locale ).getString( "report.surefire.description" ) -: getDescription(); +return getBundle( locale ).getReportDescription(); } /** @@ -333,13 +327,15 @@ public abstract class AbstractSurefireReportMojo @Override public abstract String getOutputName(); -private ResourceBundle getBundle( Locale locale ) -{ -return ResourceBundle.getBundle( "surefire-report", locale, getClass().getClassLoader() ); -} +protected abstract LocalizedProperties getBundle( Locale locale, ClassLoader resourceBundleClassLoader ); protected final ConsoleLogger getConsoleLogger() { return new PluginConsoleLogger( getLog() ); } + +final LocalizedProperties getBundle( Locale locale ) +{ +return getBundle( locale, getClass().getClassLoader() ); +} } http://git-wip-us.apac
maven-surefire git commit: [SUREFIRE-1490] Change header of the Failsafe Report [Forced Update!]
Repository: maven-surefire Updated Branches: refs/heads/SUREFIRE-1490 8292ee534 -> 6174be76f (forced update) [SUREFIRE-1490] Change header of the Failsafe Report Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/6174be76 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/6174be76 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/6174be76 Branch: refs/heads/SUREFIRE-1490 Commit: 6174be76f52ffc2873a18a5215f60767843d7479 Parents: c10e717 Author: Tibor17 Authored: Wed Mar 7 02:43:37 2018 +0100 Committer: Tibor17 Committed: Wed Mar 7 23:56:00 2018 +0100 -- .../report/AbstractSurefireReportMojo.java | 22 ++-- .../surefire/report/FailsafeReportMojo.java | 59 +- .../surefire/report/LocalizedProperties.java| 116 +++ .../report/SurefireReportGenerator.java | 90 ++ .../surefire/report/SurefireReportMojo.java | 33 ++ .../main/resources/surefire-report.properties | 3 +- .../resources/surefire-report_de.properties | 1 + .../resources/surefire-report_sv.properties | 1 + .../surefire/report/Surefire597Test.java| 10 +- .../Surefire1490ReportTitleDescriptionIT.java | 93 +++ .../src/test/resources/surefire-1490/pom.xml| 97 .../src/test/java/it/Surefire1490IT.java| 31 + .../src/test/java/it/Surefire1490Test.java | 31 + 13 files changed, 484 insertions(+), 103 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/6174be76/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java -- diff --git a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java index b6d4a9d..7c78936 100644 --- a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java +++ b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java @@ -24,7 +24,6 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Locale; -import java.util.ResourceBundle; import org.apache.maven.model.ReportPlugin; import org.apache.maven.plugin.surefire.log.api.ConsoleLogger; import org.apache.maven.plugins.annotations.Parameter; @@ -36,7 +35,6 @@ import org.apache.maven.shared.utils.PathTool; import static java.util.Collections.addAll; import static org.apache.maven.plugins.surefire.report.SurefireReportParser.hasReportFiles; import static org.apache.maven.shared.utils.StringUtils.isEmpty; -import static org.apache.maven.shared.utils.StringUtils.isNotEmpty; /** * Abstract base class for reporting test results using Surefire. @@ -136,7 +134,7 @@ public abstract class AbstractSurefireReportMojo } new SurefireReportGenerator( getReportsDirectories(), locale, showSuccess, determineXrefLocation(), - getConsoleLogger(), isNotEmpty( getTitle() ) ? getTitle() : null ) + getConsoleLogger() ) .doGenerateReport( getBundle( locale ), getSink() ); } @@ -311,9 +309,7 @@ public abstract class AbstractSurefireReportMojo @Override public String getName( Locale locale ) { -return isEmpty( getTitle() ) -? getBundle( locale ).getString( "report.surefire.name" ) -: getTitle(); +return getBundle( locale ).getReportName(); } /** @@ -322,9 +318,7 @@ public abstract class AbstractSurefireReportMojo @Override public String getDescription( Locale locale ) { -return isEmpty( getDescription() ) -? getBundle( locale ).getString( "report.surefire.description" ) -: getDescription(); +return getBundle( locale ).getReportDescription(); } /** @@ -333,13 +327,15 @@ public abstract class AbstractSurefireReportMojo @Override public abstract String getOutputName(); -private ResourceBundle getBundle( Locale locale ) -{ -return ResourceBundle.getBundle( "surefire-report", locale, getClass().getClassLoader() ); -} +protected abstract LocalizedProperties getBundle( Locale locale, ClassLoader resourceBundleClassLoader ); protected final ConsoleLogger getConsoleLogger() { return new PluginConsoleLogger( getLog() ); } + +final LocalizedProperties getBundle( Locale loc
maven-surefire git commit: [SUREFIRE-1490] Change header of the Failsafe Report
Repository: maven-surefire Updated Branches: refs/heads/SUREFIRE-1490 [created] 8292ee534 [SUREFIRE-1490] Change header of the Failsafe Report Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/8292ee53 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/8292ee53 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/8292ee53 Branch: refs/heads/SUREFIRE-1490 Commit: 8292ee53404017213696b0727ec0eb2138ff22db Parents: c10e717 Author: Tibor17 Authored: Wed Mar 7 02:43:37 2018 +0100 Committer: Tibor17 Committed: Wed Mar 7 02:43:37 2018 +0100 -- .../report/AbstractSurefireReportMojo.java | 22 ++-- .../surefire/report/FailsafeReportMojo.java | 59 +- .../surefire/report/LocalizedProperties.java| 116 +++ .../report/SurefireReportGenerator.java | 90 ++ .../surefire/report/SurefireReportMojo.java | 33 ++ .../main/resources/surefire-report.properties | 3 +- .../resources/surefire-report_de.properties | 1 + .../resources/surefire-report_sv.properties | 1 + .../surefire/report/Surefire597Test.java| 10 +- 9 files changed, 232 insertions(+), 103 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8292ee53/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java -- diff --git a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java index b6d4a9d..7c78936 100644 --- a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java +++ b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java @@ -24,7 +24,6 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Locale; -import java.util.ResourceBundle; import org.apache.maven.model.ReportPlugin; import org.apache.maven.plugin.surefire.log.api.ConsoleLogger; import org.apache.maven.plugins.annotations.Parameter; @@ -36,7 +35,6 @@ import org.apache.maven.shared.utils.PathTool; import static java.util.Collections.addAll; import static org.apache.maven.plugins.surefire.report.SurefireReportParser.hasReportFiles; import static org.apache.maven.shared.utils.StringUtils.isEmpty; -import static org.apache.maven.shared.utils.StringUtils.isNotEmpty; /** * Abstract base class for reporting test results using Surefire. @@ -136,7 +134,7 @@ public abstract class AbstractSurefireReportMojo } new SurefireReportGenerator( getReportsDirectories(), locale, showSuccess, determineXrefLocation(), - getConsoleLogger(), isNotEmpty( getTitle() ) ? getTitle() : null ) + getConsoleLogger() ) .doGenerateReport( getBundle( locale ), getSink() ); } @@ -311,9 +309,7 @@ public abstract class AbstractSurefireReportMojo @Override public String getName( Locale locale ) { -return isEmpty( getTitle() ) -? getBundle( locale ).getString( "report.surefire.name" ) -: getTitle(); +return getBundle( locale ).getReportName(); } /** @@ -322,9 +318,7 @@ public abstract class AbstractSurefireReportMojo @Override public String getDescription( Locale locale ) { -return isEmpty( getDescription() ) -? getBundle( locale ).getString( "report.surefire.description" ) -: getDescription(); +return getBundle( locale ).getReportDescription(); } /** @@ -333,13 +327,15 @@ public abstract class AbstractSurefireReportMojo @Override public abstract String getOutputName(); -private ResourceBundle getBundle( Locale locale ) -{ -return ResourceBundle.getBundle( "surefire-report", locale, getClass().getClassLoader() ); -} +protected abstract LocalizedProperties getBundle( Locale locale, ClassLoader resourceBundleClassLoader ); protected final ConsoleLogger getConsoleLogger() { return new PluginConsoleLogger( getLog() ); } + +final LocalizedProperties getBundle( Locale locale ) +{ +return getBundle( locale, getClass().getClassLoader() ); +} } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8292ee53/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/FailsafeReportMojo.java ---