Fix failing tests

jodavimehran · May 5, 2024 · f6683dd · f6683dd
1 parent 3fe07a9
commit f6683dd
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/src/main/java/org/codetracker/BlockTrackerChangeHistory.java b/src/main/java/org/codetracker/BlockTrackerChangeHistory.java
@@ -153,13 +153,17 @@ public boolean checkForExtractionOrInline(ArrayDeque<Block> blocks, Version curr
                         Block blockBefore = Block.of(rightBlock.getComposite(), rightBlock.getOperation(), parentVersion);
                         if (matchedBlockFromSourceMethod == null) {
                             blockChangeHistory.handleAdd(blockBefore, rightBlock, extractOperationRefactoring.toString());
-                            blocks.add(blockBefore);
+                            if(extractMatches == 0) {
+                            	blocks.add(blockBefore);
+                            }
                         }
                         else {
                             VariableDeclarationContainer sourceOperation = extractOperationRefactoring.getSourceOperationBeforeExtraction();
                             Method sourceMethod = Method.of(sourceOperation, parentVersion);
                             Block leftBlock = Block.of(matchedBlockFromSourceMethod, sourceMethod);
-                            blocks.add(leftBlock);
+                            if(extractMatches == 0) {
+                            	blocks.add(leftBlock);
+                            }
                         }
                         blockChangeHistory.connectRelatedNodes();
                         extractMatches++;
@@ -544,7 +548,9 @@ else if (tryBefore.getFinallyClause() != null && tryAfter.getFinallyClause() ==
                     if (!bodyChange && !catchOrFinallyChange) {
                         blockChangeHistory.addChange(blockBefore, blockAfter, ChangeFactory.of(AbstractChange.Type.NO_CHANGE));
                     }
-                    blocks.add(blockBefore);
+                    if(matches == 0) {
+                    	blocks.add(blockBefore);
+                    }
                     blockChangeHistory.connectRelatedNodes();
                     matches++;
                 }
@@ -559,7 +565,9 @@ else if (mapping instanceof LeafMapping && mapping.getFragment2() instanceof Sta
                     else {
                         blockChangeHistory.addChange(blockBefore, blockAfter, ChangeFactory.of(AbstractChange.Type.NO_CHANGE));
                     }
-                    blocks.add(blockBefore);
+                    if(matches == 0) {
+                    	blocks.add(blockBefore);
+                    }
                     blockChangeHistory.connectRelatedNodes();
                     matches++;
                 }