[javascriptlint-commit] SF.net SVN: javascriptlint:[344] trunk

[<mat...@us...>]

Revision: 344
          http://sourceforge.net/p/javascriptlint/code/344
Author:   matthiasmiller
Date:     2013-10-10 15:24:17 +0000 (Thu, 10 Oct 2013)
Log Message:
-----------
Run jsengine unit tests and fix broken tests.

Modified Paths:
--------------
    trunk/javascriptlint/jsl.py
    trunk/jsengine/parser/__init__.py

Modified: trunk/javascriptlint/jsl.py
===================================================================
--- trunk/javascriptlint/jsl.py	2013-10-10 14:07:41 UTC (rev 343)
+++ trunk/javascriptlint/jsl.py	2013-10-10 15:24:17 UTC (rev 344)
@@ -12,6 +12,7 @@
 import fs
 import htmlparse
 import jsparse
+import jsengine.parser
 import lint
 import util
 import version
@@ -123,7 +124,7 @@
 
     if options.unittest:
         suite = unittest.TestSuite();
-        for module in [conf, htmlparse, jsparse, lint, util]:
+        for module in [conf, htmlparse, jsengine.parser, jsparse, lint, util]:
             suite.addTest(unittest.findTestCases(module))
 
         runner = unittest.TextTestRunner(verbosity=options.verbosity)

Modified: trunk/jsengine/parser/__init__.py
===================================================================
--- trunk/jsengine/parser/__init__.py	2013-10-10 14:07:41 UTC (rev 343)
+++ trunk/jsengine/parser/__init__.py	2013-10-10 15:24:17 UTC (rev 344)
@@ -854,7 +854,7 @@
         try:
             parsestring('/*')
         except JSSyntaxError as error:
-            self.assertEqual(error.pos, NodePos(0, 1))
+            self.assertEqual(error.offset, 1)
         else:
             self.assert_(False)
     def testObjectEndComma(self):
@@ -867,9 +867,9 @@
         self.assertEquals(left.atom, 'a')
         self.assertEquals(right.kind, kind.RC)
         node = right.end_comma
-        self.assertEquals(node.kind, tok.COMMA)
-        self.assertEquals(node.start_offset, NodePos(0, 6))
-        self.assertEquals(node.end_offset, NodePos(0, 6))
+        self.assertEquals(node.kind, kind.COMMA)
+        self.assertEquals(node.start_offset, 6)
+        self.assertEquals(node.end_offset, 6)
     def _testArrayEndComma(self, script, col):
         root = parsestring(script)
         node, = root.kids
@@ -884,9 +884,9 @@
         if col is None:
             self.assert_(node is None)
         else:
-            self.assertEquals(node.kind, tok.COMMA)
-            self.assertEquals(node.start_offset, NodePos(0, col))
-            self.assertEquals(node.end_offset, NodePos(0, col))
+            self.assertEquals(node.kind, kind.COMMA)
+            self.assertEquals(node.start_offset, col)
+            self.assertEquals(node.end_offset, col)
     def testArrayEndComma(self):
         self._testArrayEndComma('a=[,]', 3)
         self._testArrayEndComma('a=[a,]', 4)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.