Update blame test files after RMiner improvements in nested Extract M…

…ethod
jodavimehran · Nov 19, 2024 · 2de7b96 · 2de7b96
1 parent 65b8a45
commit 2de7b96
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/src/main/java/org/codetracker/MethodTrackerChangeHistory.java b/src/main/java/org/codetracker/MethodTrackerChangeHistory.java
@@ -837,6 +837,18 @@ public boolean isMethodAdded(UMLModelDiff modelDiff, String className, Version c
             if (handleAddOperation(currentVersion, parentVersion, equalOperator, operation, "new method"))
                 return true;
         }
+        for (UMLClassBaseDiff classDiff : allClassesDiff) {
+        	for (Refactoring r : classDiff.getRefactoringsBeforePostProcessing()) {
+        		if (r instanceof ExtractOperationRefactoring) {
+        			ExtractOperationRefactoring extract = (ExtractOperationRefactoring)r;
+        			if (extract.getBodyMapper().isNested() && extract.getBodyMapper().getParentMapper() != null) {
+        				VariableDeclarationContainer container = extract.getBodyMapper().getParentMapper().getContainer2();
+        				if (handleAddOperation(currentVersion, parentVersion, equalOperator, container, "new method"))
+        	                return true;
+        			}
+        		}
+        	}
+        }
 
         UMLClass addedClass = modelDiff.getAddedClass(className);
         if (addedClass != null) {

diff --git a/src/test/resources/blame/blameTestWithLocalRepo7.txt b/src/test/resources/blame/blameTestWithLocalRepo7.txt
@@ -336,7 +336,7 @@ bdc9ef8db junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor
 180df5a92 junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassTestDescriptor.java (Sam Brannen     2018-07-03 12:05:21 +0000 336) 	private Object invokeTestClassConstructor(Optional<Object> outerInstance, ExtensionRegistry registry,
 5b4c642be junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassTestDescriptor.java (Kevin Wooten    2018-06-30 14:27:13 +0000 337) 			ExtensionContext extensionContext) {
                                                                                                                                                      338)
-5b4c642be junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassTestDescriptor.java (Kevin Wooten    2018-06-30 14:27:13 +0000 339) 		Constructor<?> constructor = ReflectionUtils.getDeclaredConstructor(this.testClass);
+902d36a3e junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassTestDescriptor.java (Marc Philipp    2017-06-30 16:16:42 +0000 339) 		Constructor<?> constructor = ReflectionUtils.getDeclaredConstructor(this.testClass);
 180df5a92 junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassTestDescriptor.java (Sam Brannen     2018-07-03 12:05:21 +0000 340) 		return outerInstance.isPresent() //
 180df5a92 junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassTestDescriptor.java (Sam Brannen     2018-07-03 12:05:21 +0000 341) 				? executableInvoker.invoke(constructor, outerInstance.get(), extensionContext, registry) //
 180df5a92 junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassTestDescriptor.java (Sam Brannen     2018-07-03 12:05:21 +0000 342) 				: executableInvoker.invoke(constructor, extensionContext, registry);

diff --git a/src/test/resources/blame/blameTestWithLocalRepo8.txt b/src/test/resources/blame/blameTestWithLocalRepo8.txt
@@ -1322,16 +1322,16 @@ a1e8d7cb0 annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java    (
 a1e8d7cb0 annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java    (Sharath Reddy     2009-10-28 10:57:21 +0000 1322) 	private static void bindFilters(XAnnotatedElement annotatedElement, EntityBinder entityBinder) {
                                                                                                                             1323)
 a1e8d7cb0 annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java    (Sharath Reddy     2009-10-28 10:57:21 +0000 1324) 		Filters filtersAnn = annotatedElement.getAnnotation( Filters.class );
-a1e8d7cb0 annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java    (Sharath Reddy     2009-10-28 10:57:21 +0000 1325) 		if ( filtersAnn != null ) {
-a1e8d7cb0 annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java    (Sharath Reddy     2009-10-28 10:57:21 +0000 1326) 			for ( Filter filter : filtersAnn.value() ) {
+7337743c9 annotations/src/java/org/hibernate/cfg/AnnotationBinder.java         (Steve Ebersole    2008-10-28 18:41:10 +0000 1325) 		if ( filtersAnn != null ) {
+7337743c9 annotations/src/java/org/hibernate/cfg/AnnotationBinder.java         (Steve Ebersole    2008-10-28 18:41:10 +0000 1326) 			for ( Filter filter : filtersAnn.value() ) {
 05dcc209a hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java (Rob Worsnop       2012-07-12 14:58:11 +0000 1327) 				entityBinder.addFilter(filter);
-a1e8d7cb0 annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java    (Sharath Reddy     2009-10-28 10:57:21 +0000 1328) 			}
-a1e8d7cb0 annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java    (Sharath Reddy     2009-10-28 10:57:21 +0000 1329) 		}
+7337743c9 annotations/src/java/org/hibernate/cfg/AnnotationBinder.java         (Steve Ebersole    2008-10-28 18:41:10 +0000 1328) 			}
+7337743c9 annotations/src/java/org/hibernate/cfg/AnnotationBinder.java         (Steve Ebersole    2008-10-28 18:41:10 +0000 1329) 		}
                                                                                                                             1330)
 a1e8d7cb0 annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java    (Sharath Reddy     2009-10-28 10:57:21 +0000 1331) 		Filter filterAnn = annotatedElement.getAnnotation( Filter.class );
-a1e8d7cb0 annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java    (Sharath Reddy     2009-10-28 10:57:21 +0000 1332) 		if ( filterAnn != null ) {
+7337743c9 annotations/src/java/org/hibernate/cfg/AnnotationBinder.java         (Steve Ebersole    2008-10-28 18:41:10 +0000 1332) 		if ( filterAnn != null ) {
 05dcc209a hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java (Rob Worsnop       2012-07-12 14:58:11 +0000 1333) 			entityBinder.addFilter(filterAnn);
-a1e8d7cb0 annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java    (Sharath Reddy     2009-10-28 10:57:21 +0000 1334) 		}
+7337743c9 annotations/src/java/org/hibernate/cfg/AnnotationBinder.java         (Steve Ebersole    2008-10-28 18:41:10 +0000 1334) 		}
 a1e8d7cb0 annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java    (Sharath Reddy     2009-10-28 10:57:21 +0000 1335) 	}
                                                                                                                             1336)
 9caca0ce3 hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java (Steve Ebersole    2015-03-10 21:53:51 +0000 1337) 	private static void bindFilterDefs(XAnnotatedElement annotatedElement, MetadataBuildingContext context) {