[Rubyeclipse-commit] org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/symbols TC_SymbolIndex.java,1.1,1.2 TC_Location.java,1.1,1.2

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

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

Modified Files:
	TC_SymbolIndex.java TC_Location.java 
Log Message:
Partial support for opening classes from Test::Unit failure.

Index: TC_Location.java
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/symbols/TC_Location.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TC_Location.java	1 Oct 2005 23:00:54 -0000	1.1
--- TC_Location.java	13 Oct 2005 01:00:30 -0000	1.2
***************
*** 4,11 ****
  
  import org.eclipse.core.runtime.Path;
  
  public class TC_Location extends TestCase {
      public void testForSource() {
!         Location location = new Location(new Path("foo"), 1, 2);
          assertEquals(true, location.forSource(new Path("foo")));
          assertEquals(false, location.forSource(new Path("Foo")));
--- 4,12 ----
  
  import org.eclipse.core.runtime.Path;
+ import org.rubypeople.rdt.internal.core.parser.RdtPosition;
  
  public class TC_Location extends TestCase {
      public void testForSource() {
!         Location location = new Location(new Path("foo"), new RdtPosition(1, 2, 3));
          assertEquals(true, location.forSource(new Path("foo")));
          assertEquals(false, location.forSource(new Path("Foo")));

Index: TC_SymbolIndex.java
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/symbols/TC_SymbolIndex.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TC_SymbolIndex.java	1 Oct 2005 23:00:54 -0000	1.1
--- TC_SymbolIndex.java	13 Oct 2005 01:00:30 -0000	1.2
***************
*** 7,11 ****
--- 7,15 ----
  import junit.framework.TestCase;
  
+ import org.eclipse.core.resources.IFile;
  import org.eclipse.core.runtime.Path;
+ import org.jruby.lexer.yacc.ISourcePosition;
+ import org.rubypeople.eclipse.shams.resources.ShamFile;
+ import org.rubypeople.rdt.internal.core.parser.RdtPosition;
  
  public class TC_SymbolIndex extends TestCase {
***************
*** 15,21 ****
      private static final Path OTHER_FOO_PATH = new Path("/utils/foo.rb");
      
!     private static final Location FOO_CLASS_LOCATION = new Location(FOO_PATH, 12, 15);
!     private static final Location OTHER_FOO_CLASS_LOCATION = new Location(OTHER_FOO_PATH, 10, 13);
!     private static final Set EMPTY_SET= Collections.EMPTY_SET;
      
      private SymbolIndex index;
--- 19,28 ----
      private static final Path OTHER_FOO_PATH = new Path("/utils/foo.rb");
      
!     private static final ISourcePosition FOO_POSITION           = new RdtPosition(10, 3, 7);
!     private static final ISourcePosition OTHER_FOO_POSITION     = new RdtPosition(12, 13, 17);
!     private static final Location FOO_CLASS_LOCATION            = new Location(FOO_PATH, FOO_POSITION);
!     private static final Location OTHER_FOO_CLASS_LOCATION      = new Location(OTHER_FOO_PATH, OTHER_FOO_POSITION);
!     private static final IFile OTHER_FOO_FILE                   = new ShamFile(OTHER_FOO_PATH);
!     private static final Set EMPTY_SET                          = Collections.EMPTY_SET;
      
      private SymbolIndex index;
***************
*** 40,47 ****
      
      public void testMultipleLocations() {
          index.add(FOO_CLASS_SYMBOL, OTHER_FOO_CLASS_LOCATION);
          assertEquals(createSet(OTHER_FOO_CLASS_LOCATION, FOO_CLASS_LOCATION), index.find(FOO_CLASS_SYMBOL));
      }
- 
      private Set createSet(Object obj1) {
          Set set = new HashSet();
--- 47,60 ----
      
      public void testMultipleLocations() {
+         index.add(FOO_CLASS_SYMBOL, OTHER_FOO_FILE, OTHER_FOO_POSITION);
+         Set expected = createSet(OTHER_FOO_CLASS_LOCATION, FOO_CLASS_LOCATION);
+         Set actual = index.find(FOO_CLASS_SYMBOL);
+         assertEquals(expected, actual);
+     }
+ 
+     public void testAlternateAdd() {
          index.add(FOO_CLASS_SYMBOL, OTHER_FOO_CLASS_LOCATION);
          assertEquals(createSet(OTHER_FOO_CLASS_LOCATION, FOO_CLASS_LOCATION), index.find(FOO_CLASS_SYMBOL));
      }
      private Set createSet(Object obj1) {
          Set set = new HashSet();