all tests on method resolution logic passing

javaparser · Aug 17, 2015 · e1171ea · e1171ea
1 parent b7eaf3c
commit e1171ea
Showing 1 changed file with 12 additions and 17 deletions.
diff --git a/src/test/java/me/tomassetti/symbolsolver/model/ContextTest.java b/src/test/java/me/tomassetti/symbolsolver/model/ContextTest.java
@@ -386,29 +386,26 @@ public void resolveReferenceToOverloadMethodWithNullParam() throws ParseExceptio
         MethodCallExpr call = Navigator.findMethodCall(method, "overloaded");
 
         JreTypeSolver typeSolver = new JreTypeSolver();
-        SymbolSolver symbolSolver = new SymbolSolver(typeSolver);
         MethodUsage ref = JavaParserFacade.get(typeSolver).solveMethodAsUsage(call);
 
         assertEquals("overloaded", ref.getName());
         assertEquals(1, ref.getNoParams());
         assertEquals("java.lang.String", ref.getParamTypes().get(0).getTypeName());
     }
 
-    /*@Test
+    @Test
     public void resolveReferenceToOverloadMethodFindStricter() throws ParseException, IOException {
         CompilationUnit cu = parseSample("OverloadedMethods");
         ClassOrInterfaceDeclaration clazz = Navigator.demandClass(cu, "OverloadedMethods");
         MethodDeclaration method = Navigator.demandMethod(clazz, "m2");
         MethodCallExpr call = Navigator.findMethodCall(method, "overloaded");
 
-        DummyTypeSolver typeSolver = new DummyTypeSolver();
-        SymbolSolver symbolSolver = new SymbolSolver(typeSolver);
-        SymbolReference<me.tomassetti.symbolsolver.model.MethodDeclaration> ref = symbolSolver.solveMethod("overloaded", Collections.emptyList(), call);
+        JreTypeSolver typeSolver = new JreTypeSolver();
+        MethodUsage ref = JavaParserFacade.get(typeSolver).solveMethodAsUsage(call);
 
-        assertEquals(true, ref.isSolved());
-        assertEquals("overloaded", ref.getCorrespondingDeclaration().getName());
-        assertEquals(1, ref.getCorrespondingDeclaration().getNoParams());
-        assertEquals("java.lang.String", ref.getCorrespondingDeclaration().getParam(0).getType());
+        assertEquals("overloaded", ref.getName());
+        assertEquals(1, ref.getNoParams());
+        assertEquals("java.lang.String", ref.getParamTypes().get(0).getTypeName());
     }
 
     @Test
@@ -418,14 +415,12 @@ public void resolveReferenceToOverloadMethodFindOnlyCompatible() throws ParseExc
         MethodDeclaration method = Navigator.demandMethod(clazz, "m3");
         MethodCallExpr call = Navigator.findMethodCall(method, "overloaded");
 
-        DummyTypeSolver typeSolver = new DummyTypeSolver();
-        SymbolSolver symbolSolver = new SymbolSolver(typeSolver);
-        SymbolReference<me.tomassetti.symbolsolver.model.MethodDeclaration> ref = symbolSolver.solveMethod("overloaded", Collections.emptyList(), call);
+        JreTypeSolver typeSolver = new JreTypeSolver();
+        MethodUsage ref = JavaParserFacade.get(typeSolver).solveMethodAsUsage(call);
 
-        assertEquals(true, ref.isSolved());
-        assertEquals("overloaded", ref.getCorrespondingDeclaration().getName());
-        assertEquals(1, ref.getCorrespondingDeclaration().getNoParams());
-        assertEquals("java.lang.Object", ref.getCorrespondingDeclaration().getParam(0).getType());
-    }*/
+        assertEquals("overloaded", ref.getName());
+        assertEquals(1, ref.getNoParams());
+        assertEquals("java.lang.Object", ref.getParamTypes().get(0).getTypeName());
+    }
 
 }