[Pydev-cvs] org.python.pydev.parser/tests/org/python/pydev/parser/jython ReaderCharStreamTest.java, 1.5, 1.6

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

Update of /cvsroot/pydev/org.python.pydev.parser/tests/org/python/pydev/parser/jython
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20472/tests/org/python/pydev/parser/jython

Modified Files:
	ReaderCharStreamTest.java 
Log Message:
Synching to latest changes:

Pydev
<ul>
<li><strong>Editor</strong>: Cursor settings no longer overridden</li>
<li><strong>Code-completion</strong>: If __all__ is defined with runtime elements (and not only in a single assign statement), it's ignored for code-completion purposes</li>
<li><strong>Debugger</strong>: Pythonpath the same in debug and regular modes (sys.path[0] is the same directory as the file run)</li>
<li><strong>Debugger</strong>: Persist choices done in the debugger when files from the debugger are not found</li>
<li><strong>Interpreter config</strong>: "email" automatically added to the "forced builtins"</li>
<li><strong>Parser</strong>: Correctly recognizing absolute import with 3 or more levels</li>
<li><strong>Syntax check</strong>: Option to do only on active editor</li>
</ul>

Also: tabs changed for spaces

Index: ReaderCharStreamTest.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.parser/tests/org/python/pydev/parser/jython/ReaderCharStreamTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ReaderCharStreamTest.java	7 Sep 2006 13:16:04 -0000	1.5
--- ReaderCharStreamTest.java	27 Sep 2008 19:58:44 -0000	1.6
***************
*** 24,68 ****
      
      public void testIt2() throws Exception {
!     	String s = new String(new char[]{'\n',34,34,34,'\n',97,'\n',34,34,34});
          //
          //"""
          //a
          //"""
!     	
!     	StringReader inString = new StringReader(s);
!     	CharStream in = new ReaderCharStream(inString);
!     	checkCvsStream(in);
!     	
!     	in = new FastCharStream(s.toCharArray());
!     	checkCvsStream(in);
!     	
!     	
      }
  
! 	private void checkCvsStream(CharStream in) throws IOException {
! 		assertEquals(10,in.BeginToken());
! 		in.backup(0);
! 		assertEquals("\n",new String(in.GetSuffix(1)));
! 		in.backup(1);
! 		
! 		assertEquals(10,in.readChar());
!     	assertEquals(34,in.readChar());
!     	assertEquals(34,in.readChar());
!     	assertEquals(34,in.readChar());
!     	assertEquals(10,in.readChar());
!     	
!     	assertEquals(97,in.readChar());
!     	
!     	assertEquals(10,in.readChar());
!     	assertEquals(34,in.readChar());
!     	assertEquals(34,in.readChar());
!     	assertEquals(34,in.readChar());
!     	try {
! 			in.readChar();
! 			fail("Expectend end");
! 		} catch (IOException e) {
! 			// expected
! 		}
! 	}
      public void testIt() throws Exception {
          String initialDoc = 
--- 24,68 ----
      
      public void testIt2() throws Exception {
!         String s = new String(new char[]{'\n',34,34,34,'\n',97,'\n',34,34,34});
          //
          //"""
          //a
          //"""
!         
!         StringReader inString = new StringReader(s);
!         CharStream in = new ReaderCharStream(inString);
!         checkCvsStream(in);
!         
!         in = new FastCharStream(s.toCharArray());
!         checkCvsStream(in);
!         
!         
      }
  
!     private void checkCvsStream(CharStream in) throws IOException {
!         assertEquals(10,in.BeginToken());
!         in.backup(0);
!         assertEquals("\n",new String(in.GetSuffix(1)));
!         in.backup(1);
!         
!         assertEquals(10,in.readChar());
!         assertEquals(34,in.readChar());
!         assertEquals(34,in.readChar());
!         assertEquals(34,in.readChar());
!         assertEquals(10,in.readChar());
!         
!         assertEquals(97,in.readChar());
!         
!         assertEquals(10,in.readChar());
!         assertEquals(34,in.readChar());
!         assertEquals(34,in.readChar());
!         assertEquals(34,in.readChar());
!         try {
!             in.readChar();
!             fail("Expectend end");
!         } catch (IOException e) {
!             // expected
!         }
!     }
      public void testIt() throws Exception {
          String initialDoc = 
***************
*** 85,114 ****
  
      private void doTests2(CharStream in) throws IOException {
! 		assertEquals('a', in.readChar());
! 		assertEquals("a", in.GetImage());
! 		
!     	assertEquals('\n',in.BeginToken());
!     	assertEquals('b', in.readChar());
!     	assertEquals("\nb", in.GetImage());
!     	
!     	in.backup(1);
!     	assertEquals("\n", in.GetImage());
!     	
!     	assertEquals('b',in.BeginToken());
!     	assertEquals("b", in.GetImage());
!     	
!     	assertEquals('c',in.BeginToken());
!     	assertEquals("c", in.GetImage());
!     	
!     	assertEquals('\n',in.BeginToken());
!     	assertEquals("\n", in.GetImage());
!     	
!     	try {
! 			in.BeginToken();
! 			fail("expected exception");
! 		} catch (IOException e) {
! 			// expected
! 		}
!     	assertEquals("\n", in.GetImage());
      }
      /**
--- 85,114 ----
  
      private void doTests2(CharStream in) throws IOException {
!         assertEquals('a', in.readChar());
!         assertEquals("a", in.GetImage());
!         
!         assertEquals('\n',in.BeginToken());
!         assertEquals('b', in.readChar());
!         assertEquals("\nb", in.GetImage());
!         
!         in.backup(1);
!         assertEquals("\n", in.GetImage());
!         
!         assertEquals('b',in.BeginToken());
!         assertEquals("b", in.GetImage());
!         
!         assertEquals('c',in.BeginToken());
!         assertEquals("c", in.GetImage());
!         
!         assertEquals('\n',in.BeginToken());
!         assertEquals("\n", in.GetImage());
!         
!         try {
!             in.BeginToken();
!             fail("expected exception");
!         } catch (IOException e) {
!             // expected
!         }
!         assertEquals("\n", in.GetImage());
      }
      /**
***************
*** 189,193 ****
          cs[5] = '\n';
          final String suf = new String(in.GetSuffix(6));
! 		assertEquals(new String(cs), suf);
          in.backup(4);
          
--- 189,193 ----
          cs[5] = '\n';
          final String suf = new String(in.GetSuffix(6));
!         assertEquals(new String(cs), suf);
          in.backup(4);