Repository: ant Updated Branches: refs/heads/master faedd2bc5 -> 2da8188cd
we shouldn't try to follow the different directions apache.org is taking Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/2da8188c Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/2da8188c Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/2da8188c Branch: refs/heads/master Commit: 2da8188cd9edcb0057f447a42d296c23c83c006a Parents: faedd2b Author: Stefan Bodewig <[email protected]> Authored: Sun Nov 16 12:37:24 2014 +0100 Committer: Stefan Bodewig <[email protected]> Committed: Sun Nov 16 12:37:24 2014 +0100 ---------------------------------------------------------------------- src/tests/antunit/taskdefs/hostinfo-test.xml | 62 +++-------------------- 1 file changed, 6 insertions(+), 56 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/2da8188c/src/tests/antunit/taskdefs/hostinfo-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/taskdefs/hostinfo-test.xml b/src/tests/antunit/taskdefs/hostinfo-test.xml index 550de4d..a044b9b 100644 --- a/src/tests/antunit/taskdefs/hostinfo-test.xml +++ b/src/tests/antunit/taskdefs/hostinfo-test.xml @@ -27,16 +27,6 @@ <property name="undef-ip4" value="0.0.0.0" /> <property name="undef-ip6" value="::" /> - <property name="apache-hostname" value="www.apache.org" /> - <property name="apache-domain" value="apache.org" /> - <property name="apache-realhost" value="eos" /> - <property name="apache-realhost.alt" value="aurora-2012" /> - <property name="apache-ip4" value="140.211.11.131" /> - <property name="apache-ip4.alt" value="192.87.106.229"/> - - <property name="apache-realhost.gump" value="www" /> - <property name="apache-domain.gump" value="apache.org" /> - <property name="xs4all-hostname" value="www.xs4all.nl" /> <property name="xs4all-domain" value="xs4all.nl" /> <property name="xs4all-realhost" value="www" /> @@ -50,52 +40,13 @@ <!-- Do not know what to expect here, machine dependent --> </target> - <target name="testApache" depends="setUp"> - <hostinfo prefix="apache" host="${apache-hostname}"/> - <au:assertTrue> - <or> - <equals arg1="${apache-realhost}" arg2="${apache.NAME}"/> - <equals arg1="${apache-realhost.alt}" arg2="${apache.NAME}"/> - <equals arg1="${apache-realhost.gump}" arg2="${apache.NAME}"/> - </or> - </au:assertTrue> - <au:assertTrue> - <or> - <equals arg1="${apache-domain}" arg2="${apache.DOMAIN}"/> - <equals arg1="${apache-domain.gump}" arg2="${apache.DOMAIN}"/> - </or> - </au:assertTrue> - <au:assertTrue> - <or> - <equals arg1="${apache-ip4}" arg2="${apache.ADDR4}"/> - <equals arg1="${apache-ip4.alt}" arg2="${apache.ADDR4}"/> - </or> - </au:assertTrue> - </target> - - <target name="testApacheNoPrefix" depends="setUp"> - <hostinfo host="${apache-hostname}"/> - <au:assertTrue> - <or> - <equals arg1="${apache-realhost}" arg2="${NAME}"/> - <equals arg1="${apache-realhost.alt}" arg2="${NAME}"/> - <equals arg1="${apache-realhost.gump}" arg2="${NAME}"/> - </or> - </au:assertTrue> - <au:assertTrue> - <or> - <equals arg1="${apache-domain}" arg2="${DOMAIN}"/> - <equals arg1="${apache-domain.gump}" arg2="${DOMAIN}"/> - </or> - </au:assertTrue> - <au:assertTrue> - <or> - <equals arg1="${apache-ip4}" arg2="${ADDR4}"/> - <equals arg1="${apache-ip4.alt}" arg2="${ADDR4}"/> - </or> - </au:assertTrue> + <target name="testForward" depends="setUp"> + <hostinfo host="${xs4all-hostname}"/> + <au:assertEquals expected="${xs4all-realhost}" actual="${NAME}"/> + <au:assertEquals expected="${xs4all-domain}" actual="${DOMAIN}"/> + <au:assertEquals expected="${xs4all-ip4}" actual="${ADDR4}"/> </target> - + <target name="testReverse" depends="setUp"> <hostinfo prefix="reverse" host="${xs4all-ip4}"/> <au:assertEquals expected="${xs4all-realhost}" actual="${reverse.NAME}"/> @@ -103,7 +54,6 @@ <au:assertEquals expected="${xs4all-ip4}" actual="${reverse.ADDR4}"/> </target> - <target name="testUndef" depends="setUp"> <hostinfo prefix="undef" host="${undef-name}"/> <au:assertEquals expected="${undef-hostname}" actual="${undef.NAME}"/>
