GitHub API, random insert

trekjs · Apr 9, 2015 · 3f5e5f6 · 3f5e5f6
1 parent 6b7ba82
commit 3f5e5f6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/benchmarks/index.js b/benchmarks/index.js
@@ -1,3 +1,4 @@
+var _ = require('lodash');
 var assert = require('assert');
 var Benchmark = require('benchmark');
 var pathToRegexp = require('path-to-regexp');
@@ -10,14 +11,14 @@ var api = require('../test/github-api');
 var suite = new Benchmark.Suite;
 
 var routes0 = new Router();
-api.forEach(function(i) {
+_.shuffle(api).forEach(function(i) {
   var method = i[0],
     path = i[1];
   routes0.add(method, path, function() {});
 });
 
 var routes1 = {};
-api.forEach(function(i) {
+_.shuffle(api).forEach(function(i) {
   var keys = [];
   var method = i[0],
     path = i[1];
@@ -26,7 +27,7 @@ api.forEach(function(i) {
 });
 
 var routes2 = {};
-api.forEach(function(i) {
+_.shuffle(api).forEach(function(i) {
   var method = i[0],
     path = i[1];
   var r = routes2[method] || (routes2[method] = new RouteRecognizer());
@@ -37,15 +38,15 @@ api.forEach(function(i) {
 });
 
 var routes3 = {};
-api.forEach(function(i) {
+_.shuffle(api).forEach(function(i) {
   var method = i[0],
     path = i[1];
   var r = routes3[method] || (routes3[method] = new RouteTrie());
   r.define(path);
 });
 
 var routes4 = {};
-api.forEach(function(i) {
+_.shuffle(api).forEach(function(i) {
   var method = i[0],
     path = i[1];
   var r = routes4[method] || (routes4[method] = new Routington());
@@ -55,7 +56,7 @@ api.forEach(function(i) {
 // add tests
 suite
   .add('trek-router', function() {
-    api.forEach(function(i) {
+    _.shuffle(api).forEach(function(i) {
       var method = i[0],
         path = i[1],
         realpath = i[2];
@@ -65,7 +66,7 @@ suite
     });
   })
   .add('path-to-regexp', function() {
-    api.forEach(function(i) {
+    _.shuffle(api).forEach(function(i) {
       var method = i[0],
         path = i[1],
         realpath = i[2];
@@ -77,7 +78,7 @@ suite
     });
   })
   .add('route-recognizer', function() {
-    api.forEach(function(i) {
+    _.shuffle(api).forEach(function(i) {
       var method = i[0],
         path = i[1],
         realpath = i[2];
@@ -87,7 +88,7 @@ suite
     });
   })
   .add('route-trie', function() {
-    api.forEach(function(i) {
+    _.shuffle(api).forEach(function(i) {
       var method = i[0],
         path = i[1],
         realpath = i[2];
@@ -97,7 +98,7 @@ suite
     });
   })
   .add('routington', function() {
-    api.forEach(function(i) {
+    _.shuffle(api).forEach(function(i) {
       var method = i[0],
         path = i[1],
         realpath = i[2];

diff --git a/test/github-api.js b/test/github-api.js
@@ -233,7 +233,7 @@ module.exports = [
   ['GET', '/search/issues', '/search/issues'],
   ['GET', '/search/users', '/search/users'],
   ['GET', '/legacy/issues/search/:owner/:repository/:state/:keyword', '/legacy/issues/search/trekjs/trek/open/iojs'],
-  ['GET', '/legacy/repos/search/:keyword', '/legacy/user/search/trekjs'],
+  ['GET', '/legacy/repos/search/:keyword', '/legacy/repos/search/trekjs'],
   ['GET', '/legacy/user/search/:keyword', '/legacy/user/search/go+iojs'],
   ['GET', '/legacy/user/email/:email', '/legacy/user/email/cfddream@gmail.com'],
 

diff --git a/test/router.test.js b/test/router.test.js
@@ -340,9 +340,9 @@ describe('Router', () => {
 
     beforeEach(() => {
       r = new Router();
-      api.forEach((i) => {
+      _.shuffle(api).forEach((i) => {
         let [method, path] = i;
-        r.add(method, path, () => {});
+        r.add(method, path, createFunc(_.camelCase(path)));
       });
 
     });
@@ -351,12 +351,13 @@ describe('Router', () => {
       r.trees['GET'].printTree('', true)
     });
 
-    api.forEach((i) => {
+    _.shuffle(api).forEach((i) => {
       let [method, path, realpath] = i;
       it(path, () => {
         let [handler, params] = r.find(method, realpath);
         // console.log(path, realpath, params);
         assert.notEqual(null, handler);
+        assert.equal(_.camelCase(path), handler.name);
         assert.equal((path.match(/\:/g) || []).length, params.length);
       });
     });