Fixed and added tests for associateEntry

thimovss · rngadam · commit ced23aa990d0 · 2016-09-09T10:21:52.000+08:00
diff --git a/app/imports/server/api/associateEntry.test.js b/app/imports/server/api/associateEntry.test.js
@@ -0,0 +1,80 @@
+import { Meteor } from 'meteor/meteor';
+import { chai } from 'meteor/practicalmeteor:chai';
+import { associateEntry } from '../../../server/api/arpTable.js';
+import '../../../lib/collections/ARPEntries.js';
+
+var assert = chai.assert,
+  expect = chai.expect;
+
+var ARPEntries = App.Collections.ARPEntries;
+
+const entries = [{
+  IP: '192.168.1.11',
+  MAC: '8C:3A:E3:93:83:93',
+  updatedAt: new Date()
+}, {
+  IP: '192.168.1.50',
+  MAC: '00:26:BB:07:54:80',
+  updatedAt: new Date()
+}, {
+  IP: '192.168.1.18',
+  MAC: '3C:15:C2:CC:DC:2A',
+  updatedAt: new Date()
+}];
+
+const ExtraEntry = {
+  IP: '192.168.1.19',
+  MAC: '3C:15:C2:CC:DC:2B',
+  updatedAt: new Date()
+};
+
+const MissingMAC = {
+  IP: '192.168.1.19',
+  updatedAt: new Date()
+};
+
+const MissingIP = {
+  MAC: '3C:15:C2:CC:DC:2B',
+  updatedAt: new Date()
+};
+
+const MissingUpdatedAt = {
+  IP: '192.168.1.19',
+  MAC: '3C:15:C2:CC:DC:2B',
+};
+
+describe('associateEntry', function() {
+  beforeEach(function() {
+    ARPEntries.remove({});
+    entries.forEach((entry) => {
+      ARPEntries.insert(entry);
+    });
+  });
+
+  it('adds the entry if it is not present yet',function(){
+  	associateEntry(ExtraEntry);
+  	assert.equal(ARPEntries.find({'MAC': ExtraEntry.MAC}).count(), 1);
+  	assert.equal(ARPEntries.find().count(), 4);
+  });
+
+  it('doesn\'t add the the entry if it is present',function(){
+  	associateEntry(entries[0]);
+  	assert.equal(ARPEntries.find().count(), 3);
+  });
+
+  it('doesn\'t add the the entry if it is missing the MAC address',function(){
+  	associateEntry(MissingMAC);
+  	assert.equal(ARPEntries.find().count(), 3);
+  });
+
+  it('doesn\'t add the the entry if it is missing the IP address',function(){
+  	associateEntry(MissingIP);
+  	assert.equal(ARPEntries.find().count(), 3);
+  });
+
+  it('doesn\'t add the the entry if it is missing the updatedAt field',function(){
+  	associateEntry(MissingUpdatedAt);
+  	assert.equal(ARPEntries.find().count(), 3);
+  });
+
+});
diff --git a/app/imports/server/api/clearExpiredEntries.test.js b/app/imports/server/api/clearExpiredEntries.test.js
@@ -6,6 +6,8 @@ import '../../../lib/collections/ARPEntries.js';
 var assert = chai.assert,
   expect = chai.expect;
 
+var ARPEntries = App.Collections.ARPEntries;
+
 const entries = [{
   IP: '192.168.1.11',
   MAC: '8C:3A:E3:93:83:93',
@@ -20,41 +22,43 @@ const entries = [{
   updatedAt: new Date()
 }];
 
+const extraEntry = {
+  IP: '192.168.1.19',
+  MAC: '3C:15:C2:CC:DC:2B',
+  updatedAt: new Date()
+};
+
 describe('clearExpiredEntries', function() {
 
   beforeEach(function() {
-    App.Collections.ARPEntries.remove({});
+    ARPEntries.remove({});
     entries.forEach((entry) => {
-      App.Collections.ARPEntries.insert(entry);
+      ARPEntries.insert(entry);
     });
   });
 
   it('does nothing if nothing changed', function() {
     clearExpiredEntries(entries);
-    assert.equal(App.Collections.ARPEntries.find().count(), 3);
+    assert.equal(ARPEntries.find().count(), 3);
   });
 
   it('removes 1 entries that has expired', function() {
     clearExpiredEntries([entries[0], entries[1]]);
-    assert.equal(App.Collections.ARPEntries.find().count(), 2);
+    assert.equal(ARPEntries.find().count(), 2);
   });
 
   it('removes 2 entries that have expired', function() {
     clearExpiredEntries([entries[0]]);
-    assert.equal(App.Collections.ARPEntries.find().count(), 1);
+    assert.equal(ARPEntries.find().count(), 1);
   });
 
   it('removes all entries that have expired', function() {
     clearExpiredEntries([]);
-    assert.equal(App.Collections.ARPEntries.find().count(), 0);
+    assert.equal(ARPEntries.find().count(), 0);
   });
 
   it('doesn\'t add new entries', function() {
-    clearExpiredEntries([entries[0], entries[1], entries[2], {
-      IP: '192.168.1.19',
-      MAC: '3C:15:C2:CC:DC:2B',
-      updatedAt: new Date()
-    }]);
-    assert.equal(App.Collections.ARPEntries.find().count(), 3);
+    clearExpiredEntries([entries[0], entries[1], entries[2], extraEntry]);
+    assert.equal(ARPEntries.find().count(), 3);
   });
 });
diff --git a/app/server/api/arpTable.js b/app/server/api/arpTable.js
@@ -63,38 +63,40 @@ var clearExpiredEntries = function(entries) {
 }
 
 var associateEntry = function(entry) {
-  var ARPEntry = ARPEntries.findOne({ MAC: entry.MAC });
+  if (entry.MAC && entry.IP && entry.updatedAt) {
+    var ARPEntry = ARPEntries.findOne({ MAC: entry.MAC });
 
-  // A new user connected to the router
-  // If MAC address doesn't exist in mongodb, add it
-  if (!ARPEntry) {
+    // A new user connected to the router
+    // If MAC address doesn't exist in mongodb, add it
+    if (!ARPEntry) {
 
-    var response;
+      var response;
 
-    try {
-      response = HTTP.call("POST", "http://api.macvendors.com/" + entry.MAC);
-    } catch (e) {
-      // Got a network error, time-out or HTTP error in the 400 or 500 range.
-      // Do nothing continue
-    }
+      try {
+        response = HTTP.call("POST", "http://api.macvendors.com/" + entry.MAC);
+      } catch (e) {
+        // Got a network error, time-out or HTTP error in the 400 or 500 range.
+        // Do nothing continue
+      }
 
-    if (response && response.content) {
-      entry.company = response.content;
-    } else {
-      console.log('error: could not get response from macvendors');
-      console.log(response);
-    }
+      if (response && response.content) {
+        entry.company = response.content;
+      } else {
+        console.log('error: could not get response from macvendors');
+        console.log(response);
+      }
 
-    ARPEntries.insert(entry);
-  }
+      ARPEntries.insert(entry);
+    }
 
-  // The user changed IP address
-  // If MAC address exists in mongodb and different IP address, update entry
-  if (ARPEntry) {
-    if (ARPEntry.IP !== entry.IP) {
-      ARPEntries.update(ARPEntry, { $set: { IP: entry.IP } });
+    // The user changed IP address
+    // If MAC address exists in mongodb and different IP address, update entry
+    if (ARPEntry) {
+      if (ARPEntry.IP !== entry.IP) {
+        ARPEntries.update(ARPEntry, { $set: { IP: entry.IP } });
+      }
     }
   }
 }
 
-export { getEntries, clearExpiredEntries, associateEntry };
+export { getEntries, clearExpiredEntries, associateEntry };
