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

chrome/browser/cocoa/cookies_window_controller_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 "app/l10n_util_mac.h"
 #include "app/tree_model.h"
 #import "base/scoped_nsobject.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/cocoa/browser_test_helper.h"
 #include "chrome/browser/browsing_data_remover.h"
 #include "chrome/browser/cocoa/clear_browsing_data_controller.h"
 #import "chrome/browser/cocoa/cookies_window_controller.h"
 #include "chrome/browser/cocoa/cocoa_test_helper.h"
 #include "chrome/browser/mock_browsing_data_database_helper.h"
 #include "chrome/browser/mock_browsing_data_local_storage_helper.h"
 #include "chrome/browser/mock_browsing_data_appcache_helper.h"
 #include "chrome/browser/cookies_tree_model.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/net/url_request_context_getter.h"
 #include "chrome/test/testing_profile.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "net/url_request/url_request_context.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#import "testing/gtest_mac.h"
 #include "testing/platform_test.h"
 #import "third_party/ocmock/OCMock/OCMock.h"
 
 // Used to test FindCocoaNode. This only sets the title and node, without
 // initializing any other members.
 @interface FakeCocoaCookieTreeNode : CocoaCookieTreeNode {
   TreeModelNode* testNode_;
 }
 - (id)initWithTreeNode:(TreeModelNode*)node;
 @end
@@ skipping 100 matching lines @@
 TEST_F(CookiesWindowControllerTest, CocoaNodeFromTreeNodeCookie) {
   net::CookieMonster* cm = browser_helper_.profile()->GetCookieMonster();
   cm->SetCookie(GURL("http://foo.com"), "A=B");
   CookiesTreeModel model(cm, database_helper_, local_storage_helper_, nil);
 
   // Root --> foo.com --> Cookies --> A. Create node for 'A'.
   TreeModelNode* node = model.GetRoot()->GetChild(0)->GetChild(0)->GetChild(0);
   CocoaCookieTreeNode* cookie = CocoaNodeFromTreeNode(node);
 
   CocoaCookieDetails* details = [cookie details];
-  EXPECT_TRUE([@"B" isEqualToString:[details content]]);
-  EXPECT_TRUE([l10n_util::GetNSString(IDS_COOKIES_COOKIE_EXPIRES_SESSION)
-      isEqualToString:[details expires]]);
-  EXPECT_TRUE([l10n_util::GetNSString(IDS_COOKIES_COOKIE_SENDFOR_ANY)
-      isEqualToString:[details sendFor]]);
-  EXPECT_TRUE([@"A" isEqualToString:[cookie title]]);
-  EXPECT_TRUE([@"A" isEqualToString:[details name]]);
-  EXPECT_TRUE([@"/" isEqualToString:[details path]]);
+  EXPECT_NSEQ(@"B", [details content]);
+  EXPECT_NSEQ(l10n_util::GetNSString(IDS_COOKIES_COOKIE_EXPIRES_SESSION),
+              [details expires]);
+  EXPECT_NSEQ(l10n_util::GetNSString(IDS_COOKIES_COOKIE_SENDFOR_ANY),
+              [details sendFor]);
+  EXPECT_NSEQ(@"A", [cookie title]);
+  EXPECT_NSEQ(@"A", [details name]);
+  EXPECT_NSEQ(@"/", [details path]);
   EXPECT_EQ(0U, [[cookie children] count]);
   EXPECT_TRUE([details created]);
   EXPECT_TRUE([cookie isLeaf]);
   EXPECT_EQ(node, [cookie treeNode]);
 }
 
 TEST_F(CookiesWindowControllerTest, CocoaNodeFromTreeNodeRecursive) {
   net::CookieMonster* cm = browser_helper_.profile()->GetCookieMonster();
   cm->SetCookie(GURL("http://foo.com"), "A=B");
   CookiesTreeModel model(cm, database_helper_, local_storage_helper_, nil);
 
   // Root --> foo.com --> Cookies --> A. Create node for 'foo.com'.
   CookieTreeNode* node = model.GetRoot()->GetChild(0);
   CocoaCookieTreeNode* domain = CocoaNodeFromTreeNode(node);
   CocoaCookieTreeNode* cookies = [[domain children] objectAtIndex:0];
   CocoaCookieTreeNode* cookie = [[cookies children] objectAtIndex:0];
 
   // Test domain-level node.
-  EXPECT_TRUE([@"foo.com" isEqualToString:[domain title]]);
+  EXPECT_NSEQ(@"foo.com", [domain title]);
 
   EXPECT_FALSE([domain isLeaf]);
   EXPECT_EQ(1U, [[domain children] count]);
   EXPECT_EQ(node, [domain treeNode]);
 
   // Test "Cookies" folder node.
-  EXPECT_TRUE([l10n_util::GetNSString(IDS_COOKIES_COOKIES) isEqualToString:
-      [cookies title]]);
+  EXPECT_NSEQ(l10n_util::GetNSString(IDS_COOKIES_COOKIES), [cookies title]);
   EXPECT_FALSE([cookies isLeaf]);
   EXPECT_EQ(1U, [[cookies children] count]);
   EXPECT_EQ(node->GetChild(0), [cookies treeNode]);
 
   // Test cookie node. This is the same as CocoaNodeFromTreeNodeCookie.
   CocoaCookieDetails* details = [cookie details];
-  EXPECT_TRUE([@"B" isEqualToString:[details content]]);
-  EXPECT_TRUE([l10n_util::GetNSString(IDS_COOKIES_COOKIE_EXPIRES_SESSION)
-      isEqualToString:[details expires]]);
-  EXPECT_TRUE([l10n_util::GetNSString(IDS_COOKIES_COOKIE_SENDFOR_ANY)
-      isEqualToString:[details sendFor]]);
-  EXPECT_TRUE([@"A" isEqualToString:[cookie title]]);
-  EXPECT_TRUE([@"A" isEqualToString:[details name]]);
-  EXPECT_TRUE([@"/" isEqualToString:[details path]]);
-  EXPECT_TRUE([@"foo.com" isEqualToString:[details domain]]);
+  EXPECT_NSEQ(@"B", [details content]);
+  EXPECT_NSEQ(l10n_util::GetNSString(IDS_COOKIES_COOKIE_EXPIRES_SESSION),
+              [details expires]);
+  EXPECT_NSEQ(l10n_util::GetNSString(IDS_COOKIES_COOKIE_SENDFOR_ANY),
+              [details sendFor]);
+  EXPECT_NSEQ(@"A", [cookie title]);
+  EXPECT_NSEQ(@"A", [details name]);
+  EXPECT_NSEQ(@"/", [details path]);
+  EXPECT_NSEQ(@"foo.com", [details domain]);
   EXPECT_EQ(0U, [[cookie children] count]);
   EXPECT_TRUE([details created]);
   EXPECT_TRUE([cookie isLeaf]);
   EXPECT_EQ(node->GetChild(0)->GetChild(0), [cookie treeNode]);
 }
 
 TEST_F(CookiesWindowControllerTest, TreeNodesAdded) {
   const GURL url = GURL("http://foo.com");
   TestingProfile* profile = browser_helper_.profile();
   net::CookieMonster* cm = profile->GetCookieMonster();
@@ skipping 58 matching lines @@
   CookiesTreeModel* model = [controller_ treeModel];
   // Root --> foo.com --> Cookies.
   CookieTreeNode* parent = model->GetRoot()->GetChild(0)->GetChild(0);
 
   // Pretend to remove the nodes.
   [controller_ modelObserver]->TreeNodesRemoved(model, parent, 1, 2);
 
   EXPECT_EQ(1U, [cocoa_children count]);
 
   NSString* title = [[[cocoa_children objectAtIndex:0] details] name];
-  EXPECT_TRUE([@"A" isEqualToString:title]);
+  EXPECT_NSEQ(@"A", title);
 }
 
 TEST_F(CookiesWindowControllerTest, TreeNodeChildrenReordered) {
   const GURL url = GURL("http://foo.com");
   TestingProfile* profile = browser_helper_.profile();
   net::CookieMonster* cm = profile->GetCookieMonster();
   cm->SetCookie(url, "A=B");
   cm->SetCookie(url, "C=D");
   cm->SetCookie(url, "E=F");
 
   controller_.reset(
       [[CookiesWindowController alloc] initWithProfile:profile
                                         databaseHelper:database_helper_
                                          storageHelper:local_storage_helper_
                                         appcacheHelper:appcache_helper_]);
 
   // Root --> foo.com --> Cookies.
   NSMutableArray* cocoa_children =
       [[[[[[controller_ cocoaTreeModel] children] objectAtIndex:0]
           children] objectAtIndex:0] mutableChildren];
   EXPECT_EQ(3U, [cocoa_children count]);
 
   // Check default ordering.
   CocoaCookieTreeNode* node = [cocoa_children objectAtIndex:0];
-  EXPECT_TRUE([@"A" isEqualToString:[[node details] name]]);
+  EXPECT_NSEQ(@"A", [[node details] name]);
   node =  [cocoa_children objectAtIndex:1];
-  EXPECT_TRUE([@"C" isEqualToString:[[node details] name]]);
+  EXPECT_NSEQ(@"C", [[node details] name]);
   node =  [cocoa_children objectAtIndex:2];
-  EXPECT_TRUE([@"E" isEqualToString:[[node details] name]]);
+  EXPECT_NSEQ(@"E", [[node details] name]);
 
   CookiesTreeModel* model = [controller_ treeModel];
   // Root --> foo.com --> Cookies.
   CookieTreeNode* parent = model->GetRoot()->GetChild(0)->GetChild(0);
 
   // Reorder the nodes.
   CookieTreeNode* node_e = parent->Remove(2);
   CookieTreeNode* node_c = parent->Remove(1);
   parent->Add(0, node_e);
   parent->Add(2, node_c);
 
   // Notify the observer of the reordering.
   [controller_ modelObserver]->TreeNodeChildrenReordered(model, parent);
 
   // Check the new order.
   node = [cocoa_children objectAtIndex:0];
-  EXPECT_TRUE([@"E" isEqualToString:[[node details] name]]);
+  EXPECT_NSEQ(@"E", [[node details] name]);
   node =  [cocoa_children objectAtIndex:1];
-  EXPECT_TRUE([@"A" isEqualToString:[[node details] name]]);
+  EXPECT_NSEQ(@"A", [[node details] name]);
   node =  [cocoa_children objectAtIndex:2];
-  EXPECT_TRUE([@"C" isEqualToString:[[node details] name]]);
+  EXPECT_NSEQ(@"C", [[node details] name]);
 }
 
 TEST_F(CookiesWindowControllerTest, TreeNodeChanged) {
   const GURL url = GURL("http://foo.com");
   TestingProfile* profile = browser_helper_.profile();
   net::CookieMonster* cm = profile->GetCookieMonster();
   cm->SetCookie(url, "A=B");
 
   controller_.reset(
       [[CookiesWindowController alloc] initWithProfile:profile
                                         databaseHelper:database_helper_
                                          storageHelper:local_storage_helper_
                                         appcacheHelper:appcache_helper_]);
 
   CookiesTreeModel* model = [controller_ treeModel];
   // Root --> foo.com --> Cookies.
   CookieTreeNode* node = model->GetRoot()->GetChild(0)->GetChild(0);
 
   // Root --> foo.com --> Cookies.
   CocoaCookieTreeNode* cocoa_node =
       [[[[[controller_ cocoaTreeModel] children] objectAtIndex:0]
           children] objectAtIndex:0];
 
-  EXPECT_TRUE([l10n_util::GetNSString(IDS_COOKIES_COOKIES) isEqualToString:
-      [cocoa_node title]]);
+  EXPECT_NSEQ(l10n_util::GetNSString(IDS_COOKIES_COOKIES),
+              [cocoa_node title]);
 
   // Fake update the cookie folder's title. This would never happen in reality,
   // but it tests the code path that ultimately calls CocoaNodeFromTreeNode,
   // which is tested elsewhere.
   node->SetTitle(L"Silly Change");
   [controller_ modelObserver]->TreeNodeChanged(model, node);
 
-  EXPECT_TRUE([@"Silly Change" isEqualToString:[cocoa_node title]]);
+  EXPECT_NSEQ(@"Silly Change", [cocoa_node title]);
 }
 
 TEST_F(CookiesWindowControllerTest, DeleteCookie) {
   const GURL url = GURL("http://foo.com");
   TestingProfile* profile = browser_helper_.profile();
   net::CookieMonster* cm = profile->GetCookieMonster();
   cm->SetCookie(url, "A=B");
   cm->SetCookie(url, "C=D");
   cm->SetCookie(GURL("http://google.com"), "E=F");
 
@@ skipping 12 matching lines @@
   NSIndexPath* indexPath = [NSIndexPath indexPathWithIndexes:pathA length:3];
   [treeController setSelectionIndexPath:indexPath];
 
   // Press the "Delete" button.
   [controller deleteCookie:nil];
 
   // Root --> foo.com --> Cookies.
   NSArray* cookies = [[[[[[controller cocoaTreeModel] children]
       objectAtIndex:0] children] objectAtIndex:0] children];
   EXPECT_EQ(1U, [cookies count]);
-  EXPECT_TRUE([@"C" isEqualToString:[[cookies lastObject] title]]);
-  EXPECT_TRUE([indexPath isEqual:[treeController selectionIndexPath]]);
+  EXPECT_NSEQ(@"C", [[cookies lastObject] title]);
+  EXPECT_NSEQ(indexPath, [treeController selectionIndexPath]);
 
   // Select cookie E.
   NSUInteger pathE[3] = {1, 0, 0};
   indexPath = [NSIndexPath indexPathWithIndexes:pathE length:3];
   [treeController setSelectionIndexPath:indexPath];
 
   // Perform delete.
   [controller deleteCookie:nil];
 
   // Make sure that both the domain level node and the Cookies folder node got
@@ skipping 221 matching lines @@
                                         databaseHelper:database_helper_
                                          storageHelper:local_storage_helper_
                                         appcacheHelper:appcache_helper_]);
   database_helper_->Notify();
 
   ASSERT_EQ(2U, [[[controller_ cocoaTreeModel] children] count]);
 
   // Root --> gdbhost1.
   CocoaCookieTreeNode* node =
       [[[controller_ cocoaTreeModel] children] objectAtIndex:0];
-  EXPECT_TRUE([@"gdbhost1" isEqualToString:[node title]]);
+  EXPECT_NSEQ(@"gdbhost1", [node title]);
   EXPECT_EQ(kCocoaCookieDetailsTypeFolder, [node nodeType]);
   EXPECT_EQ(1U, [[node children] count]);
 
   // host1 --> Web Databases.
   node = [[node children] lastObject];
-  EXPECT_TRUE([l10n_util::GetNSString(IDS_COOKIES_WEB_DATABASES)
-      isEqualToString:[node title]]);
+  EXPECT_NSEQ(l10n_util::GetNSString(IDS_COOKIES_WEB_DATABASES), [node title]);
   EXPECT_EQ(kCocoaCookieDetailsTypeFolder, [node nodeType]);
   EXPECT_EQ(1U, [[node children] count]);
 
   // Database Storage --> db1.
   node = [[node children] lastObject];
-  EXPECT_TRUE([@"db1" isEqualToString:[node title]]);
+  EXPECT_NSEQ(@"db1", [node title]);
   EXPECT_EQ(kCocoaCookieDetailsTypeTreeDatabase, [node nodeType]);
   CocoaCookieDetails* details = [node details];
-  EXPECT_TRUE([@"description 1" isEqualToString:[details databaseDescription]]);
+  EXPECT_NSEQ(@"description 1", [details databaseDescription]);
   EXPECT_TRUE([details lastModified]);
   EXPECT_TRUE([details fileSize]);
 
   // Root --> gdbhost2.
   node =
       [[[controller_ cocoaTreeModel] children] objectAtIndex:1];
-  EXPECT_TRUE([@"gdbhost2" isEqualToString:[node title]]);
+  EXPECT_NSEQ(@"gdbhost2", [node title]);
   EXPECT_EQ(kCocoaCookieDetailsTypeFolder, [node nodeType]);
   EXPECT_EQ(1U, [[node children] count]);
 
   // host1 --> Web Databases.
   node = [[node children] lastObject];
-  EXPECT_TRUE([l10n_util::GetNSString(IDS_COOKIES_WEB_DATABASES)
-      isEqualToString:[node title]]);
+  EXPECT_NSEQ(l10n_util::GetNSString(IDS_COOKIES_WEB_DATABASES), [node title]);
   EXPECT_EQ(kCocoaCookieDetailsTypeFolder, [node nodeType]);
   EXPECT_EQ(1U, [[node children] count]);
 
   // Database Storage --> db2.
   node = [[node children] lastObject];
-  EXPECT_TRUE([@"db2" isEqualToString:[node title]]);
+  EXPECT_NSEQ(@"db2", [node title]);
   EXPECT_EQ(kCocoaCookieDetailsTypeTreeDatabase, [node nodeType]);
   details = [node details];
-  EXPECT_TRUE([@"description 2" isEqualToString:[details databaseDescription]]);
+  EXPECT_NSEQ(@"description 2", [details databaseDescription]);
   EXPECT_TRUE([details lastModified]);
   EXPECT_TRUE([details fileSize]);
 }
 
 TEST_F(CookiesWindowControllerTest, CreateLocalStorageNodes) {
   TestingProfile* profile = browser_helper_.profile();
   net::CookieMonster* cm = profile->GetCookieMonster();
   cm->SetCookie(GURL("http://google.com"), "A=B");
   cm->SetCookie(GURL("http://dev.chromium.org"), "C=D");
   database_helper_ = new MockBrowsingDataDatabaseHelper(profile);
   local_storage_helper_ = new MockBrowsingDataLocalStorageHelper(profile);
   local_storage_helper_->AddLocalStorageSamples();
   controller_.reset(
       [[CookiesWindowController alloc] initWithProfile:profile
                                         databaseHelper:database_helper_
                                          storageHelper:local_storage_helper_
                                         appcacheHelper:appcache_helper_]);
   local_storage_helper_->Notify();
 
   ASSERT_EQ(4U, [[[controller_ cocoaTreeModel] children] count]);
 
   // Root --> host1.
   CocoaCookieTreeNode* node =
       [[[controller_ cocoaTreeModel] children] objectAtIndex:2];
-  EXPECT_TRUE([@"host1" isEqualToString:[node title]]);
+  EXPECT_NSEQ(@"host1", [node title]);
   EXPECT_EQ(kCocoaCookieDetailsTypeFolder, [node nodeType]);
   EXPECT_EQ(1U, [[node children] count]);
 
   // host1 --> Local Storage.
   node = [[node children] lastObject];
-  EXPECT_TRUE([l10n_util::GetNSString(IDS_COOKIES_LOCAL_STORAGE)
-      isEqualToString:[node title]]);
+  EXPECT_NSEQ(l10n_util::GetNSString(IDS_COOKIES_LOCAL_STORAGE), [node title]);
   EXPECT_EQ(kCocoaCookieDetailsTypeFolder, [node nodeType]);
   EXPECT_EQ(1U, [[node children] count]);
 
   // Local Storage --> http://host1:1/.
   node = [[node children] lastObject];
-  EXPECT_TRUE([@"http://host1:1/" isEqualToString:[node title]]);
+  EXPECT_NSEQ(@"http://host1:1/", [node title]);
   EXPECT_EQ(kCocoaCookieDetailsTypeTreeLocalStorage, [node nodeType]);
-  EXPECT_TRUE([@"http://host1:1/" isEqualToString:[[node details] domain]]);
+  EXPECT_NSEQ(@"http://host1:1/", [[node details] domain]);
   EXPECT_TRUE([[node details] lastModified]);
   EXPECT_TRUE([[node details] fileSize]);
 
   // Root --> host2.
   node =
       [[[controller_ cocoaTreeModel] children] objectAtIndex:3];
-  EXPECT_TRUE([@"host2" isEqualToString:[node title]]);
+  EXPECT_NSEQ(@"host2", [node title]);
   EXPECT_EQ(kCocoaCookieDetailsTypeFolder, [node nodeType]);
   EXPECT_EQ(1U, [[node children] count]);
 
   // host2 --> Local Storage.
   node = [[node children] lastObject];
-  EXPECT_TRUE([l10n_util::GetNSString(IDS_COOKIES_LOCAL_STORAGE)
-      isEqualToString:[node title]]);
+  EXPECT_NSEQ(l10n_util::GetNSString(IDS_COOKIES_LOCAL_STORAGE), [node title]);
   EXPECT_EQ(kCocoaCookieDetailsTypeFolder, [node nodeType]);
   EXPECT_EQ(1U, [[node children] count]);
 
   // Local Storage --> http://host2:2/.
   node = [[node children] lastObject];
-  EXPECT_TRUE([@"http://host2:2/" isEqualToString:[node title]]);
+  EXPECT_NSEQ(@"http://host2:2/", [node title]);
   EXPECT_EQ(kCocoaCookieDetailsTypeTreeLocalStorage, [node nodeType]);
-  EXPECT_TRUE([@"http://host2:2/" isEqualToString:[[node details] domain]]);
+  EXPECT_NSEQ(@"http://host2:2/", [[node details] domain]);
   EXPECT_TRUE([[node details] lastModified]);
   EXPECT_TRUE([[node details] fileSize]);
 }
 
 }  // namespace