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

Side by Side Diff: remoting/webapp/base/js/fallback_signal_strategy_unittest.js

Issue 1285213006: Send connection setup results using XHRs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 /** 5 /**
6 * @fileoverview 6 * @fileoverview
7 * TODO(garykac): Create interfaces for LogToServer and SignalStrategy. 7 * TODO(garykac): Create interfaces for LogToServer and SignalStrategy.
8 * @suppress {checkTypes|checkVars|reportUnknownTypes|visibility} 8 * @suppress {checkTypes|checkVars|reportUnknownTypes|visibility}
9 */ 9 */
10 10
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 remoting.SignalStrategy.Type.XMPP), 77 remoting.SignalStrategy.Type.XMPP),
78 new remoting.MockSignalStrategy('secondary-jid', 78 new remoting.MockSignalStrategy('secondary-jid',
79 remoting.SignalStrategy.Type.WCS)); 79 remoting.SignalStrategy.Type.WCS));
80 strategy.setStateChangedCallback(onStateChange); 80 strategy.setStateChangedCallback(onStateChange);
81 strategy.setIncomingStanzaCallback(onIncomingStanzaCallback); 81 strategy.setIncomingStanzaCallback(onIncomingStanzaCallback);
82 primary = strategy.primary_; 82 primary = strategy.primary_;
83 addSpies(primary); 83 addSpies(primary);
84 secondary = strategy.secondary_; 84 secondary = strategy.secondary_;
85 addSpies(secondary); 85 addSpies(secondary);
86 logToServer = new MockLogToServer(assert); 86 logToServer = new MockLogToServer(assert);
87 strategy.logger_ = logToServer;
Jamie 2015/08/14 20:48:00 This is ugly (and wouldn't compile if we ever want
kelvinp 2015/08/14 21:59:54 I think that's ok for test.
87 }, 88 },
88 afterEach: function() { 89 afterEach: function() {
89 onStateChange = null; 90 onStateChange = null;
90 onIncomingStanzaCallback = null; 91 onIncomingStanzaCallback = null;
91 strategy = null; 92 strategy = null;
92 primary = null; 93 primary = null;
93 secondary = null; 94 secondary = null;
94 logToServer = null; 95 logToServer = null;
95 }, 96 },
96 }); 97 });
(...skipping 15 matching lines...) Expand all
112 assert.ok(primary.connect.calledWith('server', 'username', 'authToken')); 113 assert.ok(primary.connect.calledWith('server', 'username', 'authToken'));
113 114
114 setState(assert, primary, remoting.SignalStrategy.State.NOT_CONNECTED, 115 setState(assert, primary, remoting.SignalStrategy.State.NOT_CONNECTED,
115 true); 116 true);
116 setState(assert, primary, remoting.SignalStrategy.State.CONNECTING, true); 117 setState(assert, primary, remoting.SignalStrategy.State.CONNECTING, true);
117 setState(assert, primary, remoting.SignalStrategy.State.HANDSHAKE, true); 118 setState(assert, primary, remoting.SignalStrategy.State.HANDSHAKE, true);
118 119
119 setState(assert, primary, remoting.SignalStrategy.State.CONNECTED, true); 120 setState(assert, primary, remoting.SignalStrategy.State.CONNECTED, true);
120 assert.equal(strategy.getJid(), 'primary-jid'); 121 assert.equal(strategy.getJid(), 'primary-jid');
121 122
122 strategy.sendConnectionSetupResults(logToServer);
123 logToServer.assertProgress( 123 logToServer.assertProgress(
124 remoting.SignalStrategy.Type.XMPP, 124 remoting.SignalStrategy.Type.XMPP,
125 remoting.FallbackSignalStrategy.Progress.SUCCEEDED); 125 remoting.FallbackSignalStrategy.Progress.SUCCEEDED);
126 126
127 assert.ok(!onIncomingStanzaCallback.called); 127 assert.ok(!onIncomingStanzaCallback.called);
128 primary.onIncomingStanzaCallback_('test-receive-primary'); 128 primary.onIncomingStanzaCallback_('test-receive-primary');
129 secondary.onIncomingStanzaCallback_('test-receive-secondary'); 129 secondary.onIncomingStanzaCallback_('test-receive-secondary');
130 assert.ok(onIncomingStanzaCallback.calledOnce); 130 assert.ok(onIncomingStanzaCallback.calledOnce);
131 assert.ok(onIncomingStanzaCallback.calledWith('test-receive-primary')); 131 assert.ok(onIncomingStanzaCallback.calledWith('test-receive-primary'));
132 132
(...skipping 28 matching lines...) Expand all
161 161
162 setState(assert, secondary, remoting.SignalStrategy.State.NOT_CONNECTED, 162 setState(assert, secondary, remoting.SignalStrategy.State.NOT_CONNECTED,
163 false); 163 false);
164 setState(assert, secondary, remoting.SignalStrategy.State.CONNECTING, 164 setState(assert, secondary, remoting.SignalStrategy.State.CONNECTING,
165 false); 165 false);
166 setState(assert, secondary, remoting.SignalStrategy.State.HANDSHAKE, true); 166 setState(assert, secondary, remoting.SignalStrategy.State.HANDSHAKE, true);
167 167
168 setState(assert, secondary, remoting.SignalStrategy.State.CONNECTED, true); 168 setState(assert, secondary, remoting.SignalStrategy.State.CONNECTED, true);
169 assert.equal(strategy.getJid(), 'secondary-jid'); 169 assert.equal(strategy.getJid(), 'secondary-jid');
170 170
171 strategy.sendConnectionSetupResults(logToServer);
172 logToServer.assertProgress( 171 logToServer.assertProgress(
173 remoting.SignalStrategy.Type.XMPP, 172 remoting.SignalStrategy.Type.XMPP,
174 remoting.FallbackSignalStrategy.Progress.FAILED, 173 remoting.FallbackSignalStrategy.Progress.FAILED,
175 remoting.SignalStrategy.Type.WCS, 174 remoting.SignalStrategy.Type.WCS,
176 remoting.FallbackSignalStrategy.Progress.SUCCEEDED); 175 remoting.FallbackSignalStrategy.Progress.SUCCEEDED);
177 176
178 assert.ok(!onIncomingStanzaCallback.called); 177 assert.ok(!onIncomingStanzaCallback.called);
179 primary.onIncomingStanzaCallback_('test-receive-primary'); 178 primary.onIncomingStanzaCallback_('test-receive-primary');
180 secondary.onIncomingStanzaCallback_('test-receive-secondary'); 179 secondary.onIncomingStanzaCallback_('test-receive-secondary');
181 assert.ok(onIncomingStanzaCallback.calledOnce); 180 assert.ok(onIncomingStanzaCallback.calledOnce);
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 this.clock.tick(strategy.PRIMARY_CONNECT_TIMEOUT_MS_ - 1); 221 this.clock.tick(strategy.PRIMARY_CONNECT_TIMEOUT_MS_ - 1);
223 assert.ok(!secondary.connect.called); 222 assert.ok(!secondary.connect.called);
224 this.clock.tick(1); 223 this.clock.tick(1);
225 assert.ok(secondary.connect.calledWith('server', 'username', 'authToken')); 224 assert.ok(secondary.connect.calledWith('server', 'username', 'authToken'));
226 setState(assert, secondary, remoting.SignalStrategy.State.NOT_CONNECTED, 225 setState(assert, secondary, remoting.SignalStrategy.State.NOT_CONNECTED,
227 false); 226 false);
228 setState(assert, secondary, remoting.SignalStrategy.State.CONNECTING, 227 setState(assert, secondary, remoting.SignalStrategy.State.CONNECTING,
229 false); 228 false);
230 setState(assert, secondary, remoting.SignalStrategy.State.HANDSHAKE, true); 229 setState(assert, secondary, remoting.SignalStrategy.State.HANDSHAKE, true);
231 setState(assert, secondary, remoting.SignalStrategy.State.CONNECTED, true); 230 setState(assert, secondary, remoting.SignalStrategy.State.CONNECTED, true);
232 strategy.sendConnectionSetupResults(logToServer);
233 231
234 setState(assert, secondary, remoting.SignalStrategy.State.CLOSED, true); 232 setState(assert, secondary, remoting.SignalStrategy.State.CLOSED, true);
235 setState(assert, primary, remoting.SignalStrategy.State.FAILED, false); 233 setState(assert, primary, remoting.SignalStrategy.State.FAILED, false);
236 234
237 logToServer.assertProgress( 235 logToServer.assertProgress(
238 remoting.SignalStrategy.Type.XMPP, 236 remoting.SignalStrategy.Type.XMPP,
239 remoting.FallbackSignalStrategy.Progress.TIMED_OUT, 237 remoting.FallbackSignalStrategy.Progress.TIMED_OUT,
240 remoting.SignalStrategy.Type.WCS, 238 remoting.SignalStrategy.Type.WCS,
241 remoting.FallbackSignalStrategy.Progress.SUCCEEDED, 239 remoting.FallbackSignalStrategy.Progress.SUCCEEDED,
242 remoting.SignalStrategy.Type.XMPP, 240 remoting.SignalStrategy.Type.XMPP,
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 true); 275 true);
278 setState(assert, primary, remoting.SignalStrategy.State.CONNECTING, true); 276 setState(assert, primary, remoting.SignalStrategy.State.CONNECTING, true);
279 this.clock.tick(strategy.PRIMARY_CONNECT_TIMEOUT_MS_); 277 this.clock.tick(strategy.PRIMARY_CONNECT_TIMEOUT_MS_);
280 assert.ok(secondary.connect.calledWith('server', 'username', 'authToken')); 278 assert.ok(secondary.connect.calledWith('server', 'username', 'authToken'));
281 setState(assert, secondary, remoting.SignalStrategy.State.NOT_CONNECTED, 279 setState(assert, secondary, remoting.SignalStrategy.State.NOT_CONNECTED,
282 false); 280 false);
283 setState(assert, secondary, remoting.SignalStrategy.State.CONNECTING, 281 setState(assert, secondary, remoting.SignalStrategy.State.CONNECTING,
284 false); 282 false);
285 setState(assert, secondary, remoting.SignalStrategy.State.HANDSHAKE, true); 283 setState(assert, secondary, remoting.SignalStrategy.State.HANDSHAKE, true);
286 setState(assert, secondary, remoting.SignalStrategy.State.CONNECTED, true); 284 setState(assert, secondary, remoting.SignalStrategy.State.CONNECTED, true);
287 strategy.sendConnectionSetupResults(logToServer);
288 285
289 setState(assert, primary, remoting.SignalStrategy.State.HANDSHAKE, false); 286 setState(assert, primary, remoting.SignalStrategy.State.HANDSHAKE, false);
290 setState(assert, primary, remoting.SignalStrategy.State.CONNECTED, false); 287 setState(assert, primary, remoting.SignalStrategy.State.CONNECTED, false);
291 288
292 logToServer.assertProgress( 289 logToServer.assertProgress(
293 remoting.SignalStrategy.Type.XMPP, 290 remoting.SignalStrategy.Type.XMPP,
294 remoting.FallbackSignalStrategy.Progress.TIMED_OUT, 291 remoting.FallbackSignalStrategy.Progress.TIMED_OUT,
295 remoting.SignalStrategy.Type.WCS, 292 remoting.SignalStrategy.Type.WCS,
296 remoting.FallbackSignalStrategy.Progress.SUCCEEDED, 293 remoting.FallbackSignalStrategy.Progress.SUCCEEDED,
297 remoting.SignalStrategy.Type.XMPP, 294 remoting.SignalStrategy.Type.XMPP,
298 remoting.FallbackSignalStrategy.Progress.SUCCEEDED_LATE); 295 remoting.FallbackSignalStrategy.Progress.SUCCEEDED_LATE);
299 } 296 }
300 ); 297 );
301 298
302 })(); 299 })();
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698