[Chromoting] SessionLogger refactor.

remoting/webapp/base/js/session_logger_unittest.js

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 (function() {
 
 'use strict';
 
 /** @type {remoting.SessionLogger} */
 var logger = null;
@@ skipping 56 matching lines @@
     signal_strategy_progress: Event.SignalStrategyProgress.TIMED_OUT
   });
 
   verifyEvent(assert, 1, {
     type: Event.Type.SIGNAL_STRATEGY_PROGRESS,
     signal_strategy_type: Event.SignalStrategyType.XMPP,
     signal_strategy_progress: Event.SignalStrategyProgress.SUCCEEDED
   });
 });
 
-QUnit.test('logClientSessionStateChange()', function(assert){
+QUnit.test('logSessionStateChange()', function(assert){
   var Event = remoting.ChromotingEvent;
 
   logger = new remoting.SessionLogger(Event.Role.CLIENT, logWriter);
   logger.setLogEntryMode(Event.Mode.ME2ME);
   logger.setConnectionType('stun');
   logger.setHostVersion('host_version');
   logger.setHostOs(remoting.ChromotingEvent.Os.OTHER);
   logger.setHostOsVersion('host_os_version');
 
-  logger.logClientSessionStateChange(
-      remoting.ClientSession.State.FAILED,
-      new remoting.Error(remoting.Error.Tag.HOST_IS_OFFLINE), null);
+  logger.logSessionStateChange(
+      remoting.ChromotingEvent.SessionState.CONNECTION_FAILED,
+      new remoting.Error(remoting.Error.Tag.HOST_IS_OFFLINE));
   var sessionId = logger.getSessionId();
 
   assert.ok(sessionId !== null);
 
   verifyEvent(assert, 0, {
     type: Event.Type.SESSION_STATE,
     session_state: Event.SessionState.CONNECTION_FAILED,
     connection_error: Event.ConnectionError.HOST_OFFLINE,
     os: Event.Os.MAC,
     os_version: '10.9.5',
     cpu: 'Intel',
     browser_version: '43.0.2357.81',
     application_id: 'extensionId',
     role: Event.Role.CLIENT,
     mode: Event.Mode.ME2ME,
     connection_type: Event.ConnectionType.STUN,
     host_version: 'host_version',
     host_os: remoting.ChromotingEvent.Os.OTHER,
     host_os_version: 'host_os_version',
     session_id: sessionId
   });
 });
 
-QUnit.test('logClientSessionStateChange() should handle XMPP error',
+QUnit.test('logSessionStateChange() should handle XMPP error',
     function(assert){
   var Event = remoting.ChromotingEvent;
 
   logger = new remoting.SessionLogger(Event.Role.CLIENT, logWriter);
   logger.setLogEntryMode(Event.Mode.ME2ME);
   logger.setConnectionType('stun');
   logger.setHostVersion('host_version');
   logger.setHostOs(remoting.ChromotingEvent.Os.OTHER);
   logger.setHostOsVersion('host_os_version');
 
-  var xmppError = new remoting.ChromotingEvent.XmppError('<fake-stanza/>');
-
-  logger.logClientSessionStateChange(
-      remoting.ClientSession.State.FAILED,
-      new remoting.Error(remoting.Error.Tag.HOST_IS_OFFLINE), xmppError);
+  logger.logSessionStateChange(
+      remoting.ChromotingEvent.SessionState.CONNECTION_FAILED,
+      new remoting.Error(remoting.Error.Tag.HOST_IS_OFFLINE, '<fake-stanza/>'));
   var sessionId = logger.getSessionId();
 
   assert.ok(sessionId !== null);
 
   verifyEvent(assert, 0, {
     type: Event.Type.SESSION_STATE,
     session_state: Event.SessionState.CONNECTION_FAILED,
     connection_error: Event.ConnectionError.HOST_OFFLINE,
     os: Event.Os.MAC,
     os_version: '10.9.5',
     cpu: 'Intel',
     browser_version: '43.0.2357.81',
     application_id: 'extensionId',
     role: Event.Role.CLIENT,
     mode: Event.Mode.ME2ME,
     connection_type: Event.ConnectionType.STUN,
     host_version: 'host_version',
     host_os: remoting.ChromotingEvent.Os.OTHER,
     host_os_version: 'host_os_version',
     session_id: sessionId,
     xmpp_error: {
       raw_stanza: '<fake-stanza/>'
     }
   });
 });
 
-QUnit.test('logClientSessionStateChange() should handle sessionId change.',
+QUnit.test('logSessionStateChange() should handle sessionId change.',
   function(assert){
   var clock = sinon.useFakeTimers();
   var Event = remoting.ChromotingEvent;
 
   // Creates the logger.
   logger = new remoting.SessionLogger(Event.Role.CLIENT, logWriter);
   logger.setLogEntryMode(Event.Mode.ME2ME);
   logger.setConnectionType('relay');
   logger.setHostVersion('host_version');
   logger.setHostOs(remoting.ChromotingEvent.Os.OTHER);
   logger.setHostOsVersion('host_os_version');
   var oldSessionId = logger.getSessionId();
 
   // Expires the session id.
   clock.tick(remoting.SessionLogger.MAX_SESSION_ID_AGE + 100);
 
   // Logs the event.
-  logger.logClientSessionStateChange(
-      remoting.ClientSession.State.AUTHENTICATED, remoting.Error.none(), null);
+  logger.logSessionStateChange(
+      remoting.ChromotingEvent.SessionState.AUTHENTICATED);
 
   var newSessionId = logger.getSessionId();
   verifyEvent(assert, 0, {
     type: Event.Type.SESSION_ID_OLD,
     session_id: oldSessionId,
     os: Event.Os.MAC,
     os_version: '10.9.5',
     cpu: 'Intel',
     browser_version: '43.0.2357.81',
     application_id: 'extensionId',
@@ skipping 33 matching lines @@
     role: Event.Role.CLIENT,
     mode: Event.Mode.ME2ME,
     connection_type: Event.ConnectionType.RELAY,
     host_version: 'host_version',
     host_os: remoting.ChromotingEvent.Os.OTHER,
     host_os_version: 'host_os_version',
     session_id: newSessionId
   });
 });
 
-QUnit.test('logClientSessionStateChange() should log session_duration.',
+QUnit.test('logSessionStateChange() should log session_duration.',
   function(assert){
   var clock = sinon.useFakeTimers();
   var Event = remoting.ChromotingEvent;
 
   // Creates the logger.
   logger = new remoting.SessionLogger(Event.Role.CLIENT, logWriter);
   logger.setLogEntryMode(Event.Mode.ME2ME);
   logger.setConnectionType('direct');
   logger.setHostVersion('host_version');
   logger.setHostOs(remoting.ChromotingEvent.Os.OTHER);
   logger.setHostOsVersion('host_os_version');
   logger.setAuthTotalTime(1000);
   clock.tick(2500);
 
   // Logs the event.
-  logger.logClientSessionStateChange(
-      remoting.ClientSession.State.CONNECTED, remoting.Error.none(), null);
+  logger.logSessionStateChange(
+    remoting.ChromotingEvent.SessionState.CONNECTED);
 
   verifyEvent(assert, 0, {
     type: Event.Type.SESSION_STATE,
     session_state: Event.SessionState.CONNECTED,
     connection_error: Event.ConnectionError.NONE,
     os: Event.Os.MAC,
     os_version: '10.9.5',
     cpu: 'Intel',
     browser_version: '43.0.2357.81',
     application_id: 'extensionId',
@@ skipping 101 matching lines @@
     decodeLatency: 0.0,
     renderLatency: 0.0,
     roundtripLatency: 0.0
   });
 
   sinon.assert.notCalled(logWriterSpy);
 
 });
 
 })();