Update oracle with new Extract Variable refactorings

tsantalis · Dec 20, 2024 · ef695cd · ef695cd
1 parent 9242aae
commit ef695cd
Show file tree

Hide file tree

Showing 4 changed files with 92 additions and 29 deletions.
diff --git a/src/main/java/gr/uom/java/xmi/decomposition/AbstractCodeMapping.java b/src/main/java/gr/uom/java/xmi/decomposition/AbstractCodeMapping.java
@@ -707,8 +707,8 @@ else if(stringConcatMatch(initializer, before)) {
 					}
 				}
 			}
-			if(!fragment1.getString().equals(fragment2.getString()) && initializer != null && fragment1.getVariableDeclaration(variableName) == null) {
-				if(getFragment1().getString().contains(initializer.getString()) && getFragment2().getString().contains(variableName) &&
+			if(!fragment1.getString().equals(fragment2.getString()) && initializer != null && fragment1.getVariableDeclaration(variableName) == null && !isDefaultValue(initializer.toString())) {
+				if(getFragment1().getString().contains(initializer.getString()) && getFragment2().findExpression(variableName).size() > 0 &&
 						!getFragment2().getString().equals(JAVA.RETURN_SPACE + variableName + JAVA.STATEMENT_TERMINATION)) {
 					boolean mappingFound = false;
 					for(AbstractCodeMapping m : currentMappings) {

diff --git a/src/test/java/org/refactoringminer/test/TestAllRefactorings.java b/src/test/java/org/refactoringminer/test/TestAllRefactorings.java
@@ -17,6 +17,6 @@ public void testAllRefactorings() throws Exception {
 		GitHistoryRefactoringMinerImpl detector = new GitHistoryRefactoringMinerImpl();
 		TestBuilder test = new TestBuilder(detector, REPOS, Refactorings.All.getValue());
 		RefactoringPopulator.feedRefactoringsInstances(Refactorings.All.getValue(), Systems.FSE.getValue(), test);
-		test.assertExpectationsWithGitHubAPI(12369, 20, 232);
+		test.assertExpectationsWithGitHubAPI(12378, 20, 232);
 	}
 }
diff --git a/src/test/resources/oracle/data.json b/src/test/resources/oracle/data.json
@@ -14444,6 +14444,13 @@
         "validation": "TP",
         "detectionTools": "RefactoringMiner",
         "validators": null
+    }, {
+        "type": "Extract Variable",
+        "description": "Extract Variable paramNode : TypeDeclarationNode in method public convertTypeNodeAST(n Node) : TypeDeclarationNode from class com.google.javascript.jscomp.parsing.TypeDeclarationsIRFactory",
+        "comment": null,
+        "validation": "TP",
+        "detectionTools": "RefactoringMiner",
+        "validators": null
     }],
     "refDiffExecutionTime": 3462
 }, {
@@ -20938,27 +20945,6 @@
         "validation": "TP",
         "detectionTools": "RefactoringMiner, GumTreeDiff",
         "validators": null
-    }, {
-        "type": "Rename Variable",
-        "description": "Rename Variable columnsArray : String[] to pKeys : String[] in method public forModelFindById(table Table, columns String) : String from class com.jfinal.plugin.activerecord.dialect.AnsiSqlDialect",
-        "comment": null,
-        "validation": "TP",
-        "detectionTools": "RefactoringMiner",
-        "validators": null
-    }, {
-        "type": "Rename Variable",
-        "description": "Rename Variable columnsArray : String[] to pKeys : String[] in method public forModelFindById(table Table, columns String) : String from class com.jfinal.plugin.activerecord.dialect.OracleDialect",
-        "comment": null,
-        "validation": "TP",
-        "detectionTools": "RefactoringMiner",
-        "validators": null
-    }, {
-        "type": "Rename Variable",
-        "description": "Rename Variable columnsArray : String[] to pKeys : String[] in method public forModelFindById(table Table, columns String) : String from class com.jfinal.plugin.activerecord.dialect.Sqlite3Dialect",
-        "comment": null,
-        "validation": "TP",
-        "detectionTools": "RefactoringMiner",
-        "validators": null
     }, {
         "type": "Rename Variable",
         "description": "Rename Variable pKey : String to pKeys : String[] in method public forModelSave(table Table, attrs Map<String,Object>, sql StringBuilder, paras List<Object>) : void from class com.jfinal.plugin.activerecord.dialect.OracleDialect",
@@ -22849,6 +22835,48 @@
         "validation": "TP",
         "detectionTools": "RefactoringMiner",
         "validators": null
+    }, {
+        "type": "Extract Variable",
+        "description": "Extract Variable pKeys : String[] in method public forModelFindById(table Table, columns String) : String from class com.jfinal.plugin.activerecord.dialect.OracleDialect",
+        "comment": null,
+        "validation": "TP",
+        "detectionTools": "RefactoringMiner",
+        "validators": null
+    }, {
+        "type": "Extract Variable",
+        "description": "Extract Variable pKeys : String[] in method public forModelFindById(table Table, columns String) : String from class com.jfinal.plugin.activerecord.dialect.MysqlDialect",
+        "comment": null,
+        "validation": "TP",
+        "detectionTools": "RefactoringMiner",
+        "validators": null
+    }, {
+        "type": "Extract Variable",
+        "description": "Extract Variable pKeys : String[] in method public forModelFindById(table Table, columns String) : String from class com.jfinal.plugin.activerecord.dialect.AnsiSqlDialect",
+        "comment": null,
+        "validation": "TP",
+        "detectionTools": "RefactoringMiner",
+        "validators": null
+    }, {
+        "type": "Extract Variable",
+        "description": "Extract Variable pKeys : String[] in method public forModelFindById(table Table, columns String) : String from class com.jfinal.plugin.activerecord.dialect.Sqlite3Dialect",
+        "comment": null,
+        "validation": "TP",
+        "detectionTools": "RefactoringMiner",
+        "validators": null
+    }, {
+        "type": "Extract Variable",
+        "description": "Extract Variable msg : String in method private buildMsg(actionKey String, controllerClass Class<? extends Controller>, method Method) : String from class com.jfinal.core.ActionMapping",
+        "comment": null,
+        "validation": "TP",
+        "detectionTools": "RefactoringMiner",
+        "validators": null
+    }, {
+        "type": "Extract Variable",
+        "description": "Extract Variable pKeys : String[] in method public forModelFindById(table Table, columns String) : String from class com.jfinal.plugin.activerecord.dialect.PostgreSqlDialect",
+        "comment": null,
+        "validation": "TP",
+        "detectionTools": "RefactoringMiner",
+        "validators": null
     }],
     "refDiffExecutionTime": 1822
 }, {
@@ -34561,6 +34589,20 @@
         "validation": "TP",
         "detectionTools": "RefactoringMiner",
         "validators": null
+    }, {
+        "type": "Extract Variable",
+        "description": "Extract Variable instPos : long in method protected initOpen() : void from class org.mapdb.StoreAppend",
+        "comment": null,
+        "validation": "TP",
+        "detectionTools": "RefactoringMiner",
+        "validators": null
+    }, {
+        "type": "Extract Variable",
+        "description": "Extract Variable origOffset : long in method private insertOrUpdate(recid long, out DataIO.DataOutputByteArray, isInsert boolean) : void from class org.mapdb.StoreAppend",
+        "comment": null,
+        "validation": "TP",
+        "detectionTools": "RefactoringMiner",
+        "validators": null
     }],
     "refDiffExecutionTime": 1520
 }, {
@@ -61766,6 +61808,20 @@
         "validation": "TP",
         "detectionTools": "RefactoringMiner",
         "validators": null
+    }, {
+        "type": "Extract Variable",
+        "description": "Extract Variable emptyStrings : Iterable<String> in method public iterableIsOrderedWithComparator() : void from class com.google.common.truth.IterableTest",
+        "comment": null,
+        "validation": "TP",
+        "detectionTools": "RefactoringMiner",
+        "validators": null
+    }, {
+        "type": "Extract Variable",
+        "description": "Extract Variable emptyStrings : Iterable<String> in method public iterableIsStrictlyOrderedWithComparator() : void from class com.google.common.truth.IterableTest",
+        "comment": null,
+        "validation": "TP",
+        "detectionTools": "RefactoringMiner",
+        "validators": null
     }],
     "refDiffExecutionTime": 301
 }, {
@@ -107878,6 +107934,13 @@
         "validation": "TP",
         "detectionTools": "RefactoringMiner",
         "validators": null
+    }, {
+        "type": "Extract Variable",
+        "description": "Extract Variable defaultModuleComponentArtifactMetaData : DefaultModuleComponentArtifactMetaData in method private getMetaDataArtifactFor(moduleComponentIdentifier ModuleComponentIdentifier) : ModuleDescriptorArtifactMetaData from class org.gradle.api.internal.artifacts.repositories.resolver.ExternalResourceResolver",
+        "comment": null,
+        "validation": "TP",
+        "detectionTools": "RefactoringMiner",
+        "validators": null
     }],
     "refDiffExecutionTime": 3736
 }, {

diff --git a/src/test/resources/oracle/expected.txt b/src/test/resources/oracle/expected.txt
@@ -19,7 +19,7 @@ f166866cd68efa963534c5bc7fc9ca38e4aa2838, 1, 0, 0
 f841d8dda2bf461f595755f85c3eba786783702d, 9, 0, 0
 4b762c2c70f06b0c5d2cd85866424c46478c827b, 16, 0, 0
 681dc6346ce3cf5be5c5985faad120a18949cee0, 1, 0, 0
-c41466b6fd11ef4edc40cb9fd42dc13cf4f6fde1, 4, 0, 0
+c41466b6fd11ef4edc40cb9fd42dc13cf4f6fde1, 5, 0, 0
 79c66ceab11dae0b9fd1dade7bb4120028738705, 3, 0, 0
 ba1da95200d080aef6251f13ced0ca67dff282be, 2, 0, 0
 f394599bf1423be0be2d5822ed7f1271d2841225, 2, 0, 0
@@ -118,7 +118,7 @@ d0e374ce8ecb687b4dc046d1edea9e52da17706f, 11, 0, 0
 e0dda9f61b7c409944c4734edf75b108e0288f59, 4, 0, 0
 200f1577d238a6d3fbcf99cb2a2585b2071214a6, 9, 0, 0
 22fb2c9c6974bd1fe0f6ff684f52e6cfbed1a387, 16, 0, 0
-1768840bf1e69892fd2a23776817f620edfed536, 17, 0, 0
+1768840bf1e69892fd2a23776817f620edfed536, 19, 0, 0
 a9ca2efae56815dc464189b055ffe9da23766f7f, 3, 0, 0
 1bc7905b07821f840068089343e6b77a8686d1ab, 4, 0, 0
 b395127e733b33c27f344695ebf155ecf5edeeab, 35, 0, 0
@@ -203,7 +203,7 @@ c4a37e38aba926c2bef27e4fc00e3a4848ce46bd, 6, 0, 0
 ca7d0c3b33a0863bed04c77932b9ef6b1317f34e, 1, 0, 0
 a70ca1d9ad2ea07b19c5e1f9540c809d7a12d3fb, 6, 0, 0
 d31fa31cdcc5ea2fa96116e3b1265baa180df58a, 111, 1, 3
-32dd05fc13b53873bf18c589622b55d12e3883c7, 13, 0, 0
+32dd05fc13b53873bf18c589622b55d12e3883c7, 15, 0, 0
 c265bde2ace252bc1e1c65c6af93520e5994edd2, 1, 0, 0
 40f00732b9652350ac11830367fd32db67987fc7, 17, 0, 0
 8184a32a019b2ed956e8f24c18cb49a266af47bf, 17, 0, 0
@@ -277,7 +277,7 @@ ed966510ccf8441115614e2258aea61df0ea55f5, 7, 0, 0
 0ba343846f21649e29ffc600f30a7f3e463fb24c, 15, 0, 0
 b0938501f1014cf663e33b44ed5bb9b24d19a358, 4, 0, 0
 b7cba6a700d8c5e456cdeffe9c5bf54563eab7d3, 2, 0, 0
-881baed894540031bd55e402933bcad28b74ca88, 263, 0, 13
+881baed894540031bd55e402933bcad28b74ca88, 266, 0, 13
 ab1d1dd78fe53edb50c4ede447e4ac5a55ee2ac9, 1, 0, 0
 14a7dd79148f9306dcd2f748b56fd6550e9406ab, 4, 0, 0
 5e08a9e8e93a2f117b5fbec9c6d54500d8e99a4d, 1, 0, 0
@@ -357,7 +357,7 @@ d69e5cb21c04d9eede314aaa9ad059fc603fb025, 4, 0, 1
 5f78f9ef1e6c798849d34cc66721e6c1d9709b6f, 2, 0, 0
 240097b78b70172e1cf9bc37876a566ddfb9e115, 2, 0, 0
 0fa45e4a562fc2586b1ef06a88e9c186a0835316, 17, 0, 2
-ea96643364e91125f560e9508a5cbcdb776bde64, 29, 0, 0
+ea96643364e91125f560e9508a5cbcdb776bde64, 30, 0, 0
 ba5e6d44526a2491a7004423ca2ad780c6992c46, 3, 0, 0
 b9a17665b158955ad28ef7f50cc0a8585460f053, 6, 0, 0
 3815f293ba9338f423315d93a373608c95002b15, 135, 0, 3