natas_hw
/
ant-ivy
mirror of https://github.com/apache/ant-ivy
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

check info line

This commit is contained in:
Eric Milles 2026-06-18 15:55:29 -05:00
parent 2f085c9b59
commit c30e37cf8f
Failed to extract signature
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/java/org/apache/ivy/ant/IvyDeliverTest.java
View File

@ -118,8 +118,9 @@ public class IvyDeliverTest {
res.setProject(project);
res.execute();
deliver.setPubrevision("1.2");
deliver.setDeliverpattern("build/test/deliver/merge/ivy-[revision].xml");
deliver.setPubrevision("1.2");
deliver.setStatus("release");
deliver.execute();
// should have delivered the file to the specified destination
@ -138,10 +139,10 @@ public class IvyDeliverTest {
mergeLine = mergeLine.trim();
expectedLine = expectedLine.trim();
if (!mergeLine.startsWith("<info")) {
assertEquals("published descriptor matches at line[" + lineNo + "]",
expectedLine.trim(), mergeLine.trim());
if (mergeLine.startsWith("<info")) {
mergeLine = mergeLine.replaceFirst(" publication=\"\\d+\"", "");
}
assertEquals("published descriptor matches at line[" + lineNo + "]", expectedLine.trim(), mergeLine.trim());
++lineNo;
mergeLine = merged.readLine();

2
test/java/org/apache/ivy/ant/ivy-extends-merged.xml
View File

@ -21,7 +21,7 @@
<info organisation="apache" module="resolve-extends" revision="1.2" status="release">
<!-- <extends organisation="apache" module="resolve-simple" revision="1.0" location="./ivy-multiconf.xml"/> -->
<!-- description inherited from parent -->
<description>Demonstrates configuration-specific dependencies</description>
</info>