File size: 18,141 Bytes
fd1caa7 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 | [
{
"task_id": "java-diff-utils_java-diff-utils-java-diff-utils-parent-4.16__85c3199_96f7fbd__GenerateUnifiedDiffTest_543acd06",
"project_name": "java-diff-utils_java-diff-utils-java-diff-utils-parent-4.16",
"git_clone_url": "https://github.com/java-diff-utils/java-diff-utils.git",
"rev1": "85c31995703e1f855532ce7d8394784639e65352",
"rev2": "96f7fbdebda3c1227ab1f0135d24ce3a372efca8",
"rev1_date": "2020-08-04T05:27:41Z",
"rev2_date": "2020-08-04T05:35:09Z",
"git_diff_url": "https://github.com/java-diff-utils/java-diff-utils/compare/85c31995703e1f855532ce7d8394784639e65352...96f7fbdebda3c1227ab1f0135d24ce3a372efca8",
"test_file": "java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java",
"test_changes": [
{
"change_id": "1_java-diff-utils_java-diff-utils-java-diff-utils-parent-4.16_85c3199_96f7fbd_GenerateUnifiedDiffTest",
"test_sign": "com/github/difflib/GenerateUnifiedDiffTest.testNewFileCreation:()V",
"class": "GenerateUnifiedDiffTest",
"method": "testNewFileCreation",
"module": "java-diff-utils",
"junit_selector": "com.github.difflib.GenerateUnifiedDiffTest#testNewFileCreation",
"old_test_code": "@Test\npublic void testNewFileCreation() {\n List<String> original = new ArrayList<>();\n List<String> revised = new ArrayList<>();\n revised.add(\"line1\");\n revised.add(\"line2\");\n Patch<String> patch = DiffUtils.diff(original, revised);\n List<String> udiff = UnifiedDiffUtils.generateUnifiedDiff(null, \"revised\", original, patch, 10);\n assertEquals(\"--- \", udiff.get(0));\n assertEquals(\"+++ revised\", udiff.get(1));\n assertEquals(\"@@ -0,0 +1,2 @@\", udiff.get(2));\n UnifiedDiffUtils.parseUnifiedDiff(udiff);\n}",
"new_test_code": "@Test\npublic void testNewFileCreation() {\n List<String> original = new ArrayList<>();\n List<String> revised = new ArrayList<>();\n revised.add(\"line1\");\n revised.add(\"line2\");\n Patch<String> patch = DiffUtils.diff(original, revised);\n List<String> udiff = UnifiedDiffUtils.generateUnifiedDiff(null, \"revised\", original, patch, 10);\n assertEquals(\"--- /dev/null\", udiff.get(0));\n assertEquals(\"+++ revised\", udiff.get(1));\n assertEquals(\"@@ -0,0 +1,2 @@\", udiff.get(2));\n UnifiedDiffUtils.parseUnifiedDiff(udiff);\n}",
"old_test_file_path": [
"java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java"
],
"old_test_lnum": [
"113-130"
],
"new_test_lnum": [
"113-130"
],
"old_production_code": "public static List<String> generateUnifiedDiff(String originalFileName, String revisedFileName, List<String> originalLines, Patch<String> patch, int contextSize) {\n if (!patch.getDeltas().isEmpty()) {\n List<String> ret = new ArrayList<>();\n ret.add(\"--- \" + Optional.ofNullable(originalFileName).orElse(\"\"));\n ret.add(\"+++ \" + Optional.ofNullable(revisedFileName).orElse(\"\"));\n List<AbstractDelta<String>> patchDeltas = new ArrayList<>(patch.getDeltas());\n List<AbstractDelta<String>> deltas = new ArrayList<>();\n AbstractDelta<String> delta = patchDeltas.get(0);\n deltas.add(delta);\n if (patchDeltas.size() > 1) {\n for (int i = 1; i < patchDeltas.size(); i++) {\n int position = delta.getSource().getPosition();\n AbstractDelta<String> nextDelta = patchDeltas.get(i);\n if ((position + delta.getSource().size() + contextSize) >= (nextDelta.getSource().getPosition() - contextSize)) {\n deltas.add(nextDelta);\n } else {\n List<String> curBlock = processDeltas(originalLines, deltas, contextSize, false);\n ret.addAll(curBlock);\n deltas.clear();\n deltas.add(nextDelta);\n }\n delta = nextDelta;\n }\n }\n List<String> curBlock = processDeltas(originalLines, deltas, contextSize, patchDeltas.size() == 1 && originalFileName == null);\n ret.addAll(curBlock);\n return ret;\n }\n return new ArrayList<>();\n}",
"new_production_code": "public static List<String> generateUnifiedDiff(String originalFileName, String revisedFileName, List<String> originalLines, Patch<String> patch, int contextSize) {\n if (!patch.getDeltas().isEmpty()) {\n List<String> ret = new ArrayList<>();\n ret.add(\"--- \" + Optional.ofNullable(originalFileName).orElse(NULL_FILE_INDICATOR));\n ret.add(\"+++ \" + Optional.ofNullable(revisedFileName).orElse(NULL_FILE_INDICATOR));\n List<AbstractDelta<String>> patchDeltas = new ArrayList<>(patch.getDeltas());\n List<AbstractDelta<String>> deltas = new ArrayList<>();\n AbstractDelta<String> delta = patchDeltas.get(0);\n deltas.add(delta);\n if (patchDeltas.size() > 1) {\n for (int i = 1; i < patchDeltas.size(); i++) {\n int position = delta.getSource().getPosition();\n AbstractDelta<String> nextDelta = patchDeltas.get(i);\n if ((position + delta.getSource().size() + contextSize) >= (nextDelta.getSource().getPosition() - contextSize)) {\n deltas.add(nextDelta);\n } else {\n List<String> curBlock = processDeltas(originalLines, deltas, contextSize, false);\n ret.addAll(curBlock);\n deltas.clear();\n deltas.add(nextDelta);\n }\n delta = nextDelta;\n }\n }\n List<String> curBlock = processDeltas(originalLines, deltas, contextSize, patchDeltas.size() == 1 && originalFileName == null);\n ret.addAll(curBlock);\n return ret;\n }\n return new ArrayList<>();\n}",
"focal_file_path": "java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java",
"focal_method_sign": "com/github/difflib/UnifiedDiffUtils.generateUnifiedDiff:(Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Lcom/github/difflib/patch/Patch;I)Ljava/util/List",
"focal_all_deps_scored": [
{
"dep_id": 0,
"method_sign": "com/github/difflib/UnifiedDiffUtils.generateUnifiedDiff:(Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Lcom/github/difflib/patch/Patch;I)Ljava/util/List",
"file_path_old": "java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java",
"line_nums_old": "141-198",
"file_path_new": "java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java",
"line_nums_new": "142-199",
"dependency_updated": "updated",
"score": null,
"signal_scores": {}
}
],
"coverage_gold": 0.7407407407407407,
"branch_coverage_gold": 15.3689,
"method_coverage_gold": 16.0377,
"line_coverage_gold": 22.2323,
"is_traceback": false,
"commit_gap": {
"count": 1,
"skipped_commits": [
"d3524314eb9ca25e70b8ca1027f53367ab3892bb"
]
},
"test_is_refactoring_only": false,
"has_test_dep_change": false,
"all_deps_new": [
"com/github/difflib/UnifiedDiffUtils.parseUnifiedDiff:(Ljava/util/List;)Lcom/github/difflib/patch/Patch",
"com/github/difflib/DiffUtils.diff:(Ljava/util/List;Ljava/util/List;)Lcom/github/difflib/patch/Patch",
"com/github/difflib/UnifiedDiffUtils.generateUnifiedDiff:(Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Lcom/github/difflib/patch/Patch;I)Ljava/util/List"
],
"all_deps_old": [
"com/github/difflib/UnifiedDiffUtils.parseUnifiedDiff:(Ljava/util/List;)Lcom/github/difflib/patch/Patch",
"com/github/difflib/DiffUtils.diff:(Ljava/util/List;Ljava/util/List;)Lcom/github/difflib/patch/Patch",
"com/github/difflib/UnifiedDiffUtils.generateUnifiedDiff:(Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Lcom/github/difflib/patch/Patch;I)Ljava/util/List"
],
"deps_changes": [
{
"method_sign": "com/github/difflib/UnifiedDiffUtils.generateUnifiedDiff:(Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Lcom/github/difflib/patch/Patch;I)Ljava/util/List",
"change_type": "UPDATE",
"file_path_old": "java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java",
"file_path_new": "java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java",
"source": "production",
"is_test_dependency": false,
"is_refactoring_only": false
}
],
"variant_result": {
"old_on_old": "pass",
"old_on_new": "fail",
"new_on_old": "fail",
"new_on_new": "pass"
}
}
],
"version": "java-diff-utils-parent-4.16",
"java_version": 8
},
{
"task_id": "java-diff-utils_java-diff-utils-java-diff-utils-parent-4.16__923918a_ae23408__GenerateUnifiedDiffTest_543acd06",
"project_name": "java-diff-utils_java-diff-utils-java-diff-utils-parent-4.16",
"git_clone_url": "https://github.com/java-diff-utils/java-diff-utils.git",
"rev1": "923918a53e3d1324503665586730895e4d9a1434",
"rev2": "ae2340874806dfec3f8c7ac3637448362d675500",
"rev1_date": "2020-02-23T22:16:39Z",
"rev2_date": "2020-02-23T22:51:28Z",
"git_diff_url": "https://github.com/java-diff-utils/java-diff-utils/compare/923918a53e3d1324503665586730895e4d9a1434...ae2340874806dfec3f8c7ac3637448362d675500",
"test_file": "java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java",
"test_changes": [
{
"change_id": "4_java-diff-utils_java-diff-utils-java-diff-utils-parent-4.16_923918a_ae23408_GenerateUnifiedDiffTest",
"test_sign": "com/github/difflib/GenerateUnifiedDiffTest.testNewFileCreation:()V",
"class": "GenerateUnifiedDiffTest",
"method": "testNewFileCreation",
"module": "java-diff-utils",
"junit_selector": "com.github.difflib.GenerateUnifiedDiffTest#testNewFileCreation",
"old_test_code": "@Test\npublic void testNewFileCreation() throws DiffException {\n List<String> original = new ArrayList<>();\n List<String> revised = new ArrayList<>();\n revised.add(\"line1\");\n revised.add(\"line2\");\n Patch<String> patch = DiffUtils.diff(original, revised);\n List<String> udiff = UnifiedDiffUtils.generateUnifiedDiff(null, \"revised\", original, patch, 10);\n assertEquals(\"--- null\", udiff.get(0));\n assertEquals(\"+++ revised\", udiff.get(1));\n assertEquals(\"@@ -0,0 +1,2 @@\", udiff.get(2));\n UnifiedDiffUtils.parseUnifiedDiff(udiff);\n}",
"new_test_code": "@Test\npublic void testNewFileCreation() throws DiffException {\n List<String> original = new ArrayList<>();\n List<String> revised = new ArrayList<>();\n revised.add(\"line1\");\n revised.add(\"line2\");\n Patch<String> patch = DiffUtils.diff(original, revised);\n List<String> udiff = UnifiedDiffUtils.generateUnifiedDiff(null, \"revised\", original, patch, 10);\n assertEquals(\"--- \", udiff.get(0));\n assertEquals(\"+++ revised\", udiff.get(1));\n assertEquals(\"@@ -0,0 +1,2 @@\", udiff.get(2));\n UnifiedDiffUtils.parseUnifiedDiff(udiff);\n}",
"old_test_file_path": [
"java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java"
],
"old_test_lnum": [
"111-128"
],
"new_test_lnum": [
"111-128"
],
"old_production_code": "public static List<String> generateUnifiedDiff(String originalFileName, String revisedFileName, List<String> originalLines, Patch<String> patch, int contextSize) {\n if (!patch.getDeltas().isEmpty()) {\n List<String> ret = new ArrayList<>();\n ret.add(\"--- \" + originalFileName);\n ret.add(\"+++ \" + revisedFileName);\n List<AbstractDelta<String>> patchDeltas = new ArrayList<>(patch.getDeltas());\n List<AbstractDelta<String>> deltas = new ArrayList<>();\n AbstractDelta<String> delta = patchDeltas.get(0);\n deltas.add(delta);\n if (patchDeltas.size() > 1) {\n for (int i = 1; i < patchDeltas.size(); i++) {\n int position = delta.getSource().getPosition();\n AbstractDelta<String> nextDelta = patchDeltas.get(i);\n if ((position + delta.getSource().size() + contextSize) >= (nextDelta.getSource().getPosition() - contextSize)) {\n deltas.add(nextDelta);\n } else {\n List<String> curBlock = processDeltas(originalLines, deltas, contextSize, false);\n ret.addAll(curBlock);\n deltas.clear();\n deltas.add(nextDelta);\n }\n delta = nextDelta;\n }\n }\n List<String> curBlock = processDeltas(originalLines, deltas, contextSize, patchDeltas.size() == 1 && originalFileName == null);\n ret.addAll(curBlock);\n return ret;\n }\n return new ArrayList<>();\n}",
"new_production_code": "public static List<String> generateUnifiedDiff(String originalFileName, String revisedFileName, List<String> originalLines, Patch<String> patch, int contextSize) {\n if (!patch.getDeltas().isEmpty()) {\n List<String> ret = new ArrayList<>();\n ret.add(\"--- \" + Optional.ofNullable(originalFileName).orElse(\"\"));\n ret.add(\"+++ \" + Optional.ofNullable(revisedFileName).orElse(\"\"));\n List<AbstractDelta<String>> patchDeltas = new ArrayList<>(patch.getDeltas());\n List<AbstractDelta<String>> deltas = new ArrayList<>();\n AbstractDelta<String> delta = patchDeltas.get(0);\n deltas.add(delta);\n if (patchDeltas.size() > 1) {\n for (int i = 1; i < patchDeltas.size(); i++) {\n int position = delta.getSource().getPosition();\n AbstractDelta<String> nextDelta = patchDeltas.get(i);\n if ((position + delta.getSource().size() + contextSize) >= (nextDelta.getSource().getPosition() - contextSize)) {\n deltas.add(nextDelta);\n } else {\n List<String> curBlock = processDeltas(originalLines, deltas, contextSize, false);\n ret.addAll(curBlock);\n deltas.clear();\n deltas.add(nextDelta);\n }\n delta = nextDelta;\n }\n }\n List<String> curBlock = processDeltas(originalLines, deltas, contextSize, patchDeltas.size() == 1 && originalFileName == null);\n ret.addAll(curBlock);\n return ret;\n }\n return new ArrayList<>();\n}",
"focal_file_path": "java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java",
"focal_method_sign": "com/github/difflib/UnifiedDiffUtils.generateUnifiedDiff:(Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Lcom/github/difflib/patch/Patch;I)Ljava/util/List",
"focal_all_deps_scored": [
{
"dep_id": 0,
"method_sign": "com/github/difflib/UnifiedDiffUtils.generateUnifiedDiff:(Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Lcom/github/difflib/patch/Patch;I)Ljava/util/List",
"file_path_old": "java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java",
"line_nums_old": "128-185",
"file_path_new": "java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java",
"line_nums_new": "129-186",
"dependency_updated": "updated",
"score": null,
"signal_scores": {}
}
],
"coverage_gold": 0.7407407407407407,
"branch_coverage_gold": 15.7778,
"method_coverage_gold": 16.2304,
"line_coverage_gold": 21.8447,
"is_traceback": false,
"commit_gap": {
"count": 0,
"skipped_commits": []
},
"test_is_refactoring_only": false,
"has_test_dep_change": false,
"all_deps_new": [
"com/github/difflib/DiffUtils.diff:(Ljava/util/List;Ljava/util/List;)Lcom/github/difflib/patch/Patch",
"com/github/difflib/UnifiedDiffUtils.parseUnifiedDiff:(Ljava/util/List;)Lcom/github/difflib/patch/Patch",
"com/github/difflib/UnifiedDiffUtils.generateUnifiedDiff:(Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Lcom/github/difflib/patch/Patch;I)Ljava/util/List"
],
"all_deps_old": [
"com/github/difflib/DiffUtils.diff:(Ljava/util/List;Ljava/util/List;)Lcom/github/difflib/patch/Patch",
"com/github/difflib/UnifiedDiffUtils.parseUnifiedDiff:(Ljava/util/List;)Lcom/github/difflib/patch/Patch",
"com/github/difflib/UnifiedDiffUtils.generateUnifiedDiff:(Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Lcom/github/difflib/patch/Patch;I)Ljava/util/List"
],
"deps_changes": [
{
"method_sign": "com/github/difflib/UnifiedDiffUtils.generateUnifiedDiff:(Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Lcom/github/difflib/patch/Patch;I)Ljava/util/List",
"change_type": "UPDATE",
"file_path_old": "java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java",
"file_path_new": "java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java",
"source": "production",
"is_test_dependency": false,
"is_refactoring_only": false
}
],
"variant_result": {
"old_on_old": "pass",
"old_on_new": "fail",
"new_on_old": "fail",
"new_on_new": "pass"
}
}
],
"version": "java-diff-utils-parent-4.16",
"java_version": 8
}
] |