GUI -- Garbage can icon added to app view, fixed broken unit tests.

Change-Id: I1efdf764b242cc020049d31d569e8956aed6719c

@@ -132,6 +132,18 @@
             '68.2l11.4-0.9c2.7,12.3,12.9,29.6,37.7,29.6c26.9,0,34.6-17.2,34.9' +
             '-18L81.5,74.5z',
 
+            garbage: 'M94.6,20.2c0,2.7-2.1,4.8-4.8,4.8H19.2c-2.7,0-4.8-2.1-' +
+            '4.8-4.8s2.1-4.8,4.8-4.8h27.6c-0.8-0.7-1.4-1.7-1.4-2.9c0-2.1,1.7-' +
+            '3.9,3.9-3.9h10.4c2.1,0,3.9,1.7,3.9,3.9c0,1.2-0.5,2.2-1.4,2.9h' +
+            '27.6C92.5,15.4,94.6,17.6,94.6,20.2z M91,33.4v64.8c0,2-1.7,3.6-' +
+            '3.8,3.6h-65c-2.1,0-3.8-1.6-3.8-3.6V33.4c0-2,1.7-3.6,3.8-3.6h65C' +
+            '89.3,29.8,91,31.4,91,33.4z M31.5,37.7c0-2.1-1.2-3.8-2.7-3.8h-0.7' +
+            'c-1.5,0-2.7,1.7-2.7,3.8v55.9c0,2.1,1.2,3.8,2.7,3.8h0.7c1.5,0,2.7' +
+            '-1.7,2.7-3.8V37.7z M58.5,37.7c0-2.1-1.8-3.8-4-3.8h-1c-2.2,0-4,' +
+            '1.7-4,3.8v55.9c0,2.1,1.8,3.8,4,3.8h1c2.2,0,4-1.7,4-3.8V37.7z M' +
+            '83.5,37.7c0-2.1-1.2-3.8-2.7-3.8h-0.7c-1.5,0-2.7,1.7-2.7,3.8v55.9' +
+            'c0,2.1,1.2,3.8,2.7,3.8h0.7c1.5,0,2.7-1.7,2.7-3.8V37.7z',
+
             // --- Navigation glyphs ------------------------------------
 
             flowTable: 'M15.9,19.1h-8v-13h8V19.1z M90.5,6.1H75.6v13h14.9V6.1z' +

@@ -38,6 +38,7 @@
         stop: 'stop',
 
         refresh: 'refresh',
+        garbage: 'garbage',
 
         upArrow: 'triangleUp',
         downArrow: 'triangleDown',

@@ -10,7 +10,7 @@
             <div id="app-install"    icon icon-size="36" icon-id="plus" class="active"></div>
             <div id="app-activate"   icon icon-size="36" icon-id="play"></div>
             <div id="app-deactivate" icon icon-size="36" icon-id="stop"></div>
-            <div id="app-uninstall"  icon icon-size="36" icon-id="minus"></div>
+            <div id="app-uninstall"  icon icon-size="36" icon-id="garbage"></div>
         </div>
 
         <form id="app-form" method="POST" action="rs/applications/upload"

@@ -48,7 +48,7 @@
         document.getElementById('app-form-response').onload = function () {
             document.getElementById('app-form').reset();
             $scope.refresh();
-        }
+        };
 
         function appAction(action) {
             if (selection) {

@@ -20,7 +20,7 @@
 describe('factory: fw/svg/glyph.js', function() {
     var $log, fs, gs, d3Elem, svg;
 
-    var numBaseGlyphs = 41,
+    var numBaseGlyphs = 42,
         vbBird = '352 224 113 112',
         vbGlyph = '0 0 110 110',
         vbBadge = '0 0 10 10',
@@ -43,6 +43,7 @@ describe('factory: fw/svg/glyph.js', function() {
             lock: 'M79.4,48.6h',
             topo: 'M97.2,76.3H86.6',
             refresh: 'M102.6,40.8L88.4',
+            garbage: 'M94.6,20.2c',
 
             // navigation specific glyphs
             flowTable: tablePrefix + 'M102.2,23.6H7.9v',
@@ -86,6 +87,7 @@ describe('factory: fw/svg/glyph.js', function() {
         glyphIds = [
             'unknown', 'node', 'switch', 'roadm', 'endstation', 'router',
             'bgpSpeaker', 'chain', 'crown', 'lock', 'topo', 'refresh',
+            'garbage',
             'flowTable', 'portTable', 'groupTable',
             'summary', 'details', 'ports', 'map', 'cycleLabels',
             'oblique', 'filters', 'resetZoom', 'relatedIntents', 'nextIntent',

@@ -19,7 +19,7 @@
  */
 
 describe('factory: fw/widget/tableBuilder.js', function () {
-    var $log, $rootScope, fs, tbs;
+    var $log, $rootScope, fs, tbs, is;
 
     var mockObj,
         mockWss = {
@@ -28,7 +28,7 @@ describe('factory: fw/widget/tableBuilder.js', function () {
             unbindHandlers: function () {}
         };
 
-    beforeEach(module('onosWidget', 'onosUtil', 'onosRemote'));
+    beforeEach(module('onosWidget', 'onosUtil', 'onosRemote', 'onosSvg'));
 
     beforeEach(function () {
         module(function ($provide) {
@@ -37,11 +37,12 @@ describe('factory: fw/widget/tableBuilder.js', function () {
     });
 
     beforeEach(inject(function (_$log_, _$rootScope_,
-                                FnService, TableBuilderService) {
+                                FnService, TableBuilderService, IconService) {
         $log = _$log_;
         $rootScope = _$rootScope_;
         fs = FnService;
         tbs = TableBuilderService;
+        is = IconService;
     }));
 
     function mockSelCb(event, sel) {}