Factor tab context menu into a shared model and fix mac and win to use it. Im...

chrome/browser/tab_menu_model_unittest.cc

Index: chrome/browser/tab_menu_model_unittest.cc
===================================================================
--- chrome/browser/tab_menu_model_unittest.cc	(revision 0)
+++ chrome/browser/tab_menu_model_unittest.cc	(revision 0)
@@ -0,0 +1,68 @@
+// 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/browser/tab_menu_model.h"
+
+#include "base/logging.h"
+#include "testing/platform_test.h"
+#include "testing/gtest/include/gtest/gtest.h"

[viettrungluu, 2009/12/15 23:18:45]

g < p, and we usually order in the simplest way, I think.

[pink (ping after 24hrs), 2009/12/16 14:52:49]

Done.

+
+// A menu delegate that counts the number of times certain things are called
+// to make sure things are hooked up properly.
+class Delegate : public menus::SimpleMenuModel::Delegate {

[viettrungluu, 2009/12/15 23:18:45]

I've seen this before. Perhaps we should have a file with common code for
testing the menus?

[pink (ping after 24hrs), 2009/12/16 14:52:49]

I'll refactor this in a new cl, i don't want to clog up this CL since the
trybots are giving me such fits. I'll make a new parent class that houses this
and the method below these tests can inherit from.

+ public:
+  Delegate() : execute_count_(0), enable_count_(0) { }
+
+  virtual bool IsCommandIdChecked(int command_id) const { return false; }
+  virtual bool IsCommandIdEnabled(int command_id) const {
+    ++enable_count_;
+    return true;
+  }
+  virtual bool GetAcceleratorForCommandId(
+      int command_id,
+      menus::Accelerator* accelerator) { return false; }
+  virtual void ExecuteCommand(int command_id) { ++execute_count_; }
+
+  int execute_count_;
+  mutable int enable_count_;
+};
+
+class TabMenuModelTest : public PlatformTest {
+};
+
+// Recursively checks the enabled state and executes a command on every item
+// that's not a separator or a submenu parent item. The returned count should
+// match the number of times the delegate is called to ensure every item works.
+static void CountEnabledExecutable(menus::MenuModel* model, int* count) {

[viettrungluu, 2009/12/15 23:18:45]

This too.

[pink (ping after 24hrs), 2009/12/16 14:52:49]

same.

+  for (int i = 0; i < model->GetItemCount(); ++i) {
+    menus::MenuModel::ItemType type = model->GetTypeAt(i);
+    switch (type) {
+      case menus::MenuModel::TYPE_SEPARATOR:
+        continue;
+      case menus::MenuModel::TYPE_SUBMENU:
+        CountEnabledExecutable(model->GetSubmenuModelAt(i), count);
+        break;
+      default:
+        model->IsEnabledAt(i);  // Check if it's enabled (ignore answer).
+        model->ActivatedAt(i);  // Execute it.
+        (*count)++;  // Increment the count of executable items seen.
+        break;
+    }
+  }
+}
+
+TEST_F(TabMenuModelTest, Basics) {
+  Delegate delegate;
+  TabMenuModel model(&delegate);
+
+  // Verify it has items. The number varies by platform, so we don't check
+  // the exact number.
+  EXPECT_GT(model.GetItemCount(), 5);
+
+  int item_count = 0;
+  CountEnabledExecutable(&model, &item_count);
+  EXPECT_GT(item_count, 0);
+  EXPECT_EQ(item_count, delegate.execute_count_);
+  EXPECT_EQ(item_count, delegate.enable_count_);
+}
Property changes on: chrome/browser/tab_menu_model_unittest.cc
___________________________________________________________________
Name: svn:eol-style
   + LF