From 12c4863febee7bf9e99f908af8b177a52fdb934f Mon Sep 17 00:00:00 2001
From: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date: Mon, 12 Jan 2015 08:43:29 -0800
Subject: [PATCH] [Telemetry] Fix failing specs

Fix failing specs related to usage of subscriptions in the
TelemetryController, introduced for WTD-644.
---
 platform/telemetry/src/TelemetryController.js | 47 ++++++++++---------
 .../telemetry/test/TelemetryControllerSpec.js |  5 +-
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/platform/telemetry/src/TelemetryController.js b/platform/telemetry/src/TelemetryController.js
index 94aa0358ef..82d128c899 100644
--- a/platform/telemetry/src/TelemetryController.js
+++ b/platform/telemetry/src/TelemetryController.js
@@ -123,6 +123,21 @@ define(
                 }));
             }
 
+            // Subscribe to streaming telemetry updates
+            function subscribe(telemetryCapability, id) {
+                return telemetryCapability.subscribe(function () {
+                    requestTelemetryForId(id, false);
+                });
+            }
+
+            // Stop listening to active subscriptions
+            function unsubscribe() {
+                self.subscriptions.forEach(function (s) {
+                    return s && s();
+                });
+                self.subscriptions = [];
+            }
+
             // Look up domain objects which have telemetry capabilities.
             // This will either be the object in view, or object that
             // this object delegates its telemetry capability to.
@@ -152,12 +167,17 @@ define(
             function buildResponseContainer(domainObject) {
                 var telemetry = domainObject &&
                         domainObject.getCapability("telemetry"),
+                    id,
                     metadata;
 
                 if (telemetry) {
+                    id = domainObject.getId();
+
+                    self.subscriptions.push(subscribe(telemetry, id));
+
                     metadata = telemetry.getMetadata();
 
-                    self.response[domainObject.getId()] = {
+                    self.response[id] = {
                         name: domainObject.getModel().name,
                         domainObject: domainObject,
                         metadata: metadata,
@@ -186,29 +206,13 @@ define(
                 }
             }
 
-            // Subscribe to streaming telemetry updates
-            function subscribe(domainObject) {
-                var telemetryCapability =
-                    domainObject.getCapability("telemetry");
-                return telemetryCapability.subscribe(function () {
-                    requestTelemetryForId(
-                        domainObject.getId(),
-                        false
-                    );
-                });
-            }
-
-            // Stop listening to active subscriptions
-            function unsubscribe() {
-                self.subscriptions.forEach(function (s) {
-                    return s && s();
-                });
-            }
-
             // Build response containers (as above) for all
             // domain objects, and update some controller-internal
             // state to support subsequent calls.
             function buildResponseContainers(domainObjects) {
+                // Clear out any existing subscriptions
+                unsubscribe();
+
                 // Build the containers
                 domainObjects.forEach(buildResponseContainer);
 
@@ -227,9 +231,6 @@ define(
                     return self.response[id].metadata;
                 });
 
-                // Subscribe to all telemetry objects
-                self.subscriptions = domainObjects.map(subscribe);
-
                 // Issue a request for the new objects, if we
                 // know what our request looks like
                 if (self.request) {
diff --git a/platform/telemetry/test/TelemetryControllerSpec.js b/platform/telemetry/test/TelemetryControllerSpec.js
index 4714a70520..234b084bd9 100644
--- a/platform/telemetry/test/TelemetryControllerSpec.js
+++ b/platform/telemetry/test/TelemetryControllerSpec.js
@@ -12,6 +12,7 @@ define(
                 mockLog,
                 mockDomainObject,
                 mockTelemetry,
+                mockUnsubscribe,
                 controller;
 
             function mockPromise(value) {
@@ -44,8 +45,9 @@ define(
 
                 mockTelemetry = jasmine.createSpyObj(
                     "telemetry",
-                    [ "requestData", "getMetadata" ]
+                    [ "requestData", "subscribe", "getMetadata" ]
                 );
+                mockUnsubscribe = jasmine.createSpy("unsubscribe");
 
                 mockQ.when.andCallFake(mockPromise);
                 mockQ.all.andReturn(mockPromise([mockDomainObject]));
@@ -63,6 +65,7 @@ define(
                 mockTelemetry.requestData.andReturn(mockPromise({
                     telemetryKey: "some value"
                 }));
+                mockTelemetry.subscribe.andReturn(mockUnsubscribe);
 
                 controller = new TelemetryController(
                     mockScope,