From 321e1a3206f6cf47451c39fa8349a215f16f2869 Mon Sep 17 00:00:00 2001 From: Gunnar Morling Date: Fri, 3 May 2013 19:41:30 +0200 Subject: [PATCH] #6 Adding test for mapping into raw type --- .../ap/test/collection/CollectionMappingTest.java | 12 ++++++++++++ .../org/mapstruct/ap/test/collection/Source.java | 10 ++++++++++ .../ap/test/collection/SourceTargetMapper.java | 3 ++- .../org/mapstruct/ap/test/collection/Target.java | 13 +++++++++++++ 4 files changed, 37 insertions(+), 1 deletion(-) diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/CollectionMappingTest.java b/processor/src/test/java/org/mapstruct/ap/test/collection/CollectionMappingTest.java index ca12eac90..c00d42f4f 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/collection/CollectionMappingTest.java +++ b/processor/src/test/java/org/mapstruct/ap/test/collection/CollectionMappingTest.java @@ -202,4 +202,16 @@ public class CollectionMappingTest extends MapperTestBase { assertThat( source ).isNotNull(); assertThat( source.getIntegerList() ).containsOnly( 1, 2 ); } + + @Test + @IssueKey("6") + public void shouldMapIntegerSetToRawSet() { + Source source = new Source(); + source.setIntegerSet( new HashSet( Arrays.asList( 1, 2 ) ) ); + + Target target = SourceTargetMapper.INSTANCE.sourceToTarget( source ); + + assertThat( target ).isNotNull(); + assertThat( target.getSet() ).containsOnly( 1, 2 ); + } } diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/Source.java b/processor/src/test/java/org/mapstruct/ap/test/collection/Source.java index f4d7d1d1d..01867783a 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/collection/Source.java +++ b/processor/src/test/java/org/mapstruct/ap/test/collection/Source.java @@ -33,6 +33,8 @@ public class Source { private List integerList; + private Set integerSet; + public List getStringList() { return stringList; } @@ -80,4 +82,12 @@ public class Source { public void setIntegerList(List integerList) { this.integerList = integerList; } + + public Set getIntegerSet() { + return integerSet; + } + + public void setIntegerSet(Set integerSet) { + this.integerSet = integerSet; + } } diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/SourceTargetMapper.java b/processor/src/test/java/org/mapstruct/ap/test/collection/SourceTargetMapper.java index cbe38fc12..d965d7f2a 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/collection/SourceTargetMapper.java +++ b/processor/src/test/java/org/mapstruct/ap/test/collection/SourceTargetMapper.java @@ -26,7 +26,8 @@ public interface SourceTargetMapper { public static SourceTargetMapper INSTANCE = Mappers.getMapper( SourceTargetMapper.class ); @Mappings({ - @Mapping(source = "integerList", target = "integerCollection") + @Mapping(source = "integerList", target = "integerCollection"), + @Mapping(source = "integerSet", target = "set") }) Target sourceToTarget(Source source); diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/Target.java b/processor/src/test/java/org/mapstruct/ap/test/collection/Target.java index 701449457..68d7dc5eb 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/collection/Target.java +++ b/processor/src/test/java/org/mapstruct/ap/test/collection/Target.java @@ -33,6 +33,9 @@ public class Target { private Collection integerCollection; + @SuppressWarnings("rawtypes") + private Set set; + public List getStringList() { return stringList; } @@ -80,4 +83,14 @@ public class Target { public void setIntegerCollection(Collection integerCollection) { this.integerCollection = integerCollection; } + + @SuppressWarnings("rawtypes") + public Set getSet() { + return set; + } + + @SuppressWarnings("rawtypes") + public void setSet(Set set) { + this.set = set; + } }