From f58b26b51977f1de9f7db7a9bbfc08b333cb33a4 Mon Sep 17 00:00:00 2001 From: sjaakd Date: Mon, 21 Apr 2014 12:37:40 +0200 Subject: [PATCH] #198 adding unit test for type conversion --- .../ap/test/exceptions/ExceptionTest.java | 14 ++++++++++++-- .../org/mapstruct/ap/test/exceptions/Source.java | 10 ++++++++++ .../ap/test/exceptions/SourceTargetMapper.java | 3 ++- .../org/mapstruct/ap/test/exceptions/Target.java | 11 +++++++++++ 4 files changed, 35 insertions(+), 3 deletions(-) diff --git a/processor/src/test/java/org/mapstruct/ap/test/exceptions/ExceptionTest.java b/processor/src/test/java/org/mapstruct/ap/test/exceptions/ExceptionTest.java index d624f981f..32fe40e8b 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/exceptions/ExceptionTest.java +++ b/processor/src/test/java/org/mapstruct/ap/test/exceptions/ExceptionTest.java @@ -18,6 +18,7 @@ */ package org.mapstruct.ap.test.exceptions; +import java.text.ParseException; import org.mapstruct.ap.test.exceptions.imports.TestException1; import org.mapstruct.ap.test.exceptions.imports.TestExceptionBase; import java.util.ArrayList; @@ -48,7 +49,7 @@ public class ExceptionTest { @Test( expected = RuntimeException.class ) @IssueKey( "198" ) - public void shouldThrowRuntimeInBeanMapping() throws TestException2 { + public void shouldThrowRuntimeInBeanMapping() throws TestException2, ParseException { Source source = new Source(); source.setSize( 1 ); SourceTargetMapper sourceTargetMapper = SourceTargetMapper.INSTANCE; @@ -57,13 +58,22 @@ public class ExceptionTest { @Test( expected = TestException2.class ) @IssueKey( "198" ) - public void shouldThrowTestException2InBeanMapping() throws TestException2 { + public void shouldThrowTestException2InBeanMapping() throws TestException2, ParseException { Source source = new Source(); source.setSize( 2 ); SourceTargetMapper sourceTargetMapper = SourceTargetMapper.INSTANCE; sourceTargetMapper.sourceToTarget( source ); } + @Test( expected = ParseException.class ) + @IssueKey( "198" ) + public void shouldThrowTestParseExceptionInBeanMappingDueToTypeConverion() throws TestException2, ParseException { + Source source = new Source(); + source.setDate( "nonsense" ); + SourceTargetMapper sourceTargetMapper = SourceTargetMapper.INSTANCE; + sourceTargetMapper.sourceToTarget( source ); + } + @Test( expected = RuntimeException.class ) @IssueKey( "198" ) public void shouldThrowRuntimeInIterableMapping() throws TestException2 { diff --git a/processor/src/test/java/org/mapstruct/ap/test/exceptions/Source.java b/processor/src/test/java/org/mapstruct/ap/test/exceptions/Source.java index 1f8da932e..fb4ae4d45 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/exceptions/Source.java +++ b/processor/src/test/java/org/mapstruct/ap/test/exceptions/Source.java @@ -25,6 +25,7 @@ package org.mapstruct.ap.test.exceptions; public class Source { private int size; + private String date; public int getSize() { return size; @@ -33,4 +34,13 @@ public class Source { public void setSize( int size ) { this.size = size; } + + public String getDate() { + return date; + } + + public void setDate( String date ) { + this.date = date; + } + } diff --git a/processor/src/test/java/org/mapstruct/ap/test/exceptions/SourceTargetMapper.java b/processor/src/test/java/org/mapstruct/ap/test/exceptions/SourceTargetMapper.java index e70db5811..4460e88d0 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/exceptions/SourceTargetMapper.java +++ b/processor/src/test/java/org/mapstruct/ap/test/exceptions/SourceTargetMapper.java @@ -19,6 +19,7 @@ package org.mapstruct.ap.test.exceptions; +import java.text.ParseException; import org.mapstruct.ap.test.exceptions.imports.TestExceptionBase; import java.util.List; import java.util.Map; @@ -36,7 +37,7 @@ public interface SourceTargetMapper { SourceTargetMapper INSTANCE = Mappers.getMapper( SourceTargetMapper.class ); - Target sourceToTarget(Source source) throws TestException2; + Target sourceToTarget(Source source) throws TestException2, ParseException; List integerListToLongList(List sizes) throws TestException2; diff --git a/processor/src/test/java/org/mapstruct/ap/test/exceptions/Target.java b/processor/src/test/java/org/mapstruct/ap/test/exceptions/Target.java index d71f8998b..e45683bf5 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/exceptions/Target.java +++ b/processor/src/test/java/org/mapstruct/ap/test/exceptions/Target.java @@ -18,6 +18,8 @@ */ package org.mapstruct.ap.test.exceptions; +import java.util.Date; + /** * * @author Sjaak Derksen @@ -25,6 +27,7 @@ package org.mapstruct.ap.test.exceptions; public class Target { private Long size; + private Date date; public Long getSize() { return size; @@ -34,4 +37,12 @@ public class Target { this.size = size; } + public Date getDate() { + return date; + } + + public void setDate( Date date ) { + this.date = date; + } + }