[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2715] trunk/org.rubypeople.rdt.ui

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

Revision: 2715
          http://svn.sourceforge.net/rubyeclipse/?rev=2715&view=rev
Author:   cawilliams
Date:     2007-07-06 06:13:42 -0700 (Fri, 06 Jul 2007)

Log Message:
-----------
add test and fix for #5019 - Hyperlinks in the Console fails if the path contains backslashes

Modified Paths:
--------------
    trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/util/StackTraceLine.java
    trunk/org.rubypeople.rdt.ui.tests/src/org/rubypeople/rdt/internal/ui/TC_StackTraceLine.java

Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/util/StackTraceLine.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/util/StackTraceLine.java	2007-07-06 13:00:50 UTC (rev 2714)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/util/StackTraceLine.java	2007-07-06 13:13:42 UTC (rev 2715)
@@ -92,8 +92,7 @@
 			if (file.exists()) return false;
 			return true;
 		}
-		int index = fFilename.indexOf('/');
-		if (index != -1 && fFilename.charAt(index - 1) != ':' ) return true;		
+		if (fFilename.contains(":")) return false;
 		return false;
 	}
 

Modified: trunk/org.rubypeople.rdt.ui.tests/src/org/rubypeople/rdt/internal/ui/TC_StackTraceLine.java
===================================================================
--- trunk/org.rubypeople.rdt.ui.tests/src/org/rubypeople/rdt/internal/ui/TC_StackTraceLine.java	2007-07-06 13:00:50 UTC (rev 2714)
+++ trunk/org.rubypeople.rdt.ui.tests/src/org/rubypeople/rdt/internal/ui/TC_StackTraceLine.java	2007-07-06 13:13:42 UTC (rev 2715)
@@ -16,6 +16,7 @@
 import junit.framework.TestCase;
 
 public class TC_StackTraceLine extends TestCase {
+	private static final String BACKSLASH_FILE_PATH = "C:\\ruby\\lib\\ruby\\gems\\1.8\\gems\\activesupport-1.4.2\\lib/active_support/dependencies.rb:376:in `new_constants_in': undefined method `empty?' for nil:NilClass (NoMethodError)";
 	private static final String RUBY_CONSOLE_TEST_FAILURE 	= "testA(BTest) [/RdtTestLib/anotherFile.rb:12]:"; 
 	private static final String TEST_UNIT_VIEW_BACKTRACE  	= "   /RdtTestLib/anotherFile.rb:12"; 
 	private static final String BACKTRACE_WITH_IN 			= "   /RdtTestLib/anotherFile.rb:12:in `testB'";
@@ -105,7 +106,15 @@
 		assertEquals("Line Number", 5, traceLine.getLineNumber());
 		assertEquals("Offset", 1, traceLine.offset());
 		assertEquals("Length", 37, traceLine.length());
-
 	}
+	
+	public void testBackslashInFilePath() {
+		StackTraceLine traceLine = new StackTraceLine(BACKSLASH_FILE_PATH, new ShamProject("testing"));
+		
+		assertEquals("Filename", "C:\\ruby\\lib\\ruby\\gems\\1.8\\gems\\activesupport-1.4.2\\lib/active_support/dependencies.rb", traceLine.getFilename());
+		assertEquals("Line Number", 376, traceLine.getLineNumber());
+		assertEquals("Offset", 0, traceLine.offset());
+		assertEquals("Length", 89, traceLine.length());
+	}
 
 }


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