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

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

Revision: 2638
          http://svn.sourceforge.net/rubyeclipse/?rev=2638&view=rev
Author:   cawilliams
Date:     2007-06-20 06:35:18 -0700 (Wed, 20 Jun 2007)

Log Message:
-----------
fix broken tests

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

Modified: trunk/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/AbstractRdtTestCase.java
===================================================================
--- trunk/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/AbstractRdtTestCase.java	2007-06-20 13:10:54 UTC (rev 2637)
+++ trunk/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/AbstractRdtTestCase.java	2007-06-20 13:35:18 UTC (rev 2638)
@@ -55,7 +55,7 @@
         
         compiler.compile(monitor);
     
-        assertCompliationFor(ListUtil.create(t1), 4);
+        assertCompilationFor(ListUtil.create(t1), 3);
     }
 
     public void testNotARubyFile() throws Exception {
@@ -64,7 +64,7 @@
         
         compiler.compile(monitor);
     
-        assertCompliationFor(ListUtil.create(), 0); // FIXME should be no work done for non-ruby file?
+        assertCompilationFor(ListUtil.create(), 0); // FIXME should be no work done for non-ruby file?
     }
 
     public void testCompileIncludesFolders() throws Exception {
@@ -74,7 +74,7 @@
         
         compiler.compile(monitor);
         
-        assertCompliationFor(ListUtil.create(t3), 4);
+        assertCompilationFor(ListUtil.create(t3), 3);
     }
 
     public void testCompileMultipleFiles() throws Exception {
@@ -83,12 +83,12 @@
         setFiles(ListUtil.create(t1, t2));
     
         compiler.compile(monitor);
-        int expectedWorkUnits = 8; // code analyzer, taskparser, index, markers for each file
-        assertCompliationFor(ListUtil.create(t1, t2), expectedWorkUnits);
+        int expectedWorkUnits = 6; // code analyzer, taskparser, index, markers for each file
+        assertCompilationFor(ListUtil.create(t1, t2), expectedWorkUnits);
     }
 
     public void testCancellation() throws Exception {
-        monitor.cancelAfter(6);
+        monitor.cancelAfter(4);
         project.addResource(t1);
         project.addResource(t2);
         setFiles(ListUtil.create(t1, t2));
@@ -96,8 +96,8 @@
         compiler.compile(monitor);
         List expectedFiles = ListUtil.create(t1);
     
-        monitor.assertTaskBegun("Building test...", 8);
-        monitor.assertDone(6);
+        monitor.assertTaskBegun("Building test...", 6);
+        monitor.assertDone(4);
         List subTasks = ListUtil.create(REMOVING_MARKERS_SUB_TASK, 
                 t1.getFullPath().toString());
         monitor.assertSubTasks(subTasks);
@@ -114,13 +114,13 @@
     
         compiler.compile(monitor);
     
-        assertCompliationFor(ListUtil.create(t1), 4);
+        assertCompilationFor(ListUtil.create(t1), 3);
     }
 
     protected void setFiles(List filesForTest) throws Exception {
     }
     
-    protected void assertCompliationFor(List expectedFiles, int totalWork) {
+    protected void assertCompilationFor(List expectedFiles, int totalWork) {
         monitor.assertTaskBegun("Building test...", totalWork);
         monitor.assertDone(totalWork);
         List subTasks = ListUtil.create(REMOVING_MARKERS_SUB_TASK);

Modified: trunk/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/TC_IncrementalRdtCompiler.java
===================================================================
--- trunk/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/TC_IncrementalRdtCompiler.java	2007-06-20 13:10:54 UTC (rev 2637)
+++ trunk/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/TC_IncrementalRdtCompiler.java	2007-06-20 13:35:18 UTC (rev 2638)
@@ -22,8 +22,8 @@
         compiler.compile(monitor);
         ListUtil.create(t1); //expected files
        
-        monitor.assertTaskBegun("Building test...", 2);
-        monitor.assertDone(2);
+        monitor.assertTaskBegun("Building test...", 1);
+        monitor.assertDone(1);
         List subTasks = ListUtil.create(REMOVING_MARKERS_SUB_TASK);
         monitor.assertSubTasks(subTasks);
         assertMarkersRemoved(ListUtil.create(t1));


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