From 26090868f8306532b0b2a79b53ced7111e4e1092 Mon Sep 17 00:00:00 2001 From: tsantalis Date: Sat, 12 Oct 2024 22:16:17 -0400 Subject: [PATCH] Restore last two failing tests. Closute-148 is pending --- .../xmi/diff/ExtractOperationDetection.java | 2 +- ...a7bd1fd1a83b3b8d1b245e32f78c0b4443b7a7.txt | 20 ------------------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/src/main/java/gr/uom/java/xmi/diff/ExtractOperationDetection.java b/src/main/java/gr/uom/java/xmi/diff/ExtractOperationDetection.java index 7a53d7398..f9fd3cefe 100644 --- a/src/main/java/gr/uom/java/xmi/diff/ExtractOperationDetection.java +++ b/src/main/java/gr/uom/java/xmi/diff/ExtractOperationDetection.java @@ -300,7 +300,7 @@ private boolean parentMapperContainsOperationInvocation(UMLOperationBodyMapper p break; } } - if(callerMapping != null) { + if(callerMapping != null && (childMapper.getContainer2().isGetter() || childMapper.getContainer2().isSetter())) { for(AbstractCodeMapping mapping : childMapper.getMappings()) { if(mapping.getFragment1().equals(callerMapping.getFragment1())) { return true; diff --git a/src/test/resources/mappings/commafeed-18a7bd1fd1a83b3b8d1b245e32f78c0b4443b7a7.txt b/src/test/resources/mappings/commafeed-18a7bd1fd1a83b3b8d1b245e32f78c0b4443b7a7.txt index 833992762..6e668d5ea 100644 --- a/src/test/resources/mappings/commafeed-18a7bd1fd1a83b3b8d1b245e32f78c0b4443b7a7.txt +++ b/src/test/resources/mappings/commafeed-18a7bd1fd1a83b3b8d1b245e32f78c0b4443b7a7.txt @@ -18,26 +18,6 @@ line range:40-42==line range:46-48 line range:42-44==line range:48-50 line range:46-48==line range:52-54 line range:52-54==line range:58-60 -public fetch(feed Feed) : byte[] -> private fetch(url String) : byte[] -line range:35-35==line range:41-41 -line range:36-36==line range:42-42 -line range:39-39==line range:45-45 -line range:41-41==line range:47-47 -line range:43-43==line range:49-49 -line range:45-45==line range:51-51 -line range:47-47==line range:53-53 -line range:50-50==line range:56-56 -line range:53-53==line range:59-59 -line range:56-56==line range:62-62 -line range:34-37==line range:40-43 -line range:40-44==line range:46-50 -line range:46-48==line range:52-54 -line range:52-54==line range:58-60 -line range:34-37==line range:40-43 -line range:40-42==line range:46-48 -line range:42-44==line range:48-50 -line range:46-48==line range:52-54 -line range:52-54==line range:58-60 public fetch(feed Feed) : byte[] -> public fetch(feed Feed) : byte[] line range:56-56==line range:36-36 line range:32-32==line range:32-32 \ No newline at end of file