Skip to content

Commit 19351a8

Browse files
jleybajleyba
committed
Stop using deprecated code in the SafariDriver
1 parent 70209d1 commit 19351a8

File tree

11 files changed

+92
-90
lines changed

11 files changed

+92
-90
lines changed

‎javascript/safari-driver/debug/debug.js‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

1515
goog.provide('safaridriver.debug');
1616

17-
goog.require('goog.debug.Logger');
1817
goog.require('goog.dom');
1918
goog.require('goog.dom.TagName');
19+
goog.require('goog.log');
2020
goog.require('goog.string');
2121
goog.require('safaridriver.Command');
2222
goog.require('safaridriver.console');
@@ -30,10 +30,10 @@ goog.require('webdriver.logging');
3030

3131

3232
/**
33-
* @private {!goog.debug.Logger}
33+
* @private {goog.log.Logger}
3434
* @const
3535
*/
36-
safaridriver.debug.LOG_ = goog.debug.Logger.getLogger('safaridriver.debug');
36+
safaridriver.debug.LOG_ = goog.log.getLogger('safaridriver.debug');
3737

3838

3939
/**
@@ -43,7 +43,8 @@ safaridriver.debug.init = function() {
4343
safaridriver.console.init();
4444

4545
var messageTarget = new safaridriver.message.MessageTarget(safari.self);
46-
messageTarget.on(safaridriver.message.Log.TYPE, safaridriver.debug.onLogEntry_);
46+
messageTarget.on(
47+
safaridriver.message.Log.TYPE, safaridriver.debug.onLogEntry_);
4748
messageTarget.setLogger(safaridriver.debug.LOG_);
4849

4950
var driver = webdriver.WebDriver.createSession(

‎javascript/safari-driver/extension/commands.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ goog.provide('safaridriver.extension.commands');
2323
goog.require('bot.response');
2424
goog.require('goog.Uri');
2525
goog.require('goog.array');
26-
goog.require('goog.debug.Logger');
26+
goog.require('goog.log');
2727
goog.require('goog.string');
2828
goog.require('safaridriver.alert');
2929
goog.require('safaridriver.extension.LogDb');
@@ -35,10 +35,10 @@ goog.require('webdriver.promise');
3535

3636

3737
/**
38-
* @private {!goog.debug.Logger}
38+
* @private {goog.log.Logger}
3939
* @const
4040
*/
41-
safaridriver.extension.commands.LOG_ = goog.debug.Logger.getLogger(
41+
safaridriver.extension.commands.LOG_ = goog.log.getLogger(
4242
'safaridriver.extension.commands');
4343

4444

@@ -192,7 +192,7 @@ safaridriver.extension.commands.sendNavigationCommand_ = function(
192192
function onLoad() {
193193
tab.removeListener(safaridriver.message.Alert.TYPE, onAlert);
194194
if (response.isPending()) {
195-
safaridriver.extension.commands.LOG_.info(
195+
goog.log.info(safaridriver.extension.commands.LOG_,
196196
'Page load finished; returning');
197197
tab.removeListener(safaridriver.message.Alert.TYPE, onAlert);
198198
response.fulfill();
@@ -224,7 +224,7 @@ safaridriver.extension.commands.sendNavigationCommand_ = function(
224224
*/
225225
function onSuccess() {
226226
if (!waitForLoad && response.isPending()) {
227-
safaridriver.extension.commands.LOG_.info(
227+
goog.log.info(safaridriver.extension.commands.LOG_,
228228
'Not expecting a new page load; returning');
229229
response.fulfill();
230230
}
@@ -237,7 +237,7 @@ safaridriver.extension.commands.sendNavigationCommand_ = function(
237237
*/
238238
function onFailure(e) {
239239
if (response.isPending()) {
240-
safaridriver.extension.commands.LOG_.severe(
240+
goog.log.error(safaridriver.extension.commands.LOG_,
241241
'Error while loading page; failing', e);
242242
tab.removeListener(safaridriver.message.Load.TYPE, onLoad);
243243
response.reject(e);

‎javascript/safari-driver/extension/extension.js‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ goog.provide('safaridriver.extension');
2323
goog.require('bot.response');
2424
goog.require('goog.asserts');
2525
goog.require('goog.debug.LogManager');
26-
goog.require('goog.debug.Logger');
26+
goog.require('goog.log');
2727
goog.require('safaridriver.console');
2828
goog.require('safaridriver.extension.LogDb');
2929
goog.require('safaridriver.extension.Server');
@@ -64,12 +64,12 @@ safaridriver.extension.postLogInit_ = function() {
6464
safaridriver.extension.LogDb.getInstance().save([entry]);
6565
});
6666

67-
safaridriver.extension.LOG_.fine('Creating global session...');
67+
goog.log.fine(safaridriver.extension.LOG_, 'Creating global session...');
6868
safaridriver.extension.tabManager_ = new safaridriver.extension.TabManager();
6969
safaridriver.extension.session_ = new safaridriver.extension.Session(
7070
safaridriver.extension.tabManager_);
7171

72-
safaridriver.extension.LOG_.fine('Creating debug driver...');
72+
goog.log.fine(safaridriver.extension.LOG_, 'Creating debug driver...');
7373
var server = safaridriver.extension.createSessionServer_();
7474
safaridriver.extension.driver = new webdriver.WebDriver(
7575
new webdriver.Session('debug', {}), server);
@@ -82,16 +82,15 @@ safaridriver.extension.postLogInit_ = function() {
8282

8383
// Now that we're initialized, we sit and wait for a page to send us a client
8484
// to attempt connecting to.
85-
safaridriver.extension.LOG_.info('Waiting for connect command...');
85+
goog.log.info(safaridriver.extension.LOG_, 'Waiting for connect command...');
8686
};
8787

8888

8989
/**
90-
* @private {!goog.debug.Logger}
90+
* @private {goog.log.Logger}
9191
* @const
9292
*/
93-
safaridriver.extension.LOG_ = goog.debug.Logger.getLogger(
94-
'safaridriver.extension');
93+
safaridriver.extension.LOG_ = goog.log.getLogger('safaridriver.extension');
9594

9695

9796
/**
@@ -256,13 +255,14 @@ safaridriver.extension.onMessage_ = function(e) {
256255
var server = safaridriver.extension.createSessionServer_();
257256
server.connect(url).
258257
then(function() {
259-
safaridriver.extension.LOG_.info('Connected to client: ' + url);
258+
goog.log.info(safaridriver.extension.LOG_,
259+
'Connected to client: ' + url);
260260
safaridriver.extension.numConnections_++;
261261
server.onDispose(function() {
262262
safaridriver.extension.numConnections_--;
263263
});
264264
}, function(e) {
265-
safaridriver.extension.LOG_.severe(
265+
goog.log.error(safaridriver.extension.LOG_,
266266
'Failed to connect to client: ' + url,
267267
/** @type {Error} */(e));
268268
});
@@ -272,7 +272,7 @@ safaridriver.extension.onMessage_ = function(e) {
272272
checkIsSynchronous();
273273
if (message.blocksUiThread() &&
274274
!safaridriver.extension.session_.isExecutingCommand()) {
275-
safaridriver.extension.LOG_.warning(
275+
goog.log.warning(safaridriver.extension.LOG_,
276276
'Saving unhandled alert text: ' + message.getMessage());
277277
safaridriver.extension.session_.setUnhandledAlertText(
278278
message.getMessage());
@@ -322,12 +322,14 @@ safaridriver.extension.createSessionServer_ = function() {
322322
* @private
323323
*/
324324
safaridriver.extension.loadModule_ = function(moduleId) {
325-
safaridriver.extension.LOG_.config('Loading module(' + moduleId + ')');
325+
goog.log.fine(safaridriver.extension.LOG_,
326+
'Loading module(' + moduleId + ')');
326327
var moduleFn = safaridriver.extension.modules_[moduleId];
327328
if (moduleFn) {
328329
return bot.response.createResponse(moduleFn.toString());
329330
}
330-
safaridriver.extension.LOG_.warning('module not found: ' + moduleId);
331+
goog.log.warning(safaridriver.extension.LOG_,
332+
'module not found: ' + moduleId);
331333
return bot.response.createErrorResponse(
332334
Error('Internal error: module ' + moduleId + ' not found'));
333335
};

‎javascript/safari-driver/extension/logdb.js‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
goog.provide('safaridriver.extension.LogDb');
2222

23-
goog.require('goog.debug.Logger');
23+
goog.require('goog.log');
2424
goog.require('goog.object');
2525
goog.require('webdriver.logging');
2626
goog.require('webdriver.promise');
@@ -35,8 +35,8 @@ goog.require('webdriver.promise');
3535
*/
3636
safaridriver.extension.LogDb = function(opt_noReset) {
3737

38-
/** @private {!goog.debug.Logger} */
39-
this.log_ = goog.debug.Logger.getLogger('safaridriver.extension.LogDb');
38+
/** @private {goog.log.Logger} */
39+
this.log_ = goog.log.getLogger('safaridriver.extension.LogDb');
4040

4141
/**
4242
* Buffered log entries that have not been committed to the database yet.
@@ -158,7 +158,7 @@ safaridriver.extension.LogDb.prototype.transaction_ = function(
158158
var log = this.log_;
159159
var d = webdriver.promise.defer();
160160
var onError = function(error) {
161-
log.warning('SQL transaction failed', error);
161+
goog.log.warning(log, 'SQL transaction failed', error);
162162
d.fulfill();
163163
};
164164

@@ -298,7 +298,8 @@ safaridriver.extension.LogDb.prototype.remove_ = function(
298298
// SQLError does not extend Error, so the closure compiler will not let
299299
// us pass it as the second parameter to this logging call. Work around
300300
// by adding the details to the failure message.
301-
log.warning('Failed to prune entries from DB: (' + error.code + ') ' +
302-
error.message);
301+
goog.log.warning(log,
302+
'Failed to prune entries from DB: (' + error.code + ') ' +
303+
error.message);
303304
});
304305
};

‎javascript/safari-driver/extension/server.js‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ goog.provide('safaridriver.extension.Server');
1818
goog.require('bot.ErrorCode');
1919
goog.require('bot.response');
2020
goog.require('goog.Disposable');
21-
goog.require('goog.debug.Logger');
21+
goog.require('goog.log');
2222
goog.require('goog.object');
2323
goog.require('goog.string');
2424
goog.require('safaridriver.Command');
@@ -48,8 +48,8 @@ goog.require('webdriver.promise');
4848
safaridriver.extension.Server = function(session) {
4949
goog.base(this);
5050

51-
/** @private {!goog.debug.Logger} */
52-
this.log_ = goog.debug.Logger.getLogger('safaridriver.extension.Server');
51+
/** @private {goog.log.Logger} */
52+
this.log_ = goog.log.getLogger('safaridriver.extension.Server');
5353

5454
/** @private {!safaridriver.extension.Session} */
5555
this.session_ = session;
@@ -170,7 +170,7 @@ safaridriver.extension.Server.prototype.webSocket_ = null;
170170

171171
/** @override */
172172
safaridriver.extension.Server.prototype.disposeInternal = function() {
173-
this.logMessage_('Disposing of server', goog.debug.Logger.Level.FINE);
173+
this.logMessage_('Disposing of server', goog.log.Logger.Level.FINE);
174174

175175
if (this.webSocket_) {
176176
if (this.ready_.isPending()) {
@@ -304,7 +304,7 @@ safaridriver.extension.Server.prototype.execute = function(
304304
var handler = safaridriver.extension.Server.COMMAND_MAP_[command.getName()];
305305
if (!handler) {
306306
this.logMessage_('Unknown command: ' + command.getName(),
307-
goog.debug.Logger.Level.SEVERE);
307+
goog.log.Logger.Level.SEVERE);
308308
return webdriver.promise.rejected(bot.response.createErrorResponse(
309309
Error('Unknown command: ' + command.getName())));
310310
}
@@ -355,13 +355,13 @@ safaridriver.extension.Server.prototype.executeCommand_ = function(
355355

356356
/**
357357
* @param {string} message The message to log.
358-
* @param {goog.debug.Logger.Level=} opt_level The level to log the message at;
358+
* @param {goog.log.Logger.Level=} opt_level The level to log the message at;
359359
* Defaults to INFO.
360360
* @private
361361
*/
362362
safaridriver.extension.Server.prototype.logMessage_ = function(
363363
message, opt_level) {
364-
this.log_.log(opt_level || goog.debug.Logger.Level.INFO,
364+
goog.log.log(this.log_, opt_level || goog.log.Logger.Level.INFO,
365365
'[' + this.session_.getId() + '] ' + message);
366366
};
367367

@@ -388,7 +388,7 @@ safaridriver.extension.Server.prototype.onOpen_ = function() {
388388
safaridriver.extension.Server.prototype.onClose_ = function(url) {
389389
safaridriver.extension.Server.connectedUrls_[url] = false;
390390
this.logMessage_('WebSocket connection was closed.',
391-
goog.debug.Logger.Level.WARNING);
391+
goog.log.Logger.Level.WARNING);
392392
if (!this.isDisposed()) {
393393
if (this.ready_.isPending()) {
394394
var message = 'Failed to connect to ' + url;
@@ -409,7 +409,7 @@ safaridriver.extension.Server.prototype.onClose_ = function(url) {
409409
*/
410410
safaridriver.extension.Server.prototype.onError_ = function(event) {
411411
this.logMessage_('There was an error in the WebSocket: ' + event.data,
412-
goog.debug.Logger.Level.SEVERE);
412+
goog.log.Logger.Level.SEVERE);
413413
};
414414

415415

@@ -420,7 +420,7 @@ safaridriver.extension.Server.prototype.onError_ = function(event) {
420420
*/
421421
safaridriver.extension.Server.prototype.onMessage_ = function(event) {
422422
this.logMessage_('Received a message: ' + event.data,
423-
goog.debug.Logger.Level.FINER);
423+
goog.log.Logger.Level.FINER);
424424

425425
try {
426426
var message = safaridriver.message.fromEvent(event);
@@ -458,7 +458,7 @@ safaridriver.extension.Server.prototype.send_ = function(command, response) {
458458
this.logMessage_('Sending response: ' + str);
459459
if (!command && response['status'] === bot.ErrorCode.SUCCESS) {
460460
this.logMessage_('Sending success response with a null command: ' + str,
461-
goog.debug.Logger.Level.WARNING);
461+
goog.log.Logger.Level.WARNING);
462462
}
463463

464464
this.webSocket_.send(str);

0 commit comments

Comments
 (0)