From e1171ea4c462938720f46dc1804a47a13a45c184 Mon Sep 17 00:00:00 2001 From: Federico Tomassetti Date: Mon, 17 Aug 2015 21:31:56 +0200 Subject: [PATCH] all tests on method resolution logic passing --- .../symbolsolver/model/ContextTest.java | 29 ++++++++----------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/src/test/java/me/tomassetti/symbolsolver/model/ContextTest.java b/src/test/java/me/tomassetti/symbolsolver/model/ContextTest.java index fe6a3751f9..95d3b8942b 100644 --- a/src/test/java/me/tomassetti/symbolsolver/model/ContextTest.java +++ b/src/test/java/me/tomassetti/symbolsolver/model/ContextTest.java @@ -386,7 +386,6 @@ 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()); @@ -394,21 +393,19 @@ public void resolveReferenceToOverloadMethodWithNullParam() throws ParseExceptio 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 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 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()); + } }