1.1 --- a/ruby/test/unit/src/org/netbeans/modules/ruby/AstUtilitiesTest.java	Thu Nov 21 16:40:13 2013 -0600
     1.2 +++ b/ruby/test/unit/src/org/netbeans/modules/ruby/AstUtilitiesTest.java	Sun Dec 08 11:39:16 2013 -0600
     1.3 @@ -524,9 +524,7 @@
     1.4          Parser.Result parserResult = getParserResult("testfiles/ape.rb");
     1.5          String text = getText(parserResult);
     1.6          int caretOffset = getCaretOffset(text, "might_^fail(uri, requested_e_coll, requested_m_coll)");
     1.7 -        Node root = AstUtilities.getRoot(parserResult);
     1.8 -        AstPath path = new AstPath(root, caretOffset);
     1.9 -        Node call = path.leaf();
    1.10 +        Node call = AstUtilities.getRoot(parserResult).getNodeAt(caretOffset);
    1.11          assertTrue(AstUtilities.isCall(call));
    1.12  
    1.13          caretOffset = getCaretOffset(text, "might_fail(^uri, requested_e_coll, requested_m_coll)");
    1.14 @@ -557,9 +555,7 @@
    1.15          //int caretOffset = 2755; // "new" call from failed earlier test
    1.16          int caretOffset = getCaretOffset(text, "MUTEX = Mutex.^new");
    1.17  
    1.18 -        Node root = AstUtilities.getRoot(parserResult);
    1.19 -        AstPath path = new AstPath(root, caretOffset);
    1.20 -        Node call = path.leaf();
    1.21 +        Node call = AstUtilities.getRoot(parserResult).getNodeAt(caretOffset);
    1.22          assertTrue(AstUtilities.isCall(call));
    1.23  
    1.24          assertEquals(-1, AstUtilities.findArgumentIndex(call, caretOffset));
    1.25 @@ -571,10 +567,7 @@
    1.26          String text = getText(parserResult);
    1.27          //int caretOffset = 2755; // "new" call from failed earlier test
    1.28          int caretOffset = getCaretOffset(text, "Gem.ac^tivate(gem_name, *version_requirements)");
    1.29 -
    1.30 -        Node root = AstUtilities.getRoot(parserResult);
    1.31 -        AstPath path = new AstPath(root, caretOffset);
    1.32 -        Node call = path.leaf();
    1.33 +        Node call = AstUtilities.getRoot(parserResult).getNodeAt(caretOffset);        
    1.34          assertTrue(AstUtilities.isCall(call));
    1.35  
    1.36          caretOffset = getCaretOffset(text, "Gem.^activate(gem_name, *version_requirements)");