[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2263] trunk/org.rubypeople.rdt.core.tests/src/org /rubypeople/rdt/internal/core/builder

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

Revision: 2263
          http://svn.sourceforge.net/rubyeclipse/?rev=2263&view=rev
Author:   cawilliams
Date:     2007-04-03 11:00:37 -0700 (Tue, 03 Apr 2007)

Log Message:
-----------
fix broken test

Modified Paths:
--------------
    trunk/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/ShamMarkerManager.java
    trunk/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/TC_RubyCodeAnalyzer.java

Modified: trunk/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/ShamMarkerManager.java
===================================================================
--- trunk/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/ShamMarkerManager.java	2007-04-03 17:58:15 UTC (rev 2262)
+++ trunk/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/ShamMarkerManager.java	2007-04-03 18:00:37 UTC (rev 2263)
@@ -48,11 +48,6 @@
         syntaxExceptionArg = syntaxException;
     }
 
-    public void assertErrorCreated(ShamFile expectedFile, SyntaxException expectedSyntaxException) {
-        Assert.assertEquals("file", expectedFile, fileArg);
-        Assert.assertEquals("syntaxException", expectedSyntaxException, syntaxExceptionArg);
-    }
-
     public void createTasks(IFile file, List<TaskTag> tasks) throws CoreException {
         fileArg = file;
         tasksArg = tasks;
@@ -89,13 +84,6 @@
         endOffsetArg = endOffset;
     }
 
-	public void createError(IFile file, String message, int startLine, int startOffset, int endOffset) {
-		 fileArg = file;
-		 ISourcePosition position = new RdtPosition(startLine, startOffset, endOffset);
-		 SyntaxException e = new SyntaxException(position, message);
-	     syntaxExceptionArg = e;
-	}
-
 	public void addProblem(IFile file, IProblem problem) {
 		fileArg = file;
 		messageArg = problem.getMessage();

Modified: trunk/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/TC_RubyCodeAnalyzer.java
===================================================================
--- trunk/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/TC_RubyCodeAnalyzer.java	2007-04-03 17:58:15 UTC (rev 2262)
+++ trunk/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/TC_RubyCodeAnalyzer.java	2007-04-03 18:00:37 UTC (rev 2263)
@@ -20,6 +20,7 @@
 import org.jruby.evaluator.Instruction;
 import org.jruby.lexer.yacc.SyntaxException;
 import org.rubypeople.eclipse.shams.resources.ShamFile;
+import org.rubypeople.rdt.internal.core.parser.RdtPosition;
 
 public class TC_RubyCodeAnalyzer extends TestCase {
 
@@ -64,12 +65,12 @@
     
 
     public void testSyntaxException() throws Exception {
-        SyntaxException syntaxException = new SyntaxException(null, "");
+        SyntaxException syntaxException = new SyntaxException(new RdtPosition(1, 0, 10), "");
         parser.setExceptionToThrow(syntaxException);
         
         compiler.compileFile(file);
         
         file.assertContentStreamClosed();
-        markerManager.assertErrorCreated(file, syntaxException);
+        markerManager.assertWarningAdded(file, "", 1, 0, 10);
     }
 }


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