fdlint 0.2.0.pre → 0.2.0

data/test/js/rule/nest_try_catch_test.rb

@@ -1,29 +1,28 @@
 # encoding: utf-8
 require_relative 'base_test'
 
-require 'js/rule/checklist'
-
-module XRayTest
+module FdlintTest
   module JS
     module Rule
       
       class NestTryCatchTest < BaseTest
 
-        def test_ok
-          js = '
-            try {
-                  
-            } catch (e) {
-                
-            }
-          '
-          ret = visit js
-          assert_equal [], ret
-        end
+        check_rule [:warn, 'try catch一般不允许嵌套，若嵌套，需要充分的理由'] do
+          should_with_result do
+          [
+            'try {
+                if (a > 0) {
+                }   
+              } finally {
+                try {
+                    
+                } catch (e) {
+                    
+                }    
+              }
+            ',
 
-        def test_fail
-          js = '
-            try {
+            'try {
               if (a > 0) {
                 try {
                     
@@ -33,35 +32,19 @@ module XRayTest
               }   
             } finally {
                 
-            }
-          '
-          ret = visit js
-          assert_equal [['try catch一般不允许嵌套，若嵌套，需要充分的理由', :warn]], ret
-        end
-        
-        def test_nest_in_finnally_part
-          js = '
-            try {
-              if (a > 0) {
-              }   
-            } finally {
+            }'
+          ]
+          end
+
+          should_without_result do
+            '
               try {
-                  
+                    
               } catch (e) {
                   
-              }    
-            }
-          '
-          ret = visit js
-          assert_equal [['try catch一般不允许嵌套，若嵌套，需要充分的理由', :warn]], ret
-        end
-        
-        private
-
-        def visit(js)
-          stat = parse js, 'stat_try'
-          rule = XRay::JS::Rule::ChecklistRule.new
-          rule.visit_stat_try stat
+              }
+            '
+          end
         end
 
       end

data/test/js/rule/new_object_and_new_array_test.rb

@@ -1,34 +1,18 @@
 # encoding: utf-8
 require_relative 'base_test'
 
-require 'js/rule/checklist'
-
-module XRayTest
+module FdlintTest
   module JS
     module Rule
       
       class NewObjectAndNewArrayTest < BaseTest
 
-        def test_default
-          js = '
-            new Object();
-          '
-          ret = visit js
-          assert_equal [['使用{}代替new Object()', :error]], ret
-
-          js = '
-            new Array();
-          '
-          ret = visit js
-          assert_equal [['使用[]代替new Array()', :error]], ret
+        should_with_result [:error, '使用{}代替new Object()'] do
+          ['new Object()', 'new Object']
         end
-        
-        private
 
-        def visit(js)
-          expr = parse js, 'expr_new'
-          rule = XRay::JS::Rule::ChecklistRule.new
-          rule.visit_expr_new expr
+        should_with_result [:error, '使用[]代替new Array()'] do
+          ['new Array()', 'new Array']
         end
 
       end

data/test/js/rule/no_eval_test.rb

@@ -1,30 +1,14 @@
 # encoding: utf-8
 require_relative 'base_test'
 
-require 'js/rule/checklist'
-
-module XRayTest
+module FdlintTest
   module JS
     module Rule
       
       class NoEvalTest < BaseTest
-       
-        def test_no_eval
-          js = 'eval("a = 1 + 2 + 3")' 
-          ret = visit js
-          assert_equal [['不允许使用eval', :error]], ret
-
-          js = 'window.eval("1 + 2 + 3")'
-          ret = visit js
-          assert_equal [['不允许使用eval', :error]], ret
-        end 
-
-        private
 
-        def visit(js)
-          expr = parse js, 'expr_member'
-          rule = XRay::JS::Rule::ChecklistRule.new
-          rule.visit_expr_member expr
+        should_with_result [:error, '不允许使用eval'] do
+          ['eval("a = 1 + 2 + 3")',  'window.eval("1 + 2 + 3")']
         end
 
       end

data/test/js/rule/no_global_test.rb

@@ -1,84 +1,45 @@
 # encoding: utf-8
 require_relative 'base_test'
 
-require 'js/rule/no_global'
-
-module XRayTest
+module FdlintTest
   module JS
     module Rule
     
       class NoGlobalTest < BaseTest
-        
-        class Parser < XRay::JS::Parser
-          include XRay::ParserVisitable 
-        end
-        
-        def test_main
-          js = '
-            var a = 1;
-            a++;
-            function hello() {
-            }
-            if (a < 100) {
-              var b;
-              (function(k) {
-                var c = 123;
-
-                function d(j) {
-                  a = 1000;
-                  z = 200; 
-                  k = 300;
-                  j = 400
-                }
-              })();    
-            }
-          '
-          
-          ret = parse js 
-          assert_equal 4, ret.length
-          assert_equal '(var,[(var=,a,1)],)', ret[0].node.text
-          assert_equal 'hello', ret[1].node.text
-          assert_equal '(var,[(var=,b,)],)', ret[2].node.text
-          assert_equal '(=,z,200)', ret[3].node.text
-        end
-
-        def test_scope_in_other_function
-          js = <<-JS
-          /**
-           * scope test fixture
-           */
-          (function($){
-              function test(){
-                  var temp;
-              }
 
-              var _createSeperator = function(){
-                   var _self = this,
-                      menuEl = _self.get('menuEl');
-                   temp = [a,b,c];
-                   return new Node(temp).appendTo(menuEl);
-
-               test = 123;
-
-              //var temp2;
-              temp2 = 234;
-                };
-
-          })(jQuery);
-          JS
-
-          ret = parse js 
-          assert_equal [
-            "禁止使用未定义的变量(或全局变量)",
-            "禁止使用未定义的变量(或全局变量)"
-          ], ret.map(&:message)
-          assert_equal '(=,temp,[a,b,c])', ret[0].node.text
-          assert_equal '(=,temp2,234)', ret[1].node.text
-          
-        end
-        
-        def parse(js)
-          parse_with_rule js, XRay::JS::Rule::NoGlobalRule
+        should_with_result [:error, '禁止使用未定义的变量(或全局变量)'] do
+          [
+            %Q{ var a = 1; },
+            %Q{ (function(k) {
+                  var c = 123;
+
+                  function d(j) {
+                    a = 1000;
+                    z = 200; 
+                    k = 300;
+                    j = 400
+                  }
+                })()
+            }, <<-SRC
+              /**
+               * scope test fixture
+               */
+              (function($){
+                  function test(){
+                      var temp;
+                  }
+
+                  var _createSeperator = function(){
+                       var _self = this,
+                          menuEl = _self.get('menuEl');
+
+                       //global var
+                       temp = [a,b,c];
+                       return new Node(temp).appendTo(menuEl);
+                  };
+              })(jQuery);
+            SRC
+          ]
         end
 
       end

data/test/js/rule/private_method_check_test.rb

@@ -1,54 +1,25 @@
 # encoding: utf-8
 require_relative 'base_test'
 
-require 'js/rule/checklist'
-
-module XRayTest
+module FdlintTest
   module JS
     module Rule
       
       class PrivateMethodCheckTest < BaseTest
 
-        def test_normal
-          js = 'a.check("good")'
-          ret = visit js
-          assert_equal [], ret
-        end
-       
-        def test_protected_called
-          js = "a._check('good')"
-          ret = visit js
-          assert_equal 1, ret.length
-        end 
-
-        def test_protected_called_via_apply
-          js = "a._check.call(a, 'good')"
-          ret = visit js
-          assert_equal 1, ret.length
-        end
-
-        def test_private_called
-          js = "a.__check('good')"
-          ret = visit js
-          assert_equal 1, ret.length
-        end
-
-        def test_good_case
-          js = "this.__check('good')"
-          ret = visit js
-          assert_equal [], ret
-
-          js = "self._check('good')"
-          ret = visit js
-          assert_equal [], ret
-        end
-
-        private
-
-        def visit(js)
-          expr = parse js, 'expr_member'
-          rule = XRay::JS::Rule::ChecklistRule.new
-          rule.send :visit_expr_member, expr
+        check_rule [:error, '禁止调用对象的私有方法'] do
+          
+          should_with_result do 
+            %w[a._check('good')
+               a._check.call(a,\ 'good')
+               a.__check('good')]
+          end
+
+          should_without_result do
+            %w[a.check("good")
+            this.__check('good')
+            self._check('good')]
+          end
         end
 
       end

data/test/js/rule/semicolon_test.rb

@@ -1,59 +1,30 @@
 # encoding: utf-8
 require_relative 'base_test'
 
-require 'js/rule/checklist'
-
-module XRayTest
+module FdlintTest
   module JS
     module Rule
       
       class SemicolonTest < BaseTest
-        include XRay::JS::Rule
 
-        def setup
-          @msg = '所有语句结束带上分号'
-        end
-        
-        def test_block
-          js = '{
-            i = i++;   
-          }'
+        check_rule [:error, '所有语句结束带上分号'] do
           
-          ret = visit js, 'block'
-          assert_equal [], ret
-        end
-
-        def test_empty
-          ret = visit ';', 'empty'
-          assert_equal [], ret
-        end
-
-        def test_var
-          js = '
-            var a = 1, b = 2
-            a++;
-          '
-          ret = visit js, 'var'
-          assert_equal [[@msg, :error]], ret
-        end
-
-        def test_expression
-          js = '
-            a = i + 1 + 2 + 3 * 9
-            i++
-          '
-          ret = visit js, 'expression'
-          assert_equal [[@msg, :error]], ret
-        end
-
-        private
-        
-        def visit(js, type)
-          stat = parse js, :statement
-          assert_equal type, stat.type
-
-          rule = XRay::JS::Rule::ChecklistRule.new
-          rule.visit_statement stat
+          should_with_result do 
+            [
+              %Q{var a = 1, b = 2
+              a++;},
+
+              %Q{a = i + 1 + 2 + 3 * 9
+              i++}
+            ]
+          end
+
+          should_without_result do
+            [
+              %Q{ i = i++; },
+              ';' 
+            ]
+          end
         end
 
       end

data/test/js/rule/stat_if_with_brace_test.rb

@@ -1,64 +1,41 @@
 # encoding: utf-8
 require_relative 'base_test'
 
-require 'js/rule/checklist'
-
-module XRayTest
+module FdlintTest
   module JS
     module Rule
       
       class StatIfWithBraceTest < BaseTest
 
-        def setup
-          @msg = '所有条件区域必须用花括号括起来'
-        end
-        
-        def test_ok
-          js = '
-            if (i == 0) {
-              i++; 
-            } else {
-              i--
-            }
-          '
-          ret = visit js
-          assert_equal [], ret
-        end
-
-        def test_fail_1
-          js = '
-            if (i > 0)
-              i--
-            hello();
-          '
-          ret = visit js
-          assert_equal [[@msg, :error]], ret
-        end
-
-        def test_fail_2
-          js = '
-            if (hello()) {
-              i--;    
-            } else i++;
-
-          '
-          ret = visit js
-          assert_equal [[@msg, :error]], ret
-        end
-
-        def test_fail_3
-          js = 'if (i) i--; else i++;'
-
-          ret = visit js
-          assert_equal [[@msg, :error]], ret
-        end
-
-        private
-
-        def visit(js)
-          stat = parse js, 'stat_if'
-          rule = XRay::JS::Rule::ChecklistRule.new
-          rule.visit_stat_if stat
+        check_rule [:error, '所有条件区域必须用花括号括起来'] do
+          
+          should_with_result do 
+            [
+              %Q{
+                if (hello()) {
+                  i--;    
+                } else i++;
+              },
+              %Q{
+                if (i > 0)
+                  i--
+                hello();
+              }
+            ]
+          end
+
+          should_without_result do
+            [
+              %Q{
+                if (i == 0) {
+                  i++; 
+                } else {
+                  i--
+                }
+              },
+              %Q{ 'if (i) i--; else i++;'}
+            ]
+          end
         end
 
       end

data/test/js/rule/stat_if_with_muti_else_test.rb

@@ -1,64 +1,47 @@
 # encoding: utf-8
 require_relative 'base_test'
 
-require 'js/rule/checklist'
-
-module XRayTest
+module FdlintTest
   module JS
     module Rule
       
       class StatIfWithMutiElseTest < BaseTest
 
-        def setup
-          @msg = '3个条件及以上的条件语句用switch代替if else'
-        end
-        
-        def test_ok
-          js = '
-            if (a > 0) {
-                
-            } else if (a > 10) {
-                
-            } else {    
-
-            }
-          '
-          ret = visit js
-          assert_equal [], ret
-        end
-
-        def test_fail_1
-          js = '
-            if (a > 1) {
-            } else if (a > 20) {
-            } else if (a > 30) {
-            } else {
-            }
-          '
-          ret = visit js
-          assert_equal [[@msg, :error]], ret
-        end
-
-        def test_fail_2
-          js = '
-            if (a > 2) {
-            } else if (a > 40) {
-            } else if (a > 50) {
-            } else if (a > 60) {
-            }
-          '
-          ret = visit js
-          assert_equal [[@msg, :error]], ret
-        end
-
-
-
-        private
-
-        def visit(js)
-          stat = parse js, 'stat_if'
-          rule = XRay::JS::Rule::ChecklistRule.new
-          rule.visit_stat_if stat
+        check_rule [:error, '3个条件及以上的条件语句用switch代替if else'] do
+          
+          should_with_result do 
+            [
+              %Q{
+                if (a > 1) {
+                } else if (a > 20) {
+                } else if (a > 30) {
+                } else {
+                }
+              },
+
+              %Q{
+                if (a > 2) {
+                } else if (a > 40) {
+                } else if (a > 50) {
+                } else if (a > 60) {
+                }
+              }
+            ]
+          end
+
+          should_without_result do
+            [
+              %Q{
+                if (a > 0) {
+                    
+                } else if (a > 10) {
+                    
+                } else {    
+
+                }
+              },
+            ].last
+          end
         end
 
       end

data/test/js/rule/use_strict_equal_test.rb

@@ -1,40 +1,27 @@
 # encoding: utf-8
 require_relative 'base_test'
 
-require 'js/rule/checklist'
-
-module XRayTest
+module FdlintTest
   module JS
     module Rule
       
       class UseStrictEqualTest < BaseTest
 
-        def test_ok
-          js = 'i === 1 + 1 / 2'
-          ret = visit js
-          assert_equal [], ret 
-
-          js = 'i !== hello()'
-          ret = visit js
-          assert_equal [], ret
-        end
-
-        def test_fail
-          js = 'i == 1 + 1 / 2'
-          ret = visit js
-          assert_equal [['避免使用==和!=操作符', :warn]], ret
-
-          js = 'i != hello()'
-          ret = visit js
-          assert_equal [['避免使用==和!=操作符', :warn]], ret
-        end
-        
-        private
-
-        def visit(js)
-          expr = parse js, 'expr_equal'
-          rule = XRay::JS::Rule::ChecklistRule.new
-          rule.visit_expr_equal expr
+        check_rule [:warn, '避免使用==和!=操作符'] do
+          
+          should_with_result do 
+            [
+              'i == 1 + 1 / 2',
+              'i != hello()'
+            ]
+          end
+
+          should_without_result do
+            [
+              'i === 1 + 1 / 2',
+              'i !== hello()'
+            ]
+          end
         end
 
       end