third_codes/mapstruct
1
0
Fork 0
mirror of https://github.com/mapstruct/mapstruct.git synced 2025-07-12 00:00:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

#684 Update joda-time to fix an incompatibility with JDK 1.8.0_60 and later, and reverted changes to JodaConversionTest from commit feb5e2f13b0eea3027000cc7f03d6b63690505c5.

Browse Source
This commit is contained in:
Andreas Gudian 2015-11-07 20:28:45 +01:00
parent 18c03a328d
commit af9b54fa4f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
parent/pom.xml
View File

@ -189,7 +189,7 @@
<dependency> <dependency>
<groupId>joda-time</groupId> <groupId>joda-time</groupId>
<artifactId>joda-time</artifactId> <artifactId>joda-time</artifactId>
<version>2.3</version> <version>2.9</version>
</dependency> </dependency>
<!-- Project modules --> <!-- Project modules -->

6
processor/src/test/java/org/mapstruct/ap/test/conversion/jodatime/JodaConversionTest.java
View File

@ -57,7 +57,7 @@ public class JodaConversionTest {
src.setDateTime( new DateTime( 2014, 1, 1, 0, 0, 0, DateTimeZone.UTC ) ); src.setDateTime( new DateTime( 2014, 1, 1, 0, 0, 0, DateTimeZone.UTC ) );
Target target = SourceTargetMapper.INSTANCE.sourceToTargetDateTimeMapped( src ); Target target = SourceTargetMapper.INSTANCE.sourceToTargetDateTimeMapped( src );
assertThat( target ).isNotNull(); assertThat( target ).isNotNull();
assertThat( target.getDateTime() ).isIn( "01.01.2014 00:00 UTC", "01.01.2014 00:00 +00:00" ); assertThat( target.getDateTime() ).isEqualTo( "01.01.2014 00:00 UTC" );
} }
@Test @Test
@ -99,7 +99,7 @@ public class JodaConversionTest {
Target target = SourceTargetMapper.INSTANCE.sourceToTarget( src ); Target target = SourceTargetMapper.INSTANCE.sourceToTarget( src );
assertThat( target ).isNotNull(); assertThat( target ).isNotNull();
assertThat( target.getDateTime() ).isIn( "01.01.2014 00:00 UTC", "01.01.2014 00:00 +00:00" ); assertThat( target.getDateTime() ).isEqualTo( "01.01.2014 00:00 UTC" );
assertThat( target.getLocalDateTime() ).isEqualTo( "01.01.2014 00:00" ); assertThat( target.getLocalDateTime() ).isEqualTo( "01.01.2014 00:00" );
assertThat( target.getLocalDate() ).isEqualTo( "01.01.2014" ); assertThat( target.getLocalDate() ).isEqualTo( "01.01.2014" );
assertThat( target.getLocalTime() ).isEqualTo( "00:00" ); assertThat( target.getLocalTime() ).isEqualTo( "00:00" );
@ -107,7 +107,7 @@ public class JodaConversionTest {
// and now with default mappings // and now with default mappings
target = SourceTargetMapper.INSTANCE.sourceToTargetDefaultMapping( src ); target = SourceTargetMapper.INSTANCE.sourceToTargetDefaultMapping( src );
assertThat( target ).isNotNull(); assertThat( target ).isNotNull();
assertThat( target.getDateTime() ).isIn( "1. Januar 2014 00:00:00 UTC", "1. Januar 2014 00:00:00 +00:00" ); assertThat( target.getDateTime() ).isEqualTo( "1. Januar 2014 00:00:00 UTC" );
assertThat( target.getLocalDateTime() ).isEqualTo( "1. Januar 2014 00:00:00" ); assertThat( target.getLocalDateTime() ).isEqualTo( "1. Januar 2014 00:00:00" );
assertThat( target.getLocalDate() ).isEqualTo( "1. Januar 2014" ); assertThat( target.getLocalDate() ).isEqualTo( "1. Januar 2014" );
assertThat( target.getLocalTime() ).isEqualTo( "00:00:00" ); assertThat( target.getLocalTime() ).isEqualTo( "00:00:00" );