Use assert_nil instead of assert_equal.

git-svn-id: http://svn.redmine.org/redmine/trunk@16060 e93f8b46-1217-0410-a6f0-8f06a7374b81

4 files changed, 7 insertions, 7 deletions

diff --git a/test/unit/lib/redmine/codeset_util_test.rb b/test/unit/lib/redmine/codeset_util_test.rb
index f5a6d6336..5c88e0f75 100644
--- a/test/unit/lib/redmine/codeset_util_test.rb
+++ b/test/unit/lib/redmine/codeset_util_test.rb
@@ -51,7 +51,7 @@ class Redmine::CodesetUtilTest < ActiveSupport::TestCase
 
   def test_to_utf8_by_setting_blank_string
     assert_equal "",  Redmine::CodesetUtil.to_utf8_by_setting("")
-    assert_equal nil, Redmine::CodesetUtil.to_utf8_by_setting(nil)
+    assert_nil Redmine::CodesetUtil.to_utf8_by_setting(nil)
   end
 
   def test_to_utf8_by_setting_returns_ascii_as_utf8
diff --git a/test/unit/lib/redmine/export/pdf_test.rb b/test/unit/lib/redmine/export/pdf_test.rb
index d19bdeb14..f1f9056a3 100644
--- a/test/unit/lib/redmine/export/pdf_test.rb
+++ b/test/unit/lib/redmine/export/pdf_test.rb
@@ -94,9 +94,9 @@ class PdfTest < ActiveSupport::TestCase
       assert a2.readable?
       assert (! a2.visible?)
       aa1 = Redmine::Export::PDF::RDMPdfEncoding::attach(Attachment.all, "Testfile.PNG", "UTF-8")
-      assert_equal nil, aa1
+      assert_nil aa1
       aa2 = Redmine::Export::PDF::RDMPdfEncoding::attach(Attachment.all, "test#{str2}.png", encoding)
-      assert_equal nil, aa2
+      assert_nil aa2
 
       set_tmp_attachments_directory
     end
diff --git a/test/unit/lib/redmine/menu_manager/mapper_test.rb b/test/unit/lib/redmine/menu_manager/mapper_test.rb
index fbffc5d12..b1a61075b 100644
--- a/test/unit/lib/redmine/menu_manager/mapper_test.rb
+++ b/test/unit/lib/redmine/menu_manager/mapper_test.rb
@@ -156,7 +156,7 @@ class Redmine::MenuManager::MapperTest < ActiveSupport::TestCase
     menu_mapper.push :test_overview, { :controller => 'projects', :action => 'show'}, {}
 
     item = menu_mapper.find(:nothing)
-    assert_equal nil, item
+    assert_nil item
   end
 
   def test_delete
diff --git a/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb b/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb
index 6757d5ba5..4e09b9df6 100644
--- a/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb
+++ b/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb
@@ -336,7 +336,7 @@ class GitAdapterTest < ActiveSupport::TestCase
       assert_equal 15, revs1.length
       assert_equal "7234cb2750b63f47bff735edc50a1c0a433c2518",
                    revs1[0].identifier
-      assert_equal nil, revs1[0].parents
+      assert_nil revs1[0].parents
       assert_equal "899a15dba03a3b350b89c3f537e4bbe02a03cdc9",
                    revs1[1].identifier
       assert_equal 1, revs1[1].parents.length
@@ -477,8 +477,8 @@ class GitAdapterTest < ActiveSupport::TestCase
       assert entries1
       assert_equal 3, entries1.size
       f1 = entries1[1]
-      assert_equal nil, f1.name
-      assert_equal nil, f1.path
+      assert_nil f1.name
+      assert_nil f1.path
       assert_equal 'file', f1.kind
     end