diff --git a/src/etc/testcases/taskdefs/unzip.xml b/src/etc/testcases/taskdefs/unzip.xml
index 0ee1d0da7..345568aa6 100644
--- a/src/etc/testcases/taskdefs/unzip.xml
+++ b/src/etc/testcases/taskdefs/unzip.xml
@@ -70,6 +70,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/UnzipTest.java b/src/testcases/org/apache/tools/ant/taskdefs/UnzipTest.java
index 6f5debc6f..ff6bf8512 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/UnzipTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/UnzipTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2005 The Apache Software Foundation
+ * Copyright 2000-2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -104,6 +104,24 @@ public class UnzipTest extends BuildFileTest {
assertFileMissing("2/bar is excluded", "unziptestout/2/bar");
}
+ /*
+ * PR 38973
+ */
+ public void testTwoPatternSets() {
+ executeTarget("testTwoPatternSets");
+ assertFileMissing("1/foo is not included", "unziptestout/1/foo");
+ assertFileExists("2/bar is included", "unziptestout/2/bar");
+ }
+
+ /*
+ * PR 38973
+ */
+ public void testTwoPatternSetsWithExcludes() {
+ executeTarget("testTwoPatternSetsWithExcludes");
+ assertFileMissing("1/foo is not included", "unziptestout/1/foo");
+ assertFileMissing("2/bar is excluded", "unziptestout/2/bar");
+ }
+
/*
* PR 16213
*/