From f42ea55805d9da58cf023ede6bb8ed49438bfeb5 Mon Sep 17 00:00:00 2001
From: tsantalis <tsantalis@gmail.com>
Date: Thu, 26 Dec 2024 09:24:29 -0500
Subject: [PATCH] Properly restore broken method pair in commit

https://github.com/junit-team/junit4/commit/24a5aad1f49b4decf946f1df701e354a18544132
Rename Method	protected runMethod(method TestMethod, notifier RunNotifier) : void renamed to protected runChild(method TestMethod, notifier RunNotifier) : void in class org.junit.internal.runners.JUnit4ClassRunner
---
 .../uom/java/xmi/decomposition/UMLOperationBodyMapper.java | 7 +++++++
 src/main/java/gr/uom/java/xmi/diff/UMLClassBaseDiff.java   | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/gr/uom/java/xmi/decomposition/UMLOperationBodyMapper.java b/src/main/java/gr/uom/java/xmi/decomposition/UMLOperationBodyMapper.java
index 39414eea72..af1b5b41f8 100644
--- a/src/main/java/gr/uom/java/xmi/decomposition/UMLOperationBodyMapper.java
+++ b/src/main/java/gr/uom/java/xmi/decomposition/UMLOperationBodyMapper.java
@@ -121,6 +121,7 @@ public class UMLOperationBodyMapper implements Comparable<UMLOperationBodyMapper
 	private List<Set<AbstractCodeMapping>> internalParameterizeTestMultiMappings = new ArrayList<Set<AbstractCodeMapping>>();
 	private boolean nested;
 	private boolean lambdaBodyMapper;
+	private boolean anonymousCollapse;
 	private AbstractCall operationInvocation;
 	private Map<String, String> parameterToArgumentMap1;
 	private Map<String, String> parameterToArgumentMap2;
@@ -144,6 +145,10 @@ public boolean isNested() {
 		return nested;
 	}
 
+	public boolean isAnonymousCollapse() {
+		return anonymousCollapse;
+	}
+
 	private Set<AbstractCodeFragment> statementsWithStreamAPICalls(List<AbstractCodeFragment> leaves) {
 		Set<AbstractCodeFragment> streamAPICalls = new LinkedHashSet<AbstractCodeFragment>();
 		for(AbstractCodeFragment statement : leaves) {
@@ -461,6 +466,7 @@ else if(statement1.getString().equals(list2.get(i))) {
 				if((anonymous1.size() == 1 && anonymous2.size() == 0) ||
 						(anonymous1.size() == 1 && anonymous2.size() == 1 && anonymous1.get(0).getAnonymousClassDeclarations().size() > 0 && anonymous2.get(0).getAnonymousClassDeclarations().size() == 0) ||
 						(anonymous1.size() + nestedAnonymous1.size() == anonymous2.size() + nestedAnonymous2.size() + 1 && anonymous1.get(0).getAnonymousClassDeclarations().size() > 0)) {
+					this.anonymousCollapse = true;
 					AbstractCodeFragment anonymousFragment = null;
 					for(AbstractCodeFragment leaf1 : leaves1) {
 						if(leaf1.getAnonymousClassDeclarations().size() > 0) {
@@ -487,6 +493,7 @@ else if(lambdas1.size() == 1 && anonymous2.size() == 0 && lambdas2.size() == 0)
 				else if((anonymous1.size() == 0 && anonymous2.size() == 1) ||
 						(anonymous1.size() == 1 && anonymous2.size() == 1 && anonymous1.get(0).getAnonymousClassDeclarations().size() == 0 && anonymous2.get(0).getAnonymousClassDeclarations().size() > 0) ||
 						(anonymous1.size() + nestedAnonymous1.size() + 1 == anonymous2.size() + nestedAnonymous2.size() && anonymous2.get(0).getAnonymousClassDeclarations().size() > 0)) {
+					this.anonymousCollapse = true;
 					AbstractCodeFragment anonymousFragment = null;
 					for(AbstractCodeFragment leaf2 : leaves2) {
 						if(leaf2.getAnonymousClassDeclarations().size() > 0) {
diff --git a/src/main/java/gr/uom/java/xmi/diff/UMLClassBaseDiff.java b/src/main/java/gr/uom/java/xmi/diff/UMLClassBaseDiff.java
index ae1c5c566a..8defc6ac3d 100644
--- a/src/main/java/gr/uom/java/xmi/diff/UMLClassBaseDiff.java
+++ b/src/main/java/gr/uom/java/xmi/diff/UMLClassBaseDiff.java
@@ -2469,7 +2469,7 @@ private boolean mappedElementsMoreThanNonMappedT2(int mappings, UMLOperationBody
 			}
 		}
 		return mappings > nonMappedElementsT2 || (mappings >= nonMappedElementsT2WithoutThoseCallingAddedOperation &&
-				nonMappedElementsT2CallingAddedOperation >= nonMappedElementsT2WithoutThoseCallingAddedOperation) ||
+				nonMappedElementsT2CallingAddedOperation >= nonMappedElementsT2WithoutThoseCallingAddedOperation && !operationBodyMapper.isAnonymousCollapse()) ||
 				(operationBodyMapper.getMappings().size() > nonMappedElementsT2 && nonMappedElementsT2CallingAddedOperation > 0 &&
 						operationBodyMapper.getContainer1().getClassName().equals(operationBodyMapper.getContainer2().getClassName()));
 	}