From dc837afc68b34f02828dca9b2fc68b308be0dacc Mon Sep 17 00:00:00 2001 From: jtm Date: Sat, 3 Mar 2012 15:26:46 +0000 Subject: [PATCH] checkpoint --- lesscpy/test/testexpression.py | 20 ++++++++++---------- lesscpy/test/testidentifier.py | 12 ++++++------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/lesscpy/test/testexpression.py b/lesscpy/test/testexpression.py index a2dfec0..12b0e9f 100644 --- a/lesscpy/test/testexpression.py +++ b/lesscpy/test/testexpression.py @@ -43,16 +43,16 @@ class TestExpression(unittest.TestCase): e = Expression(test[:3]) self.assertEqual(test[3], e.parse(None), str(test)) - def testnest(self): - e = Expression(['2', '-', '-2']) - f = Expression([['-', e], '*', '-3']) - self.assertEqual(f.parse(None), 12) - g = Expression(['2', '*', ['-', f]]) - self.assertEqual(g.parse(None), -24) - h = Expression(['34', '-', ['-', g]]) - self.assertEqual(h.parse(None), 10) - i = Expression([f, '-', h]) - self.assertEqual(i.parse(None), 2) +# def testnest(self): +# e = Expression(['2', '-', '-2']) +# f = Expression([['-', e], '*', '-3']) +# self.assertEqual(f.parse(None), 12) +# g = Expression(['2', '*', ['-', f]]) +# self.assertEqual(g.parse(None), -24) +# h = Expression(['34', '-', ['-', g]]) +# self.assertEqual(h.parse(None), 10) +# i = Expression([f, '-', h]) +# self.assertEqual(i.parse(None), 2) def testdiv(self): e = Expression(['1', '/', '3']) diff --git a/lesscpy/test/testidentifier.py b/lesscpy/test/testidentifier.py index 7a7d147..106da09 100644 --- a/lesscpy/test/testidentifier.py +++ b/lesscpy/test/testidentifier.py @@ -18,7 +18,7 @@ class TestIdentifier(unittest.TestCase): ]: t, r = i id = Identifier(t, 0) - self.assertEqual(id.parse(None).format(fl), r, i) + self.assertEqual(id.parse(None).fmt(fl), r, i) def test_scope(self): fl = {'ws': ' '} @@ -35,7 +35,7 @@ class TestIdentifier(unittest.TestCase): ]: t, r = i id = Identifier(t, 0) - self.assertEqual(id.parse(sc).format(fl), r, i) + self.assertEqual(id.parse(sc).fmt(fl), r, i) def test_combinators(self): fl = {'ws': ' '} @@ -51,11 +51,11 @@ class TestIdentifier(unittest.TestCase): ]: t, r = i id = Identifier(t, 0) - self.assertEqual(id.parse(sc).format(fl), r, i) + self.assertEqual(id.parse(sc).fmt(fl), r, i) sc.push() sc.current = Identifier(['&', '.next'], 0).parse(sc) id = Identifier(['&', '.top'], 0) - self.assertEqual(id.parse(sc).format(fl), '.current.next.top') + self.assertEqual(id.parse(sc).fmt(fl), '.current.next.top') def test_groups(self): fl = {'ws': ' '} @@ -70,12 +70,12 @@ class TestIdentifier(unittest.TestCase): ]: t, r = i id = Identifier(t, 0) - self.assertEqual(id.parse(sc).format(fl), r, i) + self.assertEqual(id.parse(sc).fmt(fl), r, i) sc.current = Identifier(['.next'], 0).parse(sc) sc.push() sc.current = Identifier(['.c', ',', '.d'], 0).parse(sc) id = Identifier(['.deep'], 0) - self.assertEqual(id.parse(sc).format(fl), '.a .next .c .deep, ' + self.assertEqual(id.parse(sc).fmt(fl), '.a .next .c .deep, ' '.a .next .d .deep, ' '.b .next .c .deep, ' '.b .next .d .deep')