Bug 559027 - Update to Ant 1.10.8
Change-Id: I529e52af00ce1c224e06f20463eb14194a5eab67
diff --git a/ant/org.eclipse.ant.tests.ui/Ant Debug Tests/org/eclipse/ant/tests/ui/debug/PropertyTests.java b/ant/org.eclipse.ant.tests.ui/Ant Debug Tests/org/eclipse/ant/tests/ui/debug/PropertyTests.java
index 5c74ddc..3eeb2a7 100644
--- a/ant/org.eclipse.ant.tests.ui/Ant Debug Tests/org/eclipse/ant/tests/ui/debug/PropertyTests.java
+++ b/ant/org.eclipse.ant.tests.ui/Ant Debug Tests/org/eclipse/ant/tests/ui/debug/PropertyTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2019 IBM Corporation and others.
+ * Copyright (c) 2005, 2020 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -27,7 +27,7 @@
public class PropertyTests extends AbstractAntDebugTest {
- private static final String ANT_VERSION = "Apache Ant(TM) version 1.10.7"; //$NON-NLS-1$
+ private static final String ANT_VERSION = "Apache Ant(TM) version 1.10.8"; //$NON-NLS-1$
public PropertyTests(String name) {
super(name);
@@ -61,8 +61,7 @@
assertNotNull(property);
assertProperty(thread, "ant.project.name", "debugEcho"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- finally {
+ } finally {
terminateAndRemove(thread);
removeAllBreakpoints();
}
@@ -97,8 +96,7 @@
assertPropertyStartsWith(thread, "ant.version", ANT_VERSION); //$NON-NLS-1$
assertProperty(thread, "ant.project.name", "debugEcho"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- finally {
+ } finally {
terminateAndRemove(thread);
removeAllBreakpoints();
}
@@ -135,14 +133,14 @@
stepOver(frame);
assertProperty(thread, "CCC", "ccc"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- finally {
+ } finally {
terminateAndRemove(thread);
removeAllBreakpoints();
}
}
- private AntStackFrame assertProperty(AntThread thread, String propertyName, String propertyValue) throws DebugException {
+ private AntStackFrame assertProperty(AntThread thread, String propertyName, String propertyValue)
+ throws DebugException {
AntStackFrame frame = (AntStackFrame) thread.getTopStackFrame();
AntProperty property = frame.findProperty(propertyName);
assertNotNull("Did not find property: " + propertyName, property); //$NON-NLS-1$
@@ -151,12 +149,14 @@
return frame;
}
- private AntStackFrame assertPropertyStartsWith(AntThread thread, String propertyName, String propertyValue) throws DebugException {
+ private AntStackFrame assertPropertyStartsWith(AntThread thread, String propertyName, String propertyValue)
+ throws DebugException {
AntStackFrame frame = (AntStackFrame) thread.getTopStackFrame();
AntProperty property = frame.findProperty(propertyName);
assertNotNull("Did not find property: " + propertyName, property); //$NON-NLS-1$
AntValue value = (AntValue) property.getValue();
- assertTrue("Value of property" + propertyName + " incorrect: " + value.getValueString(), value.getValueString().startsWith(propertyValue)); //$NON-NLS-1$ //$NON-NLS-2$
+ assertTrue("Value of property" + propertyName + " incorrect: " + value.getValueString() + " should start with " //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ + propertyValue, value.getValueString().startsWith(propertyValue));
return frame;
}
}
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.tests.ui/Ant Tests/org/eclipse/ant/tests/ui/separateVM/SeparateVMTests.java b/ant/org.eclipse.ant.tests.ui/Ant Tests/org/eclipse/ant/tests/ui/separateVM/SeparateVMTests.java
index 8b2c355..b7bdb3b 100644
--- a/ant/org.eclipse.ant.tests.ui/Ant Tests/org/eclipse/ant/tests/ui/separateVM/SeparateVMTests.java
+++ b/ant/org.eclipse.ant.tests.ui/Ant Tests/org/eclipse/ant/tests/ui/separateVM/SeparateVMTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2019 IBM Corporation and others.
+ * Copyright (c) 2004, 2020 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -40,7 +40,7 @@
public class SeparateVMTests extends AbstractAntUIBuildTest {
- protected static final String PLUGIN_VERSION = "org.apache.ant_1.10.7"; //$NON-NLS-1$
+ protected static final String PLUGIN_VERSION = "org.apache.ant_1.10.8"; //$NON-NLS-1$
public SeparateVMTests(String name) {
super(name);
