Fix more failing tests

tsantalis · Dec 11, 2024 · a49b7f9 · a49b7f9
1 parent e040519
commit a49b7f9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/main/java/gr/uom/java/xmi/decomposition/UMLOperationBodyMapper.java b/src/main/java/gr/uom/java/xmi/decomposition/UMLOperationBodyMapper.java
@@ -2501,14 +2501,16 @@ public UMLOperationBodyMapper(UMLOperationBodyMapper operationBodyMapper, UMLOpe
 						}
 					}
 					else {
-						leavesT2.add(fragment);
+						if(!leavesT2.contains(fragment))
+							leavesT2.add(fragment);
 					}
 				}
 			}
 			leavesT2.addAll(operationBodyMapper.getNonMappedLeavesT2());
 			for(CompositeStatementObject composite : operationBodyMapper.getNonMappedInnerNodesT2()) {
 				for(AbstractExpression expression : composite.getExpressions()) {
-					expressionsT2.add(expression);
+					if(!expressionsT2.contains(expression))
+						expressionsT2.add(expression);
 				}
 			}
 			this.callsToExtractedMethod = callsToExtractedMethod(leavesT2);
@@ -3073,14 +3075,16 @@ public UMLOperationBodyMapper(UMLOperation removedOperation, UMLOperationBodyMap
 						}
 					}
 					else {
-						leavesT1.add(fragment);
+						if(!leavesT1.contains(fragment))
+							leavesT1.add(fragment);
 					}
 				}
 			}
 			leavesT1.addAll(operationBodyMapper.getNonMappedLeavesT1());
 			for(CompositeStatementObject composite : operationBodyMapper.getNonMappedInnerNodesT1()) {
 				for(AbstractExpression expression : composite.getExpressions()) {
-					expressionsT1.add(expression);
+					if(!expressionsT1.contains(expression))
+						expressionsT1.add(expression);
 				}
 			}
 			this.callsToInlinedMethod = callsToInlinedMethod(leavesT1);

diff --git a/src/test/resources/mappings/j2objc-d05d92de40542e85f9f26712d976e710be82914e.txt b/src/test/resources/mappings/j2objc-d05d92de40542e85f9f26712d976e710be82914e.txt
@@ -22,11 +22,12 @@ line range:661-661==line range:773-773
 line range:662-662==line range:774-774
 line range:663-663==line range:775-775
 line range:665-665==line range:777-777
+line range:654-654==line range:766-766
 line range:658-664==line range:770-776
 line range:658-664==line range:770-776
 public visit(node LambdaExpression) : boolean -> public printBlockCallWrapper(binding IMethodBinding) : void
 line range:642-642==line range:704-704
-line range:641-641==line range:705-705
+line range:641-641==line range:698-698
 public visit(node LambdaExpression) : boolean -> public printLambdaCall(functionalInterface IMethodBinding, functionalTypeBinding ITypeBinding, methodBinding IMethodBinding, parameters List<VariableDeclaration>, isCapturing boolean) : void
 line range:638-638==line range:729-729
 public visit(node LambdaExpression) : boolean -> public visit(node LambdaExpression) : boolean