[Rubyeclipse-commit] org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder TC_MassIndexUpdater.java,1.4,1.5 TC_MassIndexUpdaterJob.java,1.1,1.2

[David C. <dc...@us...>]

Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4895/src/org/rubypeople/rdt/internal/core/builder

Modified Files:
	TC_MassIndexUpdater.java TC_MassIndexUpdaterJob.java 
Log Message:
Changed job management for index building.
Changed finds to be job-based.

Index: TC_MassIndexUpdater.java
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/TC_MassIndexUpdater.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TC_MassIndexUpdater.java	13 Nov 2005 13:05:07 -0000	1.4
--- TC_MassIndexUpdater.java	20 Nov 2005 02:23:14 -0000	1.5
***************
*** 18,22 ****
--- 18,24 ----
  import org.rubypeople.eclipse.shams.resources.ShamFile;
  import org.rubypeople.eclipse.shams.resources.ShamProject;
+ import org.rubypeople.eclipse.shams.runtime.ShamMonitor;
  import org.rubypeople.rdt.internal.core.parser.ShamNode;
+ import org.rubypeople.rdt.internal.core.util.ListUtil;
  
  public class TC_MassIndexUpdater extends TestCase {
***************
*** 49,53 ****
          projects.add(project2);
          
!         massUpdater.updateProjects(projects);
          RubySourceFileCollectingVisitor expectedVisitor = 
              new RubySourceFileCollectingVisitor(new ArrayList());
--- 51,56 ----
          projects.add(project2);
          
!         ShamMonitor monitor = new ShamMonitor();
!         massUpdater.updateProjects(projects, monitor);
          RubySourceFileCollectingVisitor expectedVisitor = 
              new RubySourceFileCollectingVisitor(new ArrayList());
***************
*** 60,63 ****
--- 63,70 ----
          updater.assertUpdated(file2, rootNode2, false);
          updater.assertUpdated(file3, rootNode3, false);
+         
+         monitor.assertTaskBegun("Update symbol index", 3);
+         monitor.assertSubTasks(ListUtil.create(
+                 "file1.rb", "file2.rb", "file3.rb"));
      }
  }

Index: TC_MassIndexUpdaterJob.java
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/TC_MassIndexUpdaterJob.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TC_MassIndexUpdaterJob.java	13 Nov 2005 15:47:03 -0000	1.1
--- TC_MassIndexUpdaterJob.java	20 Nov 2005 02:23:14 -0000	1.2
***************
*** 12,15 ****
--- 12,16 ----
  
  import org.rubypeople.eclipse.shams.resources.ShamProject;
+ import org.rubypeople.eclipse.shams.runtime.ShamMonitor;
  import org.rubypeople.rdt.internal.core.ShamMassIndexUpdater;
  import org.rubypeople.rdt.internal.core.util.ListUtil;
***************
*** 22,25 ****
--- 23,27 ----
          ShamProject project = new ShamProject("test1");
          MassIndexUpdaterJob job = new MassIndexUpdaterJob(massIndexUpdater, ListUtil.create(project));
+         ShamMonitor monitor = new ShamMonitor();
          job.schedule();
          job.join();