Fix hueristics and add tests

tessel · Oct 5, 2015 · 4cdd5cc · 4cdd5cc
1 parent 564ce5f
commit 4cdd5cc
Show file tree

Hide file tree

Showing 2 changed files with 189 additions and 1 deletion.
diff --git a/lib/controller.js b/lib/controller.js
@@ -432,7 +432,8 @@ controller.runHeuristics = function(opts, tessels) {
             lanFound = true;
           }
           // We have multiple LAN Tessels which is an issue
-          else {
+          // If a USB connection wasn't found, we have too much ambiguity
+          else if (!usbFound) {
             // Return nothing because the user needs to be more specific
             return;
           }

diff --git a/test/unit/controller.js b/test/unit/controller.js
@@ -117,6 +117,193 @@ exports['controller.closeTesselConnections'] = {
   },
 };
 
+exports['controller.runHeuristics'] = {
+  setUp: function(done) {
+    this.sandbox = sinon.sandbox.create();
+    this.processOn = this.sandbox.stub(process, 'on');
+    done();
+  },
+
+  tearDown: function(done) {
+    this.sandbox.restore();
+    done();
+  },
+
+  oneUSBDevice: function(test) {
+    test.expect(1);
+
+    var a = newTessel({
+      sandbox: this.sandbox,
+      authorized: true,
+      type: 'USB'
+    });
+
+    controller.runHeuristics({}, [a])
+      .then(function(tessel) {
+        test.deepEqual(a, tessel);
+        test.done();
+      });
+  },
+
+  oneLANDevice: function(test) {
+    test.expect(1);
+
+    var a = newTessel({
+      sandbox: this.sandbox,
+      authorized: true,
+      type: 'LAN'
+    });
+
+    controller.runHeuristics({}, [a])
+      .then(function(tessel) {
+        test.deepEqual(a, tessel);
+        test.done();
+      });
+  },
+
+  USBAndLANDevices: function(test) {
+    test.expect(1);
+
+    var a = newTessel({
+      sandbox: this.sandbox,
+      authorized: true,
+      type: 'LAN'
+    });
+
+    var b = newTessel({
+      sandbox: this.sandbox,
+      authorized: true,
+      type: 'USB'
+    });
+
+    controller.runHeuristics({}, [a, b])
+      .then(function(tessel) {
+        test.deepEqual(b, tessel);
+        test.done();
+      });
+  },
+
+  bothConnectionsAndLAN: function(test) {
+    test.expect(1);
+
+    var a = newTessel({
+      sandbox: this.sandbox,
+      authorized: true,
+      type: 'LAN'
+    });
+
+    var b = newTessel({
+      sandbox: this.sandbox,
+      authorized: true,
+      type: 'USB'
+    });
+
+    b.addConnection({
+      connectionType: 'LAN',
+      authorized: true
+    });
+
+    controller.runHeuristics({}, [a, b])
+      .then(function(tessel) {
+        test.deepEqual(b, tessel);
+        test.done();
+      });
+  },
+
+  bothConnectionsAndMultipleLAN: function(test) {
+    test.expect(1);
+
+    var a = newTessel({
+      sandbox: this.sandbox,
+      authorized: true,
+      type: 'LAN'
+    });
+
+    var b = newTessel({
+      sandbox: this.sandbox,
+      authorized: true,
+      type: 'LAN'
+    });
+
+    var c = newTessel({
+      sandbox: this.sandbox,
+      authorized: true,
+      type: 'USB'
+    });
+
+    c.addConnection({
+      connectionType: 'LAN',
+      authorized: true
+    });
+
+    controller.runHeuristics({}, [a, b, c])
+      .then(function(tessel) {
+        test.deepEqual(c, tessel);
+        test.done();
+      });
+  },
+
+  USBAndLANDevicesWithNameOption: function(test) {
+    test.expect(1);
+
+    var a = newTessel({
+      sandbox: this.sandbox,
+      authorized: true,
+      type: 'LAN'
+    });
+
+    a.name = 'Me!';
+
+    var b = newTessel({
+      sandbox: this.sandbox,
+      authorized: true,
+      type: 'USB'
+    });
+
+    b.name = 'Not Me!';
+
+    controller.runHeuristics({
+        name: a.name
+      }, [a, b])
+      .then(function(tessel) {
+        test.deepEqual(a, tessel);
+        test.done();
+      });
+  },
+
+  USBAndLANDevicesWithEnvVariable: function(test) {
+    test.expect(1);
+
+    var winningName = 'Me!';
+    process.env['Tessel'] = winningName;
+
+    var a = newTessel({
+      sandbox: this.sandbox,
+      authorized: true,
+      type: 'LAN'
+    });
+
+    a.name = winningName;
+
+    var b = newTessel({
+      sandbox: this.sandbox,
+      authorized: true,
+      type: 'USB'
+    });
+
+    b.name = 'Not ' + winningName;
+
+    controller.runHeuristics({
+        name: a.name
+      }, [a, b])
+      .then(function(tessel) {
+        test.deepEqual(a, tessel);
+        process.env['Tessel'] = undefined;
+        test.done();
+      });
+  },
+};
+
 
 exports['Tessel.list'] = {