GUI -- Fixing broken unit tests.
Change-Id: Ibb5dd090e300ae3f7046144c825d8f5d53e7e24e
diff --git a/web/gui/src/main/webapp/onos.js b/web/gui/src/main/webapp/onos.js
index c1c19de..0f049e9 100644
--- a/web/gui/src/main/webapp/onos.js
+++ b/web/gui/src/main/webapp/onos.js
@@ -35,7 +35,6 @@
// view IDs.. note the first view listed is loaded at startup
var viewIds = [
- // TODO: inject view IDs server side
// {INJECTED-VIEW-IDS-START}
'sample',
'topo',
diff --git a/web/gui/src/main/webapp/tests/app/view/device/device-spec.js b/web/gui/src/main/webapp/tests/app/view/device/device-spec.js
index ffd6e55..462d70c 100644
--- a/web/gui/src/main/webapp/tests/app/view/device/device-spec.js
+++ b/web/gui/src/main/webapp/tests/app/view/device/device-spec.js
@@ -18,9 +18,6 @@
ONOS GUI -- Device Controller - Unit Tests
*/
describe('Controller: OvDeviceCtrl', function () {
- // instantiate the Device module
- beforeEach(module('ovDevice', 'onosRemote'));
-
var $log, $scope, $controller, ctrl, $mockHttp;
var fakeData = {
@@ -40,6 +37,9 @@
}]
};
+ // instantiate the Device module
+ beforeEach(module('ovDevice', 'onosRemote', 'onosLayer', 'onosSvg', 'ngRoute'));
+
beforeEach(inject(function(_$log_, $rootScope, _$controller_, $httpBackend) {
$log = _$log_;
$scope = $rootScope.$new();
@@ -48,7 +48,6 @@
}));
beforeEach(function() {
- $scope = {};
ctrl = $controller('OvDeviceCtrl', { $scope: $scope });
$mockHttp.whenGET(/\/device$/).respond(fakeData);
});
diff --git a/web/gui/src/main/webapp/tests/app/view/topo/topoEvent-spec.js b/web/gui/src/main/webapp/tests/app/view/topo/topoEvent-spec.js
index b0a5be8..32fa0e7 100644
--- a/web/gui/src/main/webapp/tests/app/view/topo/topoEvent-spec.js
+++ b/web/gui/src/main/webapp/tests/app/view/topo/topoEvent-spec.js
@@ -20,7 +20,7 @@
describe('factory: view/topo/topoEvent.js', function() {
var $log, fs, tes;
- beforeEach(module('ovTopo', 'onosUtil', 'onosLayer'));
+ beforeEach(module('ovTopo', 'onosUtil', 'onosLayer', 'ngRoute'));
beforeEach(inject(function (_$log_, FnService, TopoEventService) {
$log = _$log_;
diff --git a/web/gui/src/main/webapp/tests/app/view/topo/topoForce-spec.js b/web/gui/src/main/webapp/tests/app/view/topo/topoForce-spec.js
index 17a0d09..b1ad0e2 100644
--- a/web/gui/src/main/webapp/tests/app/view/topo/topoForce-spec.js
+++ b/web/gui/src/main/webapp/tests/app/view/topo/topoForce-spec.js
@@ -20,7 +20,7 @@
describe('factory: view/topo/topoForce.js', function() {
var $log, fs, tfs;
- beforeEach(module('ovTopo', 'onosUtil', 'onosLayer'));
+ beforeEach(module('ovTopo', 'onosUtil', 'onosLayer', 'ngRoute'));
beforeEach(inject(function (_$log_, FnService, TopoForceService) {
$log = _$log_;
@@ -36,7 +36,8 @@
expect(fs.areFunctions(tfs, [
'initForce', 'newDim', 'destroyForce',
- 'updateDeviceColors', 'toggleHosts', 'toggleOffline',
+ 'updateDeviceColors', 'toggleHosts',
+ 'togglePorts', 'toggleOffline',
'cycleDeviceLabels', 'unpin', 'showMastership',
'addDevice', 'updateDevice', 'removeDevice',
diff --git a/web/gui/src/main/webapp/tests/app/view/topo/topoModel-spec.js b/web/gui/src/main/webapp/tests/app/view/topo/topoModel-spec.js
index 84c1f61..f517f9b 100644
--- a/web/gui/src/main/webapp/tests/app/view/topo/topoModel-spec.js
+++ b/web/gui/src/main/webapp/tests/app/view/topo/topoModel-spec.js
@@ -138,8 +138,10 @@
compare: function (actual, xy1, xy2) {
var result = {};
- result.pass = (actual.x1 === xy1[0]) && (actual.y1 === xy1[1]) &&
- (actual.x2 === xy2[0]) && (actual.y2 === xy2[1]);
+ result.pass = (actual.source.x === xy1[0]) &&
+ (actual.source.y === xy1[1]) &&
+ (actual.target.x === xy2[0]) &&
+ (actual.target.y === xy2[1]);
if (result.pass) {
// for negation with ".not"