[Rubyeclipse-commit] org.rubypeople.rdt.ui.tests/src/org/rubypeople/rdt/internal/ui/text TC_RubyPartitionScanner.java,1.3,1.4

[Christopher W. <caw...@us...>]

Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.ui.tests/src/org/rubypeople/rdt/internal/ui/text
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22657/src/org/rubypeople/rdt/internal/ui/text

Modified Files:
	TC_RubyPartitionScanner.java 
Log Message:


Index: TC_RubyPartitionScanner.java
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.ui.tests/src/org/rubypeople/rdt/internal/ui/text/TC_RubyPartitionScanner.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TC_RubyPartitionScanner.java	3 Oct 2005 11:31:41 -0000	1.3
--- TC_RubyPartitionScanner.java	12 Dec 2005 20:49:25 -0000	1.4
***************
*** 28,34 ****
  		String source = "# This is a comment\n";
  		
! 		assertEquals(RubyPartitionScanner.SINGLE_LINE_COMMENT, this.getContentType(source, 0));
! 		assertEquals(RubyPartitionScanner.SINGLE_LINE_COMMENT, this.getContentType(source, 1));
! 		assertEquals(RubyPartitionScanner.SINGLE_LINE_COMMENT, this.getContentType(source, 18));
  	}
  	
--- 28,34 ----
  		String source = "# This is a comment\n";
  		
! 		assertEquals(RubyPartitionScanner.RUBY_SINGLE_LINE_COMMENT, this.getContentType(source, 0));
! 		assertEquals(RubyPartitionScanner.RUBY_SINGLE_LINE_COMMENT, this.getContentType(source, 1));
! 		assertEquals(RubyPartitionScanner.RUBY_SINGLE_LINE_COMMENT, this.getContentType(source, 18));
  	}
  	
***************
*** 43,48 ****
  		String source = "=begin\nComment\n=end";
  
! 		assertEquals(RubyPartitionScanner.MULTI_LINE_COMMENT, this.getContentType(source, 0));
! 		assertEquals(RubyPartitionScanner.MULTI_LINE_COMMENT, this.getContentType(source, 10));
  	}		
  
--- 43,48 ----
  		String source = "=begin\nComment\n=end";
  
! 		assertEquals(RubyPartitionScanner.RUBY_MULTI_LINE_COMMENT, this.getContentType(source, 0));
! 		assertEquals(RubyPartitionScanner.RUBY_MULTI_LINE_COMMENT, this.getContentType(source, 10));
  	}		
  
***************
*** 59,75 ****
  	public void testHereDocOK() {
  		String source = "puts <<TEST\nMyName\nTEST";
! 		assertEquals(RubyPartitionScanner.STRING, this.getContentType(source, 5));
  
  		source = "puts <<-TEST\nMyName\nTEST\nputs 'ab'";
! 		assertEquals(RubyPartitionScanner.STRING, this.getContentType(source, 5));
  
  		source = "puts <<\"TEST\"\nMyName\nTEST";
! 		assertEquals(RubyPartitionScanner.STRING, this.getContentType(source, 5));
  
  		source = "puts <<'TEST'\nMyName\nTEST";
! 		assertEquals(RubyPartitionScanner.STRING, this.getContentType(source, 5));
  
  		source = "puts <<-'ax%&'\nMyName\nax%&";
! 		assertEquals(RubyPartitionScanner.STRING, this.getContentType(source, 5));
  		
  	}
--- 59,75 ----
  	public void testHereDocOK() {
  		String source = "puts <<TEST\nMyName\nTEST";
! 		assertEquals(RubyPartitionScanner.RUBY_STRING, this.getContentType(source, 5));
  
  		source = "puts <<-TEST\nMyName\nTEST\nputs 'ab'";
! 		assertEquals(RubyPartitionScanner.RUBY_STRING, this.getContentType(source, 5));
  
  		source = "puts <<\"TEST\"\nMyName\nTEST";
! 		assertEquals(RubyPartitionScanner.RUBY_STRING, this.getContentType(source, 5));
  
  		source = "puts <<'TEST'\nMyName\nTEST";
! 		assertEquals(RubyPartitionScanner.RUBY_STRING, this.getContentType(source, 5));
  
  		source = "puts <<-'ax%&'\nMyName\nax%&";
! 		assertEquals(RubyPartitionScanner.RUBY_STRING, this.getContentType(source, 5));
  		
  	}
***************
*** 82,86 ****
  		assertEquals(IDocument.DEFAULT_CONTENT_TYPE, this.getContentType(source, 5));
  		// normaler String
! 		assertEquals(RubyPartitionScanner.STRING, this.getContentType(source, 9));
  		
  		// end not on first column
--- 82,86 ----
  		assertEquals(IDocument.DEFAULT_CONTENT_TYPE, this.getContentType(source, 5));
  		// normaler String
! 		assertEquals(RubyPartitionScanner.RUBY_STRING, this.getContentType(source, 9));
  		
  		// end not on first column