This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant.git
The following commit(s) were added to refs/heads/master by this push:
new 10bbddc33 upgrade to AntUnit 1.5.0
10bbddc33 is described below
commit 10bbddc3340438bf5467cfa7c73b9f9d0fe3a89b
Author: Stefan Bodewig <[email protected]>
AuthorDate: Fri Jun 19 18:05:24 2026 +0200
upgrade to AntUnit 1.5.0
---
lib/libraries.properties | 2 +-
lib/optional/ant-antunit-1.4.1.jar | Bin 61246 -> 0 bytes
lib/optional/ant-antunit-1.5.0.jar | Bin 0 -> 64749 bytes
src/tests/antunit/taskdefs/echoxml-test.xml | 4 +---
src/tests/antunit/taskdefs/javac-test.xml | 12 +++---------
src/tests/antunit/taskdefs/loadproperties-test.xml | 4 +---
src/tests/antunit/taskdefs/local-test.xml | 4 +---
src/tests/antunit/taskdefs/pathconvert-test.xml | 4 +---
src/tests/antunit/taskdefs/propertyhelper-test.xml | 12 +++---------
src/tests/antunit/taskdefs/whichresource-test.xml | 4 +---
10 files changed, 12 insertions(+), 34 deletions(-)
diff --git a/lib/libraries.properties b/lib/libraries.properties
index 99e63d109..172649418 100644
--- a/lib/libraries.properties
+++ b/lib/libraries.properties
@@ -34,7 +34,7 @@ m2.repo=https://repo1.maven.org/maven2/
# Versions of different libraries. Please keep in alphabetical order, except
# when a specific dependency forces them to be out-of-order
ivy.version=2.5.3
-ant-antunit.version=1.4.1
+ant-antunit.version=1.5.0
antlr.version=2.7.7
bcel.version=6.9.0
bsf.version=2.4.0
diff --git a/lib/optional/ant-antunit-1.4.1.jar
b/lib/optional/ant-antunit-1.4.1.jar
deleted file mode 100644
index b5c14ddda..000000000
Binary files a/lib/optional/ant-antunit-1.4.1.jar and /dev/null differ
diff --git a/lib/optional/ant-antunit-1.5.0.jar
b/lib/optional/ant-antunit-1.5.0.jar
new file mode 100644
index 000000000..d70770b97
Binary files /dev/null and b/lib/optional/ant-antunit-1.5.0.jar differ
diff --git a/src/tests/antunit/taskdefs/echoxml-test.xml
b/src/tests/antunit/taskdefs/echoxml-test.xml
index b7a3eca29..8f0f38e86 100644
--- a/src/tests/antunit/taskdefs/echoxml-test.xml
+++ b/src/tests/antunit/taskdefs/echoxml-test.xml
@@ -79,9 +79,7 @@
<a:something a:foo="bar"/>
</echoxml>
<au:assertResourceContains resource="${file}" value="a:something"/>
- <au:assertFalse message="Didn't expecte ${file} to contain antlib:a">
- <resourcecontains resource="${file}" substring="antlib:a"/>
- </au:assertFalse>
+ <au:assertResourceDoesntContain resource="${file}" value="antlib:a"/>
</target>
</project>
diff --git a/src/tests/antunit/taskdefs/javac-test.xml
b/src/tests/antunit/taskdefs/javac-test.xml
index ab5e3eb18..f42e12698 100644
--- a/src/tests/antunit/taskdefs/javac-test.xml
+++ b/src/tests/antunit/taskdefs/javac-test.xml
@@ -68,9 +68,7 @@
<equals arg1="${classes-updated}" arg2="true" />
</au:assertTrue>
<javac srcdir="javac-dir/good-src" destdir="${build-dir}"
updatedProperty="classes-updated-2" />
- <au:assertFalse>
- <isset property="classes-updated-2" />
- </au:assertFalse>
+ <au:assertPropertyNotSet name="classes-updated-2" />
</target>
<target name="test-error-property" depends="setup">
@@ -105,9 +103,7 @@
description="https://issues.apache.org/bugzilla/show_bug.cgi?id=43114";>
<!-- no changes, shouldn't recompile, the initial bug -->
<javac srcdir="${javac-dir}/src" destdir="${build-dir}"
updatedProperty="second-pass" />
- <au:assertFalse>
- <isset property="second-pass" />
- </au:assertFalse>
+ <au:assertPropertyNotSet name="second-pass" />
<sleep seconds="2" />
<!-- change package-info.java but make containing target dir even
@@ -129,9 +125,7 @@
<!-- no changes, shouldn't recompile, the initial bug -->
<javac srcdir="${javac-dir}/src" updatedProperty="second-pass" />
- <au:assertFalse>
- <isset property="second-pass" />
- </au:assertFalse>
+ <au:assertPropertyNotSet name="second-pass" />
<sleep seconds="2" />
<!-- change package-info.java but make containing target dir even
diff --git a/src/tests/antunit/taskdefs/loadproperties-test.xml
b/src/tests/antunit/taskdefs/loadproperties-test.xml
index f3ac9e900..e3ae26c73 100644
--- a/src/tests/antunit/taskdefs/loadproperties-test.xml
+++ b/src/tests/antunit/taskdefs/loadproperties-test.xml
@@ -101,9 +101,7 @@ http.@SERVER@ = ${server}
<loadproperties>
<string value="#foo=bar" />
</loadproperties>
- <au:assertFalse>
- <isset property="foo" />
- </au:assertFalse>
+ <au:assertPropertyNotSet name="foo" />
</target>
<target name="testPrefixAttributeProperties">
diff --git a/src/tests/antunit/taskdefs/local-test.xml
b/src/tests/antunit/taskdefs/local-test.xml
index 8c4c51baa..c00fdb2e4 100644
--- a/src/tests/antunit/taskdefs/local-test.xml
+++ b/src/tests/antunit/taskdefs/local-test.xml
@@ -25,9 +25,7 @@
<au:assertPropertyEquals name="bar" value="bar" />
<target name="testGlobalLocal">
- <au:assertFalse>
- <isset property="bar" />
- </au:assertFalse>
+ <au:assertPropertyNotSet name="bar" />
</target>
<target name="testBaseline">
diff --git a/src/tests/antunit/taskdefs/pathconvert-test.xml
b/src/tests/antunit/taskdefs/pathconvert-test.xml
index 56340cabc..3ac8ad1ad 100644
--- a/src/tests/antunit/taskdefs/pathconvert-test.xml
+++ b/src/tests/antunit/taskdefs/pathconvert-test.xml
@@ -105,9 +105,7 @@
<pathconvert property="result" setonempty="false">
<resources />
</pathconvert>
- <au:assertFalse>
- <isset property="result" />
- </au:assertFalse>
+ <au:assertPropertyNotSet name="result" />
</target>
<target name="testDest">
diff --git a/src/tests/antunit/taskdefs/propertyhelper-test.xml
b/src/tests/antunit/taskdefs/propertyhelper-test.xml
index 2eecb4a91..fcdd6f09f 100644
--- a/src/tests/antunit/taskdefs/propertyhelper-test.xml
+++ b/src/tests/antunit/taskdefs/propertyhelper-test.xml
@@ -71,9 +71,7 @@
<target name="testNull" depends="setUp" if="prereqs-ok">
<!-- demonstrate that a null value always implies a nonexistent property
-->
- <au:assertFalse>
- <isset property="null" />
- </au:assertFalse>
+ <au:assertPropertyNotSet name="null" />
</target>
<target name="testAvailable" depends="setUp" if="prereqs-ok">
@@ -113,9 +111,7 @@
</target>
<target name="XtestLoadPropertiesWithObjects" if="prereqs-ok"
depends="setUp">
- <au:assertFalse>
- <isset property="object2" />
- </au:assertFalse>
+ <au:assertPropertyNotSet name="object2" />
<string id="props" value="object2=$${object}" />
<!-- verify the property is not yet expanded -->
<au:assertTrue>
@@ -131,9 +127,7 @@
</target>
<target name="testLoadPropertiesWithStrings" if="prereqs-ok" depends="setUp">
- <au:assertFalse>
- <isset property="string2" />
- </au:assertFalse>
+ <au:assertPropertyNotSet name="string2" />
<string id="props" value="string2=$${string}" />
<!-- verify the property is not yet expanded -->
<au:assertTrue>
diff --git a/src/tests/antunit/taskdefs/whichresource-test.xml
b/src/tests/antunit/taskdefs/whichresource-test.xml
index be8648c3d..c09c17ba2 100644
--- a/src/tests/antunit/taskdefs/whichresource-test.xml
+++ b/src/tests/antunit/taskdefs/whichresource-test.xml
@@ -43,9 +43,7 @@
class="ClassNotPresent"
classpathref="whichresource-build"/>
- <au:assertFalse>
- <isset property="whichresource.prop2"/>
- </au:assertFalse>
+ <au:assertPropertyNotSet name="whichresource.prop2"/>
</target>
</project>
