Making CloseWindow and CloseTab automation API...

chrome/test/automated_ui_tests/automated_ui_test_test.cc

 // Copyright (c) 2009 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.
 
 #include "chrome/test/automated_ui_tests/automated_ui_test_base.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 
 TEST_F(AutomatedUITestBase, NewTab) {
   int tab_count;
@@ skipping 12 matching lines @@
   active_browser()->GetTabCount(&tab_count);
   ASSERT_EQ(1, tab_count);
   DuplicateTab();
   active_browser()->GetTabCount(&tab_count);
   ASSERT_EQ(2, tab_count);
   DuplicateTab();
   active_browser()->GetTabCount(&tab_count);
   ASSERT_EQ(3, tab_count);
 }
 
-TEST_F(AutomatedUITestBase, OpenCloseBrowserWindow) {
+TEST_F(AutomatedUITestBase, OpenBrowserWindow) {
   int num_browser_windows;
   int tab_count;
   automation()->GetBrowserWindowCount(&num_browser_windows);
   ASSERT_EQ(1, num_browser_windows);
   active_browser()->GetTabCount(&tab_count);
   ASSERT_EQ(1, tab_count);
 
   BrowserProxy* previous_browser;
   ASSERT_TRUE(OpenAndActivateNewBrowserWindow(&previous_browser));
   scoped_ptr<BrowserProxy>browser_1(previous_browser);
@@ skipping 25 matching lines @@
   bool application_closed;
   CloseBrowser(browser_1.get(), &application_closed);
   ASSERT_FALSE(application_closed);
   automation()->GetBrowserWindowCount(&num_browser_windows);
   ASSERT_EQ(2, num_browser_windows);
   CloseBrowser(browser_2.get(), &application_closed);
   ASSERT_FALSE(application_closed);
   automation()->GetBrowserWindowCount(&num_browser_windows);
   ASSERT_EQ(1, num_browser_windows);
 }
+
+TEST_F(AutomatedUITestBase, CloseBrowserWindow) {
+  int tab_count;
+  NewTab();
+  active_browser()->GetTabCount(&tab_count);
+  ASSERT_EQ(2, tab_count);
+
+  ASSERT_TRUE(OpenAndActivateNewBrowserWindow(NULL));
+  NewTab();
+  NewTab();
+  active_browser()->GetTabCount(&tab_count);
+  ASSERT_EQ(3, tab_count);
+
+  ASSERT_TRUE(OpenAndActivateNewBrowserWindow(NULL));
+  NewTab();
+  NewTab();
+  NewTab();
+  active_browser()->GetTabCount(&tab_count);
+  ASSERT_EQ(4, tab_count);
+
+  ASSERT_TRUE(CloseActiveWindow());
+  active_browser()->GetTabCount(&tab_count);
+
+  if (tab_count == 2) {
+    ASSERT_TRUE(CloseActiveWindow());
+    active_browser()->GetTabCount(&tab_count);
+    ASSERT_EQ(3, tab_count);
+  } else {
+    ASSERT_EQ(3, tab_count);
+    ASSERT_TRUE(CloseActiveWindow());
+    active_browser()->GetTabCount(&tab_count);
+    ASSERT_EQ(2, tab_count);
+  }
+
+  ASSERT_FALSE(CloseActiveWindow());
+}
+
+TEST_F(AutomatedUITestBase, CloseTab) {
+  int num_browser_windows;
+  int tab_count;
+  NewTab();
+  automation()->GetBrowserWindowCount(&num_browser_windows);
+  ASSERT_EQ(1, num_browser_windows);
+  active_browser()->GetTabCount(&tab_count);
+  ASSERT_EQ(2, tab_count);
+
+  ASSERT_TRUE(OpenAndActivateNewBrowserWindow(NULL));
+  NewTab();
+  NewTab();
+  active_browser()->GetTabCount(&tab_count);
+  ASSERT_EQ(3, tab_count);
+  automation()->GetBrowserWindowCount(&num_browser_windows);
+  ASSERT_EQ(2, num_browser_windows);
+
+  ASSERT_TRUE(CloseActiveTab());
+  active_browser()->GetTabCount(&tab_count);
+  ASSERT_EQ(2, tab_count);
+  ASSERT_TRUE(CloseActiveTab());
+  active_browser()->GetTabCount(&tab_count);
+  ASSERT_EQ(1, tab_count);
+  num_browser_windows = 0;
+  automation()->GetBrowserWindowCount(&num_browser_windows);
+  ASSERT_EQ(2, num_browser_windows);
+
+  // The browser window is closed by closing this tab.
+  ASSERT_TRUE(CloseActiveTab());
+  automation()->GetBrowserWindowCount(&num_browser_windows);
+  ASSERT_EQ(1, num_browser_windows);
+  // Active_browser_ is now the first created window.
+  active_browser()->GetTabCount(&tab_count);
+  ASSERT_EQ(2, tab_count);
+  ASSERT_TRUE(CloseActiveTab());
+  active_browser()->GetTabCount(&tab_count);
+  ASSERT_EQ(1, tab_count);
+
+  // The last tab should not be closed.
+  ASSERT_FALSE(CloseActiveTab());
+  active_browser()->GetTabCount(&tab_count);
+  ASSERT_EQ(1, tab_count);
+}