[Pydev-cvs] org.python.pydev.core/tests/org/python/pydev/core/docutils ParsingUtilsTest.java, 1.9, 1.10

[Fabio Z. <fa...@us...>]

Update of /cvsroot/pydev/org.python.pydev.core/tests/org/python/pydev/core/docutils
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28721/tests/org/python/pydev/core/docutils

Modified Files:
	ParsingUtilsTest.java 
Log Message:
- Improved code formatter to deal with operators (+, -, *, etc)
- Improved code formatter to handle '=' differently inside function calls / keyword args

Index: ParsingUtilsTest.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.core/tests/org/python/pydev/core/docutils/ParsingUtilsTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ParsingUtilsTest.java	14 Jul 2008 23:02:23 -0000	1.9
--- ParsingUtilsTest.java	19 Jul 2008 19:53:36 -0000	1.10
***************
*** 44,47 ****
--- 44,96 ----
      }
      
+     public void testEatComments() {
+         String str = "" +
+         "#comm1\n" +
+         "pass\n" +
+         "";
+         ParsingUtils parsingUtils = ParsingUtils.create(str);
+         int i = parsingUtils.eatComments(null, 0);
+         assertEquals('\n', parsingUtils.charAt(i));
+     }
+     
+     public void testEatLiterals() {
+         String str = "" +
+         "'''\n" +
+         "pass\n" +
+         "'''" +
+         "w" +
+         "";
+         ParsingUtils parsingUtils = ParsingUtils.create(str);
+         int i = parsingUtils.eatLiterals(null, 0);
+         assertEquals(11, i);
+         assertEquals('\'', parsingUtils.charAt(i));
+     }
+     
+     public void testEatWhitespaces() {
+         String str = "" +
+         "    #comm\n" +
+         "pass\n" +
+         "";
+         ParsingUtils parsingUtils = ParsingUtils.create(str);
+         FastStringBuffer buf = new FastStringBuffer();
+         int i = parsingUtils.eatWhitespaces(buf, 0);
+         assertEquals(3, i);
+         assertEquals("    ", buf.toString());
+         assertEquals(' ', parsingUtils.charAt(i));
+     }
+     
+     
+     public void testEatWhitespaces2() {
+         String str = "" +
+         "    ";
+         ParsingUtils parsingUtils = ParsingUtils.create(str);
+         FastStringBuffer buf = new FastStringBuffer();
+         int i = parsingUtils.eatWhitespaces(buf, 0);
+         assertEquals("    ", buf.toString());
+         assertEquals(' ', parsingUtils.charAt(i));
+         assertEquals(3, i);
+     }
+     
+     
      public void testIterator() throws Exception {
      	String str = "" +
***************
*** 51,55 ****
      	"";
      	Document d = new Document(str);
!     	Iterator it = ParsingUtils.getNoLiteralsOrCommentsIterator(d);
      	assertEquals("\n",it.next());
      	assertEquals(true,it.hasNext());
--- 100,104 ----
      	"";
      	Document d = new Document(str);
!     	Iterator<String> it = ParsingUtils.getNoLiteralsOrCommentsIterator(d);
      	assertEquals("\n",it.next());
      	assertEquals(true,it.hasNext());