Fix failing tests

tsantalis · Dec 17, 2024 · 0a11281 · 0a11281
1 parent 5f9833d
commit 0a11281
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/main/java/gr/uom/java/xmi/decomposition/OperationInvocation.java b/src/main/java/gr/uom/java/xmi/decomposition/OperationInvocation.java
@@ -306,6 +306,10 @@ else if(arg.charAt(i) == '\n' || arg.charAt(i) == '{') {
     			}
     			inferredArgumentTypes.add(UMLType.extractTypeObject(type));
     		}
+    		else if(arg.endsWith(".INSTANCE") || arg.endsWith(".instance()") || arg.endsWith(".getInstance()")) {
+    			String type = arg.substring(0, arg.lastIndexOf("."));
+    			inferredArgumentTypes.add(UMLType.extractTypeObject(type));
+    		}
     		else if(indexOfOpeningParenthesis == 0 && arg.contains(")") && !arg.contains(JAVA.LAMBDA_ARROW) && !arg.contains(JAVA.METHOD_REFERENCE) && arg.indexOf(")") < arg.length()) {
     			String cast = arg.substring(indexOfOpeningParenthesis + 1, arg.indexOf(")"));
     			if(cast.charAt(0) != '(') {
@@ -465,6 +469,19 @@ private static String handleNumber(String argument) {
 		    Double.parseDouble(argument);
 		    return "double";
 		} catch (NumberFormatException e) {}
+		/*if(argument.contains(".")) {
+			String beforeDot = argument.substring(0, argument.lastIndexOf("."));
+			String afterDot = argument.substring(argument.lastIndexOf(".") + 1, argument.length());
+			int counter = 0;
+			for(int i=0; i<afterDot.length(); i++) {
+				if(Character.isUpperCase(afterDot.charAt(i)) || afterDot.charAt(i) == '_') {
+					counter++;
+				}
+			}
+			if(counter == afterDot.length()) {
+				return beforeDot;
+			}
+		}*/
 		return null;
 	}
 

diff --git a/src/main/java/gr/uom/java/xmi/decomposition/ReplacementAlgorithm.java b/src/main/java/gr/uom/java/xmi/decomposition/ReplacementAlgorithm.java
@@ -2817,7 +2817,8 @@ else if(objectCreation1.inlinedStatementBecomesAdditionalArgument(creationCoveri
 						replacementInfo.addReplacement(replacement);
 						return replacementInfo.getReplacements();
 					}
-					else if(objectCreation1.compatibleName(creationCoveringTheEntireStatement2) && objectCreation1.equalArguments(creationCoveringTheEntireStatement2) && objectCreation1.identicalExpression(creationCoveringTheEntireStatement2)) {
+					else if(objectCreation1.compatibleName(creationCoveringTheEntireStatement2) && objectCreation1.equalArguments(creationCoveringTheEntireStatement2) && objectCreation1.identicalExpression(creationCoveringTheEntireStatement2) &&
+							variableDeclarations1.size() == variableDeclarations2.size()) {
 						Replacement replacement = new ObjectCreationReplacement(objectCreation1.actualString(),
 								creationCoveringTheEntireStatement2.actualString(), (ObjectCreation)objectCreation1, creationCoveringTheEntireStatement2, ReplacementType.CLASS_INSTANCE_CREATION);
 						replacementInfo.addReplacement(replacement);