From 5ecdf5ad8fcba66a3f81e1805c6f491855a33981 Mon Sep 17 00:00:00 2001 From: Kristian Rosenvold Date: Thu, 26 Jan 2012 22:37:06 +0000 Subject: [PATCH] o Moved some classes around a bit, tidied the package structure git-svn-id: https://svn.apache.org/repos/asf/maven/surefire/trunk@1236422 13f79535-47bb-0310-9956-ffa450edef68 --- maven-surefire-common/pom.xml | 4 +-- .../plugin/surefire/AbstractSurefireMojo.java | 1 - .../plugin/surefire/CommonReflector.java | 1 - .../surefire/InPluginVMSurefireStarter.java | 1 - .../surefire}/StartupReportConfiguration.java | 28 +++++++++---------- .../booterclient/ForkConfiguration.java | 2 +- .../surefire/booterclient/ForkStarter.java | 2 +- .../output/ThreadedStreamConsumer.java | 4 +-- .../report/AbstractConsoleReporter.java | 4 ++- .../surefire/report/AbstractFileReporter.java | 4 ++- .../surefire/report/AbstractReporter.java | 5 +++- .../surefire/report/AbstractTextReporter.java | 4 ++- .../surefire/report/BriefConsoleReporter.java | 2 +- .../surefire/report/BriefFileReporter.java | 2 +- .../report/ConsoleOutputDirectReporter.java | 3 +- .../report/ConsoleOutputFileReporter.java | 4 ++- .../surefire/report/ConsoleReporter.java | 2 +- .../report/DetailedConsoleReporter.java | 2 +- .../surefire/report/FileReporter.java | 2 +- .../surefire/report/FileReporterFactory.java | 12 +++----- .../surefire/report/MulticastingReporter.java | 4 ++- .../surefire/report/PrettyPrintXMLWriter.java | 2 +- .../surefire/report/Reporter.java | 5 +++- .../surefire/report/TestSetRunListener.java | 10 +++++-- .../surefire/report/XMLReporter.java} | 10 ++++--- .../surefire/runorder/StatisticsReporter.java | 2 +- .../{ => plugin}/surefire/util/Relocator.java | 2 +- .../surefire/util/internal/BlockingQueue.java | 2 +- .../internal/FunkyTwoThreadBlockingQueue.java | 2 +- .../util/internal/Java15BlockingQueue.java | 2 +- .../util/internal/TwoThreadBlockingQueue.java | 2 +- .../TestSetMockReporterFactory.java | 2 +- .../report/ConsoleOutputFileReporterTest.java | 2 ++ .../surefire/report/FileReporterTest.java | 2 ++ .../surefire/report/XMLReporterTest.java | 11 ++++---- .../maven/surefire/util/RelocatorTest.java | 2 ++ .../internal/TwoThreadBlockingQueueTest.java | 4 +++ 37 files changed, 92 insertions(+), 63 deletions(-) rename maven-surefire-common/src/main/java/org/apache/maven/{surefire/booter => plugin/surefire}/StartupReportConfiguration.java (87%) rename maven-surefire-common/src/main/java/org/apache/maven/{ => plugin}/surefire/report/AbstractConsoleReporter.java (94%) rename maven-surefire-common/src/main/java/org/apache/maven/{ => plugin}/surefire/report/AbstractFileReporter.java (95%) rename maven-surefire-common/src/main/java/org/apache/maven/{ => plugin}/surefire/report/AbstractReporter.java (95%) rename maven-surefire-common/src/main/java/org/apache/maven/{ => plugin}/surefire/report/AbstractTextReporter.java (96%) rename maven-surefire-common/src/main/java/org/apache/maven/{ => plugin}/surefire/report/BriefConsoleReporter.java (95%) rename maven-surefire-common/src/main/java/org/apache/maven/{ => plugin}/surefire/report/BriefFileReporter.java (96%) rename maven-surefire-common/src/main/java/org/apache/maven/{ => plugin}/surefire/report/ConsoleOutputDirectReporter.java (95%) rename maven-surefire-common/src/main/java/org/apache/maven/{ => plugin}/surefire/report/ConsoleOutputFileReporter.java (95%) rename maven-surefire-common/src/main/java/org/apache/maven/{ => plugin}/surefire/report/ConsoleReporter.java (95%) rename maven-surefire-common/src/main/java/org/apache/maven/{ => plugin}/surefire/report/DetailedConsoleReporter.java (95%) rename maven-surefire-common/src/main/java/org/apache/maven/{ => plugin}/surefire/report/FileReporter.java (96%) rename maven-surefire-common/src/main/java/org/apache/maven/{ => plugin}/surefire/report/MulticastingReporter.java (95%) rename maven-surefire-common/src/main/java/org/apache/maven/{ => plugin}/surefire/report/PrettyPrintXMLWriter.java (99%) rename maven-surefire-common/src/main/java/org/apache/maven/{ => plugin}/surefire/report/Reporter.java (95%) rename maven-surefire-common/src/main/java/org/apache/maven/{ => plugin}/surefire/report/TestSetRunListener.java (93%) rename maven-surefire-common/src/main/java/org/apache/maven/{surefire/report/XMLReporter2.java => plugin/surefire/report/XMLReporter.java} (97%) rename maven-surefire-common/src/main/java/org/apache/maven/{ => plugin}/surefire/util/Relocator.java (97%) rename maven-surefire-common/src/main/java/org/apache/maven/{ => plugin}/surefire/util/internal/BlockingQueue.java (95%) rename maven-surefire-common/src/main/java/org/apache/maven/{ => plugin}/surefire/util/internal/FunkyTwoThreadBlockingQueue.java (98%) rename maven-surefire-common/src/main/java/org/apache/maven/{ => plugin}/surefire/util/internal/Java15BlockingQueue.java (95%) rename maven-surefire-common/src/main/java/org/apache/maven/{ => plugin}/surefire/util/internal/TwoThreadBlockingQueue.java (98%) diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml index 31d301b4ab..35223b1b9b 100644 --- a/maven-surefire-common/pom.xml +++ b/maven-surefire-common/pom.xml @@ -112,8 +112,8 @@ - org.codehaus.plexus.util - org.apache.maven.plugin.surefire.report.plexus.util + org.codehaus.plexus.util.xml + org.apache.maven.plugin.surefire.report.plexus.util.xml 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 ff5b1e7610..68132be048 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 @@ -57,7 +57,6 @@ import org.apache.maven.surefire.booter.ProviderConfiguration; import org.apache.maven.surefire.booter.ProviderParameterNames; import org.apache.maven.surefire.booter.StartupConfiguration; -import org.apache.maven.surefire.booter.StartupReportConfiguration; import org.apache.maven.surefire.booter.SurefireBooterForkException; import org.apache.maven.surefire.booter.SurefireExecutionException; import org.apache.maven.surefire.report.ReporterConfiguration; diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/CommonReflector.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/CommonReflector.java index abcc01d1be..758e05a068 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/CommonReflector.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/CommonReflector.java @@ -22,7 +22,6 @@ import java.io.File; import java.lang.reflect.Constructor; import org.apache.maven.plugin.surefire.report.FileReporterFactory; -import org.apache.maven.surefire.booter.StartupReportConfiguration; import org.apache.maven.surefire.util.ReflectionUtils; import org.apache.maven.surefire.util.SurefireReflectionException; diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/InPluginVMSurefireStarter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/InPluginVMSurefireStarter.java index 1dfa10a68f..57a0242843 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/InPluginVMSurefireStarter.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/InPluginVMSurefireStarter.java @@ -22,7 +22,6 @@ import org.apache.maven.surefire.booter.ProviderConfiguration; import org.apache.maven.surefire.booter.ProviderFactory; import org.apache.maven.surefire.booter.StartupConfiguration; -import org.apache.maven.surefire.booter.StartupReportConfiguration; import org.apache.maven.surefire.booter.SurefireExecutionException; import org.apache.maven.surefire.suite.RunResult; diff --git a/maven-surefire-common/src/main/java/org/apache/maven/surefire/booter/StartupReportConfiguration.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/StartupReportConfiguration.java similarity index 87% rename from maven-surefire-common/src/main/java/org/apache/maven/surefire/booter/StartupReportConfiguration.java rename to maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/StartupReportConfiguration.java index cba5113c96..f218197e3d 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/surefire/booter/StartupReportConfiguration.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/StartupReportConfiguration.java @@ -1,4 +1,4 @@ -package org.apache.maven.surefire.booter; +package org.apache.maven.plugin.surefire; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,18 +22,18 @@ import java.io.File; import java.io.PrintStream; import java.util.Properties; +import org.apache.maven.plugin.surefire.report.AbstractConsoleReporter; +import org.apache.maven.plugin.surefire.report.AbstractFileReporter; +import org.apache.maven.plugin.surefire.report.BriefConsoleReporter; +import org.apache.maven.plugin.surefire.report.BriefFileReporter; +import org.apache.maven.plugin.surefire.report.ConsoleOutputDirectReporter; +import org.apache.maven.plugin.surefire.report.ConsoleOutputFileReporter; +import org.apache.maven.plugin.surefire.report.ConsoleReporter; +import org.apache.maven.plugin.surefire.report.DetailedConsoleReporter; +import org.apache.maven.plugin.surefire.report.FileReporter; +import org.apache.maven.plugin.surefire.report.Reporter; +import org.apache.maven.plugin.surefire.report.XMLReporter; import org.apache.maven.plugin.surefire.runorder.StatisticsReporter; -import org.apache.maven.surefire.report.AbstractConsoleReporter; -import org.apache.maven.surefire.report.AbstractFileReporter; -import org.apache.maven.surefire.report.BriefConsoleReporter; -import org.apache.maven.surefire.report.BriefFileReporter; -import org.apache.maven.surefire.report.ConsoleOutputDirectReporter; -import org.apache.maven.surefire.report.ConsoleOutputFileReporter; -import org.apache.maven.surefire.report.ConsoleReporter; -import org.apache.maven.surefire.report.DetailedConsoleReporter; -import org.apache.maven.surefire.report.FileReporter; -import org.apache.maven.surefire.report.Reporter; -import org.apache.maven.surefire.report.XMLReporter2; /** * All the parameters used to construct reporters @@ -135,11 +135,11 @@ public File getReportsDirectory() return reportsDirectory; } - public XMLReporter2 instantiateXmlReporter() + public XMLReporter instantiateXmlReporter() { if ( !isDisableXmlReport() ) { - return new XMLReporter2( trimStackTrace, reportsDirectory, reportNameSuffix ); + return new XMLReporter( trimStackTrace, reportsDirectory, reportNameSuffix ); } return null; } diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java index b4dc72eb11..a93ba05399 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java @@ -30,11 +30,11 @@ import java.util.jar.JarEntry; import java.util.jar.JarOutputStream; import java.util.jar.Manifest; +import org.apache.maven.plugin.surefire.util.Relocator; import org.apache.maven.surefire.booter.ClassLoaderConfiguration; import org.apache.maven.surefire.booter.Classpath; import org.apache.maven.surefire.booter.ForkedBooter; import org.apache.maven.surefire.booter.SurefireBooterForkException; -import org.apache.maven.surefire.util.Relocator; import org.apache.maven.surefire.util.UrlUtils; import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.cli.Commandline; 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 ca2d50e92e..b9b5fefe6d 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 @@ -32,6 +32,7 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import org.apache.maven.plugin.surefire.CommonReflector; +import org.apache.maven.plugin.surefire.StartupReportConfiguration; import org.apache.maven.plugin.surefire.booterclient.output.ForkClient; import org.apache.maven.plugin.surefire.booterclient.output.ThreadedStreamConsumer; import org.apache.maven.plugin.surefire.report.FileReporterFactory; @@ -40,7 +41,6 @@ import org.apache.maven.surefire.booter.ProviderConfiguration; import org.apache.maven.surefire.booter.ProviderFactory; import org.apache.maven.surefire.booter.StartupConfiguration; -import org.apache.maven.surefire.booter.StartupReportConfiguration; import org.apache.maven.surefire.booter.SurefireBooterForkException; import org.apache.maven.surefire.booter.SurefireExecutionException; import org.apache.maven.surefire.booter.SystemPropertyManager; diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ThreadedStreamConsumer.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ThreadedStreamConsumer.java index d5f78d748c..43248f84ab 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ThreadedStreamConsumer.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ThreadedStreamConsumer.java @@ -19,8 +19,8 @@ * under the License. */ -import org.apache.maven.surefire.util.internal.BlockingQueue; -import org.apache.maven.surefire.util.internal.Java15BlockingQueue; +import org.apache.maven.plugin.surefire.util.internal.BlockingQueue; +import org.apache.maven.plugin.surefire.util.internal.Java15BlockingQueue; import org.codehaus.plexus.util.cli.StreamConsumer; /** diff --git a/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractConsoleReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractConsoleReporter.java similarity index 94% rename from maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractConsoleReporter.java rename to maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractConsoleReporter.java index 781d0dd713..32129d8959 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractConsoleReporter.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractConsoleReporter.java @@ -1,4 +1,4 @@ -package org.apache.maven.surefire.report; +package org.apache.maven.plugin.surefire.report; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,6 +23,8 @@ import java.io.OutputStreamWriter; import java.io.PrintStream; import java.io.PrintWriter; +import org.apache.maven.surefire.report.ReportEntry; +import org.apache.maven.surefire.report.ReporterException; /** * Base class for console reporters. diff --git a/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractFileReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractFileReporter.java similarity index 95% rename from maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractFileReporter.java rename to maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractFileReporter.java index b9e981e27c..f63f894f3d 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractFileReporter.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractFileReporter.java @@ -1,4 +1,4 @@ -package org.apache.maven.surefire.report; +package org.apache.maven.plugin.surefire.report; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,6 +23,8 @@ import java.io.FileWriter; import java.io.IOException; import java.io.PrintWriter; +import org.apache.maven.surefire.report.ReportEntry; +import org.apache.maven.surefire.report.ReporterException; /** * Base class for file reporters. diff --git a/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractReporter.java similarity index 95% rename from maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractReporter.java rename to maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractReporter.java index e8bf71a533..0c5eba4965 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractReporter.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractReporter.java @@ -1,4 +1,4 @@ -package org.apache.maven.surefire.report; +package org.apache.maven.plugin.surefire.report; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,6 +22,9 @@ import java.io.File; import java.text.NumberFormat; import java.util.Locale; +import org.apache.maven.surefire.report.ReportEntry; +import org.apache.maven.surefire.report.ReporterException; +import org.apache.maven.surefire.report.StackTraceWriter; /** * @author Jason van Zyl diff --git a/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractTextReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractTextReporter.java similarity index 96% rename from maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractTextReporter.java rename to maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractTextReporter.java index b8db9694e5..1a6602711f 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractTextReporter.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractTextReporter.java @@ -1,4 +1,4 @@ -package org.apache.maven.surefire.report; +package org.apache.maven.plugin.surefire.report; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,6 +22,8 @@ import java.io.PrintWriter; import java.util.ArrayList; import java.util.List; +import org.apache.maven.surefire.report.ReportEntry; +import org.apache.maven.surefire.report.ReporterException; /** * Text based reporter. diff --git a/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/BriefConsoleReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/BriefConsoleReporter.java similarity index 95% rename from maven-surefire-common/src/main/java/org/apache/maven/surefire/report/BriefConsoleReporter.java rename to maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/BriefConsoleReporter.java index 2ae293dfe0..bacd97c18c 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/BriefConsoleReporter.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/BriefConsoleReporter.java @@ -1,4 +1,4 @@ -package org.apache.maven.surefire.report; +package org.apache.maven.plugin.surefire.report; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/BriefFileReporter.java similarity index 96% rename from maven-surefire-common/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java rename to maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/BriefFileReporter.java index d3ea38f257..dee26baadc 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/BriefFileReporter.java @@ -1,4 +1,4 @@ -package org.apache.maven.surefire.report; +package org.apache.maven.plugin.surefire.report; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/ConsoleOutputDirectReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleOutputDirectReporter.java similarity index 95% rename from maven-surefire-common/src/main/java/org/apache/maven/surefire/report/ConsoleOutputDirectReporter.java rename to maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleOutputDirectReporter.java index be1a4b76b7..be2e581a77 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/ConsoleOutputDirectReporter.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleOutputDirectReporter.java @@ -1,4 +1,4 @@ -package org.apache.maven.surefire.report; +package org.apache.maven.plugin.surefire.report; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -20,6 +20,7 @@ */ import java.io.PrintStream; +import org.apache.maven.surefire.report.ReportEntry; /** * Outputs test system out/system err directly to the console diff --git a/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/ConsoleOutputFileReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleOutputFileReporter.java similarity index 95% rename from maven-surefire-common/src/main/java/org/apache/maven/surefire/report/ConsoleOutputFileReporter.java rename to maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleOutputFileReporter.java index eaeba71983..b98290055a 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/ConsoleOutputFileReporter.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleOutputFileReporter.java @@ -1,4 +1,4 @@ -package org.apache.maven.surefire.report; +package org.apache.maven.plugin.surefire.report; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -25,6 +25,8 @@ import java.io.IOException; import java.io.PrintWriter; +import org.apache.maven.surefire.report.ReportEntry; +import org.apache.maven.surefire.report.ReporterException; import org.apache.maven.surefire.util.NestedRuntimeException; /** diff --git a/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/ConsoleReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleReporter.java similarity index 95% rename from maven-surefire-common/src/main/java/org/apache/maven/surefire/report/ConsoleReporter.java rename to maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleReporter.java index 942ecd0f72..eb61f24f88 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/ConsoleReporter.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleReporter.java @@ -1,4 +1,4 @@ -package org.apache.maven.surefire.report; +package org.apache.maven.plugin.surefire.report; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/DetailedConsoleReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DetailedConsoleReporter.java similarity index 95% rename from maven-surefire-common/src/main/java/org/apache/maven/surefire/report/DetailedConsoleReporter.java rename to maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DetailedConsoleReporter.java index f558beab4f..9149b220b8 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/DetailedConsoleReporter.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DetailedConsoleReporter.java @@ -1,4 +1,4 @@ -package org.apache.maven.surefire.report; +package org.apache.maven.plugin.surefire.report; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/FileReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporter.java similarity index 96% rename from maven-surefire-common/src/main/java/org/apache/maven/surefire/report/FileReporter.java rename to maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporter.java index 81a66c54b4..4508222d2b 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/FileReporter.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporter.java @@ -1,4 +1,4 @@ -package org.apache.maven.surefire.report; +package org.apache.maven.plugin.surefire.report; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporterFactory.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporterFactory.java index 4935ce0078..8dc0b876d2 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporterFactory.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporterFactory.java @@ -19,23 +19,19 @@ * under the License. */ +import java.io.PrintStream; +import java.util.ArrayList; +import java.util.List; +import org.apache.maven.plugin.surefire.StartupReportConfiguration; import org.apache.maven.plugin.surefire.runorder.StatisticsReporter; -import org.apache.maven.surefire.booter.StartupReportConfiguration; import org.apache.maven.surefire.report.ConsoleLogger; import org.apache.maven.surefire.report.DefaultDirectConsoleReporter; -import org.apache.maven.surefire.report.MulticastingReporter; -import org.apache.maven.surefire.report.Reporter; import org.apache.maven.surefire.report.ReporterConfiguration; import org.apache.maven.surefire.report.ReporterFactory; import org.apache.maven.surefire.report.RunListener; import org.apache.maven.surefire.report.RunStatistics; -import org.apache.maven.surefire.report.TestSetRunListener; import org.apache.maven.surefire.suite.RunResult; -import java.io.PrintStream; -import java.util.ArrayList; -import java.util.List; - /** * Provides RunListener implementations to the providers. *

diff --git a/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/MulticastingReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/MulticastingReporter.java similarity index 95% rename from maven-surefire-common/src/main/java/org/apache/maven/surefire/report/MulticastingReporter.java rename to maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/MulticastingReporter.java index 02c7d4c03c..c6b261077f 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/MulticastingReporter.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/MulticastingReporter.java @@ -1,4 +1,4 @@ -package org.apache.maven.surefire.report; +package org.apache.maven.plugin.surefire.report; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -20,6 +20,8 @@ */ import java.util.List; +import org.apache.maven.surefire.report.CategorizedReportEntry; +import org.apache.maven.surefire.report.ReportEntry; /** * A reporter that broadcasts to other reporters diff --git a/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/PrettyPrintXMLWriter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/PrettyPrintXMLWriter.java similarity index 99% rename from maven-surefire-common/src/main/java/org/apache/maven/surefire/report/PrettyPrintXMLWriter.java rename to maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/PrettyPrintXMLWriter.java index 8bd0f3381b..256795bfa4 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/PrettyPrintXMLWriter.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/PrettyPrintXMLWriter.java @@ -1,4 +1,4 @@ -package org.apache.maven.surefire.report; +package org.apache.maven.plugin.surefire.report; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/Reporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/Reporter.java similarity index 95% rename from maven-surefire-common/src/main/java/org/apache/maven/surefire/report/Reporter.java rename to maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/Reporter.java index 88d93c6123..9b18045de4 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/Reporter.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/Reporter.java @@ -1,4 +1,4 @@ -package org.apache.maven.surefire.report; +package org.apache.maven.plugin.surefire.report; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,6 +19,9 @@ * under the License. */ +import org.apache.maven.surefire.report.ReportEntry; +import org.apache.maven.surefire.report.ReporterException; + /** * Persists reports somewhere *

diff --git a/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/TestSetRunListener.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java similarity index 93% rename from maven-surefire-common/src/main/java/org/apache/maven/surefire/report/TestSetRunListener.java rename to maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java index 3239271337..ef4a254623 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/TestSetRunListener.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java @@ -1,4 +1,4 @@ -package org.apache.maven.surefire.report; +package org.apache.maven.plugin.surefire.report; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -20,6 +20,12 @@ */ import org.apache.maven.plugin.surefire.runorder.StatisticsReporter; +import org.apache.maven.surefire.report.ConsoleLogger; +import org.apache.maven.surefire.report.ConsoleOutputReceiver; +import org.apache.maven.surefire.report.ReportEntry; +import org.apache.maven.surefire.report.RunListener; +import org.apache.maven.surefire.report.RunStatistics; +import org.apache.maven.surefire.report.TestSetStatistics; import org.apache.maven.surefire.util.internal.ByteBuffer; import java.util.ArrayList; @@ -46,7 +52,7 @@ public class TestSetRunListener public TestSetRunListener( AbstractConsoleReporter consoleReporter, AbstractFileReporter fileReporter, - XMLReporter2 xmlReporter, Reporter reporter, StatisticsReporter statisticsReporter, + XMLReporter xmlReporter, Reporter reporter, StatisticsReporter statisticsReporter, RunStatistics globalStats ) { diff --git a/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/XMLReporter2.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/XMLReporter.java similarity index 97% rename from maven-surefire-common/src/main/java/org/apache/maven/surefire/report/XMLReporter2.java rename to maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/XMLReporter.java index d922c98de4..e2cc15ee73 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/XMLReporter2.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/XMLReporter.java @@ -1,4 +1,4 @@ -package org.apache.maven.surefire.report; +package org.apache.maven.plugin.surefire.report; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -33,6 +33,8 @@ import java.util.List; import java.util.Properties; import java.util.StringTokenizer; +import org.apache.maven.surefire.report.ReportEntry; +import org.apache.maven.surefire.report.ReporterException; import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.xml.Xpp3Dom; import org.codehaus.plexus.util.xml.Xpp3DomWriter; @@ -70,7 +72,7 @@ * @see Ant's format enhancement proposal * (not yet implemented by Ant 1.8.2) */ -public class XMLReporter2 +public class XMLReporter extends AbstractReporter { private static final String LS = System.getProperty( "line.separator" ); @@ -85,12 +87,12 @@ public class XMLReporter2 private int elapsed = 0; - public XMLReporter2( boolean trimStackTrace, File reportsDirectory ) + public XMLReporter( boolean trimStackTrace, File reportsDirectory ) { this( trimStackTrace, reportsDirectory, null ); } - public XMLReporter2( boolean trimStackTrace, File reportsDirectory, String reportNameSuffix ) + public XMLReporter( boolean trimStackTrace, File reportsDirectory, String reportNameSuffix ) { super( trimStackTrace ); this.reportsDirectory = reportsDirectory; diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/runorder/StatisticsReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/runorder/StatisticsReporter.java index c1a4480f16..639a0dc484 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/runorder/StatisticsReporter.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/runorder/StatisticsReporter.java @@ -21,8 +21,8 @@ import java.io.File; import java.io.FileNotFoundException; +import org.apache.maven.plugin.surefire.report.Reporter; import org.apache.maven.surefire.report.ReportEntry; -import org.apache.maven.surefire.report.Reporter; import org.apache.maven.surefire.util.NestedRuntimeException; /** diff --git a/maven-surefire-common/src/main/java/org/apache/maven/surefire/util/Relocator.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/Relocator.java similarity index 97% rename from maven-surefire-common/src/main/java/org/apache/maven/surefire/util/Relocator.java rename to maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/Relocator.java index 5f53b81075..31dde5d5ea 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/surefire/util/Relocator.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/Relocator.java @@ -1,4 +1,4 @@ -package org.apache.maven.surefire.util; +package org.apache.maven.plugin.surefire.util; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-surefire-common/src/main/java/org/apache/maven/surefire/util/internal/BlockingQueue.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/BlockingQueue.java similarity index 95% rename from maven-surefire-common/src/main/java/org/apache/maven/surefire/util/internal/BlockingQueue.java rename to maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/BlockingQueue.java index e9fce8255e..6a14a7694e 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/surefire/util/internal/BlockingQueue.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/BlockingQueue.java @@ -1,4 +1,4 @@ -package org.apache.maven.surefire.util.internal; +package org.apache.maven.plugin.surefire.util.internal; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-surefire-common/src/main/java/org/apache/maven/surefire/util/internal/FunkyTwoThreadBlockingQueue.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/FunkyTwoThreadBlockingQueue.java similarity index 98% rename from maven-surefire-common/src/main/java/org/apache/maven/surefire/util/internal/FunkyTwoThreadBlockingQueue.java rename to maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/FunkyTwoThreadBlockingQueue.java index e5cb9ce4e5..12e16ad2c7 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/surefire/util/internal/FunkyTwoThreadBlockingQueue.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/FunkyTwoThreadBlockingQueue.java @@ -1,4 +1,4 @@ -package org.apache.maven.surefire.util.internal; +package org.apache.maven.plugin.surefire.util.internal; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-surefire-common/src/main/java/org/apache/maven/surefire/util/internal/Java15BlockingQueue.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/Java15BlockingQueue.java similarity index 95% rename from maven-surefire-common/src/main/java/org/apache/maven/surefire/util/internal/Java15BlockingQueue.java rename to maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/Java15BlockingQueue.java index 90246de10b..1b3f8396ba 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/surefire/util/internal/Java15BlockingQueue.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/Java15BlockingQueue.java @@ -1,4 +1,4 @@ -package org.apache.maven.surefire.util.internal; +package org.apache.maven.plugin.surefire.util.internal; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-surefire-common/src/main/java/org/apache/maven/surefire/util/internal/TwoThreadBlockingQueue.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/TwoThreadBlockingQueue.java similarity index 98% rename from maven-surefire-common/src/main/java/org/apache/maven/surefire/util/internal/TwoThreadBlockingQueue.java rename to maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/TwoThreadBlockingQueue.java index 3d43af36dd..ba979f0c5c 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/surefire/util/internal/TwoThreadBlockingQueue.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/TwoThreadBlockingQueue.java @@ -1,4 +1,4 @@ -package org.apache.maven.surefire.util.internal; +package org.apache.maven.plugin.surefire.util.internal; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/TestSetMockReporterFactory.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/TestSetMockReporterFactory.java index d9f86575ab..8d6cfe55a5 100644 --- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/TestSetMockReporterFactory.java +++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/TestSetMockReporterFactory.java @@ -19,8 +19,8 @@ * under the License. */ +import org.apache.maven.plugin.surefire.StartupReportConfiguration; import org.apache.maven.plugin.surefire.report.FileReporterFactory; -import org.apache.maven.surefire.booter.StartupReportConfiguration; import org.apache.maven.surefire.report.RunListener; /** diff --git a/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/ConsoleOutputFileReporterTest.java b/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/ConsoleOutputFileReporterTest.java index 9063ec6f02..3297958ee3 100644 --- a/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/ConsoleOutputFileReporterTest.java +++ b/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/ConsoleOutputFileReporterTest.java @@ -20,6 +20,8 @@ */ import java.io.File; +import org.apache.maven.plugin.surefire.report.ConsoleOutputFileReporter; + import junit.framework.TestCase; public class ConsoleOutputFileReporterTest diff --git a/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/FileReporterTest.java b/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/FileReporterTest.java index e1078a6055..a72dad974f 100644 --- a/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/FileReporterTest.java +++ b/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/FileReporterTest.java @@ -20,6 +20,8 @@ */ import java.io.File; +import org.apache.maven.plugin.surefire.report.FileReporter; + import junit.framework.TestCase; public class FileReporterTest diff --git a/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/XMLReporterTest.java b/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/XMLReporterTest.java index c7b462b4a7..7d92d450e1 100644 --- a/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/XMLReporterTest.java +++ b/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/XMLReporterTest.java @@ -20,6 +20,7 @@ */ import java.io.File; +import org.apache.maven.plugin.surefire.report.XMLReporter; import org.codehaus.plexus.util.xml.Xpp3Dom; import junit.framework.AssertionFailedError; @@ -29,7 +30,7 @@ public class XMLReporterTest extends TestCase { - private XMLReporter2 reporter; + private XMLReporter reporter; private ReportEntry reportEntry; @@ -39,7 +40,7 @@ protected void setUp() throws Exception { super.setUp(); - reporter = new XMLReporter2( true, new File( "." )); + reporter = new XMLReporter( true, new File( "." )); message = "junit.framework.AssertionFailedError"; reportEntry = new SimpleReportEntry( this.getClass().getName(), "XMLReporterTest", new PojoStackTraceWriter( "", "", new AssertionFailedError() ) , @@ -64,7 +65,7 @@ public void testTestFailed() assertResult( reporter, message ); } - private void assertResult( XMLReporter2 reporter, String message ) + private void assertResult( XMLReporter reporter, String message ) { Xpp3Dom result = (Xpp3Dom) reporter.getResults().next(); Xpp3Dom child = result.getChild( "error" ); @@ -79,7 +80,7 @@ public void testFileNameWithoutSuffix() File reportDir = new File( "." ); String testName = "org.apache.maven.surefire.report.XMLReporterTest"; reportEntry = new SimpleReportEntry( this.getClass().getName(), testName, new Integer( 12) ); - reporter = new XMLReporter2( true, reportDir, null ); + reporter = new XMLReporter( true, reportDir, null ); reporter.testSetCompleted( reportEntry ); File expectedReportFile = new File( reportDir, "TEST-" + testName + ".xml" ); @@ -96,7 +97,7 @@ public void testFileNameWithSuffix() String testName = "org.apache.maven.surefire.report.XMLReporterTest"; String suffixText = "sampleSuffixText"; reportEntry = new SimpleReportEntry( this.getClass().getName(), testName ); - reporter = new XMLReporter2( true, reportDir, suffixText ); + reporter = new XMLReporter( true, reportDir, suffixText ); reporter.testSetCompleted( reportEntry ); File expectedReportFile = new File( reportDir, "TEST-" + testName + "-" + suffixText + ".xml" ); diff --git a/maven-surefire-common/src/test/java/org/apache/maven/surefire/util/RelocatorTest.java b/maven-surefire-common/src/test/java/org/apache/maven/surefire/util/RelocatorTest.java index 6de98ad304..d605528ae7 100644 --- a/maven-surefire-common/src/test/java/org/apache/maven/surefire/util/RelocatorTest.java +++ b/maven-surefire-common/src/test/java/org/apache/maven/surefire/util/RelocatorTest.java @@ -19,6 +19,8 @@ * under the License. */ +import org.apache.maven.plugin.surefire.util.Relocator; + import junit.framework.TestCase; /** diff --git a/maven-surefire-common/src/test/java/org/apache/maven/surefire/util/internal/TwoThreadBlockingQueueTest.java b/maven-surefire-common/src/test/java/org/apache/maven/surefire/util/internal/TwoThreadBlockingQueueTest.java index 7e5263f18b..af034957df 100644 --- a/maven-surefire-common/src/test/java/org/apache/maven/surefire/util/internal/TwoThreadBlockingQueueTest.java +++ b/maven-surefire-common/src/test/java/org/apache/maven/surefire/util/internal/TwoThreadBlockingQueueTest.java @@ -26,6 +26,10 @@ import java.util.concurrent.FutureTask; import java.util.concurrent.LinkedBlockingQueue; +import org.apache.maven.plugin.surefire.util.internal.BlockingQueue; +import org.apache.maven.plugin.surefire.util.internal.FunkyTwoThreadBlockingQueue; +import org.apache.maven.plugin.surefire.util.internal.TwoThreadBlockingQueue; + import junit.framework.Assert; import junit.framework.TestCase;