[Mac] Use the new {EXPECT,ASSERT}_NS{EQ,NE} macros where possible.

chrome/browser/cocoa/history_menu_bridge_unittest.mm

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import <Cocoa/Cocoa.h>
 #include <vector>
 
 #include "base/ref_counted_memory.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/cancelable_request.h"
 #include "chrome/browser/cocoa/browser_test_helper.h"
 #include "chrome/browser/cocoa/cocoa_test_helper.h"
 #include "chrome/browser/cocoa/history_menu_bridge.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "gfx/codec/png_codec.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#import "testing/gtest_mac.h"
 
 namespace {
 
 class MockTRS : public TabRestoreService {
  public:
   MockTRS(Profile* profile) : TabRestoreService(profile, NULL) {}
   MOCK_CONST_METHOD0(entries, const TabRestoreService::Entries&());
 };
 
 class MockBridge : public HistoryMenuBridge {
@@ skipping 94 matching lines @@
 
   NSInteger tag = HistoryMenuBridge::kMostVisited;
   AddItemToMenu(menu, @"alpha", @selector(openHistoryMenuItem:), tag);
   AddItemToMenu(menu, @"bravo", @selector(openHistoryMenuItem:), tag);
   AddItemToMenu(menu, @"charlie", @selector(openHistoryMenuItem:), tag);
   AddItemToMenu(menu, @"delta", @selector(openHistoryMenuItem:), tag);
 
   ClearMenuSection(menu, HistoryMenuBridge::kMostVisited);
 
   EXPECT_EQ(1, [menu numberOfItems]);
-  EXPECT_TRUE([@"HEADER" isEqualToString:
-      [[menu itemWithTag:HistoryMenuBridge::kMostVisitedTitle] title]]);
+  EXPECT_NSEQ(@"HEADER",
+      [[menu itemWithTag:HistoryMenuBridge::kMostVisitedTitle] title]);
 }
 
 // Skip menu items that are not hooked up to |-openHistoryMenuItem:|.
 TEST_F(HistoryMenuBridgeTest, ClearHistoryMenuSkipping) {
   NSMenu* menu = [[[NSMenu alloc] initWithTitle:@"history foo"] autorelease];
   AddItemToMenu(menu, @"HEADER", NULL, HistoryMenuBridge::kMostVisitedTitle);
 
   NSInteger tag = HistoryMenuBridge::kMostVisited;
   AddItemToMenu(menu, @"alpha", @selector(openHistoryMenuItem:), tag);
   AddItemToMenu(menu, @"bravo", @selector(openHistoryMenuItem:), tag);
   AddItemToMenu(menu, @"TITLE", NULL, HistoryMenuBridge::kRecentlyClosedTitle);
   AddItemToMenu(menu, @"charlie", @selector(openHistoryMenuItem:), tag);
 
   ClearMenuSection(menu, tag);
 
   EXPECT_EQ(2, [menu numberOfItems]);
-  EXPECT_TRUE([@"HEADER" isEqualToString:
-      [[menu itemWithTag:HistoryMenuBridge::kMostVisitedTitle] title]]);
-  EXPECT_TRUE([@"TITLE" isEqualToString:
-      [[menu itemAtIndex:1] title]]);
+  EXPECT_NSEQ(@"HEADER",
+      [[menu itemWithTag:HistoryMenuBridge::kMostVisitedTitle] title]);
+  EXPECT_NSEQ(@"TITLE",
+      [[menu itemAtIndex:1] title]);
 }
 
 // Edge case test for clearing an empty menu.
 TEST_F(HistoryMenuBridgeTest, ClearHistoryMenuEmpty) {
   NSMenu* menu = [[[NSMenu alloc] initWithTitle:@"history foo"] autorelease];
   AddItemToMenu(menu, @"HEADER", NULL, HistoryMenuBridge::kMostVisited);
 
   ClearMenuSection(menu, HistoryMenuBridge::kMostVisited);
 
   EXPECT_EQ(1, [menu numberOfItems]);
-  EXPECT_TRUE([@"HEADER" isEqualToString:
-      [[menu itemWithTag:HistoryMenuBridge::kMostVisited] title]]);
+  EXPECT_NSEQ(@"HEADER",
+      [[menu itemWithTag:HistoryMenuBridge::kMostVisited] title]);
 }
 
 // Test that AddItemToMenu() properly adds HistoryItem objects as menus.
 TEST_F(HistoryMenuBridgeTest, AddItemToMenu) {
   NSMenu* menu = [[[NSMenu alloc] initWithTitle:@"history foo"] autorelease];
 
   const string16 short_url = ASCIIToUTF16("http://foo/");
   const string16 long_url = ASCIIToUTF16("http://super-duper-long-url--."
       "that.cannot.possibly.fit.even-in-80-columns"
       "or.be.reasonably-displayed-in-a-menu"
@@ skipping 50 matching lines @@
 
   bridge_->TabRestoreServiceChanged(trs.get());
 
   NSMenu* menu = bridge_->HistoryMenu();
   ASSERT_EQ(2U, [[menu itemArray] count]);
 
   NSMenuItem* item1 = [menu itemAtIndex:0];
   MockBridge::HistoryItem* hist1 = bridge_->HistoryItemForMenuItem(item1);
   EXPECT_TRUE(hist1);
   EXPECT_EQ(24, hist1->session_id);
-  EXPECT_TRUE([@"Google" isEqualToString:[item1 title]]);
+  EXPECT_NSEQ(@"Google", [item1 title]);
 
   NSMenuItem* item2 = [menu itemAtIndex:1];
   MockBridge::HistoryItem* hist2 = bridge_->HistoryItemForMenuItem(item2);
   EXPECT_TRUE(hist2);
   EXPECT_EQ(42, hist2->session_id);
-  EXPECT_TRUE([@"Apple" isEqualToString:[item2 title]]);
+  EXPECT_NSEQ(@"Apple", [item2 title]);
 }
 
 // Test that the menu is created for a mix of windows and tabs.
 TEST_F(HistoryMenuBridgeTest, RecentlyClosedTabsAndWindows) {
   scoped_refptr<MockTRS> trs(new MockTRS(browser_test_helper_.profile()));
   MockTRS::Entries entries;
 
   MockTRS::Tab tab1 = CreateSessionTab(GURL("http://google.com"),
                                        ASCIIToUTF16("Google"));
   tab1.id = 24;
@@ skipping 33 matching lines @@
 
   bridge_->TabRestoreServiceChanged(trs.get());
 
   NSMenu* menu = bridge_->HistoryMenu();
   ASSERT_EQ(4U, [[menu itemArray] count]);
 
   NSMenuItem* item1 = [menu itemAtIndex:0];
   MockBridge::HistoryItem* hist1 = bridge_->HistoryItemForMenuItem(item1);
   EXPECT_TRUE(hist1);
   EXPECT_EQ(24, hist1->session_id);
-  EXPECT_TRUE([@"Google" isEqualToString:[item1 title]]);
+  EXPECT_NSEQ(@"Google", [item1 title]);
 
   NSMenuItem* item2 = [menu itemAtIndex:1];
   MockBridge::HistoryItem* hist2 = bridge_->HistoryItemForMenuItem(item2);
   EXPECT_TRUE(hist2);
   EXPECT_EQ(30, hist2->session_id);
   EXPECT_EQ(2U, hist2->tabs.size());
   // Do not test menu item title because it is localized.
   NSMenu* submenu1 = [item2 submenu];
   EXPECT_EQ(4U, [[submenu1 itemArray] count]);
   // Do not test Restore All Tabs because it is localiced.
   EXPECT_TRUE([[submenu1 itemAtIndex:1] isSeparatorItem]);
-  EXPECT_TRUE([@"foo" isEqualToString:[[submenu1 itemAtIndex:2] title]]);
-  EXPECT_TRUE([@"bar" isEqualToString:[[submenu1 itemAtIndex:3] title]]);
+  EXPECT_NSEQ(@"foo", [[submenu1 itemAtIndex:2] title]);
+  EXPECT_NSEQ(@"bar", [[submenu1 itemAtIndex:3] title]);
 
   NSMenuItem* item3 = [menu itemAtIndex:2];
   MockBridge::HistoryItem* hist3 = bridge_->HistoryItemForMenuItem(item3);
   EXPECT_TRUE(hist3);
   EXPECT_EQ(42, hist3->session_id);
-  EXPECT_TRUE([@"Apple" isEqualToString:[item3 title]]);
+  EXPECT_NSEQ(@"Apple", [item3 title]);
 
   NSMenuItem* item4 = [menu itemAtIndex:3];
   MockBridge::HistoryItem* hist4 = bridge_->HistoryItemForMenuItem(item4);
   EXPECT_TRUE(hist4);
   EXPECT_EQ(50, hist4->session_id);
   EXPECT_EQ(3U, hist4->tabs.size());
   // Do not test menu item title because it is localized.
   NSMenu* submenu2 = [item4 submenu];
   EXPECT_EQ(5U, [[submenu2 itemArray] count]);
   // Do not test Restore All Tabs because it is localiced.
   EXPECT_TRUE([[submenu2 itemAtIndex:1] isSeparatorItem]);
-  EXPECT_TRUE([@"magic" isEqualToString:[[submenu2 itemAtIndex:2] title]]);
-  EXPECT_TRUE([@"goats" isEqualToString:[[submenu2 itemAtIndex:3] title]]);
-  EXPECT_TRUE([@"teleporter" isEqualToString:[[submenu2 itemAtIndex:4] title]]);
+  EXPECT_NSEQ(@"magic", [[submenu2 itemAtIndex:2] title]);
+  EXPECT_NSEQ(@"goats", [[submenu2 itemAtIndex:3] title]);
+  EXPECT_NSEQ(@"teleporter", [[submenu2 itemAtIndex:4] title]);
 }
 
 // Tests that we properly request an icon from the FaviconService.
 TEST_F(HistoryMenuBridgeTest, GetFaviconForHistoryItem) {
   // Create a fake item.
   HistoryMenuBridge::HistoryItem item;
   item.title = ASCIIToUTF16("Title");
   item.url = GURL("http://google.com");
 
   // Request the icon.
@@ skipping 32 matching lines @@
   // Pretend to be called back.
   GotFaviconData(item.icon_handle, true, bytes, false, GURL());
 
   // Make sure the callback works.
   EXPECT_EQ(false, item.icon_requested);
   EXPECT_TRUE(item.icon.get());
   EXPECT_TRUE([item.menu_item image]);
 }
 
 }  // namespace