diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-07 23:41:21 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-07 23:41:21 +0000 |
| commit | 95626f9c92f73b0ce15a9e96e6077469f8c53a8f (patch) | |
| tree | 4583e78a6018c8a94e81b19a86a6b08b79a29f9c /webkit | |
| parent | 28c196952f639ae961bfb63365362a15ed2e34d7 (diff) | |
| download | chromium_src-95626f9c92f73b0ce15a9e96e6077469f8c53a8f.zip chromium_src-95626f9c92f73b0ce15a9e96e6077469f8c53a8f.tar.gz chromium_src-95626f9c92f73b0ce15a9e96e6077469f8c53a8f.tar.bz2 | |
Linux port: enable a bunch of already-passing test shell tests.
Review URL: http://codereview.chromium.org/9707
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5036 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/test_shell/SConscript | 12 | ||||
| -rw-r--r-- | webkit/tools/test_shell/text_input_controller_unittest.cc | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/webkit/tools/test_shell/SConscript b/webkit/tools/test_shell/SConscript index a3764f9..e7d7bfb 100644 --- a/webkit/tools/test_shell/SConscript +++ b/webkit/tools/test_shell/SConscript @@ -159,20 +159,26 @@ test_files = [ 'node_leak_test.cc', 'run_all_tests.cc', 'test_shell_test.cc', + 'text_input_controller_unittest.cc', '$WEBKIT_DIR/glue/autocomplete_input_listener_unittest.cc', '$WEBKIT_DIR/glue/bookmarklet_unittest.cc', + '$WEBKIT_DIR/glue/context_menu_unittest.cc', '$WEBKIT_DIR/glue/cpp_bound_class_unittest.cc', '$WEBKIT_DIR/glue/cpp_variant_unittest.cc', '$WEBKIT_DIR/glue/dom_operations_unittest.cc', '$WEBKIT_DIR/glue/dom_serializer_unittest.cc', '$WEBKIT_DIR/glue/glue_serialize_unittest.cc', '$WEBKIT_DIR/glue/iframe_redirect_unittest.cc', + '$WEBKIT_DIR/glue/mimetype_unittest.cc', '$WEBKIT_DIR/glue/multipart_response_delegate_unittest.cc', '$WEBKIT_DIR/glue/password_autocomplete_listener_unittest.cc', '$WEBKIT_DIR/glue/regular_expression_unittest.cc', '$WEBKIT_DIR/glue/resource_fetcher_unittest.cc', '$WEBKIT_DIR/glue/webframe_unittest.cc', '$WEBKIT_DIR/port/platform/GKURL_unittest.cpp', + '$WEBKIT_DIR/port/platform/image-decoders/bmp/BMPImageDecoder_unittest.cpp', + '$WEBKIT_DIR/port/platform/image-decoders/ico/ICOImageDecoder_unittest.cpp', + '$WEBKIT_DIR/port/platform/image-decoders/xbm/XBMImageDecoder_unittest.cpp', '$V8_DIR/snapshot-empty$OBJSUFFIX', ] @@ -180,15 +186,9 @@ if env['PLATFORM'] == 'win32': # TODO(port): put portable files in above test_files declaration. test_files.extend([ 'plugin_tests.cc', - 'text_input_controller_unittest.cc', - '$WEBKIT_DIR/glue/context_menu_unittest.cc', - '$WEBKIT_DIR/glue/mimetype_unittest.cc', # Commented out until a regression is fixed and this file is restored. #'$WEBKIT_DIR/glue/stringimpl_unittest.cc', '$WEBKIT_DIR/glue/webplugin_impl_unittest.cc', - '$WEBKIT_DIR/port/platform/image-decoders/bmp/BMPImageDecoder_unittest.cpp', - '$WEBKIT_DIR/port/platform/image-decoders/ico/ICOImageDecoder_unittest.cpp', - '$WEBKIT_DIR/port/platform/image-decoders/xbm/XBMImageDecoder_unittest.cpp', ]) test_shell_tests = env.ChromeTestProgram('test_shell_tests', diff --git a/webkit/tools/test_shell/text_input_controller_unittest.cc b/webkit/tools/test_shell/text_input_controller_unittest.cc index 4eb16a3..6e47edd 100644 --- a/webkit/tools/test_shell/text_input_controller_unittest.cc +++ b/webkit/tools/test_shell/text_input_controller_unittest.cc @@ -19,9 +19,9 @@ class TestTextInputController : public TextInputController { TEST(TextInputControllerTest, MethodMapIsInitialized) { TestTextInputController text_input_controller; - - EXPECT_EQ(14, text_input_controller.MethodCount()); - + + EXPECT_EQ(14U, text_input_controller.MethodCount()); + EXPECT_TRUE(text_input_controller.IsMethodRegistered( "insertText")); EXPECT_TRUE(text_input_controller.IsMethodRegistered( @@ -50,7 +50,7 @@ TEST(TextInputControllerTest, MethodMapIsInitialized) { "validAttributesForMarkedText")); EXPECT_TRUE(text_input_controller.IsMethodRegistered( "makeAttributedString")); - + // Negative test. EXPECT_FALSE(text_input_controller.IsMethodRegistered( "momeRathsOutgrabe")); |