akr	2007-11-20 00:57:52 +0900 (Tue, 20 Nov 2007)

  New Revision: 13973

  Modified files:
    trunk/ChangeLog
    trunk/test/fileutils/fileasserts.rb
    trunk/test/fileutils/test_fileutils.rb

  Log:
    * test/fileutils/fileasserts.rb (assert_equal_time): show nsec if
      assertion fails but time.to_s equals.
      (assert_same_entry): use assert_equal_time.
    
    * test/fileutils/test_fileutils.rb (test_install): use
      assert_equal_time.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=13973&r2=13972
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/test/fileutils/test_fileutils.rb?r1=13973&r2=13972
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/test/fileutils/fileasserts.rb?r1=13973&r2=13972

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 13972)
+++ ChangeLog	(revision 13973)
@@ -1,3 +1,12 @@
+Tue Nov 20 00:52:46 2007  Tanaka Akira  <akr@f...>
+
+	* test/fileutils/fileasserts.rb (assert_equal_time): show nsec if
+	  assertion fails but time.to_s equals.
+	  (assert_same_entry): use assert_equal_time.
+
+	* test/fileutils/test_fileutils.rb (test_install): use
+	  assert_equal_time.
+
 Mon Nov 19 18:46:49 2007  Tanaka Akira  <akr@f...>
 
 	* file.c (utime_internal): fallback utimensat to utimes.
Index: test/fileutils/test_fileutils.rb
===================================================================
--- test/fileutils/test_fileutils.rb	(revision 13972)
+++ test/fileutils/test_fileutils.rb	(revision 13973)
@@ -789,7 +789,7 @@
     install 'tmp/aaa', 'tmp/bbb'
     assert_equal "aaa\n", File.read('tmp/bbb')
     assert_equal 0600, (File.stat('tmp/bbb').mode & 0777) if have_file_perm?
-    assert_equal t, File.mtime('tmp/bbb')
+    assert_equal_time t, File.mtime('tmp/bbb')
 
     File.unlink 'tmp/aaa'
     File.unlink 'tmp/bbb'
Index: test/fileutils/fileasserts.rb
===================================================================
--- test/fileutils/fileasserts.rb	(revision 13972)
+++ test/fileutils/fileasserts.rb	(revision 13973)
@@ -17,7 +17,7 @@
         b = File.stat(to)
         assert_equal a.mode, b.mode, "mode #{a.mode} != #{b.mode}"
         #assert_equal a.atime, b.atime
-        assert_equal a.mtime, b.mtime, "mtime #{a.mtime} != #{b.mtime}"
+        assert_equal_time a.mtime, b.mtime, "mtime #{a.mtime} != #{b.mtime}"
         assert_equal a.uid, b.uid, "uid #{a.uid} != #{b.uid}"
         assert_equal a.gid, b.gid, "gid #{a.gid} != #{b.gid}"
       end
@@ -62,6 +62,22 @@
         }
       end
 
+      def assert_equal_time(expected, actual, message=nil)
+        _wrap_assertion {
+	  expected_str = expected.to_s
+	  actual_str = actual.to_s
+	  if expected_str == actual_str
+	    expected_str << " (nsec=#{expected.nsec})"
+	    actual_str << " (nsec=#{actual.nsec})"
+	  end
+	  full_message = build_message(message, <<EOT, expected_str, actual_str)
+<?> expected but was
+<?>.
+EOT
+	  assert_block(full_message) { expected == actual }
+        }
+      end
+
     end
   end
 end

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml