Improve unit test for BlockStmtContextResolutionTest

javaparser · Mar 23, 2022 · 0b892c2 · 0b892c2
1 parent 9b9536f
commit 0b892c2
Showing 1 changed file with 22 additions and 1 deletion.
diff --git a/...avaparser/symbolsolver/resolution/javaparser/contexts/BlockStmtContextResolutionTest.java b/...avaparser/symbolsolver/resolution/javaparser/contexts/BlockStmtContextResolutionTest.java
@@ -29,8 +29,10 @@
 import com.github.javaparser.ParserConfiguration;
 import com.github.javaparser.StaticJavaParser;
 import com.github.javaparser.ast.CompilationUnit;
+import com.github.javaparser.ast.expr.AssignExpr;
 import com.github.javaparser.ast.stmt.BlockStmt;
 import com.github.javaparser.resolution.declarations.ResolvedValueDeclaration;
+import com.github.javaparser.resolution.types.ResolvedType;
 import com.github.javaparser.symbolsolver.JavaSymbolSolver;
 import com.github.javaparser.symbolsolver.javaparsermodel.contexts.BlockStmtContext;
 import com.github.javaparser.symbolsolver.model.resolution.SymbolReference;
@@ -49,7 +51,7 @@ void setup() {
 
     // issue #3526
     @Test
-    void field_must_be_resolved_from_previous_declaration(){
+    void must_be_resolved_from_previous_declaration(){
         String src = "public class Example {\n"
                 + "    int a = 3;\n"
                 + "    public void bla() {\n"
@@ -69,5 +71,24 @@ void field_must_be_resolved_from_previous_declaration(){
         assertEquals(true, ref.isSolved());
         assertEquals("int", ref.getCorrespondingDeclaration().getType().asPrimitive().describe());
     }
+
+    @Test
+    void must_be_resolved_from_previous_declaration_second_declaration_of_the_same_field_name(){
+        String src = "public class Example {\n"
+                + "    int a = 3;\n"
+                + "    public void bla() {\n"
+                + "        a = 7; // 'a' must be resolved as int not String"
+                + "        String a = \"\";\n"
+                + "        a = \"test\";\n"
+                + "    }\n"
+                + "}";
+        ParserConfiguration configuration = new ParserConfiguration()
+                .setSymbolResolver(new JavaSymbolSolver(new CombinedTypeSolver(new ReflectionTypeSolver())));
+        StaticJavaParser.setConfiguration(configuration);
+        CompilationUnit cu = StaticJavaParser.parse(src);
+        AssignExpr expr = cu.findAll(AssignExpr.class).get(1);
+        ResolvedType rt2 = expr.calculateResolvedType();
+        assertEquals("java.lang.String", rt2.describe());
+    }
 
 }