Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1722)

Side by Side Diff: chrome/browser/sync/sync_js_controller_unittest.cc

Issue 7649006: more changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix another typo Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/sync/sync_js_controller.h" 5 #include "chrome/browser/sync/sync_js_controller.h"
6 6
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "chrome/browser/sync/js/js_arg_list.h" 9 #include "chrome/browser/sync/js/js_arg_list.h"
10 #include "chrome/browser/sync/js/js_event_details.h" 10 #include "chrome/browser/sync/js/js_event_details.h"
(...skipping 19 matching lines...) Expand all
30 MessageLoop message_loop_; 30 MessageLoop message_loop_;
31 }; 31 };
32 32
33 TEST_F(SyncJsControllerTest, Messages) { 33 TEST_F(SyncJsControllerTest, Messages) {
34 InSequence dummy; 34 InSequence dummy;
35 // |mock_backend| needs to outlive |sync_js_controller|. 35 // |mock_backend| needs to outlive |sync_js_controller|.
36 StrictMock<MockJsBackend> mock_backend; 36 StrictMock<MockJsBackend> mock_backend;
37 SyncJsController sync_js_controller; 37 SyncJsController sync_js_controller;
38 38
39 ListValue arg_list1, arg_list2; 39 ListValue arg_list1, arg_list2;
40 arg_list1.Append(Value::CreateBooleanValue(false)); 40 arg_list1.Append(base::FalseValue());
41 arg_list2.Append(Value::CreateIntegerValue(5)); 41 arg_list2.Append(base::NumberValue::New(5));
42 JsArgList args1(&arg_list1), args2(&arg_list2); 42 JsArgList args1(&arg_list1), args2(&arg_list2);
43 43
44 // TODO(akalin): Write matchers for WeakHandle and use them here 44 // TODO(akalin): Write matchers for WeakHandle and use them here
45 // instead of _. 45 // instead of _.
46 EXPECT_CALL(mock_backend, SetJsEventHandler(_)); 46 EXPECT_CALL(mock_backend, SetJsEventHandler(_));
47 EXPECT_CALL(mock_backend, ProcessJsMessage("test1", HasArgs(args2), _)); 47 EXPECT_CALL(mock_backend, ProcessJsMessage("test1", HasArgs(args2), _));
48 EXPECT_CALL(mock_backend, ProcessJsMessage("test2", HasArgs(args1), _)); 48 EXPECT_CALL(mock_backend, ProcessJsMessage("test2", HasArgs(args1), _));
49 49
50 sync_js_controller.AttachJsBackend(mock_backend.AsWeakHandle()); 50 sync_js_controller.AttachJsBackend(mock_backend.AsWeakHandle());
51 sync_js_controller.ProcessJsMessage("test1", args2, 51 sync_js_controller.ProcessJsMessage("test1", args2,
52 WeakHandle<JsReplyHandler>()); 52 WeakHandle<JsReplyHandler>());
53 sync_js_controller.ProcessJsMessage("test2", args1, 53 sync_js_controller.ProcessJsMessage("test2", args1,
54 WeakHandle<JsReplyHandler>()); 54 WeakHandle<JsReplyHandler>());
55 PumpLoop(); 55 PumpLoop();
56 56
57 // Let destructor of |sync_js_controller| call RemoveBackend(). 57 // Let destructor of |sync_js_controller| call RemoveBackend().
58 } 58 }
59 59
60 TEST_F(SyncJsControllerTest, QueuedMessages) { 60 TEST_F(SyncJsControllerTest, QueuedMessages) {
61 // |mock_backend| needs to outlive |sync_js_controller|. 61 // |mock_backend| needs to outlive |sync_js_controller|.
62 StrictMock<MockJsBackend> mock_backend; 62 StrictMock<MockJsBackend> mock_backend;
63 SyncJsController sync_js_controller; 63 SyncJsController sync_js_controller;
64 64
65 ListValue arg_list1, arg_list2; 65 ListValue arg_list1, arg_list2;
66 arg_list1.Append(Value::CreateBooleanValue(false)); 66 arg_list1.Append(base::FalseValue());
67 arg_list2.Append(Value::CreateIntegerValue(5)); 67 arg_list2.Append(base::NumberValue::New(5));
68 JsArgList args1(&arg_list1), args2(&arg_list2); 68 JsArgList args1(&arg_list1), args2(&arg_list2);
69 69
70 // Should queue messages. 70 // Should queue messages.
71 sync_js_controller.ProcessJsMessage("test1", args2, 71 sync_js_controller.ProcessJsMessage("test1", args2,
72 WeakHandle<JsReplyHandler>()); 72 WeakHandle<JsReplyHandler>());
73 sync_js_controller.ProcessJsMessage("test2", args1, 73 sync_js_controller.ProcessJsMessage("test2", args1,
74 WeakHandle<JsReplyHandler>()); 74 WeakHandle<JsReplyHandler>());
75 75
76 Mock::VerifyAndClearExpectations(&mock_backend); 76 Mock::VerifyAndClearExpectations(&mock_backend);
77 77
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 sync_js_controller.HandleJsEvent("anotherevent", details2); 117 sync_js_controller.HandleJsEvent("anotherevent", details2);
118 sync_js_controller.RemoveJsEventHandler(&event_handler1); 118 sync_js_controller.RemoveJsEventHandler(&event_handler1);
119 sync_js_controller.RemoveJsEventHandler(&event_handler2); 119 sync_js_controller.RemoveJsEventHandler(&event_handler2);
120 sync_js_controller.HandleJsEvent("droppedevent", details2); 120 sync_js_controller.HandleJsEvent("droppedevent", details2);
121 121
122 PumpLoop(); 122 PumpLoop();
123 } 123 }
124 124
125 } // namespace 125 } // namespace
126 } // namespace browser_sync 126 } // namespace browser_sync
OLDNEW
« no previous file with comments | « chrome/browser/sync/protocol/proto_value_conversions.cc ('k') | chrome/browser/sync/sync_setup_wizard_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698