From 6c678fd2c33c6030de9722d3b1649e2cdbf48a8e Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Wed, 10 Feb 2010 13:31:55 +0000
Subject: [PATCH] add a test for <war> to guard against a bug like 6836 from
 <ear>

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@908494 13f79535-47bb-0310-9956-ffa450edef68
---
 src/tests/antunit/taskdefs/war-test.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/tests/antunit/taskdefs/war-test.xml b/src/tests/antunit/taskdefs/war-test.xml
index 82632bbc1..052e8ce95 100644
--- a/src/tests/antunit/taskdefs/war-test.xml
+++ b/src/tests/antunit/taskdefs/war-test.xml
@@ -184,4 +184,15 @@
     <unzip src="${output}/test.war" dest="${output}/out"/>
     <au:assertFileExists file="${output}/out/WEB-INF/lib/ant.jar"/>
   </target>
+
+  <target name="testOnlyOneWebXml">
+    <mkdir dir="${input}/WEB-INF"/>
+    <mkdir dir="${output}"/>
+    <touch file="${input}/WEB-INF/web.xml"/>
+    <touch file="${input}/x.xml"/>
+    <war destfile="${output}/test.war" webxml="${input}/x.xml">
+      <fileset dir="${input}"/>
+    </war>
+    <au:assertLogContains text="Warning: selected war files include a second WEB-INF/web.xml which will be ignored."/>
+  </target>
 </project>