You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2019/04/12 01:44:51 UTC

[maven-surefire] branch 1546-1222 updated: added config params for DisplayName (useFileName, useTestCaseClassName, useTestCaseMethodName)

This is an automated email from the ASF dual-hosted git repository.

tibordigana pushed a commit to branch 1546-1222
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git


The following commit(s) were added to refs/heads/1546-1222 by this push:
     new 3abb951  added config params for DisplayName (useFileName, useTestCaseClassName, useTestCaseMethodName)
3abb951 is described below

commit 3abb951099791cc441de29ca79d42167f6952b7a
Author: tibordigana <ti...@apache.org>
AuthorDate: Fri Apr 12 03:44:24 2019 +0200

    added config params for DisplayName (useFileName, useTestCaseClassName, useTestCaseMethodName)
---
 .../extensions/DefaultStatelessReporter.java       |  7 ++-
 .../maven/surefire/extensions/SourceNameType.java  | 26 +++++------
 .../surefire/extensions/StatelessReporter.java     | 54 +++++++++++++++++++---
 3 files changed, 66 insertions(+), 21 deletions(-)

diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/DefaultStatelessReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/DefaultStatelessReporter.java
index 744edc4..a2e59a4 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/DefaultStatelessReporter.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/DefaultStatelessReporter.java
@@ -19,10 +19,13 @@ package org.apache.maven.plugin.surefire.extensions;
  * under the License.
  */
 
+import org.apache.maven.plugin.surefire.report.StatelessXmlReporter;
 import org.apache.maven.surefire.extensions.StatelessReportEventListener;
 import org.apache.maven.surefire.extensions.StatelessReporter;
 
 /**
+ * Default implementation for extension of {@link StatelessXmlReporter} in plugin.
+ *
  * author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
  * @since 3.0.0-M4
  */
@@ -34,6 +37,8 @@ public class DefaultStatelessReporter
     public StatelessReportEventListener<StatelessReporterEvent> createStatelessReportEventListener(
             DefaultStatelessReportMojoConfiguration configuration )
     {
-        return null;
+        return new StatelessXmlReporter( configuration.getReportsDirectory(), configuration.getReportNameSuffix(),
+                configuration.isTrimStackTrace(), configuration.getRerunFailingTestsCount(),
+                configuration.getTestClassMethodRunHistory(), configuration.getXsdSchemaLocation() );
     }
 }
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/DefaultStatelessReporter.java b/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/SourceNameType.java
similarity index 57%
copy from maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/DefaultStatelessReporter.java
copy to surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/SourceNameType.java
index 744edc4..dc49f48 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/DefaultStatelessReporter.java
+++ b/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/SourceNameType.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.surefire.extensions;
+package org.apache.maven.surefire.extensions;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,21 +19,21 @@ package org.apache.maven.plugin.surefire.extensions;
  * under the License.
  */
 
-import org.apache.maven.surefire.extensions.StatelessReportEventListener;
-import org.apache.maven.surefire.extensions.StatelessReporter;
-
 /**
- * author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
+ * Naming conventions for report file, report class and method name.
+ *
+ * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
  * @since 3.0.0-M4
  */
-public class DefaultStatelessReporter
-        extends StatelessReporter<StatelessReporterEvent, DefaultStatelessReportMojoConfiguration>
+public enum SourceNameType
 {
+    /**
+     * Fully qualified Java class or name.
+     */
+    DEFAULT,
 
-    @Override
-    public StatelessReportEventListener<StatelessReporterEvent> createStatelessReportEventListener(
-            DefaultStatelessReportMojoConfiguration configuration )
-    {
-        return null;
-    }
+    /**
+     * Human readable text, see JUnit5 annotation <em>DisplayName</em>.
+     */
+    PHRASED
 }
diff --git a/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/StatelessReporter.java b/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/StatelessReporter.java
index ab87bcc..a8f8586 100644
--- a/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/StatelessReporter.java
+++ b/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/StatelessReporter.java
@@ -22,6 +22,8 @@ package org.apache.maven.surefire.extensions;
 import java.util.EventObject;
 
 /**
+ * Extension for stateless reporter.
+ *
  * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
  * @since 3.0.0-M4
  * @param <T> Generic type of event type
@@ -30,6 +32,16 @@ import java.util.EventObject;
 public abstract class StatelessReporter<T extends EventObject, C extends StatelessReportMojoConfiguration>
 {
     private boolean disableXmlReport;
+    private SourceNameType useFileName;
+    private SourceNameType useTestCaseClassName;
+    private SourceNameType useTestCaseMethodName;
+
+    /**
+     * Creates reporter.
+     *
+     * @return reporter object
+     */
+    public abstract StatelessReportEventListener<T> createStatelessReportEventListener( C configuration );
 
     public boolean isDisableXmlReport()
     {
@@ -41,16 +53,44 @@ public abstract class StatelessReporter<T extends EventObject, C extends Statele
         this.disableXmlReport = disableXmlReport;
     }
 
-    /**
-     * Creates reporter.
-     *
-     * @return reporter object
-     */
-    public abstract StatelessReportEventListener<T> createStatelessReportEventListener( C configuration );
+    public SourceNameType getUseFileName()
+    {
+        return useFileName;
+    }
+
+    public void setUseFileName( SourceNameType useFileName )
+    {
+        this.useFileName = useFileName;
+    }
+
+    public SourceNameType getUseTestCaseClassName()
+    {
+        return useTestCaseClassName;
+    }
+
+    public void setUseTestCaseClassName( SourceNameType useTestCaseClassName )
+    {
+        this.useTestCaseClassName = useTestCaseClassName;
+    }
+
+    public SourceNameType getUseTestCaseMethodName()
+    {
+        return useTestCaseMethodName;
+    }
+
+    public void setUseTestCaseMethodName( SourceNameType useTestCaseMethodName )
+    {
+        this.useTestCaseMethodName = useTestCaseMethodName;
+    }
 
     @Override
     public String toString()
     {
-        return "StatelessReporter{" + "disableXmlReport=" + disableXmlReport + '}';
+        return "StatelessReporter{"
+                + "disableXmlReport=" + disableXmlReport
+                + ", useFileName=" + useFileName
+                + ", useTestCaseClassName=" + useTestCaseClassName
+                + ", useTestCaseMethodName=" + useTestCaseMethodName
+                + '}';
     }
 }