Merge lp:~adiroiban/pocket-lint/bug-780723 into lp:pocket-lint

[Adi Roiban]

I have split the main comment test into multiple tests.

The previous build was failing at 'test_getNextRule_comment_single_line' test.

[Curtis Hovey (sinzui)]

Thank you.

review: Approve (code)

=== modified file 'pocketlint/contrib/cssccc.py'
--- pocketlint/contrib/cssccc.py	2011-04-18 01:43:03 +0000
+++ pocketlint/contrib/cssccc.py	2011-05-10 20:12:57 +0000
@@ -44,7 +44,7 @@
 '''
 from __future__ import with_statement
 
-__version__ = '0.1.0'
+__version__ = '0.1.1'
 
 import sys
 
@@ -380,11 +380,10 @@
                 break
 
             # Look for comment start/end.
-            comment_check = _check_comment(data)
             (comment_update,
             before_comment,
             after_comment,
-            newline_consumed) = comment_check
+            newline_consumed) = _check_comment(data)
             if comment_update is not None:
                 comment_started = comment_update
 
@@ -438,15 +437,19 @@
     before_comment = None
     after_comment = None
     newline_consumed = False
+
     comment_start = data.find(COMMENT_START)
     if comment_start != -1:
         comment_started = True
         before_comment = data[:comment_start]
+        # Only use `None` to signal that there is no text before the comment.
+        if before_comment == '':
+            before_comment = None
 
     comment_end = data.find(COMMENT_END)
     if comment_end != -1:
         comment_started = False
-        # Comment end after the lenght of the actual comment end
+        # Set comment end after the lenght of the actual comment end
         # marker.
         comment_end += len(COMMENT_END)
         if before_comment is None and data[comment_end] == '\n':

=== modified file 'pocketlint/tests/test_cssccc.py'
--- pocketlint/tests/test_cssccc.py	2011-04-18 01:43:03 +0000
+++ pocketlint/tests/test_cssccc.py	2011-05-10 20:12:57 +0000
@@ -90,7 +90,7 @@
         self.assertEqual(1, rule.declarations.start_character)
 
     def test_getNextRule_stop(self):
-        text ='rule1{st1\n}\n@font-face {\n src: url("u\n u"); \n }\nr2{st2}'
+        text = 'rule1{st1\n}\n@font-face {\n src: url("u\n u"); \n }\nr2{st2}'
         lint = CSSCodingConventionChecker(text)
         rule = lint.getNextRule()
         self.assertTrue(rule.type is CSSRuleSet.type)
@@ -100,21 +100,64 @@
         self.assertTrue(rule.type is CSSRuleSet.type)
         self.failUnlessRaises(StopIteration, lint.getNextRule)
 
-    def test_getNextRule_comment(self):
-        text = '\n\n/* c\nm*/\nsel\n{\ns/*com*/\ncont1;/*com*/\ncont2;}'
-        lint = CSSCodingConventionChecker(text)
-        rule = lint.getNextRule()
-        self.assertTrue(rule.type is CSSRuleSet.type)
-        self.assertEqual('\n\nsel\n', rule.selector.text)
-        self.assertEqual(0, rule.selector.start_line)
-        self.assertEqual(0, rule.selector.start_character)
-        self.assertEqual('\ns\ncont1;\ncont2;', rule.declarations.text)
-        self.assertEqual(5, rule.declarations.start_line)
-        self.assertEqual(1, rule.declarations.start_character)
+    def test_getNextRule_comment_multiline(self):
+        text = (
+            '\n'
+            '\n'
+            '/* multi line\n'
+            ' * comment \n'
+            ' */\n'
+            'selector {\n'
+            'cont2;\n'
+            '}')
+        lint = CSSCodingConventionChecker(text)
+        rule = lint.getNextRule()
+        self.assertTrue(rule.type is CSSRuleSet.type)
+        self.assertEqual('\n\nselector ', rule.selector.text)
+        self.assertEqual(0, rule.selector.start_line)
+        self.assertEqual(0, rule.selector.start_character)
+
+    def test_getNextRule_comment_inline(self):
+        text = (
+            'selector {\n'
+            'so/* inline comment*/me\n'
+            '}\n')
+        lint = CSSCodingConventionChecker(text)
+        rule = lint.getNextRule()
+        self.assertTrue(rule.type is CSSRuleSet.type)
+        self.assertEqual('\nsome\n', rule.declarations.text)
+        self.assertEqual(0, rule.declarations.start_line)
+        self.assertEqual(10, rule.declarations.start_character)
+
+    def test_getNextRule_comment_end_of_line(self):
+        text = (
+            'selector {\n'
+            'cont1;  /*end of line comment*/\n'
+            '}')
+        lint = CSSCodingConventionChecker(text)
+        rule = lint.getNextRule()
+        self.assertTrue(rule.type is CSSRuleSet.type)
+        self.assertEqual('\ncont1;  \n', rule.declarations.text)
+        self.assertEqual(0, rule.declarations.start_line)
+        self.assertEqual(10, rule.declarations.start_character)
+
+    def test_getNextRule_comment_single_line(self):
+        text = (
+            '\n'
+            '/* single line comment */\n'
+            'selector2 {\n'
+            'cont1;\n'
+            '}')
+        lint = CSSCodingConventionChecker(text)
+        rule = lint.getNextRule()
+        self.assertTrue(rule.type is CSSRuleSet.type)
+        self.assertEqual('\nselector2 ', rule.selector.text)
+        self.assertEqual(0, rule.selector.start_line)
+        self.assertEqual(0, rule.selector.start_character)
 
     def test_get_at_import_rule(self):
         '''Test for @import url(/css/screen.css) screen, projection;'''
-        text ='rule1{st1\n}\n@import  url(somet) print, soment ;rule2{st2}'
+        text = 'rule1{st1\n}\n@import  url(somet) print, soment ;rule2{st2}'
         lint = CSSCodingConventionChecker(text)
         rule = lint.getNextRule()
         self.assertTrue(rule.type is CSSRuleSet.type)
@@ -131,7 +174,7 @@
 
     def test_get_at_charset_rule(self):
         '''Test for @charset "ISO-8859-15";'''
-        text ='rule1{st1\n}\n@charset  "utf" ;rule2{st2}'
+        text = 'rule1{st1\n}\n@charset  "utf" ;rule2{st2}'
         lint = CSSCodingConventionChecker(text)
         rule = lint.getNextRule()
         self.assertTrue(rule.type is CSSRuleSet.type)
@@ -148,7 +191,7 @@
 
     def test_get_at_namespace_rule(self):
         '''Test for @namespace  foo  "http://foo" ;'''
-        text ='rule1{st1\n}@namespace  foo  "http://foo" ;rule2{st2}'
+        text = 'rule1{st1\n}@namespace  foo  "http://foo" ;rule2{st2}'
         lint = CSSCodingConventionChecker(text)
         rule = lint.getNextRule()
         self.assertTrue(rule.type is CSSRuleSet.type)
@@ -170,7 +213,7 @@
           margin-left: 5cm; /* left pages only */
         }
         '''
-        text ='rule1{st1\n}\n@page :left {\n  mar; /*com*/\n }\nrule2{st2}'
+        text = 'rule1{st1\n}\n@page :left {\n  mar; /*com*/\n }\nrule2{st2}'
         lint = CSSCodingConventionChecker(text)
         rule = lint.getNextRule()
         self.assertTrue(rule.type is CSSRuleSet.type)
@@ -194,7 +237,7 @@
               /fonts/example");
         }
         '''
-        text ='rule1{st1\n}\n@font-face {\n src: url("u\n u"); \n }\nr2{st2}'
+        text = 'rule1{st1\n}\n@font-face {\n src: url("u\n u"); \n }\nr2{st2}'
         lint = CSSCodingConventionChecker(text)
         rule = lint.getNextRule()
         self.assertTrue(rule.type is CSSRuleSet.type)