Cleaned up the SDEF...

chrome/browser/cocoa/applescript/window_applescript_test.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>
 
 #import "base/scoped_nsobject.h"
 #include "base/sys_string_conversions.h"
 #import "chrome/browser/app_controller_mac.h"
 #import "chrome/browser/chrome_browser_application_mac.h"
@@ skipping 58 matching lines @@
   EXPECT_EQ(1U, [tabs count]);
   TabAppleScript* tab1 = [tabs objectAtIndex:0];
   EXPECT_EQ([tab1 container], aWindow.get());
   EXPECT_NSEQ(AppleScript::kTabsProperty,
               [tab1 containerProperty]);
 }
 
 // Insert a new tab.
 IN_PROC_BROWSER_TEST_F(WindowAppleScriptTest, InsertTab) {
   // Emulate what applescript would do when creating a new tab.
+  // Emulates a script like |set var to make new tab with
+  // properties URL:"http://google.com"}|.
   scoped_nsobject<TabAppleScript> aTab([[TabAppleScript alloc] init]);
+  scoped_nsobject<NSNumber> var([[aTab.get() uniqueID] copy]);
   [aTab.get() setURL:@"http://google.com"];
   scoped_nsobject<WindowAppleScript> aWindow(
       [[WindowAppleScript alloc] initWithBrowser:browser()]);
   [aWindow.get() insertInTabs:aTab.get()];
-  EXPECT_EQ([aTab.get() container], aWindow.get());
+
+  // Represents the tab after it is inserted.
+  TabAppleScript* tab = [[aWindow.get() tabs] objectAtIndex:1];
+  EXPECT_EQ(GURL("http://google.com"),
+            GURL(base::SysNSStringToUTF8([tab URL])));
+  EXPECT_EQ([tab container], aWindow.get());
   EXPECT_NSEQ(AppleScript::kTabsProperty,
-              [aTab.get() containerProperty]);
-  TabAppleScript* tab2 = [[aWindow.get() tabs] objectAtIndex:1];
-  EXPECT_EQ(GURL("http://google.com"),
-            GURL(base::SysNSStringToUTF8([tab2 URL])));
+              [tab containerProperty]);
+  EXPECT_NSEQ(var.get(), [tab uniqueID]);
 }
 
 // Insert a new tab at a particular position
 IN_PROC_BROWSER_TEST_F(WindowAppleScriptTest, InsertTabAtPosition) {
-  scoped_nsobject<TabAppleScript> tab1([[TabAppleScript alloc] init]);
-  scoped_nsobject<TabAppleScript> tab2([[TabAppleScript alloc] init]);
+  // Emulate what applescript would do when creating a new tab.
+  // Emulates a script like |set var to make new tab with
+  // properties URL:"http://google.com"} at before tab 1|.
+  scoped_nsobject<TabAppleScript> aTab([[TabAppleScript alloc] init]);
+  scoped_nsobject<NSNumber> var([[aTab.get() uniqueID] copy]);
+  [aTab.get() setURL:@"http://google.com"];
   scoped_nsobject<WindowAppleScript> aWindow(
       [[WindowAppleScript alloc] initWithBrowser:browser()]);
-  [aWindow.get() insertInTabs:tab1.get()];
-  [aWindow.get() insertInTabs:tab2.get()];
+  [aWindow.get() insertInTabs:aTab.get() atIndex:0];
 
-  scoped_nsobject<TabAppleScript> aTab([[TabAppleScript alloc] init]);
-  [aWindow.get() insertInTabs:aTab.get() atIndex:1];
-  TabAppleScript* tab = [[aWindow.get() tabs] objectAtIndex:1];
-  EXPECT_NSEQ([aTab.get() uniqueID],
-              [tab uniqueID]);
+  // Represents the tab after it is inserted.
+  TabAppleScript* tab = [[aWindow.get() tabs] objectAtIndex:0];
+  EXPECT_EQ(GURL("http://google.com"),
+            GURL(base::SysNSStringToUTF8([tab URL])));
+  EXPECT_EQ([tab container], aWindow.get());
+  EXPECT_NSEQ(AppleScript::kTabsProperty, [tab containerProperty]);
+  EXPECT_NSEQ(var.get(), [tab uniqueID]);
 }
 
 // Inserting and deleting tabs.
 IN_PROC_BROWSER_TEST_F(WindowAppleScriptTest, InsertAndDeleteTabs) {
   scoped_nsobject<WindowAppleScript> aWindow(
       [[WindowAppleScript alloc] initWithBrowser:browser()]);
   scoped_nsobject<TabAppleScript> aTab;
   int count;
   for (int i = 0; i < 5; ++i) {
     for (int j = 0; j < 3; ++j) {
@@ skipping 42 matching lines @@
 // Order of windows.
 IN_PROC_BROWSER_TEST_F(WindowAppleScriptTest, WindowOrder) {
   scoped_nsobject<WindowAppleScript> window2(
       [[WindowAppleScript alloc] initWithBrowser:browser()]);
   scoped_nsobject<WindowAppleScript> window1(
       [[WindowAppleScript alloc] init]);
   EXPECT_EQ([window1.get() windowComparator:window2.get()], NSOrderedAscending);
   EXPECT_EQ([window2.get() windowComparator:window1.get()],
             NSOrderedDescending);
 }