[nant-commits] CVS: nant/tests/NAnt.Core/Tasks MoveTest.cs,1.6,1.7 TouchTaskTest.cs,1.7,1.8

[Ian M. <ia...@us...>]

Update of /cvsroot/nant/nant/tests/NAnt.Core/Tasks
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13653/tests/NAnt.Core/Tasks

Modified Files:
	MoveTest.cs TouchTaskTest.cs 
Log Message:
fixes a couple of failing tests on mono/linux
- check for IsWin32 on move task test as overwrite is permitted on nix platforms
- use InvariantCultere when ToStringing datetimes. This gets around a date formatting incompatibility with mono ( logged in bugzilla )
- use larger value for milli seconds so that touch date is > 01/01/1970 09:00. Works around another mono bug ( also logged )

Index: MoveTest.cs
===================================================================
RCS file: /cvsroot/nant/nant/tests/NAnt.Core/Tasks/MoveTest.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MoveTest.cs	24 May 2004 18:19:48 -0000	1.6
--- MoveTest.cs	2 Jul 2004 14:40:20 -0000	1.7
***************
*** 27,30 ****
--- 27,31 ----
  using NUnit.Framework;
  
+ using NAnt.Core;
  using NAnt.Core.Tasks;
  
***************
*** 79,83 ****
  
          [Test]
-         [ExpectedException(typeof(TestBuildException))]
          public void Test_MoveNoOverwrite() {
              string tempFileDest = CreateTempFile(Path.Combine(_tempDirDest, "foo-dest.xml"));
--- 80,83 ----
***************
*** 85,91 ****
              // ensure source file is more recent than destination file
              File.SetLastWriteTime(_tempFileSrc, DateTime.Now.AddDays(1));
! 
              string result = RunBuild(string.Format(CultureInfo.InvariantCulture, 
                  _xmlProjectTemplate, _tempFileSrc, tempFileDest, "false"));
          }
      }
--- 85,102 ----
              // ensure source file is more recent than destination file
              File.SetLastWriteTime(_tempFileSrc, DateTime.Now.AddDays(1));
!             try {
              string result = RunBuild(string.Format(CultureInfo.InvariantCulture, 
                  _xmlProjectTemplate, _tempFileSrc, tempFileDest, "false"));
+                 // on non-windows platforms overwriting a file is permitted without a warning or exception
+                 if ( PlatformHelper.IsWin32 ) {
+                     Assertion.Fail("Build should have failed with File Overwrite exception.");
+                 }
+             } 
+             catch (TestBuildException) {
+                 // just catch the exception
+             }
+             catch (Exception){
+                 Assertion.Fail("Unexpected Exception.");
+             }     
          }
      }

Index: TouchTaskTest.cs
===================================================================
RCS file: /cvsroot/nant/nant/tests/NAnt.Core/Tasks/TouchTaskTest.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** TouchTaskTest.cs	24 May 2004 18:19:48 -0000	1.7
--- TouchTaskTest.cs	2 Jul 2004 14:40:20 -0000	1.8
***************
*** 69,73 ****
              DateTime newTouchDate = DateTime.Parse("01/01/1980");
              string fileName = _fileList[0];
!             RunBuild(FormatBuildFile("file='" + fileName + "' datetime='" + newTouchDate.ToString() + "'"));
  
              FileInfo file = new FileInfo(fileName);
--- 69,73 ----
              DateTime newTouchDate = DateTime.Parse("01/01/1980");
              string fileName = _fileList[0];
!             RunBuild(FormatBuildFile("file='" + fileName + "' datetime='" + newTouchDate.ToString(CultureInfo.InvariantCulture) + "'"));
  
              FileInfo file = new FileInfo(fileName);
***************
*** 86,93 ****
          [Test]
          public void Test_File_Millis() {
!             // <touch file='myfile' millis='100000'/>
  
              string fileName = _fileList[0];
!             int milliSeconds = 100000;
              RunBuild(FormatBuildFile("file='" + fileName + "' millis='" + milliSeconds.ToString() + "'"));
              FileInfo file = new FileInfo(fileName);
--- 86,93 ----
          [Test]
          public void Test_File_Millis() {
!             // <touch file='myfile' millis='1000000000'/>
  
              string fileName = _fileList[0];
!             int milliSeconds = 1000000000;
              RunBuild(FormatBuildFile("file='" + fileName + "' millis='" + milliSeconds.ToString() + "'"));
              FileInfo file = new FileInfo(fileName);
***************
*** 158,162 ****
  
              DateTime newTouchDate = DateTime.Parse("01/01/1980");          
!             RunBuild(FormatBuildFile("datetime='" + newTouchDate.ToString() + "'","<fileset basedir='" + TempDirName + "'><include name='**' /></fileset>"));
  
              for (int i = 0; i < _fileList.Count; i++) {
--- 158,162 ----
  
              DateTime newTouchDate = DateTime.Parse("01/01/1980");          
!             RunBuild(FormatBuildFile("datetime='" + newTouchDate.ToString(CultureInfo.InvariantCulture) + "'","<fileset basedir='" + TempDirName + "'><include name='**' /></fileset>"));
  
              for (int i = 0; i < _fileList.Count; i++) {
***************
*** 174,181 ****
              //</touch>
  
!             int milliSeconds = 100000;
              DateTime newTouchDate = DateTime.Parse("01/01/1970").AddMilliseconds(milliSeconds);
            
!             RunBuild(FormatBuildFile("datetime='" + newTouchDate.ToString() + "'","<fileset basedir='" + TempDirName + "'><include name='**' /></fileset>"));
  
              for (int i = 0; i < _fileList.Count; i++) {
--- 174,181 ----
              //</touch>
  
!             int milliSeconds = 1000000000;
              DateTime newTouchDate = DateTime.Parse("01/01/1970").AddMilliseconds(milliSeconds);
            
!             RunBuild(FormatBuildFile("datetime='" + newTouchDate.ToString(CultureInfo.InvariantCulture) + "'","<fileset basedir='" + TempDirName + "'><include name='**' /></fileset>"));
  
              for (int i = 0; i < _fileList.Count; i++) {