--- E:\src\extern\nant-85rc3\tests\NAnt.Core\Types\FileSetTest.cs	Wed Mar 16 06:12:22 2005
+++ E:\src\extern\nant\tests\NAnt.Core\Types\FileSetTest.cs	Wed May 04 17:42:10 2005
@@ -23,13 +23,14 @@
 
 using NUnit.Framework;
 
+using NAnt.Core;
 using NAnt.Core.Types;
 using Tests.NAnt.Core.Util;
 
 namespace Tests.NAnt.Core {
 
     [TestFixture]
-    public class FileSetTest : BuildTestBase {
+	public class FileSetTest : BuildTestBase {
 
         FileSet _fileSet;
 
@@ -226,6 +227,37 @@
             RunBuild(buildXML);
         }
 
+
+        [Test]
+        public void Test_Includes_Fileset() {
+            const string buildXML = @"<project name=""fileset-test"">
+	                <fileset id=""foo1"">
+		                <includes name=""world.peace"" />
+	                </fileset>
+	                <fileset id=""foo2"">
+		                <includesfileset refid=""foo1"" />
+		                <includes name=""world.war"" />
+	                </fileset>
+	                <fileset id=""foo2"">
+		                <includesfileset refid=""foo2"" />
+		                <includes name=""reefer.saddness"" />
+	                </fileset>
+                </project>";
+						
+			Project project = CreateFilebasedProject(buildXML);
+			ExecuteProject(project);
+
+			_fileSet = (FileSet)project.DataTypeReferences["foo1"];
+			Assert.AreEqual(1, _fileSet.FileNames.Count);
+			AssertMatch("world.peace");
+
+			_fileSet = (FileSet)project.DataTypeReferences["foo2"];
+			Assert.AreEqual(3, _fileSet.FileNames.Count);
+			AssertMatch("world.peace");
+			AssertMatch("world.war");
+			AssertMatch("reefer.saddness");
+		}
+		
         void AssertMatch(string fileName) {
             AssertMatch(fileName, true);
         }