[openoffice] branch AOO42X updated: Refs #i128455# - updated junit to 4.13.2. updated NamedRequest inner class Suite constructor to match the signature of the super class ParentRunner that was the only constructor until JUnit 4.13. Now ParentRunner has a second constructor that made passing a null arg ambiguous. (#131)

[cmarcum]

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

cmarcum pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/AOO42X by this push:
     new 2b3f926  Refs #i128455# - updated junit to 4.13.2. updated 
NamedRequest inner class Suite constructor to match the signature of the super 
class ParentRunner that was the only constructor until JUnit 4.13.  Now 
ParentRunner has a second constructor that made passing a null arg ambiguous. 
(#131)
2b3f926 is described below

commit 2b3f926ea1fc9b78f8f713c6f9bda1e8cb7e02ed
Author: Carl Marcum <carl.mar...@codebuilders.net>
AuthorDate: Fri Jun 4 16:19:47 2021 -0400

    Refs #i128455# - updated junit to 4.13.2. updated NamedRequest inner class 
Suite constructor to match the signature of the super class ParentRunner that 
was the only constructor until JUnit 4.13.  Now ParentRunner has a second 
constructor that made passing a null arg ambiguous. (#131)
---
 test/build.xml                                                    | 2 +-
 .../source/org/openoffice/test/common/NamedRequest.java           | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/build.xml b/test/build.xml
index 6a9635b..e68009b 100644
--- a/test/build.xml
+++ b/test/build.xml
@@ -27,7 +27,7 @@
        <property name="junit.home" value="${env.JUNIT_HOME}" />
        <property name="dist.dir" value="." />
        <property name="dist.name" value="aoo_test" />
-       <property name="junit.jar.repos" 
value="https://repo1.maven.org/maven2/junit/junit/4.12/junit-4.12.jar"; />
+       <property name="junit.jar.repos" 
value="https://repo1.maven.org/maven2/junit/junit/4.13.2/junit-4.13.2.jar"; />
        <property name="hamcrest.jar.repos" 
value="https://repo1.maven.org/maven2/org/hamcrest/hamcrest/2.2/hamcrest-2.2.jar";
 />
        
        <path id="uno.classpath">
diff --git 
a/test/testcommon/source/org/openoffice/test/common/NamedRequest.java 
b/test/testcommon/source/org/openoffice/test/common/NamedRequest.java
index dbfbe55..32391e6 100644
--- a/test/testcommon/source/org/openoffice/test/common/NamedRequest.java
+++ b/test/testcommon/source/org/openoffice/test/common/NamedRequest.java
@@ -55,7 +55,7 @@ public class NamedRequest extends Request {
                                name = name.substring(0, 128) + "...";
                        }
                }
-               suite = new Suite(name);
+               suite = new Suite(null, name);
                return arg;
        }
        
@@ -156,9 +156,9 @@ public class NamedRequest extends Request {
                protected final List<Runner> fRunners = new ArrayList<Runner>();
 
                protected String name;
-               
-               protected Suite(String name) throws InitializationError {
-                       super(null);
+
+               protected Suite(Class<?> testClass, String name) throws 
InitializationError {
+                       super(testClass);
                        this.name = name;
                }