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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: remoting/webapp/crd/js/fallback_signal_strategy_unittest.js

Issue 1017613002: Migrate Remoting Webapp Unittests to use QUnit 2.0 syntax. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Reviewer's feedback Created 5 years, 9 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 side-by-side diff with in-line comments
Download patch
« remoting/webapp/crd/js/apps_v2_migration_unittest.js ('K') | « remoting/webapp/crd/js/error_unittest.js ('k') | remoting/webapp/crd/js/host_table_entry_unittest.js » ('j') | remoting/webapp/crd/js/xhr_unittest.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/webapp/crd/js/fallback_signal_strategy_unittest.js
diff --git a/remoting/webapp/crd/js/fallback_signal_strategy_unittest.js b/remoting/webapp/crd/js/fallback_signal_strategy_unittest.js
index 9f97a7293599b4943df6458344582585445d7ccd..f1622155c93ec44a1d2ba94df0741d1f971ab755 100644
--- a/remoting/webapp/crd/js/fallback_signal_strategy_unittest.js
+++ b/remoting/webapp/crd/js/fallback_signal_strategy_unittest.js
@@ -20,11 +20,12 @@ var MockLogToServer = function() {
/** @type {function(...)} */
MockLogToServer.prototype.assertProgress = function() {
- equal(this.logSignalStrategyProgress.callCount * 2, arguments.length);
+ QUnit.equal(this.logSignalStrategyProgress.callCount * 2, arguments.length);
for (var i = 0; i < this.logSignalStrategyProgress.callCount; ++i) {
- equal(this.logSignalStrategyProgress.getCall(i).args[0], arguments[2 * i]);
- equal(this.logSignalStrategyProgress.getCall(i).args[1],
- arguments[2 * i + 1]);
+ QUnit.equal(
+ this.logSignalStrategyProgress.getCall(i).args[0], arguments[2 * i]);
+ QUnit.equal(this.logSignalStrategyProgress.getCall(i).args[1],
+ arguments[2 * i + 1]);
}
};
@@ -56,16 +57,16 @@ function setState(baseSignalStrategy, state, expectCallback) {
baseSignalStrategy.setStateForTesting(state);
if (expectCallback) {
- equal(onStateChange.callCount, 1);
- ok(onStateChange.calledWith(state));
- equal(strategy.getState(), state);
+ QUnit.equal(onStateChange.callCount, 1);
+ QUnit.ok(onStateChange.calledWith(state));
+ QUnit.equal(strategy.getState(), state);
} else {
- ok(!onStateChange.called);
+ QUnit.ok(!onStateChange.called);
}
};
-module('fallback_signal_strategy', {
- setup: function() {
+QUnit.module('fallback_signal_strategy', {
+ beforeEach: function() {
onStateChange = sinon.spy();
onIncomingStanzaCallback = sinon.spy();
strategy = new remoting.FallbackSignalStrategy(
@@ -79,7 +80,7 @@ module('fallback_signal_strategy', {
secondary = strategy.secondary_;
logToServer = new MockLogToServer();
},
- teardown: function() {
+ afterEach: function() {
onStateChange = null;
onIncomingStanzaCallback = null;
strategy = null;
@@ -89,66 +90,66 @@ module('fallback_signal_strategy', {
},
});
-test('primary succeeds; send & receive routed to it',
+QUnit.test('primary succeeds; send & receive routed to it',
function() {
- ok(!onStateChange.called);
- ok(!primary.connect.called);
+ QUnit.ok(!onStateChange.called);
+ QUnit.ok(!primary.connect.called);
strategy.connect('server', 'username', 'authToken');
- ok(primary.connect.calledWith('server', 'username', 'authToken'));
+ QUnit.ok(primary.connect.calledWith('server', 'username', 'authToken'));
setState(primary, remoting.SignalStrategy.State.NOT_CONNECTED, true);
setState(primary, remoting.SignalStrategy.State.CONNECTING, true);
setState(primary, remoting.SignalStrategy.State.HANDSHAKE, true);
setState(primary, remoting.SignalStrategy.State.CONNECTED, true);
- equal(strategy.getJid(), 'primary-jid');
+ QUnit.equal(strategy.getJid(), 'primary-jid');
strategy.sendConnectionSetupResults(logToServer);
logToServer.assertProgress(
remoting.SignalStrategy.Type.XMPP,
remoting.FallbackSignalStrategy.Progress.SUCCEEDED);
- ok(!onIncomingStanzaCallback.called);
+ QUnit.ok(!onIncomingStanzaCallback.called);
primary.onIncomingStanzaCallback_('test-receive-primary');
secondary.onIncomingStanzaCallback_('test-receive-secondary');
- ok(onIncomingStanzaCallback.calledOnce);
- ok(onIncomingStanzaCallback.calledWith('test-receive-primary'));
+ QUnit.ok(onIncomingStanzaCallback.calledOnce);
+ QUnit.ok(onIncomingStanzaCallback.calledWith('test-receive-primary'));
- ok(!primary.sendMessage.called);
+ QUnit.ok(!primary.sendMessage.called);
strategy.sendMessage('test-send');
- ok(primary.sendMessage.calledOnce);
- ok(primary.sendMessage.calledWith('test-send'));
+ QUnit.ok(primary.sendMessage.calledOnce);
+ QUnit.ok(primary.sendMessage.calledWith('test-send'));
- ok(!primary.dispose.called);
- ok(!secondary.dispose.called);
+ QUnit.ok(!primary.dispose.called);
+ QUnit.ok(!secondary.dispose.called);
setState(primary, remoting.SignalStrategy.State.CLOSED, true);
strategy.dispose();
- ok(primary.dispose.calledOnce);
- ok(secondary.dispose.calledOnce);
+ QUnit.ok(primary.dispose.calledOnce);
+ QUnit.ok(secondary.dispose.calledOnce);
}
);
-test('primary fails; secondary succeeds; send & receive routed to it',
+QUnit.test('primary fails; secondary succeeds; send & receive routed to it',
function() {
- ok(!onStateChange.called);
- ok(!primary.connect.called);
+ QUnit.ok(!onStateChange.called);
+ QUnit.ok(!primary.connect.called);
strategy.connect('server', 'username', 'authToken');
- ok(primary.connect.calledWith('server', 'username', 'authToken'));
+ QUnit.ok(primary.connect.calledWith('server', 'username', 'authToken'));
setState(primary, remoting.SignalStrategy.State.NOT_CONNECTED,
true);
setState(primary, remoting.SignalStrategy.State.CONNECTING, true);
- ok(!secondary.connect.called);
+ QUnit.ok(!secondary.connect.called);
setState(primary, remoting.SignalStrategy.State.FAILED, false);
- ok(secondary.connect.calledWith('server', 'username', 'authToken'));
+ QUnit.ok(secondary.connect.calledWith('server', 'username', 'authToken'));
setState(secondary, remoting.SignalStrategy.State.NOT_CONNECTED, false);
setState(secondary, remoting.SignalStrategy.State.CONNECTING, false);
setState(secondary, remoting.SignalStrategy.State.HANDSHAKE, true);
setState(secondary, remoting.SignalStrategy.State.CONNECTED, true);
- equal(strategy.getJid(), 'secondary-jid');
+ QUnit.equal(strategy.getJid(), 'secondary-jid');
strategy.sendConnectionSetupResults(logToServer);
logToServer.assertProgress(
@@ -157,52 +158,52 @@ test('primary fails; secondary succeeds; send & receive routed to it',
remoting.SignalStrategy.Type.WCS,
remoting.FallbackSignalStrategy.Progress.SUCCEEDED);
- ok(!onIncomingStanzaCallback.called);
+ QUnit.ok(!onIncomingStanzaCallback.called);
primary.onIncomingStanzaCallback_('test-receive-primary');
secondary.onIncomingStanzaCallback_('test-receive-secondary');
- ok(onIncomingStanzaCallback.calledOnce);
- ok(onIncomingStanzaCallback.calledWith('test-receive-secondary'));
+ QUnit.ok(onIncomingStanzaCallback.calledOnce);
+ QUnit.ok(onIncomingStanzaCallback.calledWith('test-receive-secondary'));
- ok(!secondary.sendMessage.called);
+ QUnit.ok(!secondary.sendMessage.called);
strategy.sendMessage('test-send');
- ok(!primary.sendMessage.called);
- ok(secondary.sendMessage.calledOnce);
- ok(secondary.sendMessage.calledWith('test-send'));
+ QUnit.ok(!primary.sendMessage.called);
+ QUnit.ok(secondary.sendMessage.calledOnce);
+ QUnit.ok(secondary.sendMessage.calledWith('test-send'));
}
);
-test('primary fails; secondary fails',
+QUnit.test('primary fails; secondary fails',
function() {
- ok(!onStateChange.called);
- ok(!primary.connect.called);
+ QUnit.ok(!onStateChange.called);
+ QUnit.ok(!primary.connect.called);
strategy.connect('server', 'username', 'authToken');
- ok(primary.connect.calledWith('server', 'username', 'authToken'));
+ QUnit.ok(primary.connect.calledWith('server', 'username', 'authToken'));
setState(primary, remoting.SignalStrategy.State.NOT_CONNECTED, true);
- ok(!secondary.connect.called);
+ QUnit.ok(!secondary.connect.called);
setState(primary, remoting.SignalStrategy.State.CONNECTING, true);
setState(primary, remoting.SignalStrategy.State.FAILED, false);
- ok(secondary.connect.calledWith('server', 'username', 'authToken'));
+ QUnit.ok(secondary.connect.calledWith('server', 'username', 'authToken'));
setState(secondary, remoting.SignalStrategy.State.NOT_CONNECTED, false);
setState(primary, remoting.SignalStrategy.State.CONNECTING, false);
setState(secondary, remoting.SignalStrategy.State.FAILED, true);
}
);
-test('primary times out; secondary succeeds',
+QUnit.test('primary times out; secondary succeeds',
function() {
- ok(!onStateChange.called);
- ok(!primary.connect.called);
+ QUnit.ok(!onStateChange.called);
+ QUnit.ok(!primary.connect.called);
strategy.connect('server', 'username', 'authToken');
- ok(primary.connect.calledWith('server', 'username', 'authToken'));
+ QUnit.ok(primary.connect.calledWith('server', 'username', 'authToken'));
setState(primary, remoting.SignalStrategy.State.NOT_CONNECTED,
true);
setState(primary, remoting.SignalStrategy.State.CONNECTING, true);
this.clock.tick(strategy.PRIMARY_CONNECT_TIMEOUT_MS_ - 1);
- ok(!secondary.connect.called);
+ QUnit.ok(!secondary.connect.called);
this.clock.tick(1);
- ok(secondary.connect.calledWith('server', 'username', 'authToken'));
+ QUnit.ok(secondary.connect.calledWith('server', 'username', 'authToken'));
setState(secondary, remoting.SignalStrategy.State.NOT_CONNECTED, false);
setState(secondary, remoting.SignalStrategy.State.CONNECTING, false);
setState(secondary, remoting.SignalStrategy.State.HANDSHAKE, true);
@@ -222,38 +223,38 @@ test('primary times out; secondary succeeds',
}
);
-test('primary times out; secondary fails',
+QUnit.test('primary times out; secondary fails',
function() {
- ok(!onStateChange.called);
- ok(!primary.connect.called);
+ QUnit.ok(!onStateChange.called);
+ QUnit.ok(!primary.connect.called);
strategy.connect('server', 'username', 'authToken');
- ok(primary.connect.calledWith('server', 'username', 'authToken'));
+ QUnit.ok(primary.connect.calledWith('server', 'username', 'authToken'));
setState(primary, remoting.SignalStrategy.State.NOT_CONNECTED,
true);
setState(primary, remoting.SignalStrategy.State.CONNECTING, true);
this.clock.tick(strategy.PRIMARY_CONNECT_TIMEOUT_MS_ - 1);
- ok(!secondary.connect.called);
+ QUnit.ok(!secondary.connect.called);
this.clock.tick(1);
- ok(secondary.connect.calledWith('server', 'username', 'authToken'));
+ QUnit.ok(secondary.connect.calledWith('server', 'username', 'authToken'));
setState(secondary, remoting.SignalStrategy.State.NOT_CONNECTED, false);
setState(secondary, remoting.SignalStrategy.State.CONNECTING, false);
setState(secondary, remoting.SignalStrategy.State.FAILED, true);
}
);
-test('primary times out; secondary succeeds; primary succeeds late',
+QUnit.test('primary times out; secondary succeeds; primary succeeds late',
function() {
- ok(!onStateChange.called);
- ok(!primary.connect.called);
+ QUnit.ok(!onStateChange.called);
+ QUnit.ok(!primary.connect.called);
strategy.connect('server', 'username', 'authToken');
- ok(primary.connect.calledWith('server', 'username', 'authToken'));
+ QUnit.ok(primary.connect.calledWith('server', 'username', 'authToken'));
setState(primary, remoting.SignalStrategy.State.NOT_CONNECTED,
true);
setState(primary, remoting.SignalStrategy.State.CONNECTING, true);
this.clock.tick(strategy.PRIMARY_CONNECT_TIMEOUT_MS_);
- ok(secondary.connect.calledWith('server', 'username', 'authToken'));
+ QUnit.ok(secondary.connect.calledWith('server', 'username', 'authToken'));
setState(secondary, remoting.SignalStrategy.State.NOT_CONNECTED, false);
setState(secondary, remoting.SignalStrategy.State.CONNECTING, false);
setState(secondary, remoting.SignalStrategy.State.HANDSHAKE, true);
« remoting/webapp/crd/js/apps_v2_migration_unittest.js ('K') | « remoting/webapp/crd/js/error_unittest.js ('k') | remoting/webapp/crd/js/host_table_entry_unittest.js » ('j') | remoting/webapp/crd/js/xhr_unittest.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698