fdlint 0.2.0.pre → 0.2.0

data/test/html/rule/check_prop_seperator_test.rb

@@ -1,28 +1,24 @@
 # encoding: utf-8
 
 require_relative '../../helper'
-require 'html/rule/check_tag_rule'
 
-module XRayTest
+module FdlintTest
   module HTML
     module Rule
       
       class CheckPropSeperatorTest < Test::Unit::TestCase
 
-        include XRay::HTML
+        include FdlintTest::HTML
 
-        def setup
-          @rule = XRay::HTML::Rule::CheckTagRule.new
-        end
+        check_rule [:error, '属性值必须使用双引号'] do
 
-        def test_check_double_quote
-          prop = XRay::HTML::Property.new('id', 'info', "\"")
-          assert_equal [], @rule.check_html_property(prop)
-        end
+          should_with_result do
+            %Q{<input type='radio' />}
+          end
 
-        def test_check_single_quote
-          prop = XRay::HTML::Property.new('id', 'info', "\'")
-          assert_equal [["属性值必须使用双引号", :error]], @rule.check_html_property(prop)
+          should_without_result do
+            %Q{<input type="radio" />}
+          end
         end
 
       end

data/test/html/rule/check_style_prop_test.rb

@@ -1,26 +1,21 @@
 # encoding: utf-8
 
 require_relative '../../helper'
-require 'html/rule/check_tag_rule'
 
-module XRayTest
+module FdlintTest
   module HTML
     module Rule
       
       class CheckStylePropTest < Test::Unit::TestCase
 
-        def setup
-          @rule = XRay::HTML::Rule::CheckTagRule.new
-        end
+        include FdlintTest::HTML
 
-        def test_check_normal
-          prop = XRay::HTML::Property.new('href', '#nogo')
-          assert_equal [], @rule.check_html_property(prop)
-        end
+        check_rule [:error, '不能定义内嵌样式style'] do
+
+          should_with_result do
+            %Q{<div style='background:transparent;' />}
+          end
 
-        def test_check_tag_with_style_prop
-          prop = XRay::HTML::Property.new('style', 'nogo')
-          assert_equal [["不能定义内嵌样式style", :error]], @rule.check_html_property(prop)
         end
 
       end

data/test/html/rule/check_tag_closed_test.rb

@@ -1,56 +1,31 @@
 # encoding: utf-8
 
 require_relative '../../helper'
-require 'html/rule/check_tag_rule'
 
-module XRayTest
+module FdlintTest
   module HTML
     module Rule
       
       class CheckTagClosedTest < Test::Unit::TestCase
 
-        def setup
-          @rule = XRay::HTML::Rule::CheckTagRule.new
-        end
-
-        def test_check_normal_tag
-          tag = XRay::HTML::Element.new('div', {:class=>'footer'})
-          assert_equal [], @rule.check_html_tag(tag)
-        end
+        include FdlintTest::HTML
 
-        def test_check_normal_tag_not_closed
-          tag = XRay::HTML::Element.new('div', {:class=>'footer'})
-          tag.close_type = :none
-          assert_equal [["标签必须正确闭合", :error]], @rule.check_html_tag(tag)
-        end
-
-        def test_check_normal_tag_self_closed
-          tag = XRay::HTML::Element.new('div', {:class=>'footer'})
-          tag.close_type = :self
-          assert_equal [], @rule.check_html_tag(tag)
-        end
+        check_rule [:error, '标签必须正确闭合'] do
 
-        def test_check_self_close_tag_right
-          tag = XRay::HTML::Element.new('img', {:class=>'footer', :alt=>'image'})
-          tag.close_type = :self
-          assert_equal [], @rule.check_html_tag(tag)
-        end
-      
-        def test_check_self_close_tag_close_after
-          tag = XRay::HTML::Element.new('img', {:class=>'footer', :alt=>'image'})
-          assert_equal [["标签必须正确闭合", :error]], @rule.check_html_tag(tag)
-        end
-      
-        def test_check_text
-          tag = XRay::HTML::TextElement.new('hello world')
-          assert_equal [], @rule.check_html_tag(tag)
+          should_without_result do
+            [
+              %Q{<br>},
+              %Q{<br/>},
+              %Q{<p></p>},
+              %Q{<p/>},
+              %Q{<img src="" alt="" >},
+              %Q{<img src="" alt="" />},
+              %Q{text},
+              %Q{<!--comment-->}
+            ]
+          end
         end
 
-        def test_check_comment
-          tag = XRay::HTML::CommentElement.new('hello world')
-          assert_equal [], @rule.check_html_tag(tag)
-        end
-      
       end
 
     end

data/test/html/rule/check_tag_downcase_test.rb

@@ -1,50 +1,53 @@
 # encoding: utf-8
 
 require_relative '../../helper'
-require 'html/rule/check_tag_rule'
 
-module XRayTest
+module FdlintTest
   module HTML
     module Rule
       
       class CheckTagDowncaseTest < Test::Unit::TestCase
 
-        def setup
-          @rule = XRay::HTML::Rule::CheckTagRule.new
-        end
+        include FdlintTest::HTML
 
-        def test_check_normal_prop_name
-          prop = XRay::HTML::Property.new('href', '#nogo')
-          assert_equal [], @rule.check_html_property(prop)
-        end
+        check_rule [:error, '标签名必须小写'] do
 
-        def test_check_normal_tag_name
-          tag = XRay::HTML::Element.new('div', {:class=>'footer'})
-          assert_equal [], @rule.check_html_tag(tag)
-        end
-      
-        def test_check_tag_with_upcase_name
-          tag = XRay::HTML::Element.new('DIV', {:class=>'footer'})
-          assert_equal [["标签名必须小写", :error]], @rule.check_html_tag(tag)
-        end
+          should_with_result do
+            %Q{<INPUT type="radio" />}
+          end
 
-        def test_check_tag_with_upcase_ending
-          tag = XRay::HTML::Element.new('div', nil, [], :after, '</DIV>')
-          assert_equal [["标签名必须小写", :error]], @rule.check_html_tag(tag)
+          should_without_result do
+            %Q{<input type="radio" />}
+          end
         end
 
-        def test_check_tag_with_simple_upcase_prop_name
-          prop = XRay::HTML::Property.new('Href', 'nogo')
-          assert_equal [["属性名必须小写，连字符用中横线", :error]], @rule.check_html_property(prop)
+        check_rule [:error, '属性名连字符用中横线'] do
+          should_with_result do
+            [
+              %Q{<a data_id="1"/>}
+            ]
+          end
+
+          should_without_result do
+            %Q{<a data-id="1"/>}
+          end
         end
 
-        def test_check_tag_with_style_prop
-          prop = XRay::HTML::Property.new('Style', 'nogo')
-          assert_equal [["不能定义内嵌样式style", :error], ["属性名必须小写，连字符用中横线", :error]], @rule.check_html_property(prop)
+        check_rule [:error, '属性名必须小写'] do
+          should_with_result do
+            [
+              %Q{<a dataId="1"/>},
+              %Q{<a HREF=""/>},
+              %Q{<a Href=""/>}
+            ]
+          end
+
+          should_without_result do
+            %Q{<a href=""/>}
+          end
         end
 
       end
-
     end
   end
 end

data/test/html/rule/check_unescape_char_test.rb

@@ -1,31 +1,31 @@
 # encoding: utf-8
 
 require_relative '../../helper'
-require 'html/rule/check_tag_rule'
 
-module XRayTest
+module FdlintTest
   module HTML
     module Rule
       
       class CheckUnescapedCharTest < Test::Unit::TestCase
 
-        def setup
-          @rule = XRay::HTML::Rule::CheckTagRule.new
-        end
+        include FdlintTest::HTML
 
-        def test_check_normal_text_tag
-          tag = XRay::HTML::TextElement.new('hello')
-          assert_equal [], @rule.check_html_text(tag)
-        end
-      
-        def test_check_text_el_with_rt
-          tag = XRay::HTML::TextElement.new('>>>')
-          assert_equal [["特殊HTML符号(>和<)必须转义", :error]], @rule.check_html_text(tag)
-        end
+        check_rule [:error, '特殊HTML符号(>和<)必须转义'] do
+
+          should_with_result do
+            [
+              %Q{<test>>>></test>},
+              %Q{<a><<<</a>},
+              %Q{<a><<<>>></a>}
+            ]
+          end
 
-        def test_check_text_el_with_lt
-          tag = XRay::HTML::TextElement.new('<<<<')
-          assert_equal [["特殊HTML符号(>和<)必须转义", :error]], @rule.check_html_text(tag)
+          should_without_result do
+            [
+              %Q{<p/>},
+              %Q{<script> 1>5 </script>}
+            ]
+          end
         end
 
       end

data/test/html/rule/check_unique_import_test.rb

@@ -1,49 +1,31 @@
 # encoding: utf-8
 
 require_relative '../../helper'
-require 'html/rule/check_tag_rule'
 
-module XRayTest
+module FdlintTest
   module HTML
     module Rule
       
       class CheckUniqueImportTest < Test::Unit::TestCase
 
-        def setup
-          @rule = XRay::HTML::Rule::CheckTagRule.new
-        end
-
-        def test_check_normal_script
-          tag = XRay::HTML::Element.new('script', {:src=>'http://style.china.alibaba.com/lib/fdev-v4/core/fdev-min.js'})
-          assert_equal [], @rule.visit_tag(tag)
-        end
+        include FdlintTest::HTML
 
-        def test_check_repeated_script
-          tag = XRay::HTML::Element.new('script', {:src=>'http://style.china.alibaba.com/lib/fdev-v4/core/fdev-min.js'})
-          assert_equal [], @rule.visit_tag(tag)
-          (1..10).each do 
-            assert_equal [["避免重复引用同一或相同功能文件", :error]], @rule.visit_tag(tag)
-          end
-        end
+        check_rule [:error, '避免重复引用同一文件'] do
 
-        def test_check_with_inline_script
-          tag = XRay::HTML::Element.new('script')
-          assert_equal [], @rule.visit_tag(tag)
-          (1..10).each do 
-            assert_equal [], @rule.visit_tag(tag)
+          should_with_result do
+            [
+              %Q{<script src="fdev-min.js"></script>} * 2,
+              %Q{<script src="fdev-min.js"></script>} * 5,
+              %Q{<link rel="stylesheet" href="test.css"/>} * 2,
+              %Q{<link rel="stylesheet" href="test.css"/>} * 5
+            ]
           end
-        end
-
-        def test_check_normal_style
-          tag = XRay::HTML::Element.new('link', {:rel => 'stylesheet', :href=>'http://style.china.alibaba.com/css/lib/fdev-v4/core/fdev-min.css'}, [], :self)
-          assert_equal [], @rule.visit_tag(tag)
-        end
 
-        def test_check_repeated_style
-          tag = XRay::HTML::Element.new('link', {:rel => 'stylesheet', :href=>'http://style.china.alibaba.com/css/lib/fdev-v4/core/fdev-min.css'}, [], :self)
-          assert_equal [], @rule.visit_tag(tag)
-          (1..10).each do 
-            assert_equal [["避免重复引用同一或相同功能文件", :error]], @rule.visit_tag(tag)
+          should_without_result do
+            [
+              %Q{<script src="fdev-min.js"></script>},
+              %Q{<link rel="stylesheet" href="test.css"/>}
+            ]
           end
         end
 

data/test/html/rule_test.rb

@@ -18,13 +18,11 @@ require_relative 'rule/check_head_contain_meta_and_title_test'
 require_relative 'rule/check_block_level_element_test'
 require_relative 'rule/check_form_element_name_test'
 require_relative 'rule/check_button_test'
-require_relative 'rule/check_class_count_test'
 require_relative 'rule/check_tag_closed_test'
-require_relative 'rule/check_html_template_test'
 require_relative 'rule/check_css_in_head_test'
 require_relative 'rule/check_unescape_char_test'
 
-module XRayTest
+module FdlintTest
   
   module HTML
 
@@ -47,9 +45,7 @@ module XRayTest
         tests << Rule::CheckBlockLevelElementTest.suite
         tests << Rule::CheckFormElementNameTest.suite
         tests << Rule::CheckButtonTest.suite
-        tests << Rule::CheckClassCountTest.suite
         tests << Rule::CheckTagClosedTest.suite
-        tests << Rule::CheckHTMLTemplateTest.suite
         tests << Rule::CheckCSSInHeadTest.suite
         tests << Rule::CheckUnescapedCharTest.suite
         tests
@@ -58,5 +54,5 @@ module XRayTest
   end
 end
 
-Test::Unit::UI::Console::TestRunner.run( XRayTest::HTML::RuleTest ) if __FILE__ == $0
+Test::Unit::UI::Console::TestRunner.run( FdlintTest::HTML::RuleTest ) if __FILE__ == $0
 

data/test/js/expr/expr.rb

@@ -3,7 +3,7 @@ require_relative 'left_hand'
 require_relative 'operate'
 
 
-module XRayTest
+module FdlintTest
   module JS
     module Expr
       

data/test/js/expr/left_hand.rb

@@ -1,4 +1,4 @@
-module XRayTest
+module FdlintTest
   module JS
     module Expr
       

data/test/js/expr/operate.rb

@@ -1,4 +1,4 @@
-module XRayTest
+module FdlintTest
   module JS
     module Expr
       

data/test/js/expr/primary.rb

@@ -1,4 +1,4 @@
-module XRayTest
+module FdlintTest
   module JS
     module Expr
       

data/test/js/parser_test.rb

@@ -1,20 +1,18 @@
 # encoding: utf-8
 require File.expand_path('../helper', File.dirname(__FILE__))
 
-require 'js/parser'
+require 'fdlint/parser/js/js_parser'
 
 require_relative 'expr/expr'
 require_relative 'stat/stat'
 
 
-module XRayTest
+module FdlintTest
   module JS
     class ParserTest < Test::Unit::TestCase 
-      include XRay::JS
 
       include Expr::Expr
       include Stat::Stat
-
       
       def test_parse_program()
         js = '
@@ -72,8 +70,7 @@ module XRayTest
 
 
       def create_parser(js)
-        Parser.new js, XRayTest::Logger.new
-        
+        ::Fdlint::Parser::JS::JsParser.new js
       end
 
       def parse_js(action, js)

data/test/js/rule/alert_check_test.rb

@@ -1,32 +1,18 @@
 # encoding: utf-8
 require_relative 'base_test'
 
-require 'js/rule/checklist'
-
-module XRayTest
+module FdlintTest
   module JS
     module Rule
       
       class AlertCheckTest < BaseTest
 
-        def test_visit_alert
-          js = 'alert'
-          ret = visit js
-          assert_equal 1, ret.length
-        end
-       
-        def test_vist_window_alert
-          js = "window.alert"
-          ret = visit js
-          assert_equal [], ret
-        end 
+        check_rule [:warn, '必须去掉临时调试代码。如果一定要使用alert功能，请使用 window.alert'] do
 
-        private
+          should_with_result do
+            'alert'
+          end
 
-        def visit(js)
-          expr = parse js, 'expr_member'
-          rule = XRay::JS::Rule::ChecklistRule.new
-          rule.send :visit_expr_member, expr
         end
 
       end

data/test/js/rule/base_test.rb

@@ -1,32 +1,18 @@
 require_relative '../../helper'
 
-require 'js/parser'
-require 'parser_visitable'
+require 'fdlint/parser/js/js_parser'
+require 'fdlint/parser/parser_visitable'
 
-module XRayTest
+module FdlintTest
 
   module JS
     module Rule
 
-      class VisitableParser < XRay::JS::Parser
-          include XRay::ParserVisitable 
+      class VisitableParser < Fdlint::Parser::JS::JsParser
       end
 
       class BaseTest < Test::Unit::TestCase
-
-        def parse(js, action = 'parse_program')
-          parser = XRay::JS::Parser.new js, XRayTest::Logger.new
-          parser.send "parse_#{action}" 
-        end 
-
-        def parse_with_rule(js, rule, options = {})
-          parser = VisitableParser.new js, XRayTest::Logger.new
-          rule = rule.new if rule.is_a? Class
-          parser.add_visitor rule 
-          parser.parse_program
-          parser.results
-        end
-         
+        include FdlintTest::JS
       end
 
     end

data/test/js/rule/jq_check_test.rb

@@ -1,86 +1,54 @@
 # encoding: utf-8
 require_relative 'base_test'
 
-require 'js/rule/checklist'
-
-module XRayTest
+module FdlintTest
   module JS
     module Rule
       
       class JqCheckTest < BaseTest
-        def test_visit_expr_member
-          js = 'jQuery.noConflict'
-          ret = visit js
-          assert_equal 2, ret.length
-        end
-       
-        def test_check_direct_jquery_call
-          js = "jQuery.namespace"
-          ret = visit js
-          assert_equal [], ret
-          
-          jses = [
-            'jQuery.bind',
-            'jQuery[method]',
-            'jQuery(function($) {})',
-            'jQuery.extend'
-          ]
-
-          jses.each do |js|
-            r = visit js
-            assert r.include? ['禁止直接使用jQuery变量，使用全局闭包写法"(function($, NS){....})(jQuery,Namespace);"，jQuery.namespace例外', :error]
-          end
-        end 
 
-        def test_check_forbit_method_call
-          jses = %w(
+        
+        should_with_result [:error, '禁止使用jQuery.sub()和jQuery.noConflict方法'] do
+          %w{
+            jQ.noConflict
             $.sub
             $.noConflict
             jQuery.sub
             jQuery.noConflict
-          )
+          }
+        end
 
-          jses.each do |js|
-            r = visit js
-            assert r.include?( ['禁止使用jQuery.sub()和jQuery.noConflict方法', :error] )
+        check_rule [:error, '禁止直接使用jQuery变量，使用全局闭包写法，jQuery.namespace例外'] do
+          should_with_result do
+            %w{
+              jQuery.bind
+              jQuery[method]
+              jQuery(function($)\ {})
+              jQuery.extend
+            }
+          end
+
+          next
+
+          should_without_result do
+            "jQuery.namespace"
           end
         end
 
-        def test_check_data_call_param
-          jses = %w(
+        should_with_result [:error, '使用".data()"读写自定义属性时需要转化成驼峰形式'] do
+          %w{
             $.data("doc-config")
             jQuery.data('doc-config')
-          )
-          jses.each do |js|
-            r = visit js
-            assert r.include? ['使用".data()"读写自定义属性时需要转化成驼峰形式', :error]
-          end
+          }
         end
 
-        def test_check_ctor_selector
-          jses = [
+        should_with_result [:warn, '使用选择器时，能确定tagName的，必须加上tagName'] do
+          [
             "$('.myclass', div)",
             "$('.myclass')",
             "$('[name=123]')",
             "$(':first')"
           ]
-          
-          jses.each do |js|
-            r = visit js
-            assert r.include? ['使用选择器时，能确定tagName的，必须加上tagName', :warn]
-          end
-
-          js = '$()'
-          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
         end
 
       end