Repository: incubator-tamaya Updated Branches: refs/heads/master 3133174f9 -> 1ca28c88f
Refactor test cases Fix error of swapped expected and actual. Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/1ca28c88 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/1ca28c88 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/1ca28c88 Branch: refs/heads/master Commit: 1ca28c88f9f5ffc6fccec4009512991f8d91a75f Parents: 3133174 Author: Phil Ottlinger <[email protected]> Authored: Sat Oct 28 21:22:34 2017 +0200 Committer: Phil Ottlinger <[email protected]> Committed: Sat Oct 28 21:22:34 2017 +0200 ---------------------------------------------------------------------- .../internal/converters/DurationConverterTest.java | 14 +++++--------- .../core/internal/converters/EnumConverterTest.java | 9 ++++----- 2 files changed, 9 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/1ca28c88/code/core/src/test/java/org/apache/tamaya/core/internal/converters/DurationConverterTest.java ---------------------------------------------------------------------- diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/DurationConverterTest.java b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/DurationConverterTest.java index 33c1bba..8a37c0f 100644 --- a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/DurationConverterTest.java +++ b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/DurationConverterTest.java @@ -25,10 +25,6 @@ import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import java.time.Duration; -import java.time.format.DateTimeFormatterBuilder; -import java.time.temporal.ChronoField; -import java.time.temporal.Temporal; -import java.time.temporal.TemporalUnit; import static org.junit.Assert.*; @@ -59,15 +55,15 @@ public class DurationConverterTest { public void convert() throws Exception { DurationConverter conv = new DurationConverter(); Duration duration = conv.convert("PT20.345S", context); - assertEquals(duration, Duration.parse("PT20.345S")); + assertEquals(Duration.parse("PT20.345S"), duration); duration = conv.convert("PT15M", context); - assertEquals(duration, Duration.parse("PT15M")); + assertEquals(Duration.parse("PT15M"), duration); duration = conv.convert("PT10H", context); - assertEquals(duration, Duration.parse("PT10H")); + assertEquals(Duration.parse("PT10H"), duration); duration = conv.convert("P2D", context); - assertEquals(duration, Duration.parse("P2D")); + assertEquals(Duration.parse("P2D"), duration); duration = conv.convert("P2DT3H4M", context); - assertEquals(duration, Duration.parse("P2DT3H4M")); + assertEquals(Duration.parse("P2DT3H4M"), duration); duration = conv.convert("foo", context); assertNull(duration); } http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/1ca28c88/code/core/src/test/java/org/apache/tamaya/core/internal/converters/EnumConverterTest.java ---------------------------------------------------------------------- diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/EnumConverterTest.java b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/EnumConverterTest.java index 6618961..924499b 100644 --- a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/EnumConverterTest.java +++ b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/EnumConverterTest.java @@ -18,7 +18,6 @@ */ package org.apache.tamaya.core.internal.converters; -import org.apache.tamaya.ConfigurationProvider; import org.apache.tamaya.TypeLiteral; import org.apache.tamaya.spi.ConversionContext; import org.junit.Test; @@ -39,18 +38,18 @@ public class EnumConverterTest { @Test public void testConvert() { - assertEquals(testConverter.convert(RoundingMode.CEILING.toString(), - DUMMY_CONTEXT), RoundingMode.CEILING); + assertEquals(RoundingMode.CEILING, testConverter.convert(RoundingMode.CEILING.toString(), + DUMMY_CONTEXT)); } @Test public void testConvert_LowerCase() { - assertEquals(testConverter.convert("ceiling", DUMMY_CONTEXT), RoundingMode.CEILING); + assertEquals(RoundingMode.CEILING, testConverter.convert("ceiling", DUMMY_CONTEXT)); } @Test public void testConvert_MixedCase() { - assertEquals(testConverter.convert("CeiLinG", DUMMY_CONTEXT), RoundingMode.CEILING); + assertEquals(RoundingMode.CEILING, testConverter.convert("CeiLinG", DUMMY_CONTEXT)); } @Test
