Fix for issue tsantalis#855

Author: tsantalis

src/main/java/gr/uom/java/xmi/UMLAttribute.java

@@ -92,6 +92,11 @@ public AbstractCall isDelegate() {
 		return null;
 	}
 
+	@Override
+	public AbstractCall singleStatementCallingMethod() {
+		return null;
+	}
+
 	public boolean isRecursive() {
 		return false;
 	}

src/main/java/gr/uom/java/xmi/UMLInitializer.java

@@ -134,6 +134,11 @@ public AbstractCall isDelegate() {
 		return null;
 	}
 
+	@Override
+	public AbstractCall singleStatementCallingMethod() {
+		return null;
+	}
+
 	public Optional<UMLAnonymousClass> getAnonymousClassContainer() {
 		return anonymousClassContainer;
 	}

src/main/java/gr/uom/java/xmi/UMLOperation.java

@@ -620,6 +620,17 @@ public boolean hasVarargsParameter() {
 		return false;
 	}
 
+	public AbstractCall singleStatementCallingMethod() {
+		if(getBody() != null) {
+			List<AbstractStatement> statements = getBody().getCompositeStatement().getStatements();
+			if(statements.size() == 1 && statements.get(0) instanceof StatementObject) {
+				StatementObject statement = (StatementObject)statements.get(0);
+				return statement.invocationCoveringEntireFragment();
+			}
+		}
+		return null;
+	}
+
 	public AbstractCall isDelegate() {
 		if(getBody() != null) {
 			List<AbstractStatement> statements = getBody().getCompositeStatement().getStatements();

src/main/java/gr/uom/java/xmi/VariableDeclarationContainer.java

@@ -126,6 +126,7 @@ default boolean identicalTextFixture(VariableDeclarationContainer operation) {
 	boolean isSetter();
 	boolean isConstructor();
 	AbstractCall isDelegate();
+	AbstractCall singleStatementCallingMethod();
 	boolean isRecursive();
 	boolean isMain();
 	boolean isStatic();

src/main/java/gr/uom/java/xmi/decomposition/LambdaExpressionObject.java

@@ -440,6 +440,11 @@ public AbstractCall isDelegate() {
 		return null;
 	}
 
+	@Override
+	public AbstractCall singleStatementCallingMethod() {
+		return null;
+	}
+
 	@Override
 	public boolean isRecursive() {
 		return false;

src/main/java/gr/uom/java/xmi/decomposition/UMLOperationBodyMapper.java

@@ -10307,9 +10307,33 @@ else if(!thisCommonJavadoc && otherCommonJavadoc) {
 						return Integer.compare(thisEditDistance, otherEditDistance);
 					}
 					else {
+						AbstractCall thisDelegate = this.getContainer2().singleStatementCallingMethod();
+						AbstractCall otherDelegate = operationBodyMapper.getContainer2().singleStatementCallingMethod();
+						boolean delegateArgumentInMethodName = false;
+						if(thisDelegate != null && otherDelegate != null) {
+							boolean thisMatch = false;
+							for(String arg : thisDelegate.arguments()) {
+								if(arg.startsWith("\"") && arg.endsWith("\""))
+									arg = arg.substring(1, arg.length()-1);
+								if(this.getContainer2().getName().toLowerCase().contains(arg)) {
+									thisMatch = true;
+									break;
+								}
+							}
+							boolean otherMatch = false;
+							for(String arg : otherDelegate.arguments()) {
+								if(arg.startsWith("\"") && arg.endsWith("\""))
+									arg = arg.substring(1, arg.length()-1);
+								if(operationBodyMapper.getContainer2().getName().toLowerCase().contains(arg)) {
+									otherMatch = true;
+									break;
+								}
+							}
+							delegateArgumentInMethodName = thisMatch && otherMatch;
+						}
 						int thisOperationNameEditDistance = this.operationNameEditDistance();
 						int otherOperationNameEditDistance = operationBodyMapper.operationNameEditDistance();
-						if(thisOperationNameEditDistance != otherOperationNameEditDistance) {
+						if(thisOperationNameEditDistance != otherOperationNameEditDistance && !delegateArgumentInMethodName) {
 							return Integer.compare(thisOperationNameEditDistance, otherOperationNameEditDistance);
 						}
 						if(this.container1.getClassName().equals(this.container2.getClassName()) && operationBodyMapper.container1.getClassName().equals(operationBodyMapper.container2.getClassName())) {

src/main/java/gr/uom/java/xmi/diff/UMLClassBaseDiff.java

@@ -2267,6 +2267,15 @@ else if(allStatementsMappedOrParameterized(operationBodyMapper)) {
 				mapperSet.add(operationBodyMapper);
 			}
 		}
+		if (mappings == 0 && isPartOfMethodExtracted(removedOperation, addedOperation) && removedOperation.hasTestAnnotation() && addedOperation.hasTestAnnotation()) {
+			int absoluteDifferenceInPosition = computeAbsoluteDifferenceInPositionWithinClass(removedOperation, addedOperation);
+			if(removedOperation.isConstructor() == addedOperation.isConstructor() &&
+					mappedElementsMoreThanNonMappedT2(mappings, operationBodyMapper) &&
+					absoluteDifferenceInPosition <= differenceInPosition &&
+					removedOperation.testMethodCheck(addedOperation)) {
+				mapperSet.add(operationBodyMapper);
+			}
+		}
 	}
 
 	private void updateMapperSet(TreeSet<UMLOperationBodyMapper> mapperSet, UMLOperation removedOperation, UMLOperation operationInsideAnonymousClass, UMLOperation addedOperation, int differenceInPosition) throws RefactoringMinerTimedOutException {

src/test/java/org/refactoringminer/test/TestStatementMappings.java

@@ -580,7 +580,8 @@ public void handle(String commitId, List<Refactoring> refactorings) {
 		"https://github.com/eclipse-jgit/jgit.git, 7ff6eb584cf8b83f83a3b5edf897feb53dbf42c0, jgit-7ff6eb584cf8b83f83a3b5edf897feb53dbf42c0.txt",
 		"https://github.com/jenkinsci/git-client-plugin.git, 6d261108e7471db380146f945bb228b5fc8c44cc, git-client-plugin-6d261108e7471db380146f945bb228b5fc8c44cc.txt",
 		"https://github.com/javaparser/javaparser.git, 548fb9c5a72776ec009c5f2f92b1a4c480a05030, javaparser-548fb9c5a72776ec009c5f2f92b1a4c480a05030.txt",
-		"https://github.com/apache/ant.git, 52926715b4f4f53da4b63cf660a14f357d7a9b6e, ant-52926715b4f4f53da4b63cf660a14f357d7a9b6e.txt"
+		"https://github.com/apache/ant.git, 52926715b4f4f53da4b63cf660a14f357d7a9b6e, ant-52926715b4f4f53da4b63cf660a14f357d7a9b6e.txt",
+		"https://github.com/apache/cassandra.git, ab51b794735bd5731357d6fd4cb92cf0059a7ad1, cassandra-ab51b794735bd5731357d6fd4cb92cf0059a7ad1.txt"
 	})
 	public void testExtractMethodStatementMappings(String url, String commit, String testResultFileName) throws Exception {
 		GitHistoryRefactoringMinerImpl miner = new GitHistoryRefactoringMinerImpl();

src/test/java/org/refactoringminer/test/TestStatementMappingsJunit4.java

@@ -1740,6 +1740,36 @@ public void handle(String commitId, List<Refactoring> refactorings) {
 		Assert.assertTrue(expected.size() == actual.size() && expected.containsAll(actual) && actual.containsAll(expected));
 	}
 
+	@Test
+	public void testExtractMethodStatementMappings32() throws Exception {
+		GitHistoryRefactoringMinerImpl miner = new GitHistoryRefactoringMinerImpl();
+		final List<String> actual = new ArrayList<>();
+		miner.detectAtCommitWithGitHubAPI("https://github.com/apache/cassandra.git", "ab51b794735bd5731357d6fd4cb92cf0059a7ad1", new File(REPOS), new RefactoringHandler() {
+			@Override
+			public void handle(String commitId, List<Refactoring> refactorings) {
+				List<UMLOperationBodyMapper> parentMappers = new ArrayList<>();
+				for (Refactoring ref : refactorings) {
+					if(ref instanceof ExtractOperationRefactoring) {
+						ExtractOperationRefactoring ex = (ExtractOperationRefactoring)ref;
+						UMLOperationBodyMapper bodyMapper = ex.getBodyMapper();
+						if(!bodyMapper.isNested()) {
+							if(!parentMappers.contains(bodyMapper.getParentMapper())) {
+								parentMappers.add(bodyMapper.getParentMapper());
+							}
+						}
+						mapperInfo(bodyMapper, actual);
+					}
+				}
+				for(UMLOperationBodyMapper parentMapper : parentMappers) {
+					mapperInfo(parentMapper, actual);
+				}
+			}
+		});
+		
+		List<String> expected = IOUtils.readLines(new FileReader(EXPECTED_PATH + "cassandra-ab51b794735bd5731357d6fd4cb92cf0059a7ad1.txt"));
+		Assert.assertTrue(expected.size() == actual.size() && expected.containsAll(actual) && actual.containsAll(expected));
+	}
+
 	@Test
 	public void testSlidedStatementMappings() throws Exception {
 		GitHistoryRefactoringMinerImpl miner = new GitHistoryRefactoringMinerImpl();

src/test/resources/mappings/cassandra-ab51b794735bd5731357d6fd4cb92cf0059a7ad1.txt

@@ -0,0 +1,39 @@
+public copyFile(cfDir File, file File) : void -> public copyFile(cfDir File, file File, target File) : void
+line range:695-695==line range:806-806
+line range:699-699==line range:809-809
+line range:703-703==line range:814-814
+line range:702-703==line range:813-814
+line range:700-704==line range:810-815
+line range:696-705==line range:807-816
+line range:697-705==line range:808-816
+line range:698-698==line range:801-801
+public testVerifyOldSSTables() : void -> private verifyOldSSTables(tableSuffix String) : void
+line range:349-349==line range:414-414
+line range:351-351==line range:416-416
+line range:361-361==line range:426-426
+line range:365-365==line range:430-430
+line range:342-342==line range:407-407
+line range:343-343==line range:408-408
+line range:350-351==line range:415-416
+line range:347-354==line range:412-419
+line range:353-354==line range:418-419
+line range:345-355==line range:410-420
+line range:359-366==line range:424-431
+line range:363-366==line range:428-431
+line range:357-367==line range:422-432
+line range:340-368==line range:405-433
+line range:346-355==line range:411-420
+line range:358-367==line range:423-432
+line range:341-368==line range:406-433
+public copySstablesFromTestData(table String, ksDir File, ks String) : void -> public copySstablesFromTestData(legacyVersion Version, tablePattern String, ksDir File, ks String) : void
+line range:666-666==line range:771-771
+line range:667-667==line range:772-772
+line range:673-673==line range:781-781
+line range:671-674==line range:776-782
+line range:669-675==line range:774-783
+line range:672-674==line range:777-782
+line range:670-675==line range:775-783
+public copyFile(cfDir File, file File) : void -> public copyFile(cfDir File, file File) : void
+line range:698-698==line range:801-801
+public testVerifyOldSSTables() : void -> public testVerifyOldSimpleSSTables() : void
+public copySstablesFromTestData(table String, ksDir File, ks String) : void -> public copySstablesFromTestData(legacyVersion Version, tablePattern String, ksDir File) : void