tests update

tests/__init__.py

@@ -9,9 +9,11 @@
 import spritemap_test
 '''
 import parsing
+import tokenize
+import one_liners
 
 # mods = [color_convert, ccss_to_css, minify, spritemap_test]
-mods = [parsing]
+mods = [parsing, tokenize, one_liners]
 def all_tests():
     return unittest.TestSuite(getattr(mod, 'all_tests')() for mod in mods)
 

tests/parsing.py

@@ -8,98 +8,6 @@
 from codetalker.pgm.grammar import Text, ParseError
 from codetalker.pgm.errors import *
 
-class Tokenize(TestCase):
-    def tokens(self):
-        text = 'hello = world'
-        tokens = grammar.get_tokens(text)
-        self.assertEqual(len(tokens), 5)
-        self.assertEqual(tokens[2].charno, 7)
-        self.assertEqual(tokens[-1].value, 'world')
-
-    def token_lines(self):
-        text = 'hello\nworld = 6'
-        tokens = grammar.get_tokens(text)
-        self.assertEqual(len(tokens), 7)
-        self.assertEqual(tokens[-2].lineno, 2)
-
-class Parse(TestCase):
-    def parse(self):
-        text = 'hello=orld\n\nother=bar\n'
-        tree = check_parse(text)
-
-    def rule_def(self):
-        text = 'div:\n  a = b\n  @import(d)'
-        tree = check_parse(text)
-
-    def selectors(self):
-        text = '#some:\n stuff = 3\n\n#other .stuff:\n k = ok'
-        tree = check_parse(text)
-
-    def hyphen(self):
-        text = '.a-b-c:\n and = other'
-        tree = check_parse(text)
-
-    def color(self):
-        check_parse('five = #555\n\na = #666666')
-        try:
-            check_parse('one = #1111')
-            raise Exception('supposed to fail on #1111')
-        except:
-            pass
-
-    def attr(self):
-        check_parse('one:\n two: 4\n three = 7')
-        check_parse('one:\n -moz-something: 17')
-        check_fail('two: 4')
-        check_fail('one:\n -moz -space: 5')
-
-    def neg_number(self):
-        check_parse('one = -10')
-        check_parse('one = -10px')
-        check_parse('one = 10%')
-        check_parse('one = -10em')
-        check_parse('one = -10%')
-
-    def url(self):
-        check_parse('one = url("hello.png")')
-
-def make_pass(grammar, text):
-    def meta(self):
-        try:
-            return grammar.process(text)
-        except ParseError:
-            return grammar.process(text, debug=True)
-    return meta
-
-def make_fail(grammar, text):
-    def meta(self):
-        try:
-            tree = grammar.process(text)
-            self.fail('Expected "%s" to fail' % text.encode('string_escape'))
-        except ParseError:
-            pass
-    return meta
-
-strings = [(
-    '',
-    # assignment + expressions
-    'a = b',
-    '\na = b + c',
-    'a = b+c/3.0 - 12',
-    'a = 12px',
-    'a= 12px + 1/4%',
-    'a = a b',
-    # @declares
-    '@import("abc.css")',
-    '@dothis()',
-    '@other(1, 3, 4+5, 45/manhatten)',
-),()]
-
-for i, good in enumerate(strings[0]):
-    setattr(Parse, '%d_good' % i, make_pass(grammar, good))
-for i, bad in enumerate(strings[1]):
-    setattr(Parse, '%d_bad' % i, make_fail(grammar, good))
-
 class Convert(TestCase):
     pass