Landing georgey's CL

chrome/browser/cocoa/edit_search_engine_cocoa_controller_unittest.mm

 // 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 "app/l10n_util_mac.h"
 #include "base/scoped_nsobject.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/cocoa/browser_test_helper.h"
 #include "chrome/browser/cocoa/cocoa_test_helper.h"
 #import "chrome/browser/cocoa/edit_search_engine_cocoa_controller.h"
@@ skipping 61 matching lines @@
 
   // Test window title is set correctly.
   NSString* title = l10n_util::GetNSString(
       IDS_SEARCH_ENGINES_EDITOR_NEW_WINDOW_TITLE);
   EXPECT_TRUE([title isEqualToString:[[controller_ window] title]]);
 }
 
 TEST_F(EditSearchEngineControllerTest, SetImageViews) {
   EXPECT_TRUE([controller_ window]);  // Force the window to load.
   EXPECT_EQ([controller_ badImage], [[controller_ nameImage] image]);
-  // An empty keyword is OK.
-  EXPECT_EQ([controller_ goodImage], [[controller_ keywordImage] image]);
+  // An empty keyword is not OK.
+  EXPECT_EQ([controller_ badImage], [[controller_ keywordImage] image]);
   EXPECT_EQ([controller_ badImage], [[controller_ urlImage] image]);
 }
 
 // This test ensures that on creating a new keyword, we are in an "invalid"
 // state that cannot save.
 TEST_F(EditSearchEngineControllerTest, InvalidState) {
   EXPECT_TRUE([controller_ window]);  // Force window to load.
   NSString* toolTip = nil;
   EXPECT_FALSE([controller_ validateFields]);
 
   EXPECT_TRUE([@"" isEqualToString:[[controller_ nameField] stringValue]]);
   EXPECT_EQ([controller_ badImage], [[controller_ nameImage] image]);
   toolTip = l10n_util::GetNSString(IDS_SEARCH_ENGINES_INVALID_TITLE_TT);
   EXPECT_TRUE([toolTip isEqualToString:[[controller_ nameField] toolTip]]);
   EXPECT_TRUE([toolTip isEqualToString:[[controller_ nameImage] toolTip]]);
 
-  // Keywords can be empty strings.
+  // Keywords can not be empty strings.
   EXPECT_TRUE([@"" isEqualToString:[[controller_ keywordField] stringValue]]);
-  EXPECT_EQ([controller_ goodImage], [[controller_ keywordImage] image]);
-  EXPECT_FALSE([[controller_ keywordField] toolTip]);
-  EXPECT_FALSE([[controller_ keywordImage] toolTip]);
+  EXPECT_EQ([controller_ badImage], [[controller_ keywordImage] image]);
+  EXPECT_TRUE([[controller_ keywordField] toolTip]);
+  EXPECT_TRUE([[controller_ keywordImage] toolTip]);
 
   EXPECT_TRUE([@"" isEqualToString:[[controller_ urlField] stringValue]]);
   EXPECT_EQ([controller_ badImage], [[controller_ urlImage] image]);
   toolTip = l10n_util::GetNSString(IDS_SEARCH_ENGINES_INVALID_URL_TT);
   EXPECT_TRUE([toolTip isEqualToString:[[controller_ urlField] toolTip]]);
   EXPECT_TRUE([toolTip isEqualToString:[[controller_ urlImage] toolTip]]);
 }
 
 // Tests that the single name field validates.
 TEST_F(EditSearchEngineControllerTest, ValidateName) {
   EXPECT_TRUE([controller_ window]);  // Force window to load.
 
   EXPECT_EQ([controller_ badImage], [[controller_ nameImage] image]);
   EXPECT_FALSE([controller_ validateFields]);
   NSString* toolTip =
       l10n_util::GetNSString(IDS_SEARCH_ENGINES_INVALID_TITLE_TT);
   EXPECT_TRUE([toolTip isEqualToString:[[controller_ nameField] toolTip]]);
   EXPECT_TRUE([toolTip isEqualToString:[[controller_ nameImage] toolTip]]);
   [[controller_ nameField] setStringValue:@"Test Name"];
   EXPECT_FALSE([controller_ validateFields]);
   EXPECT_EQ([controller_ goodImage], [[controller_ nameImage] image]);
   EXPECT_FALSE([[controller_ nameField] toolTip]);
   EXPECT_FALSE([[controller_ nameImage] toolTip]);
   EXPECT_FALSE([[controller_ doneButton] isEnabled]);
 }
 
-// The keyword field is valid even if empty.
+// The keyword field is not valid if it is empty.
 TEST_F(EditSearchEngineControllerTest, ValidateKeyword) {
   EXPECT_TRUE([controller_ window]);  // Force window load.
 
-  EXPECT_EQ([controller_ goodImage], [[controller_ keywordImage] image]);
+  EXPECT_EQ([controller_ badImage], [[controller_ keywordImage] image]);
   EXPECT_FALSE([controller_ validateFields]);
-  EXPECT_FALSE([[controller_ keywordField] toolTip]);
-  EXPECT_FALSE([[controller_ keywordImage] toolTip]);
+  EXPECT_TRUE([[controller_ keywordField] toolTip]);
+  EXPECT_TRUE([[controller_ keywordImage] toolTip]);
   [[controller_ keywordField] setStringValue:@"foobar"];
   EXPECT_FALSE([controller_ validateFields]);
   EXPECT_EQ([controller_ goodImage], [[controller_ keywordImage] image]);
   EXPECT_FALSE([[controller_ keywordField] toolTip]);
   EXPECT_FALSE([[controller_ keywordImage] toolTip]);
   EXPECT_FALSE([[controller_ doneButton] isEnabled]);
 }
 
 // Tests that the URL field validates.
 TEST_F(EditSearchEngineControllerTest, ValidateURL) {
@@ skipping 13 matching lines @@
   EXPECT_FALSE([[controller_ doneButton] isEnabled]);
 }
 
 // Tests that if the user enters all valid data that the UI reflects that
 // and that they can save.
 TEST_F(EditSearchEngineControllerTest, ValidateFields) {
   EXPECT_TRUE([controller_ window]);  // Force window to load.
 
   // State before entering data.
   EXPECT_EQ([controller_ badImage], [[controller_ nameImage] image]);
-  EXPECT_EQ([controller_ goodImage], [[controller_ keywordImage] image]);
+  EXPECT_EQ([controller_ badImage], [[controller_ keywordImage] image]);
   EXPECT_EQ([controller_ badImage], [[controller_ urlImage] image]);
   EXPECT_FALSE([[controller_ doneButton] isEnabled]);
   EXPECT_FALSE([controller_ validateFields]);
 
   [[controller_ nameField] setStringValue:@"Test Name"];
   EXPECT_FALSE([controller_ validateFields]);
   EXPECT_EQ([controller_ goodImage], [[controller_ nameImage] image]);
   EXPECT_FALSE([[controller_ doneButton] isEnabled]);
 
   [[controller_ keywordField] setStringValue:@"foobar"];
@@ skipping 27 matching lines @@
   NSString* nameString = [[controller_ nameField] stringValue];
   EXPECT_TRUE([@"Foobar" isEqualToString:nameString]);
   NSString* keywordString = [[controller_ keywordField] stringValue];
   EXPECT_TRUE([@"keyword" isEqualToString:keywordString]);
   NSString* urlValueString = [[controller_ urlField] stringValue];
   EXPECT_TRUE([@"http://foo-bar.com" isEqualToString:urlValueString]);
   EXPECT_TRUE([controller_ validateFields]);
 }
 
 }  // namespace