Added tests for ConductorAxisController and TimeConductor

nasa · Oct 27, 2016 · b0901e8 · b0901e8
1 parent dfed0a0
commit b0901e8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/platform/features/conductor-v2/conductor/src/ui/ConductorAxisControllerSpec.js b/platform/features/conductor-v2/conductor/src/ui/ConductorAxisControllerSpec.js
@@ -29,7 +29,7 @@ define([
     $,
     d3
 ) {
-    ddescribe("The ConductorAxisController", function () {
+    describe("The ConductorAxisController", function () {
         var directive,
             mockConductor,
             mockConductorViewService,

diff --git a/src/api/TimeConductorSpec.js b/src/api/TimeConductorSpec.js
@@ -52,19 +52,19 @@ define(['./TimeConductor'], function (TimeConductor) {
             bounds = {start: 0, end: 1};
             expect(tc.bounds()).not.toBe(bounds);
             expect(tc.bounds.bind(tc, bounds)).not.toThrow();
-            expect(tc.bounds()).toBe(bounds);
+            expect(tc.bounds()).toEqual(bounds);
         });
 
         it("Disallows setting of invalid bounds", function () {
             bounds = {start: 1, end: 0};
-            expect(tc.bounds()).not.toBe(bounds);
+            expect(tc.bounds()).not.toEqual(bounds);
             expect(tc.bounds.bind(tc, bounds)).toThrow();
-            expect(tc.bounds()).not.toBe(bounds);
+            expect(tc.bounds()).not.toEqual(bounds);
 
             bounds = {start: 1};
-            expect(tc.bounds()).not.toBe(bounds);
+            expect(tc.bounds()).not.toEqual(bounds);
             expect(tc.bounds.bind(tc, bounds)).toThrow();
-            expect(tc.bounds()).not.toBe(bounds);
+            expect(tc.bounds()).not.toEqual(bounds);
         });
 
         it("Allows setting of time system with bounds", function () {
@@ -106,5 +106,17 @@ define(['./TimeConductor'], function (TimeConductor) {
             tc.follow(follow);
             expect(eventListener).toHaveBeenCalledWith(follow);
         });
+
+        it("If bounds are set and TOI lies inside them, do not change TOI", function () {
+            tc.timeOfInterest(6);
+            tc.bounds({start: 1, end: 10});
+            expect(tc.timeOfInterest()).toEqual(6);
+        });
+
+        it("If bounds are set and TOI lies outside them, reset TOI", function () {
+            tc.timeOfInterest(11);
+            tc.bounds({start: 1, end: 10});
+            expect(tc.timeOfInterest()).toBeUndefined();
+        });
     });
 });