Accepting request 1208207 from Java:packages

3.5.1

OBS-URL: https://build.opensuse.org/request/show/1208207
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/maven-surefire?expand=0&rev=12
This commit is contained in:
Ana Guerrero 2024-10-16 21:46:20 +00:00 committed by Git OBS Bridge
commit dc712e8347
13 changed files with 3772 additions and 804 deletions

View File

@ -1,33 +1,249 @@
From 2506b32ba90ef0e336f088e7aa8c12d3273ba242 Mon Sep 17 00:00:00 2001 From 71bca819927dcd976ece1aab6cdb9ddd4aab8a09 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com> From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 10 Jul 2017 10:37:50 +0200 Date: Mon, 10 Jul 2017 10:37:50 +0200
Subject: [PATCH 1/4] Port to TestNG 7.4.0 Subject: [PATCH 1/2] Port to TestNG 7.4.0
--- ---
pom.xml | 2 +- pom.xml | 2 +-
.../surefire-testng-utils/pom.xml | 1 -
.../java/testng/utils/MethodSelectorTest.java | 106 ++++++++++++++++--
surefire-providers/surefire-testng/pom.xml | 1 - surefire-providers/surefire-testng/pom.xml | 1 -
.../maven/surefire/testng/conf/AbstractDirectConfigurator.java | 2 +- .../maven/surefire/testng/TestNGReporter.java | 4 -
.../maven/surefire/testng/conf/TestNGMapConfigurator.java | 2 +- .../conf/AbstractDirectConfigurator.java | 2 +-
4 files changed, 3 insertions(+), 4 deletions(-) .../testng/conf/TestNGMapConfigurator.java | 9 +-
.../surefire/testng/TestNGReporterTest.java | 4 +-
.../conf/TestNGMapConfiguratorTest.java | 6 +-
9 files changed, 104 insertions(+), 31 deletions(-)
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index cb15de8f7..2f9a061e7 100644 index 432d7ebae..75a61b38e 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -97,7 +97,7 @@ @@ -98,7 +98,7 @@
<mavenSharedUtilsVersion>3.3.4</mavenSharedUtilsVersion> <mavenSharedUtilsVersion>3.3.4</mavenSharedUtilsVersion>
<powermockVersion>2.0.9</powermockVersion> <powermockVersion>2.0.9</powermockVersion>
<jacocoVersion>0.8.11</jacocoVersion> <jacocoVersion>0.8.12</jacocoVersion>
- <testngVersion>5.11</testngVersion> - <testngVersion>5.11</testngVersion>
+ <testngVersion>7.4.0</testngVersion> + <testngVersion>7.4.0</testngVersion>
<surefire-shared-utils.version>${project.version}</surefire-shared-utils.version> <surefire-shared-utils.version>${project.version}</surefire-shared-utils.version>
<maven.surefire.scm.devConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-surefire.git</maven.surefire.scm.devConnection> <maven.surefire.scm.devConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-surefire.git</maven.surefire.scm.devConnection>
<maven.site.path>surefire-archives/surefire-LATEST</maven.site.path> <maven.site.path>surefire-archives/surefire-LATEST</maven.site.path>
diff --git a/surefire-providers/surefire-testng-utils/pom.xml b/surefire-providers/surefire-testng-utils/pom.xml
index 2816d9329..fbb357d02 100644
--- a/surefire-providers/surefire-testng-utils/pom.xml
+++ b/surefire-providers/surefire-testng-utils/pom.xml
@@ -47,7 +47,6 @@
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>${testngVersion}</version>
- <classifier>jdk15</classifier>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/surefire-providers/surefire-testng-utils/src/test/java/testng/utils/MethodSelectorTest.java b/surefire-providers/surefire-testng-utils/src/test/java/testng/utils/MethodSelectorTest.java
index c0e7838bd..5f180624d 100644
--- a/surefire-providers/surefire-testng-utils/src/test/java/testng/utils/MethodSelectorTest.java
+++ b/surefire-providers/surefire-testng-utils/src/test/java/testng/utils/MethodSelectorTest.java
@@ -19,6 +19,10 @@
package testng.utils;
import java.lang.reflect.Method;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
import junit.framework.TestCase;
import org.apache.maven.surefire.api.testset.TestListResolver;
@@ -27,7 +31,11 @@
import org.testng.IRetryAnalyzer;
import org.testng.ITestClass;
import org.testng.ITestNGMethod;
+import org.testng.ITestResult;
+import org.testng.internal.ConstructorOrMethod;
import org.testng.internal.DefaultMethodSelectorContext;
+import org.testng.internal.reflect.ReflectionHelper;
+import org.testng.xml.XmlTest;
/**
*
@@ -65,16 +73,26 @@ public void testInclusionOfMethodFromSubClass() {
}
private static class FakeTestNGMethod implements ITestNGMethod {
+ private final ConstructorOrMethod consMethod;
private final Class<?> clazz;
private final String methodName;
FakeTestNGMethod(Class<?> clazz, String methodName) {
+ ConstructorOrMethod temp = null;
+ Method[] methods = ReflectionHelper.getLocalMethods(clazz);
+ for (Method method : methods) {
+ if (method.getName().equalsIgnoreCase(methodName)) {
+ temp = new ConstructorOrMethod(method);
+ break;
+ }
+ }
this.clazz = clazz;
this.methodName = methodName;
+ this.consMethod = temp;
}
@Override
- public Class getRealClass() {
+ public Class<?> getRealClass() {
return clazz;
}
@@ -86,19 +104,14 @@ public ITestClass getTestClass() {
@Override
public void setTestClass(ITestClass iTestClass) {}
- @Override
- public Method getMethod() {
- return null;
- }
-
@Override
public String getMethodName() {
return methodName;
}
@Override
- public Object[] getInstances() {
- return new Object[0];
+ public Object getInstance() {
+ return null;
}
@Override
@@ -202,6 +215,9 @@ public long getTimeOut() {
return 0;
}
+ @Override
+ public void setTimeOut(long timeOut) {}
+
@Override
public int getInvocationCount() {
return 0;
@@ -249,11 +265,19 @@ public int getThreadPoolSize() {
@Override
public void setThreadPoolSize(int i) {}
+ @Override
+ public boolean getEnabled() {
+ return false;
+ }
+
@Override
public String getDescription() {
return null;
}
+ @Override
+ public void setDescription(String description) {}
+
@Override
public void incrementCurrentInvocationCount() {}
@@ -270,6 +294,14 @@ public int getParameterInvocationCount() {
return 0;
}
+ @Override
+ public void setMoreInvocationChecker(Callable<Boolean> moreInvocationChecker) {}
+
+ @Override
+ public boolean hasMoreInvocation() {
+ return false;
+ }
+
@Override
public ITestNGMethod clone() {
try {
@@ -280,12 +312,17 @@ public ITestNGMethod clone() {
}
@Override
- public IRetryAnalyzer getRetryAnalyzer() {
+ public IRetryAnalyzer getRetryAnalyzer(ITestResult result) {
+ return null;
+ }
+
+ @Override
+ public Class<? extends IRetryAnalyzer> getRetryAnalyzerClass() {
return null;
}
@Override
- public void setRetryAnalyzer(IRetryAnalyzer iRetryAnalyzer) {}
+ public void setRetryAnalyzerClass(Class<? extends IRetryAnalyzer> clazz) {}
@Override
public boolean skipFailedInvocations() {
@@ -309,8 +346,55 @@ public boolean ignoreMissingDependencies() {
public void setIgnoreMissingDependencies(boolean b) {}
@Override
- public int compareTo(Object o) {
+ public List<Integer> getInvocationNumbers() {
+ return Collections.emptyList();
+ }
+
+ @Override
+ public void setInvocationNumbers(List<Integer> numbers) {}
+
+ @Override
+ public void addFailedInvocationNumber(int number) {}
+
+ @Override
+ public List<Integer> getFailedInvocationNumbers() {
+ return Collections.emptyList();
+ }
+
+ @Override
+ public int getPriority() {
+ return 0;
+ }
+
+ @Override
+ public void setPriority(int priority) {}
+
+ @Override
+ public int getInterceptedPriority() {
return 0;
}
+
+ @Override
+ public void setInterceptedPriority(int priority) {}
+
+ @Override
+ public XmlTest getXmlTest() {
+ return null;
+ }
+
+ @Override
+ public ConstructorOrMethod getConstructorOrMethod() {
+ return consMethod;
+ }
+
+ @Override
+ public Map<String, String> findMethodParameters(XmlTest test) {
+ return test.getLocalParameters();
+ }
+
+ @Override
+ public String getQualifiedName() {
+ return null;
+ }
}
}
diff --git a/surefire-providers/surefire-testng/pom.xml b/surefire-providers/surefire-testng/pom.xml diff --git a/surefire-providers/surefire-testng/pom.xml b/surefire-providers/surefire-testng/pom.xml
index c7633d60c..00f22400c 100644 index aa23267c3..33b1ef76f 100644
--- a/surefire-providers/surefire-testng/pom.xml --- a/surefire-providers/surefire-testng/pom.xml
+++ b/surefire-providers/surefire-testng/pom.xml +++ b/surefire-providers/surefire-testng/pom.xml
@@ -56,7 +56,6 @@ @@ -57,7 +57,6 @@
<groupId>org.testng</groupId> <groupId>org.testng</groupId>
<artifactId>testng</artifactId> <artifactId>testng</artifactId>
<version>${testngVersion}</version> <version>${testngVersion}</version>
@ -35,8 +251,23 @@ index c7633d60c..00f22400c 100644
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java
index ec887b792..3021a4049 100644
--- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java
+++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java
@@ -59,10 +59,6 @@ public class TestNGReporter
/**
* Constructs a new instance that will listen to
* test updates from a {@link org.testng.TestNG} class instance.
- * <br>
- * <br>It is assumed that the requisite {@link org.testng.TestNG#addListener(ITestListener)}
- * method call has already associated with this instance <i>before</i> the test
- * suite is run.
*
* @param reportManager Instance to report suite status to
*/
diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java
index b73b9bacd..ab187b6d5 100644 index b73b9bacd..6ab5a626d 100644
--- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java --- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java
+++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java +++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java
@@ -57,7 +57,7 @@ public void configure(TestNG testng, Map<String, String> options) throws TestSet @@ -57,7 +57,7 @@ public void configure(TestNG testng, Map<String, String> options) throws TestSet
@ -49,10 +280,24 @@ index b73b9bacd..ab187b6d5 100644
@Override @Override
diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java
index d91e76afc..06dbd2316 100755 index d91e76afc..4bb4fe0b0 100755
--- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java --- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java
+++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java +++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java
@@ -71,7 +71,7 @@ protected void configureThreadCount(XmlSuite suite, Map<String, String> options) @@ -33,12 +33,7 @@
/**
* TestNG configurator for 5.3+ versions. TestNG exposes a {@link org.testng.TestNG#configure(java.util.Map)} method.
- * All supported TestNG options are passed in String format, except
- * {@link org.testng.TestNGCommandLineArgs#LISTENER_COMMAND_OPT} which is {@link java.util.List List&gt;Class&lt;},
- * {@link org.testng.TestNGCommandLineArgs#JUNIT_DEF_OPT} which is a {@link Boolean},
- * {@link org.testng.TestNGCommandLineArgs#SKIP_FAILED_INVOCATION_COUNT_OPT} which is a {@link Boolean},
- * {@link org.testng.TestNGCommandLineArgs#OBJECT_FACTORY_COMMAND_OPT} which is a {@link Class},
- * {@link org.testng.TestNGCommandLineArgs#REPORTERS_LIST} which is a {@link java.util.List List&gt;ReporterConfig&lt;}.
+ * All supported TestNG options are passed in String format.
* <br>
* Test classes and/or suite files are not passed along as options parameters, but configured separately.
*
@@ -71,7 +66,7 @@ protected void configureThreadCount(XmlSuite suite, Map<String, String> options)
protected void configureParallel(XmlSuite suite, Map<String, String> options) throws TestSetFailedException { protected void configureParallel(XmlSuite suite, Map<String, String> options) throws TestSetFailedException {
String parallel = options.get(PARALLEL_PROP); String parallel = options.get(PARALLEL_PROP);
if (parallel != null) { if (parallel != null) {
@ -61,6 +306,52 @@ index d91e76afc..06dbd2316 100755
} }
} }
-- diff --git a/surefire-providers/surefire-testng/src/test/java/org/apache/maven/surefire/testng/TestNGReporterTest.java b/surefire-providers/surefire-testng/src/test/java/org/apache/maven/surefire/testng/TestNGReporterTest.java
2.44.0 index 514ecf9f8..5b201d765 100644
--- a/surefire-providers/surefire-testng/src/test/java/org/apache/maven/surefire/testng/TestNGReporterTest.java
+++ b/surefire-providers/surefire-testng/src/test/java/org/apache/maven/surefire/testng/TestNGReporterTest.java
@@ -129,7 +129,7 @@ public void testOnTestFailure() {
ITestResult testResult = mock(ITestResult.class);
when(testResult.getThrowable()).thenReturn(stackTrace);
- when(cls.getRealClass()).thenReturn(getClass());
+ when((Object) cls.getRealClass()).thenReturn(getClass());
when(testResult.getTestClass()).thenReturn(cls);
when(testResult.getMethod()).thenReturn(method);
when(testResult.getName()).thenReturn("myTest");
@@ -200,7 +200,7 @@ public void testOnTestFailedButWithinSuccessPercentage() {
ITestResult testResult = mock(ITestResult.class);
when(testResult.getThrowable()).thenReturn(stackTrace);
- when(cls.getRealClass()).thenReturn(getClass());
+ when((Object) cls.getRealClass()).thenReturn(getClass());
when(testResult.getTestClass()).thenReturn(cls);
when(testResult.getMethod()).thenReturn(method);
when(testResult.getName()).thenReturn("myTest");
diff --git a/surefire-providers/surefire-testng/src/test/java/org/apache/maven/surefire/testng/conf/TestNGMapConfiguratorTest.java b/surefire-providers/surefire-testng/src/test/java/org/apache/maven/surefire/testng/conf/TestNGMapConfiguratorTest.java
index 097a74d1e..8b34db85d 100755
--- a/surefire-providers/surefire-testng/src/test/java/org/apache/maven/surefire/testng/conf/TestNGMapConfiguratorTest.java
+++ b/surefire-providers/surefire-testng/src/test/java/org/apache/maven/surefire/testng/conf/TestNGMapConfiguratorTest.java
@@ -24,7 +24,7 @@
import junit.framework.TestCase;
import org.apache.maven.surefire.api.testset.TestSetFailedException;
-import org.testng.ReporterConfig;
+import org.testng.internal.ReporterConfig;
/**
* @author Kristian Rosenvold
@@ -62,8 +62,8 @@ public void testGroupByInstances() throws Exception {
public void testReporter() throws Exception {
Map<String, Object> convertedOptions = getConvertedOptions("reporter", "classname");
- List<ReporterConfig> reporter = (List) convertedOptions.get("-reporterslist");
- ReporterConfig reporterConfig = reporter.get(0);
+ String reporter = (String) convertedOptions.get("-reporterslist");
+ ReporterConfig reporterConfig = ReporterConfig.deserialize(reporter);
assertEquals("classname", reporterConfig.getClassName());
}
--
2.46.1

1972
0002-Unshade-surefire.patch Normal file

File diff suppressed because it is too large Load Diff

View File

@ -2,7 +2,7 @@
<service name="tar_scm" mode="disabled"> <service name="tar_scm" mode="disabled">
<param name="scm">git</param> <param name="scm">git</param>
<param name="url">https://github.com/apache/maven-surefire.git</param> <param name="url">https://github.com/apache/maven-surefire.git</param>
<param name="revision">surefire-3.2.5</param> <param name="revision">surefire-3.5.1</param>
<param name="match-tag">surefire-*</param> <param name="match-tag">surefire-*</param>
<param name="versionformat">@PARENT_TAG@</param> <param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">surefire-(.*)</param> <param name="versionrewrite-pattern">surefire-(.*)</param>

BIN
maven-surefire-3.2.5.tar.xz (Stored with Git LFS)

Binary file not shown.

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:842f80efec4d3e2b65b3e43c910a002b3873279d41d6dce1fec8afa738c9f8ad
size 911104

File diff suppressed because it is too large Load Diff

BIN
maven-surefire-build.tar.xz (Stored with Git LFS)

Binary file not shown.

View File

@ -1,3 +1,81 @@
-------------------------------------------------------------------
Thu Oct 3 14:33:33 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Upgrade to 3.5.1
* Bug
+ SUREFIRE-1737: Disabling the JUnit5Xml30StatelessReporter has
no effect
+ SUREFIRE-2257: [REGRESSION] NPEx: Cannot invoke
"Object.toString()" because "value" is null
+ SUREFIRE-2267: Packages for commons-codec should be relocated
in surefire-shared-utils
+ SUREFIRE-2268: Tests run under classpath if JDK 23 is used
* Improvement
+ SUREFIRE-2264: Limit usage of commons-io from
surefire-shared-utils
+ SUREFIRE-2266: Execute ITs in parallel
+ SUREFIRE-2270: Use JUnit5 in surefire-shadefire
- Upgrade to 3.5.0
* Improvement
+ SUREFIRE-2227: Dynamically calculate xrefTestLocation
* Task
+ SUREFIRE-2161: Align Mojo class names and output names
- Upgrade to 3.4.0
* Bug
+ SUREFIRE-2251: [REGRESSION] java.lang.NoSuchMethodException:
org.apache.maven.plugin.surefire.StartupReportConfiguration
.<init>
+ SUREFIRE-2253: [REGRESSION] Bump
org.apache.commons:commons-compress from 1.26.0 to 1.26.1
causes hang
* Improvement
+ SUREFIRE-1385: System properties defined in the Surefire and
Failsafe plugin configuration should override user properties
- Upgrade to 3.3.1
* Bug
+ SUREFIRE-2105: Failsafe report size increased with version
upgrade from 2.17 to 2.22.2
+ SUREFIRE-2242: Plain test report does not include names of the
skipped tests
+ SUREFIRE-2250: Surefire Test Report Schema properties element
is not consistent with the code
* Improvement
+ SUREFIRE-1360: Ability to disable properties for successfully
passed tests
+ SUREFIRE-1934: Ability to disable system-out/system-err for
successfully passed tests
+ SUREFIRE-2124: Avoid creating unnecessary target files for pom
projects
+ SUREFIRE-2249: Doc for 'properties' parameter does not mention
JUnit
- Upgrade to 3.3.0
* Bug
+ SUREFIRE-1939: Build fails if java.home has <=2 path
components
+ SUREFIRE-2232: [REGRESSION] StatelessXmlReporter fails to
process failed result without a throwable
+ SUREFIRE-2240: Using JUnit BOM prevents upgrading the engine
version via plugin dependency
* Improvement
+ SUREFIRE-2248: Make "type" attribute on failures and errors in
(surefire|failsafe)-test-report schema optional
* Test
+ SUREFIRE-2141: Surefire 3.0.0-M8 tests don't pass on Mac M1
(Surefire1295AttributeJvmCrashesToTestsIT)
* Task
+ SUREFIRE-2244: Make IT for SUREFIRE-1295 reliable
+ SUREFIRE-2246: Clean up dependencies reported by
dependencies:analyze
- Modified patches:
* maven-surefire-bootstrap-resources.patch
+ regenerate from non-bootstrap build
* 0001-Port-to-TestNG-7.4.0.patch
+ rediff and augment to make the test pass in upstream evironment
- Added patch:
* 0002-Unshade-surefire.patch
+ remove the use of the shaded surefire-shared-utils artifact
in favour of direct use of the dependencies
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Apr 10 10:54:02 UTC 2024 - Fridrich Strba <fstrba@suse.com> Wed Apr 10 10:54:02 UTC 2024 - Fridrich Strba <fstrba@suse.com>

View File

@ -18,7 +18,7 @@
%global base_name maven-surefire %global base_name maven-surefire
Name: %{base_name}-plugins Name: %{base_name}-plugins
Version: 3.2.5 Version: 3.5.1
Release: 0 Release: 0
Summary: Test framework project Summary: Test framework project
License: Apache-2.0 AND CPL-1.0 License: Apache-2.0 AND CPL-1.0
@ -28,6 +28,7 @@ Source0: %{base_name}-%{version}.tar.xz
Source1: https://www.apache.org/licenses/LICENSE-2.0.txt Source1: https://www.apache.org/licenses/LICENSE-2.0.txt
Source2: https://www.eclipse.org/legal/cpl-v10.html Source2: https://www.eclipse.org/legal/cpl-v10.html
Patch0: 0001-Port-to-TestNG-7.4.0.patch Patch0: 0001-Port-to-TestNG-7.4.0.patch
Patch1: 0002-Unshade-surefire.patch
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: java-devel >= 1.8 BuildRequires: java-devel >= 1.8
BuildRequires: maven-local BuildRequires: maven-local
@ -35,15 +36,25 @@ BuildRequires: mvn(org.apache.maven.doxia:doxia-core)
BuildRequires: mvn(org.apache.maven.doxia:doxia-sink-api) BuildRequires: mvn(org.apache.maven.doxia:doxia-sink-api)
BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-api)
BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-impl) BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-impl)
BuildRequires: mvn(org.apache.maven.resolver:maven-resolver-api)
BuildRequires: mvn(org.apache.maven.shared:maven-shared-utils)
BuildRequires: mvn(org.apache.maven.surefire:maven-surefire-common) BuildRequires: mvn(org.apache.maven.surefire:maven-surefire-common)
BuildRequires: mvn(org.apache.maven.surefire:surefire-api)
BuildRequires: mvn(org.apache.maven.surefire:surefire-booter)
BuildRequires: mvn(org.apache.maven.surefire:surefire-extensions-api)
BuildRequires: mvn(org.apache.maven.surefire:surefire-logger-api)
BuildRequires: mvn(org.apache.maven.surefire:surefire-report-parser) BuildRequires: mvn(org.apache.maven.surefire:surefire-report-parser)
BuildRequires: mvn(org.apache.maven:maven-artifact)
BuildRequires: mvn(org.apache.maven:maven-core) BuildRequires: mvn(org.apache.maven:maven-core)
BuildRequires: mvn(org.apache.maven:maven-model) BuildRequires: mvn(org.apache.maven:maven-model)
BuildRequires: mvn(org.apache.maven:maven-parent:pom:) BuildRequires: mvn(org.apache.maven:maven-parent:pom:)
BuildRequires: mvn(org.apache.maven:maven-plugin-api) BuildRequires: mvn(org.apache.maven:maven-plugin-api)
BuildRequires: mvn(org.apache.maven:maven-settings)
BuildRequires: mvn(org.codehaus.plexus:plexus-i18n)
BuildRequires: mvn(org.codehaus.plexus:plexus-interpolation)
BuildRequires: mvn(org.codehaus.plexus:plexus-xml) BuildRequires: mvn(org.codehaus.plexus:plexus-xml)
BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus)
BuildRequires: mvn(org.fusesource.jansi:jansi) BuildRequires: mvn(org.fusesource.jansi:jansi)
#!BuildRequires: maven-compiler-plugin-bootstrap #!BuildRequires: maven-compiler-plugin-bootstrap
#!BuildRequires: maven-jar-plugin-bootstrap #!BuildRequires: maven-jar-plugin-bootstrap
@ -102,31 +113,27 @@ Javadoc for %{name}.
cp -p %{SOURCE1} %{SOURCE2} . cp -p %{SOURCE1} %{SOURCE2} .
%patch -P 0 -p1 %patch -P 0 -p1
#patch -P 1 -p1 %patch -P 1 -p1
# Disable strict doclint # Disable strict doclint
sed -i /-Xdoclint:all/d pom.xml sed -i /-Xdoclint:all/d pom.xml
%pom_remove_dep org.junit:junit-bom
%pom_disable_module surefire-shadefire
%pom_remove_dep -r org.apache.maven.surefire:surefire-shadefire
# Help plugin is needed only to evaluate effective Maven settings.
# For building RPM package default settings will suffice.
%pom_remove_plugin :maven-help-plugin surefire-its
# QA plugin useful only for upstream # QA plugin useful only for upstream
%pom_remove_plugin -r :jacoco-maven-plugin %pom_remove_plugin -r :jacoco-maven-plugin
# Not wanted # Not wanted
%pom_remove_plugin -r :maven-shade-plugin %pom_remove_plugin -r :maven-shade-plugin
find -name *.java -exec sed -i -e s/org.apache.maven.surefire.shared.utils/org.apache.maven.shared.utils/ -e s/org.apache.maven.surefire.shared.io/org.apache.commons.io/ -e s/org.apache.maven.surefire.shared.lang3/org.apache.commons.lang3/ -e s/org.apache.maven.surefire.shared.compress/org.apache.commons.compress/ {} \;
# Not packaged # Not packaged
%pom_remove_plugin -r :animal-sniffer-maven-plugin %pom_remove_plugin -r :animal-sniffer-maven-plugin
# Complains # Complains
%pom_remove_plugin -r :apache-rat-plugin %pom_remove_plugin -r :apache-rat-plugin
%pom_disable_module surefire-shadefire
%pom_remove_dep -r :surefire-shadefire
# Help plugin is needed only to evaluate effective Maven settings.
# For building RPM package default settings will suffice.
%pom_remove_plugin :maven-help-plugin surefire-its
# We don't need site-source # We don't need site-source
%pom_remove_plugin :maven-assembly-plugin maven-surefire-plugin %pom_remove_plugin :maven-assembly-plugin maven-surefire-plugin
%pom_remove_dep -r ::::site-source %pom_remove_dep -r ::::site-source
@ -136,13 +143,12 @@ for module in \
maven-surefire-common \ maven-surefire-common \
surefire-api \ surefire-api \
surefire-booter \ surefire-booter \
surefire-grouper \
surefire-extensions-api \ surefire-extensions-api \
surefire-extensions-spi \ surefire-extensions-spi \
surefire-grouper \
surefire-its \ surefire-its \
surefire-logger-api \ surefire-logger-api \
surefire-providers \ surefire-providers \
surefire-shared-utils \
surefire-report-parser; do surefire-report-parser; do
%pom_disable_module ${module} %pom_disable_module ${module}
done done

View File

@ -1,3 +1,81 @@
-------------------------------------------------------------------
Thu Oct 3 14:33:33 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Upgrade to 3.5.1
* Bug
+ SUREFIRE-1737: Disabling the JUnit5Xml30StatelessReporter has
no effect
+ SUREFIRE-2257: [REGRESSION] NPEx: Cannot invoke
"Object.toString()" because "value" is null
+ SUREFIRE-2267: Packages for commons-codec should be relocated
in surefire-shared-utils
+ SUREFIRE-2268: Tests run under classpath if JDK 23 is used
* Improvement
+ SUREFIRE-2264: Limit usage of commons-io from
surefire-shared-utils
+ SUREFIRE-2266: Execute ITs in parallel
+ SUREFIRE-2270: Use JUnit5 in surefire-shadefire
- Upgrade to 3.5.0
* Improvement
+ SUREFIRE-2227: Dynamically calculate xrefTestLocation
* Task
+ SUREFIRE-2161: Align Mojo class names and output names
- Upgrade to 3.4.0
* Bug
+ SUREFIRE-2251: [REGRESSION] java.lang.NoSuchMethodException:
org.apache.maven.plugin.surefire.StartupReportConfiguration
.<init>
+ SUREFIRE-2253: [REGRESSION] Bump
org.apache.commons:commons-compress from 1.26.0 to 1.26.1
causes hang
* Improvement
+ SUREFIRE-1385: System properties defined in the Surefire and
Failsafe plugin configuration should override user properties
- Upgrade to 3.3.1
* Bug
+ SUREFIRE-2105: Failsafe report size increased with version
upgrade from 2.17 to 2.22.2
+ SUREFIRE-2242: Plain test report does not include names of the
skipped tests
+ SUREFIRE-2250: Surefire Test Report Schema properties element
is not consistent with the code
* Improvement
+ SUREFIRE-1360: Ability to disable properties for successfully
passed tests
+ SUREFIRE-1934: Ability to disable system-out/system-err for
successfully passed tests
+ SUREFIRE-2124: Avoid creating unnecessary target files for pom
projects
+ SUREFIRE-2249: Doc for 'properties' parameter does not mention
JUnit
- Upgrade to 3.3.0
* Bug
+ SUREFIRE-1939: Build fails if java.home has <=2 path
components
+ SUREFIRE-2232: [REGRESSION] StatelessXmlReporter fails to
process failed result without a throwable
+ SUREFIRE-2240: Using JUnit BOM prevents upgrading the engine
version via plugin dependency
* Improvement
+ SUREFIRE-2248: Make "type" attribute on failures and errors in
(surefire|failsafe)-test-report schema optional
* Test
+ SUREFIRE-2141: Surefire 3.0.0-M8 tests don't pass on Mac M1
(Surefire1295AttributeJvmCrashesToTestsIT)
* Task
+ SUREFIRE-2244: Make IT for SUREFIRE-1295 reliable
+ SUREFIRE-2246: Clean up dependencies reported by
dependencies:analyze
- Modified patches:
* maven-surefire-bootstrap-resources.patch
+ regenerate from non-bootstrap build
* 0001-Port-to-TestNG-7.4.0.patch
+ rediff and augment to make the test pass in upstream evironment
- Added patch:
* 0002-Unshade-surefire.patch
+ remove the use of the shaded surefire-shared-utils artifact
in favour of direct use of the dependencies
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Apr 10 10:54:02 UTC 2024 - Fridrich Strba <fstrba@suse.com> Wed Apr 10 10:54:02 UTC 2024 - Fridrich Strba <fstrba@suse.com>

View File

@ -18,7 +18,7 @@
%global base_name maven-surefire %global base_name maven-surefire
Name: %{base_name}-provider-junit5 Name: %{base_name}-provider-junit5
Version: 3.2.5 Version: 3.5.1
Release: 0 Release: 0
Summary: JUnit 5 provider for Maven Surefire Summary: JUnit 5 provider for Maven Surefire
License: Apache-2.0 AND CPL-1.0 License: Apache-2.0 AND CPL-1.0
@ -28,11 +28,13 @@ Source0: %{base_name}-%{version}.tar.xz
Source1: https://www.apache.org/licenses/LICENSE-2.0.txt Source1: https://www.apache.org/licenses/LICENSE-2.0.txt
Source2: https://www.eclipse.org/legal/cpl-v10.html Source2: https://www.eclipse.org/legal/cpl-v10.html
Patch0: 0001-Port-to-TestNG-7.4.0.patch Patch0: 0001-Port-to-TestNG-7.4.0.patch
Patch1: 0002-Unshade-surefire.patch
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: java-devel >= 1.8 BuildRequires: java-devel >= 1.8
BuildRequires: maven-local BuildRequires: maven-local
BuildRequires: mvn(org.apache.maven.surefire:common-java5) BuildRequires: mvn(org.apache.maven.surefire:common-java5)
BuildRequires: mvn(org.apache.maven:maven-parent:pom:) BuildRequires: mvn(org.apache.maven:maven-parent:pom:)
BuildRequires: mvn(org.junit.platform:junit-platform-engine)
BuildRequires: mvn(org.junit.platform:junit-platform-launcher) BuildRequires: mvn(org.junit.platform:junit-platform-launcher)
# PpidChecker relies on /usr/bin/ps to check process uptime # PpidChecker relies on /usr/bin/ps to check process uptime
Requires: procps Requires: procps
@ -53,31 +55,27 @@ Javadoc for %{name}.
cp -p %{SOURCE1} %{SOURCE2} . cp -p %{SOURCE1} %{SOURCE2} .
%patch -P 0 -p1 %patch -P 0 -p1
#patch -P 1 -p1 %patch -P 1 -p1
# Disable strict doclint # Disable strict doclint
sed -i /-Xdoclint:all/d pom.xml sed -i /-Xdoclint:all/d pom.xml
%pom_remove_dep org.junit:junit-bom
%pom_disable_module surefire-shadefire
%pom_remove_dep -r org.apache.maven.surefire:surefire-shadefire
# Help plugin is needed only to evaluate effective Maven settings.
# For building RPM package default settings will suffice.
%pom_remove_plugin :maven-help-plugin surefire-its
# QA plugin useful only for upstream # QA plugin useful only for upstream
%pom_remove_plugin -r :jacoco-maven-plugin %pom_remove_plugin -r :jacoco-maven-plugin
# Not wanted # Not wanted
%pom_remove_plugin -r :maven-shade-plugin %pom_remove_plugin -r :maven-shade-plugin
find -name *.java -exec sed -i -e s/org.apache.maven.surefire.shared.utils/org.apache.maven.shared.utils/ -e s/org.apache.maven.surefire.shared.io/org.apache.commons.io/ -e s/org.apache.maven.surefire.shared.lang3/org.apache.commons.lang3/ -e s/org.apache.maven.surefire.shared.compress/org.apache.commons.compress/ {} \;
# Not packaged # Not packaged
%pom_remove_plugin -r :animal-sniffer-maven-plugin %pom_remove_plugin -r :animal-sniffer-maven-plugin
# Complains # Complains
%pom_remove_plugin -r :apache-rat-plugin %pom_remove_plugin -r :apache-rat-plugin
%pom_disable_module surefire-shadefire
%pom_remove_dep -r :surefire-shadefire
# Help plugin is needed only to evaluate effective Maven settings.
# For building RPM package default settings will suffice.
%pom_remove_plugin :maven-help-plugin surefire-its
# We don't need site-source # We don't need site-source
%pom_remove_plugin :maven-assembly-plugin maven-surefire-plugin %pom_remove_plugin :maven-assembly-plugin maven-surefire-plugin
%pom_remove_dep -r ::::site-source %pom_remove_dep -r ::::site-source

View File

@ -1,3 +1,82 @@
-------------------------------------------------------------------
Thu Oct 3 14:33:33 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Upgrade to 3.5.1
* Bug
+ SUREFIRE-1737: Disabling the JUnit5Xml30StatelessReporter has
no effect
+ SUREFIRE-2257: [REGRESSION] NPEx: Cannot invoke
"Object.toString()" because "value" is null
+ SUREFIRE-2267: Packages for commons-codec should be relocated
in surefire-shared-utils
+ SUREFIRE-2268: Tests run under classpath if JDK 23 is used
* Improvement
+ SUREFIRE-2264: Limit usage of commons-io from
surefire-shared-utils
+ SUREFIRE-2266: Execute ITs in parallel
+ SUREFIRE-2270: Use JUnit5 in surefire-shadefire
- Upgrade to 3.5.0
* Improvement
+ SUREFIRE-2227: Dynamically calculate xrefTestLocation
* Task
+ SUREFIRE-2161: Align Mojo class names and output names
- Upgrade to 3.4.0
* Bug
+ SUREFIRE-2251: [REGRESSION] java.lang.NoSuchMethodException:
org.apache.maven.plugin.surefire.StartupReportConfiguration
.<init>
+ SUREFIRE-2253: [REGRESSION] Bump
org.apache.commons:commons-compress from 1.26.0 to 1.26.1
causes hang
* Improvement
+ SUREFIRE-1385: System properties defined in the Surefire and
Failsafe plugin configuration should override user properties
- Upgrade to 3.3.1
* Bug
+ SUREFIRE-2105: Failsafe report size increased with version
upgrade from 2.17 to 2.22.2
+ SUREFIRE-2242: Plain test report does not include names of the
skipped tests
+ SUREFIRE-2250: Surefire Test Report Schema properties element
is not consistent with the code
* Improvement
+ SUREFIRE-1360: Ability to disable properties for successfully
passed tests
+ SUREFIRE-1934: Ability to disable system-out/system-err for
successfully passed tests
+ SUREFIRE-2124: Avoid creating unnecessary target files for pom
projects
+ SUREFIRE-2249: Doc for 'properties' parameter does not mention
JUnit
- Upgrade to 3.3.0
* Bug
+ SUREFIRE-1939: Build fails if java.home has <=2 path
components
+ SUREFIRE-2232: [REGRESSION] StatelessXmlReporter fails to
process failed result without a throwable
+ SUREFIRE-2240: Using JUnit BOM prevents upgrading the engine
version via plugin dependency
* Improvement
+ SUREFIRE-2248: Make "type" attribute on failures and errors in
(surefire|failsafe)-test-report schema optional
* Test
+ SUREFIRE-2141: Surefire 3.0.0-M8 tests don't pass on Mac M1
(Surefire1295AttributeJvmCrashesToTestsIT)
* Task
+ SUREFIRE-2244: Make IT for SUREFIRE-1295 reliable
+ SUREFIRE-2246: Clean up dependencies reported by
dependencies:analyze
- Modified patches:
* maven-surefire-bootstrap-resources.patch
+ regenerate from non-bootstrap build
* 0001-Port-to-TestNG-7.4.0.patch
+ rediff and augment to make the test pass in upstream
environment
- Added patch:
* 0002-Unshade-surefire.patch
+ remove the use of the shaded surefire-shared-utils artifact
in favour of direct use of the dependencies
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jun 10 19:00:07 UTC 2024 - Fridrich Strba <fstrba@suse.com> Mon Jun 10 19:00:07 UTC 2024 - Fridrich Strba <fstrba@suse.com>

View File

@ -17,7 +17,7 @@
Name: maven-surefire Name: maven-surefire
Version: 3.2.5 Version: 3.5.1
Release: 0 Release: 0
Summary: Test framework project Summary: Test framework project
License: Apache-2.0 AND CPL-1.0 License: Apache-2.0 AND CPL-1.0
@ -28,6 +28,7 @@ Source1: https://www.apache.org/licenses/LICENSE-2.0.txt
Source2: https://www.eclipse.org/legal/cpl-v10.html Source2: https://www.eclipse.org/legal/cpl-v10.html
Source10: %{name}-build.tar.xz Source10: %{name}-build.tar.xz
Patch0: 0001-Port-to-TestNG-7.4.0.patch Patch0: 0001-Port-to-TestNG-7.4.0.patch
Patch1: 0002-Unshade-surefire.patch
Patch10: %{name}-bootstrap-resources.patch Patch10: %{name}-bootstrap-resources.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: apache-commons-compress BuildRequires: apache-commons-compress
@ -37,21 +38,22 @@ BuildRequires: atinject
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: java-devel >= 1.8 BuildRequires: java-devel >= 1.8
BuildRequires: javacc BuildRequires: javacc
BuildRequires: javapackages-local BuildRequires: javapackages-local >= 6
BuildRequires: jdom
BuildRequires: jsr-305 BuildRequires: jsr-305
BuildRequires: junit BuildRequires: junit
BuildRequires: maven-common-artifact-filters BuildRequires: maven-common-artifact-filters
BuildRequires: maven-doxia-core BuildRequires: maven-doxia-core
BuildRequires: maven-doxia-logging-api
BuildRequires: maven-doxia-sink-api BuildRequires: maven-doxia-sink-api
BuildRequires: maven-doxia-sitetools
BuildRequires: maven-lib BuildRequires: maven-lib
BuildRequires: maven-plugin-annotations BuildRequires: maven-plugin-annotations
BuildRequires: maven-reporting-api BuildRequires: maven-reporting-api
BuildRequires: maven-reporting-impl BuildRequires: maven-reporting-impl
BuildRequires: maven-resolver BuildRequires: maven-resolver-api
BuildRequires: maven-resolver-impl
BuildRequires: maven-resolver-named-locks
BuildRequires: maven-resolver-util
BuildRequires: maven-shared-utils BuildRequires: maven-shared-utils
BuildRequires: plexus-containers-component-annotations
BuildRequires: plexus-i18n BuildRequires: plexus-i18n
BuildRequires: plexus-interpolation BuildRequires: plexus-interpolation
BuildRequires: plexus-languages BuildRequires: plexus-languages
@ -139,32 +141,28 @@ Javadoc for %{name}.
cp -p %{SOURCE1} %{SOURCE2} . cp -p %{SOURCE1} %{SOURCE2} .
%patch -P 0 -p1 %patch -P 0 -p1
#patch -P 1 -p1 %patch -P 1 -p1
%patch -P 10 -p1 %patch -P 10 -p1
# Disable strict doclint # Disable strict doclint
sed -i /-Xdoclint:all/d pom.xml sed -i /-Xdoclint:all/d pom.xml
%pom_remove_dep org.junit:junit-bom # QA plugin useful only for upstream
%pom_remove_plugin -r :jacoco-maven-plugin
# Not wanted
%pom_remove_plugin -r :maven-shade-plugin
# Not packaged
%pom_remove_plugin -r :animal-sniffer-maven-plugin
# Complains
%pom_remove_plugin -r :apache-rat-plugin
%pom_disable_module surefire-shadefire %pom_disable_module surefire-shadefire
%pom_remove_dep -r org.apache.maven.surefire:surefire-shadefire %pom_remove_dep -r :surefire-shadefire
# Help plugin is needed only to evaluate effective Maven settings. # Help plugin is needed only to evaluate effective Maven settings.
# For building RPM package default settings will suffice. # For building RPM package default settings will suffice.
%pom_remove_plugin :maven-help-plugin surefire-its %pom_remove_plugin :maven-help-plugin surefire-its
# QA plugin useful only for upstream
%pom_remove_plugin -r :jacoco-maven-plugin
# Not wanted
%pom_remove_plugin -r :maven-shade-plugin
find -name *.java -exec sed -i -e s/org.apache.maven.surefire.shared.utils/org.apache.maven.shared.utils/ -e s/org.apache.maven.surefire.shared.io/org.apache.commons.io/ -e s/org.apache.maven.surefire.shared.lang3/org.apache.commons.lang3/ -e s/org.apache.maven.surefire.shared.compress/org.apache.commons.compress/ {} \;
# Not packaged
%pom_remove_plugin -r :animal-sniffer-maven-plugin
# Complains
%pom_remove_plugin -r :apache-rat-plugin
# We don't need site-source # We don't need site-source
%pom_remove_plugin :maven-assembly-plugin maven-surefire-plugin %pom_remove_plugin :maven-assembly-plugin maven-surefire-plugin
%pom_remove_dep -r ::::site-source %pom_remove_dep -r ::::site-source
@ -178,20 +176,16 @@ find -name *.java -exec sed -i -e s/org.apache.maven.surefire.shared.utils/org.a
mkdir -p lib mkdir -p lib
build-jar-repository -s -p lib \ build-jar-repository -s -p lib \
atinject \
apache-commons-lang3 \ apache-commons-lang3 \
atinject \
commons-compress \ commons-compress \
commons-io \ commons-io \
javacc \
jsr-305 \ jsr-305 \
junit \ junit \
maven-common-artifact-filters/maven-common-artifact-filters \ maven-common-artifact-filters/maven-common-artifact-filters \
maven-doxia/doxia-core \ maven-doxia/doxia-core \
maven-doxia/doxia-logging-api \
maven-doxia/doxia-sink-api \ maven-doxia/doxia-sink-api \
maven-doxia-sitetools/doxia-site-renderer \
maven/maven-artifact \ maven/maven-artifact \
maven/maven-compat \
maven/maven-core \ maven/maven-core \
maven/maven-model \ maven/maven-model \
maven/maven-plugin-api \ maven/maven-plugin-api \
@ -200,10 +194,12 @@ build-jar-repository -s -p lib \
maven-reporting-api/maven-reporting-api \ maven-reporting-api/maven-reporting-api \
maven-reporting-impl/maven-reporting-impl \ maven-reporting-impl/maven-reporting-impl \
maven-resolver/maven-resolver-api \ maven-resolver/maven-resolver-api \
maven-resolver/maven-resolver-impl \
maven-resolver/maven-resolver-named-locks \
maven-resolver/maven-resolver-util \ maven-resolver/maven-resolver-util \
maven-shared-utils/maven-shared-utils \ maven-shared-utils/maven-shared-utils \
org.eclipse.sisu.plexus \
org.eclipse.sisu.inject \ org.eclipse.sisu.inject \
org.eclipse.sisu.plexus \
plexus-containers/plexus-component-annotations \ plexus-containers/plexus-component-annotations \
plexus-i18n/plexus-i18n \ plexus-i18n/plexus-i18n \
plexus/interpolation \ plexus/interpolation \
@ -228,7 +224,6 @@ for module in \
surefire-grouper \ surefire-grouper \
surefire-extensions-api \ surefire-extensions-api \
surefire-extensions-spi \ surefire-extensions-spi \
surefire-shared-utils \
maven-surefire-common \ maven-surefire-common \
surefire-report-parser \ surefire-report-parser \
maven-surefire-plugin \ maven-surefire-plugin \
@ -240,8 +235,8 @@ for module in \
fi fi
done done
for module in \ for module in \
common-junit3 \
common-java5 \ common-java5 \
common-junit3 \
common-junit4 \ common-junit4 \
common-junit48 \ common-junit48 \
surefire-junit3 \ surefire-junit3 \