From af7b02cb1b18a0589cca06f12fcc1e735b229fee Mon Sep 17 00:00:00 2001 From: thunderhook <8238759+thunderhook@users.noreply.github.com> Date: Thu, 22 Aug 2024 22:12:07 +0200 Subject: [PATCH] #3678 add before mapping to test --- .../ap/test/bugs/_3678/Issue3678Mapper.java | 17 +++++++++++++---- .../ap/test/bugs/_3678/Issue3678Test.java | 5 +++-- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_3678/Issue3678Mapper.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_3678/Issue3678Mapper.java index 882047d5c..de52264bb 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/bugs/_3678/Issue3678Mapper.java +++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_3678/Issue3678Mapper.java @@ -5,7 +5,11 @@ */ package org.mapstruct.ap.test.bugs._3678; +import java.util.ArrayList; +import java.util.List; + import org.mapstruct.AfterMapping; +import org.mapstruct.BeforeMapping; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; @@ -14,15 +18,20 @@ public abstract class Issue3678Mapper { abstract SimpleDestination sourceToDestination(SimpleSource source); - int afterMappingInvocationCount = 0; + List invocations = new ArrayList<>(); + + @BeforeMapping + void beforeMapping(SimpleSource simpleSource) { + invocations.add( "beforeMapping" ); + } @AfterMapping void afterMapping(SimpleSource simpleSource) { - afterMappingInvocationCount++; + invocations.add( "afterMapping" ); } - public int getAfterMappingInvocationCount() { - return afterMappingInvocationCount; + public List getInvocations() { + return invocations; } public static class SimpleSource { diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_3678/Issue3678Test.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_3678/Issue3678Test.java index 60495ea1b..bb35f1434 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/bugs/_3678/Issue3678Test.java +++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_3678/Issue3678Test.java @@ -26,8 +26,9 @@ public class Issue3678Test { Issue3678Mapper.SimpleSource source = new Issue3678Mapper.SimpleSource( "name", "description" ); Issue3678Mapper.SimpleDestination simpleDestination = mapper.sourceToDestination( source ); - assertThat( mapper.getAfterMappingInvocationCount() ) - .isOne(); + assertThat( mapper.getInvocations() ) + .containsExactly( "beforeMapping", "afterMapping" ) + .doesNotHaveDuplicates(); } }