Add new comment mapping tests

Author: tsantalis

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

@@ -74,7 +74,7 @@ public UMLCommentListDiff modifiedMatchingText(UMLCommentGroup other) {
 		}
 		else if(this.group.size() != other.group.size() && this.group.size() > 0) {
 			UMLCommentListDiff diff = new UMLCommentListDiff(this, other);
-			if(diff.isManyToManyReformat() && diff.getDeletedComments().isEmpty() && diff.getAddedComments().isEmpty()) {
+			if(diff.isManyToManyReformatWithIdenticalText() && diff.getDeletedComments().isEmpty() && diff.getAddedComments().isEmpty()) {
 				return diff;
 			}
 		}

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

@@ -23,6 +23,7 @@ public class UMLCommentListDiff {
 	private List<UMLComment> deletedComments;
 	private List<UMLComment> addedComments;
 	private boolean manyToManyReformat;
+	private boolean manyToManyReformatWithIdenticalText;
 	private Set<AbstractCodeMapping> mappings;
 	private UMLOperationBodyMapper operationBodyMapper;
 	private UMLAbstractClassDiff classDiff;
@@ -582,6 +583,7 @@ private void processModifiedComments(UMLCommentGroup groupBefore, UMLCommentGrou
 			}
 			if(deletedComments.size() >= 1 && addedComments.size() >= 1) {
 				manyToManyReformat = true;
+				manyToManyReformatWithIdenticalText = true;
 			}
 		}
 		else {
@@ -863,4 +865,8 @@ public List<UMLComment> getAddedComments() {
 	public boolean isManyToManyReformat() {
 		return manyToManyReformat;
 	}
+
+	public boolean isManyToManyReformatWithIdenticalText() {
+		return manyToManyReformatWithIdenticalText;
+	}
 }

src/test/java/org/refactoringminer/test/TestJavadocDiff.java

@@ -4,11 +4,13 @@
 import java.io.FileReader;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.junit.jupiter.api.Assertions;
@@ -26,6 +28,7 @@
 import gr.uom.java.xmi.diff.ExtractOperationRefactoring;
 import gr.uom.java.xmi.diff.InlineOperationRefactoring;
 import gr.uom.java.xmi.diff.UMLClassDiff;
+import gr.uom.java.xmi.diff.UMLModelDiff;
 
 public class TestJavadocDiff {
 	private static final String REPOS = System.getProperty("user.dir") + "/src/test/resources/oracle/commits";
@@ -118,6 +121,34 @@ public void testMethodCommentMappings(String url, String commitId, String classN
 		Assertions.assertTrue(expected.size() == actual.size() && expected.containsAll(actual) && actual.containsAll(expected));
 	}
 
+	@ParameterizedTest
+	@CsvSource({
+		"GroupTreeViewModel-v1.txt, GroupTreeViewModel-v2.txt, jabgui/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java, jabRef-GroupTreeViewModel-716.txt",
+		"GroupNodeViewModel-v1.txt, GroupNodeViewModel-v2.txt, jabgui/src/main/java/org/jabref/gui/groups/GroupNodeViewModel.java, jabRef-GroupNodeViewModel-716.txt",
+		"NewEntryAction-v1.txt, NewEntryAction-v2.txt, jabgui/src/main/java/org/jabref/gui/importer/NewEntryAction.java, jabRef-NewEntryAction-716.txt"
+	})
+	public void testMethodCommentMappings(String filePath1, String filePath2, String qualifiedName, String testResultFileName) throws Exception {
+		final List<String> actual = new ArrayList<>();
+		Map<String, String> fileContentsBefore = new LinkedHashMap<String, String>();
+		Map<String, String> fileContentsCurrent = new LinkedHashMap<String, String>();
+		String contentsV1 = FileUtils.readFileToString(new File(EXPECTED_PATH + filePath1));
+		String contentsV2 = FileUtils.readFileToString(new File(EXPECTED_PATH + filePath2));
+		fileContentsBefore.put(qualifiedName, contentsV1);
+		fileContentsCurrent.put(qualifiedName, contentsV2);
+		UMLModel parentUMLModel = GitHistoryRefactoringMinerImpl.createModel(fileContentsBefore, new LinkedHashSet<String>());
+		UMLModel currentUMLModel = GitHistoryRefactoringMinerImpl.createModel(fileContentsCurrent, new LinkedHashSet<String>());
+
+		UMLModelDiff modelDiff = parentUMLModel.diff(currentUMLModel);
+		List<UMLClassDiff> commonClassDiff = modelDiff.getCommonClassDiffList();
+		for(UMLClassDiff classDiff : commonClassDiff) {
+			for(UMLOperationBodyMapper mapper : classDiff.getOperationBodyMapperList()) {
+				commentInfo(mapper, actual);
+			}
+		}
+		List<String> expected = IOUtils.readLines(new FileReader(EXPECTED_PATH + testResultFileName));
+		Assertions.assertTrue(expected.size() == actual.size() && expected.containsAll(actual) && actual.containsAll(expected));
+	}
+
 	@ParameterizedTest
 	@CsvSource({
 		"https://github.com/jOOQ/jOOQ.git, 58a4e74d28073e7c6f15d1f225ac1c2fd9aa4357, org.jooq.tools.Convert.ConvertAll, jOOQ-58a4e74d28073e7c6f15d1f225ac1c2fd9aa4357-comments.txt",