Fix failing tests (#827)

tsantalis · Dec 13, 2024 · 9c1c0b8 · 9c1c0b8
1 parent 69d6071
commit 9c1c0b8
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 2 deletions.
diff --git a/src/main/java/gr/uom/java/xmi/decomposition/LambdaExpressionObject.java b/src/main/java/gr/uom/java/xmi/decomposition/LambdaExpressionObject.java
@@ -4,6 +4,7 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -71,7 +72,7 @@ else if(param instanceof SingleVariableDeclaration) {
 			this.parameters.add(parameter);
 		}
 		if(lambda.getBody() instanceof Block) {
-			this.body = new OperationBody(cu, sourceFolder, filePath, (Block)lambda.getBody(), this, activeVariableDeclarations, javaFileContent);
+			this.body = new OperationBody(cu, sourceFolder, filePath, (Block)lambda.getBody(), this, new HashMap<>(activeVariableDeclarations), javaFileContent);
 		}
 		else if(lambda.getBody() instanceof Expression) {
 			this.expression = new AbstractExpression(cu, sourceFolder, filePath, (Expression)lambda.getBody(), CodeElementType.LAMBDA_EXPRESSION_BODY, this, activeVariableDeclarations, javaFileContent);
@@ -88,7 +89,7 @@ public LambdaExpressionObject(CompilationUnit cu, String sourceFolder, String fi
 		this.asString = switchCaseBody.toString();
 		this.locationInfo = new LocationInfo(cu, sourceFolder, filePath, switchCaseBody, CodeElementType.LAMBDA_EXPRESSION);
 		if(switchCaseBody instanceof Block) {
-			this.body = new OperationBody(cu, sourceFolder, filePath, (Block)switchCaseBody, this, activeVariableDeclarations, javaFileContent);
+			this.body = new OperationBody(cu, sourceFolder, filePath, (Block)switchCaseBody, this, new HashMap<>(activeVariableDeclarations), javaFileContent);
 		}
 		else {
 			//TODO find a way to support switch-case with a single statement

diff --git a/src/test/resources/commandline/drill-2b6a91a212e592a66bdad175f7b3fb8041c2ae6b-expected.json b/src/test/resources/commandline/drill-2b6a91a212e592a66bdad175f7b3fb8041c2ae6b-expected.json
@@ -514,6 +514,15 @@
 		"codeElementType": "IF_STATEMENT",
 		"description": "statement referencing the original variable",
 		"codeElement": null
+}, {
+		"filePath": "exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/DistributedQueueParallelizer.java",
+		"startLine": 148,
+		"endLine": 148,
+		"startColumn": 11,
+		"endColumn": 120,
+		"codeElementType": "RETURN_STATEMENT",
+		"description": "statement referencing the original variable",
+		"codeElement": null
 }],
 	"rightSideLocations": [{
 		"filePath": "exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/DistributedQueueParallelizer.java",
@@ -533,6 +542,15 @@
 		"codeElementType": "IF_STATEMENT",
 		"description": "statement referencing the variable with changed type",
 		"codeElement": null
+}, {
+		"filePath": "exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/DistributedQueueParallelizer.java",
+		"startLine": 184,
+		"endLine": 184,
+		"startColumn": 11,
+		"endColumn": 120,
+		"codeElementType": "RETURN_STATEMENT",
+		"description": "statement referencing the variable with changed type",
+		"codeElement": null
 }]
 },
 {

diff --git a/src/test/resources/commandline/drill-gp-expected.json b/src/test/resources/commandline/drill-gp-expected.json
@@ -3763,6 +3763,15 @@
 		"codeElementType": "IF_STATEMENT",
 		"description": "statement referencing the original variable",
 		"codeElement": null
+}, {
+		"filePath": "exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/DistributedQueueParallelizer.java",
+		"startLine": 148,
+		"endLine": 148,
+		"startColumn": 11,
+		"endColumn": 120,
+		"codeElementType": "RETURN_STATEMENT",
+		"description": "statement referencing the original variable",
+		"codeElement": null
 }],
 	"rightSideLocations": [{
 		"filePath": "exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/DistributedQueueParallelizer.java",
@@ -3782,6 +3791,15 @@
 		"codeElementType": "IF_STATEMENT",
 		"description": "statement referencing the variable with changed type",
 		"codeElement": null
+}, {
+		"filePath": "exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/DistributedQueueParallelizer.java",
+		"startLine": 184,
+		"endLine": 184,
+		"startColumn": 11,
+		"endColumn": 120,
+		"codeElementType": "RETURN_STATEMENT",
+		"description": "statement referencing the variable with changed type",
+		"codeElement": null
 }]
 },
 {