From 21eeb61d1e8a149194f5b48e322b3adf3c3619b6 Mon Sep 17 00:00:00 2001
From: jlerbsc <jean-pierre.lerbscher@jperf.com>
Date: Wed, 23 Mar 2022 18:54:36 +0100
Subject: [PATCH] Improve unit test on BlockStmtContextResolutionTest

---
 .../BlockStmtContextResolutionTest.java         | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/BlockStmtContextResolutionTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/BlockStmtContextResolutionTest.java
index e1d42efcd8..1a5d802460 100755
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/BlockStmtContextResolutionTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/BlockStmtContextResolutionTest.java
@@ -30,12 +30,8 @@
 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;
 import com.github.javaparser.symbolsolver.resolution.AbstractResolutionTest;
 import com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver;
 import com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver;
@@ -55,7 +51,7 @@ void must_be_resolved_from_previous_declaration(){
         String src = "public class Example {\n"
                 + "    int a = 3;\n"
                 + "    public void bla() {\n"
-                + "        a = 7; // 'a' must be resolved as int not String"
+                + "        a = 7; // 'a' must be resolved as int not String\n"
                 + "        String a = \"\";\n"
                 + "        a = \"test\";\n"
                 + "    }\n"
@@ -64,12 +60,9 @@ void must_be_resolved_from_previous_declaration(){
                 .setSymbolResolver(new JavaSymbolSolver(new CombinedTypeSolver(new ReflectionTypeSolver())));
         StaticJavaParser.setConfiguration(configuration);
         CompilationUnit cu = StaticJavaParser.parse(src);
-        BlockStmt stmt = cu.findFirst(BlockStmt.class).get();
-        BlockStmtContext ctx = new BlockStmtContext(stmt, new ReflectionTypeSolver());
-        SymbolReference<? extends ResolvedValueDeclaration> ref = ctx.solveSymbol("a");
-
-        assertEquals(true, ref.isSolved());
-        assertEquals("int", ref.getCorrespondingDeclaration().getType().asPrimitive().describe());
+        AssignExpr expr = cu.findFirst(AssignExpr.class).get();
+        ResolvedType rt = expr.calculateResolvedType();
+        assertEquals("int", rt.describe());
     }
     
     @Test
@@ -77,7 +70,7 @@ void must_be_resolved_from_previous_declaration_second_declaration_of_the_same_f
         String src = "public class Example {\n"
                 + "    int a = 3;\n"
                 + "    public void bla() {\n"
-                + "        a = 7; // 'a' must be resolved as int not String"
+                + "        a = 7; // 'a' must be resolved as int not String\n"
                 + "        String a = \"\";\n"
                 + "        a = \"test\";\n"
                 + "    }\n"