[nant-commits] CVS: nant/src/NAnt.Tests FileSetTest.cs,1.2,1.3 NAntTest.cs,1.5,1.6

[Gerry S. <ger...@us...>]

Update of /cvsroot/nant/nant/src/NAnt.Tests
In directory usw-pr-cvs1:/tmp/cvs-serv19798/src/NAnt.Tests

Modified Files:
	FileSetTest.cs NAntTest.cs 
Log Message:
* Added formatters to tstamp task
* Added Chris Jenkins date string support to tstamp task
* Added TStampTaskTest
* Added Chris Jenkins fix for ZipTask and Nant -D bugs
* Fixed problem with Delete task reporting duplicate messages



Index: FileSetTest.cs
===================================================================
RCS file: /cvsroot/nant/nant/src/NAnt.Tests/FileSetTest.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FileSetTest.cs	9 Mar 2002 07:27:04 -0000	1.2
--- FileSetTest.cs	28 Mar 2002 03:00:49 -0000	1.3
***************
*** 59,62 ****
--- 59,71 ----
          }
  
+         public void Test_IncludesAndAsIs() {
+             _fileSet.Includes.Add("foo");
+             _fileSet.AsIs.Add("foo");
+             _fileSet.AsIs.Add("bar");
+             AssertMatch("foo", false);
+             AssertMatch("bar", false);
+             AssertEquals(2, _fileSet.FileNames.Count);
+         }
+ 
          public void Test_Includes_All() {
              _fileSet.Includes.Add("**/*");

Index: NAntTest.cs
===================================================================
RCS file: /cvsroot/nant/nant/src/NAnt.Tests/NAntTest.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** NAntTest.cs	7 Mar 2002 08:28:01 -0000	1.5
--- NAntTest.cs	28 Mar 2002 03:00:49 -0000	1.6
***************
*** 174,179 ****
                  <project name='Test' default='test' basedir='.'>
                      <target name='test'>
!                         <property name='foo' value='me'/>
!                         <echo message='foo = ${foo}'/>
                      </target>
                  </project>";
--- 174,179 ----
                  <project name='Test' default='test' basedir='.'>
                      <target name='test'>
!                         <property name='project.name' value='Foo.Bar'/>
!                         <echo message='project.name = ${project.name}'/>
                      </target>
                  </project>";
***************
*** 184,188 ****
  
              string[] args = { 
!                 "-D:foo=bar", 
                  String.Format("-buildfile:{0}", buildFileName),
              };
--- 184,188 ----
  
              string[] args = { 
!                 "-D:project.name=MyCompany.MyProject",
                  String.Format("-buildfile:{0}", buildFileName),
              };
***************
*** 195,201 ****
  
              // regular expression to look for expected output
!             string expression = @"foo = bar";
              Match match = Regex.Match(result, expression);
!             Assert("Property 'foo' appears to have been overridden by <property> task.\n" + result, match.Success);
  
              // delete the build file
--- 195,201 ----
  
              // regular expression to look for expected output
!             string expression = @"project.name = MyCompany.MyProject";
              Match match = Regex.Match(result, expression);
!             Assert("Property 'project.name' appears to have been overridden by <property> task.\n" + result, match.Success);
  
              // delete the build file