Fix failing tests

tsantalis · Dec 30, 2024 · a526d2a · a526d2a
1 parent 699f585
commit a526d2a
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/main/java/gr/uom/java/xmi/decomposition/AbstractCall.java b/src/main/java/gr/uom/java/xmi/decomposition/AbstractCall.java
@@ -588,6 +588,10 @@ public boolean renamedWithNoExpressionAndArgumentIntersection(AbstractCall call,
 	}
 
 	private boolean oneNameContainsTheOther(AbstractCall call) {
+		return this.getName().contains(call.getName()) || call.getName().contains(this.getName());
+	}
+
+	private boolean oneNameContainsTheOtherLowerCase(AbstractCall call) {
 		return this.getName().contains(call.getName()) || call.getName().contains(this.getName()) ||
 				this.getName().toLowerCase().contains(call.getName().toLowerCase()) ||
 				call.getName().toLowerCase().contains(this.getName().toLowerCase());
@@ -923,7 +927,7 @@ public boolean identicalWithInlinedStatements(AbstractCall call, Set<Replacement
 	}
 
 	public boolean identicalWithExpressionArgumentSwap(AbstractCall call) {
-		if(getExpression() != null && call.getExpression() != null && (identicalName(call) || oneNameContainsTheOther(call))) {
+		if(getExpression() != null && call.getExpression() != null && (identicalName(call) || oneNameContainsTheOtherLowerCase(call))) {
 			int argumentIndex1 = arguments().indexOf(call.getExpression());
 			int argumentIndex2 = call.arguments().indexOf(getExpression());
 			if(argumentIndex1 != -1 && argumentIndex2 != -1 && argumentIndex1 == argumentIndex2) {
@@ -933,7 +937,7 @@ public boolean identicalWithExpressionArgumentSwap(AbstractCall call) {
 				}
 			}
 		}
-		else if(getExpression() == null && call.getExpression() != null && (identicalName(call) || oneNameContainsTheOther(call))) {
+		else if(getExpression() == null && call.getExpression() != null && (identicalName(call) || oneNameContainsTheOtherLowerCase(call))) {
 			int argumentIndex1 = arguments().indexOf(call.getExpression());
 			if(argumentIndex1 != -1) {
 				Set<String> argumentIntersection = argumentIntersection(call);
@@ -942,7 +946,7 @@ else if(getExpression() == null && call.getExpression() != null && (identicalNam
 				}
 			}
 		}
-		else if(getExpression() != null && call.getExpression() == null && (identicalName(call) || oneNameContainsTheOther(call))) {
+		else if(getExpression() != null && call.getExpression() == null && (identicalName(call) || oneNameContainsTheOtherLowerCase(call))) {
 			int argumentIndex2 = call.arguments().indexOf(getExpression());
 			if(argumentIndex2 != -1) {
 				Set<String> argumentIntersection = argumentIntersection(call);