From 6a9441d261bec725919f70ef1c813c4008dbf88c Mon Sep 17 00:00:00 2001
From: Gareth Jones <gareth.jones@sensis.com.au>
Date: Sun, 26 May 2013 17:15:10 +1000
Subject: [PATCH] more linting

---
 test/nolog-test.js | 379 +++++++++++++++++++++++----------------------
 1 file changed, 190 insertions(+), 189 deletions(-)

diff --git a/test/nolog-test.js b/test/nolog-test.js
index 8cec1bc..3c1a8e7 100644
--- a/test/nolog-test.js
+++ b/test/nolog-test.js
@@ -1,3 +1,4 @@
+"use strict";
 var vows = require('vows')
 , assert = require('assert')
 , levels = require('../lib/levels');
@@ -8,7 +9,7 @@ function MockLogger() {
   this.messages = [];
 
   this.log = function(level, message, exception) {
-	  that.messages.push({ level: level, message: message });
+    that.messages.push({ level: level, message: message });
   };
 
   this.isLevelEnabled = function(level) {
@@ -20,7 +21,7 @@ function MockLogger() {
 }
 
 function MockRequest(remoteAddr, method, originalUrl) {
-
+  
   this.socket = { remoteAddress: remoteAddr };
   this.originalUrl = originalUrl;
   this.method = method;
@@ -34,226 +35,226 @@ function MockResponse(statusCode) {
   this.statusCode = statusCode;
 
   this.end = function(chunk, encoding) {
-
+    
   };
 }
 
 vows.describe('log4js connect logger').addBatch({
   'getConnectLoggerModule': {
-      topic: function() {
-	  var clm = require('../lib/connect-logger');
-	  return clm;
-      },
-
-      'should return a "connect logger" factory' : function(clm) {
-	  assert.isObject(clm);
-      },
-
-      'nolog String' : {
-	  topic: function(clm) {
-	      var ml = new MockLogger();
-	      var cl = clm.connectLogger(ml, { nolog: "\\.gif" });
-              return {cl: cl, ml: ml};
-          },
-
-          'check unmatch url request': {
-              topic: function(d){
-		  var req = new MockRequest('my.remote.addr', 'GET', 'http://url/hoge.png'); // not gif
-		  var res = new MockResponse(200);
-		  d.cl(req, res, function() { });
-                  res.end('chunk', 'encoding');
-                  return d.ml.messages;
-              }
-            , 'check message': function(messages){
-		  assert.isArray(messages);
-		  assert.equal(messages.length, 1);
-		  assert.ok(levels.INFO.isEqualTo(messages[0].level));
-		  assert.include(messages[0].message, 'GET');
-		  assert.include(messages[0].message, 'http://url');
-		  assert.include(messages[0].message, 'my.remote.addr');
-		  assert.include(messages[0].message, '200');
-                  messages.pop();
-	      }
-	  },
-
-          'check match url request': {
-	      topic: function(d) {
-		  var req = new MockRequest('my.remote.addr', 'GET', 'http://url/hoge.gif'); // gif
-		  var res = new MockResponse(200);
-		  d.cl(req, res, function() { });
-                  res.end('chunk', 'encoding');
-                  return d.ml.messages;
-	      }
-	    , 'check message': function(messages) {
-		  assert.isArray(messages);
-		  assert.equal(messages.length, 0);
-	      }
-	  }
+    topic: function() {
+      var clm = require('../lib/connect-logger');
+      return clm;
     },
 
-      'nolog Strings' : {
-	  topic: function(clm) {
-	      var ml = new MockLogger();
-	      var cl = clm.connectLogger(ml, {nolog: "\\.gif|\\.jpe?g"});
-              return {cl: cl, ml: ml};
-          },
+    'should return a "connect logger" factory' : function(clm) {
+      assert.isObject(clm);
+    },
 
-          'check unmatch url request (png)': {
-              topic: function(d){
-		  var req = new MockRequest('my.remote.addr', 'GET', 'http://url/hoge.png'); // not gif
-		  var res = new MockResponse(200);
-		  d.cl(req, res, function() { });
-                  res.end('chunk', 'encoding');
-                  return d.ml.messages;
-              }
-            , 'check message': function(messages){
-		  assert.isArray(messages);
-		  assert.equal(messages.length, 1);
-		  assert.ok(levels.INFO.isEqualTo(messages[0].level));
-		  assert.include(messages[0].message, 'GET');
-		  assert.include(messages[0].message, 'http://url');
-		  assert.include(messages[0].message, 'my.remote.addr');
-		  assert.include(messages[0].message, '200');
-                  messages.pop();
-	      }
-	  },
+    'nolog String' : {
+      topic: function(clm) {
+        var ml = new MockLogger();
+        var cl = clm.connectLogger(ml, { nolog: "\\.gif" });
+        return {cl: cl, ml: ml};
+      },
+
+      'check unmatch url request': {
+        topic: function(d){
+          var req = new MockRequest('my.remote.addr', 'GET', 'http://url/hoge.png'); // not gif
+          var res = new MockResponse(200);
+          d.cl(req, res, function() { });
+          res.end('chunk', 'encoding');
+          return d.ml.messages;
+        }, 
+        'check message': function(messages){
+          assert.isArray(messages);
+          assert.equal(messages.length, 1);
+          assert.ok(levels.INFO.isEqualTo(messages[0].level));
+          assert.include(messages[0].message, 'GET');
+          assert.include(messages[0].message, 'http://url');
+          assert.include(messages[0].message, 'my.remote.addr');
+          assert.include(messages[0].message, '200');
+          messages.pop();
+        }
+      },
+
+      'check match url request': {
+        topic: function(d) {
+          var req = new MockRequest('my.remote.addr', 'GET', 'http://url/hoge.gif'); // gif
+          var res = new MockResponse(200);
+          d.cl(req, res, function() { });
+          res.end('chunk', 'encoding');
+          return d.ml.messages;
+        }, 
+        'check message': function(messages) {
+          assert.isArray(messages);
+          assert.equal(messages.length, 0);
+        }
+      }
+    },
+
+    'nolog Strings' : {
+      topic: function(clm) {
+        var ml = new MockLogger();
+        var cl = clm.connectLogger(ml, {nolog: "\\.gif|\\.jpe?g"});
+        return {cl: cl, ml: ml};
+      },
+      
+      'check unmatch url request (png)': {
+        topic: function(d){
+          var req = new MockRequest('my.remote.addr', 'GET', 'http://url/hoge.png'); // not gif
+          var res = new MockResponse(200);
+          d.cl(req, res, function() { });
+          res.end('chunk', 'encoding');
+          return d.ml.messages;
+        }, 
+        'check message': function(messages){
+          assert.isArray(messages);
+          assert.equal(messages.length, 1);
+          assert.ok(levels.INFO.isEqualTo(messages[0].level));
+          assert.include(messages[0].message, 'GET');
+          assert.include(messages[0].message, 'http://url');
+          assert.include(messages[0].message, 'my.remote.addr');
+          assert.include(messages[0].message, '200');
+          messages.pop();
+        }
+      },
 
       'check match url request (gif)': {
-	      topic: function(d) {
-		      var req = new MockRequest('my.remote.addr', 'GET', 'http://url/hoge.gif'); // gif
-		      var res = new MockResponse(200);
-		      d.cl(req, res, function() { });
+        topic: function(d) {
+          var req = new MockRequest('my.remote.addr', 'GET', 'http://url/hoge.gif'); // gif
+          var res = new MockResponse(200);
+          d.cl(req, res, function() { });
           res.end('chunk', 'encoding');
           return d.ml.messages;
-	      }
-	      , 'check message': function(messages) {
-		      assert.isArray(messages);
-		      assert.equal(messages.length, 0);
-	      }
-	    },
+        }, 
+        'check message': function(messages) {
+          assert.isArray(messages);
+          assert.equal(messages.length, 0);
+        }
+      },
       'check match url request (jpeg)': {
-	      topic: function(d) {
-		      var req = new MockRequest('my.remote.addr', 'GET', 'http://url/hoge.jpeg'); // gif
-		      var res = new MockResponse(200);
-		      d.cl(req, res, function() { });
+        topic: function(d) {
+          var req = new MockRequest('my.remote.addr', 'GET', 'http://url/hoge.jpeg'); // gif
+          var res = new MockResponse(200);
+          d.cl(req, res, function() { });
           res.end('chunk', 'encoding');
           return d.ml.messages;
-	      }
-	      , 'check message': function(messages) {
-		      assert.isArray(messages);
-		      assert.equal(messages.length, 0);
-	      }
-	    }
+        }, 
+        'check message': function(messages) {
+          assert.isArray(messages);
+          assert.equal(messages.length, 0);
+        }
+      }
     },
-	  'nolog Array<String>' : {
-	    topic: function(clm) {
-		    var ml = new MockLogger();
-		    var cl = clm.connectLogger(ml, {nolog: ["\\.gif", "\\.jpe?g"]});
+    'nolog Array<String>' : {
+      topic: function(clm) {
+        var ml = new MockLogger();
+        var cl = clm.connectLogger(ml, {nolog: ["\\.gif", "\\.jpe?g"]});
+        return {cl: cl, ml: ml};
+      },
+      
+      'check unmatch url request (png)': {
+        topic: function(d){
+          var req = new MockRequest('my.remote.addr', 'GET', 'http://url/hoge.png'); // not gif
+          var res = new MockResponse(200);
+          d.cl(req, res, function() { });
+          res.end('chunk', 'encoding');
+          return d.ml.messages;
+        }, 
+        'check message': function(messages){
+          assert.isArray(messages);
+          assert.equal(messages.length, 1);
+          assert.ok(levels.INFO.isEqualTo(messages[0].level));
+          assert.include(messages[0].message, 'GET');
+          assert.include(messages[0].message, 'http://url');
+          assert.include(messages[0].message, 'my.remote.addr');
+          assert.include(messages[0].message, '200');
+          messages.pop();
+        }
+      },
+
+      'check match url request (gif)': {
+        topic: function(d) {
+          var req = new MockRequest('my.remote.addr', 'GET', 'http://url/hoge.gif'); // gif
+          var res = new MockResponse(200);
+          d.cl(req, res, function() { });
+          res.end('chunk', 'encoding');
+          return d.ml.messages;
+        }, 
+        'check message': function(messages) {
+          assert.isArray(messages);
+          assert.equal(messages.length, 0);
+        }
+      },
+
+      'check match url request (jpeg)': {
+        topic: function(d) {
+          var req = new MockRequest('my.remote.addr', 'GET', 'http://url/hoge.jpeg'); // gif
+          var res = new MockResponse(200);
+          d.cl(req, res, function() { });
+          res.end('chunk', 'encoding');
+          return d.ml.messages;
+        }, 
+        'check message': function(messages) {
+          assert.isArray(messages);
+          assert.equal(messages.length, 0);
+        }
+      },
+    },
+    'nolog RegExp' : {
+      topic: function(clm) {
+        var ml = new MockLogger();
+        var cl = clm.connectLogger(ml, {nolog: /\.gif|\.jpe?g/});
         return {cl: cl, ml: ml};
       },
 
       'check unmatch url request (png)': {
         topic: function(d){
-		      var req = new MockRequest('my.remote.addr', 'GET', 'http://url/hoge.png'); // not gif
-		      var res = new MockResponse(200);
-		      d.cl(req, res, function() { });
+          var req = new MockRequest('my.remote.addr', 'GET', 'http://url/hoge.png'); // not gif
+          var res = new MockResponse(200);
+          d.cl(req, res, function() { });
           res.end('chunk', 'encoding');
           return d.ml.messages;
-        }
-        , 'check message': function(messages){
-		      assert.isArray(messages);
-		      assert.equal(messages.length, 1);
-		      assert.ok(levels.INFO.isEqualTo(messages[0].level));
-		      assert.include(messages[0].message, 'GET');
-		      assert.include(messages[0].message, 'http://url');
-		      assert.include(messages[0].message, 'my.remote.addr');
-		      assert.include(messages[0].message, '200');
+        }, 
+        'check message': function(messages){
+          assert.isArray(messages);
+          assert.equal(messages.length, 1);
+          assert.ok(levels.INFO.isEqualTo(messages[0].level));
+          assert.include(messages[0].message, 'GET');
+          assert.include(messages[0].message, 'http://url');
+          assert.include(messages[0].message, 'my.remote.addr');
+          assert.include(messages[0].message, '200');
           messages.pop();
-	      }
-	    },
-
-      'check match url request (gif)': {
-	      topic: function(d) {
-		      var req = new MockRequest('my.remote.addr', 'GET', 'http://url/hoge.gif'); // gif
-		      var res = new MockResponse(200);
-		      d.cl(req, res, function() { });
-          res.end('chunk', 'encoding');
-          return d.ml.messages;
-	      }
-	      , 'check message': function(messages) {
-		      assert.isArray(messages);
-		      assert.equal(messages.length, 0);
-	      }
-	    },
-
-      'check match url request (jpeg)': {
-	      topic: function(d) {
-		      var req = new MockRequest('my.remote.addr', 'GET', 'http://url/hoge.jpeg'); // gif
-		      var res = new MockResponse(200);
-		      d.cl(req, res, function() { });
-          res.end('chunk', 'encoding');
-          return d.ml.messages;
-	      }
-	      , 'check message': function(messages) {
-		      assert.isArray(messages);
-		      assert.equal(messages.length, 0);
-	      }
-	    },
-    },
-	  'nolog RegExp' : {
-	    topic: function(clm) {
-		    var ml = new MockLogger();
-		    var cl = clm.connectLogger(ml, {nolog: /\.gif|\.jpe?g/});
-        return {cl: cl, ml: ml};
+        }
       },
 
-      'check unmatch url request (png)': {
-        topic: function(d){
-		      var req = new MockRequest('my.remote.addr', 'GET', 'http://url/hoge.png'); // not gif
-		      var res = new MockResponse(200);
-		      d.cl(req, res, function() { });
-          res.end('chunk', 'encoding');
-          return d.ml.messages;
-        }
-        , 'check message': function(messages){
-		      assert.isArray(messages);
-		      assert.equal(messages.length, 1);
-		      assert.ok(levels.INFO.isEqualTo(messages[0].level));
-		      assert.include(messages[0].message, 'GET');
-		      assert.include(messages[0].message, 'http://url');
-		      assert.include(messages[0].message, 'my.remote.addr');
-		      assert.include(messages[0].message, '200');
-          messages.pop();
-	      }
-	    },
-
       'check match url request (gif)': {
-	      topic: function(d) {
-		      var req = new MockRequest('my.remote.addr', 'GET', 'http://url/hoge.gif'); // gif
-		      var res = new MockResponse(200);
-		      d.cl(req, res, function() { });
+        topic: function(d) {
+          var req = new MockRequest('my.remote.addr', 'GET', 'http://url/hoge.gif'); // gif
+          var res = new MockResponse(200);
+          d.cl(req, res, function() { });
           res.end('chunk', 'encoding');
           return d.ml.messages;
-	      }
-	      , 'check message': function(messages) {
-		      assert.isArray(messages);
-		      assert.equal(messages.length, 0);
-	      }
-	    },
+        }, 
+        'check message': function(messages) {
+          assert.isArray(messages);
+          assert.equal(messages.length, 0);
+        }
+      },
 
       'check match url request (jpeg)': {
-	      topic: function(d) {
-		      var req = new MockRequest('my.remote.addr', 'GET', 'http://url/hoge.jpeg'); // gif
-		      var res = new MockResponse(200);
-		      d.cl(req, res, function() { });
+        topic: function(d) {
+          var req = new MockRequest('my.remote.addr', 'GET', 'http://url/hoge.jpeg'); // gif
+          var res = new MockResponse(200);
+          d.cl(req, res, function() { });
           res.end('chunk', 'encoding');
           return d.ml.messages;
-	      }
-	      , 'check message': function(messages) {
-		      assert.isArray(messages);
-		      assert.equal(messages.length, 0);
-	      }
-	    },
+        }, 
+        'check message': function(messages) {
+          assert.isArray(messages);
+          assert.equal(messages.length, 0);
+        }
+      }
     }
   }