Repository: incubator-tamaya Updated Branches: refs/heads/master 1ca28c88f -> 2e44ea50e
Simplify tests and fix warnings Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/2e44ea50 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/2e44ea50 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/2e44ea50 Branch: refs/heads/master Commit: 2e44ea50ebc5b3f120c104b679598a1a642a3787 Parents: 1ca28c8 Author: Phil Ottlinger <[email protected]> Authored: Sun Oct 29 22:27:03 2017 +0100 Committer: Phil Ottlinger <[email protected]> Committed: Sun Oct 29 22:27:03 2017 +0100 ---------------------------------------------------------------------- .../internal/converters/EnumConverterTest.java | 35 ++++++++------------ .../converters/InstantConverterTest.java | 1 - .../converters/OptionalConverterTest.java | 4 +-- .../internal/converters/PathConverterTest.java | 3 -- .../internal/converters/ShortConverterTest.java | 10 +++--- .../internal/converters/URIConverterTest.java | 3 +- .../internal/converters/URLConverterTest.java | 2 +- 7 files changed, 23 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/2e44ea50/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 924499b..0bbc710 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 @@ -23,6 +23,7 @@ import org.apache.tamaya.spi.ConversionContext; import org.junit.Test; import java.math.RoundingMode; +import java.util.Arrays; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -32,28 +33,20 @@ import static org.junit.Assert.assertNull; */ public class EnumConverterTest { - private final EnumConverter<RoundingMode> testConverter = new EnumConverter<>(RoundingMode.class); + private final EnumConverter<RoundingMode> testConverter = new EnumConverter<>(RoundingMode.class); - private final ConversionContext DUMMY_CONTEXT = new ConversionContext.Builder("someKey", TypeLiteral.of(Enum.class)).build(); + private final ConversionContext DUMMY_CONTEXT = new ConversionContext.Builder("someKey", TypeLiteral.of(Enum.class)) + .build(); - @Test - public void testConvert() { - assertEquals(RoundingMode.CEILING, testConverter.convert(RoundingMode.CEILING.toString(), - DUMMY_CONTEXT)); - } + @Test + public void testConversionWithMixedCasing() { + for (String input : Arrays.asList(RoundingMode.CEILING.toString(), "ceiling", "CeiLinG")) { + assertEquals(RoundingMode.CEILING, testConverter.convert(input, DUMMY_CONTEXT)); + } + } - @Test - public void testConvert_LowerCase() { - assertEquals(RoundingMode.CEILING, testConverter.convert("ceiling", DUMMY_CONTEXT)); - } - - @Test - public void testConvert_MixedCase() { - assertEquals(RoundingMode.CEILING, testConverter.convert("CeiLinG", DUMMY_CONTEXT)); - } - - @Test - public void testConvert_OtherValue() { - assertNull(testConverter.convert("fooBars", DUMMY_CONTEXT)); - } + @Test + public void testConvert_OtherValue() { + assertNull(testConverter.convert("fooBars", DUMMY_CONTEXT)); + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/2e44ea50/code/core/src/test/java/org/apache/tamaya/core/internal/converters/InstantConverterTest.java ---------------------------------------------------------------------- diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/InstantConverterTest.java b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/InstantConverterTest.java index 1bf4080..4a9a828 100644 --- a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/InstantConverterTest.java +++ b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/InstantConverterTest.java @@ -25,7 +25,6 @@ import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import java.time.Instant; -import java.time.format.DateTimeFormatter; import static org.junit.Assert.*; http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/2e44ea50/code/core/src/test/java/org/apache/tamaya/core/internal/converters/OptionalConverterTest.java ---------------------------------------------------------------------- diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/OptionalConverterTest.java b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/OptionalConverterTest.java index e97d9e7..f35280b 100644 --- a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/OptionalConverterTest.java +++ b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/OptionalConverterTest.java @@ -29,14 +29,14 @@ public class OptionalConverterTest { @Test public void nullConversionYieldsEmptyOptional() { - final Optional result = new OptionalConverter().convert(null, null); + final Optional<?> result = new OptionalConverter().convert(null, null); assertThat(result).isNotNull(); assertThat(result.isPresent()).isFalse(); } @Test(expected = ConfigException.class) public void emulateExceptionWhenGivenContextIsNull() { - final Optional result = new OptionalConverter().convert("JustATestValueThatIsIgnored", null); + new OptionalConverter().convert("JustATestValueThatIsIgnored", null); } } http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/2e44ea50/code/core/src/test/java/org/apache/tamaya/core/internal/converters/PathConverterTest.java ---------------------------------------------------------------------- diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/PathConverterTest.java b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/PathConverterTest.java index 2906c06..a7f9eab 100644 --- a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/PathConverterTest.java +++ b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/PathConverterTest.java @@ -24,8 +24,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import java.nio.file.FileSystem; -import java.nio.file.FileSystems; import java.nio.file.Path; import java.nio.file.Paths; @@ -43,7 +41,6 @@ public class PathConverterTest { @Test public void convert() throws Exception { PathConverter conv = new PathConverter(); - String testRoot = FileSystems.getDefault().getRootDirectories().iterator().next().toString(); Path value = conv.convert("testRoot", context); assertEquals(value, Paths.get("testRoot")); value = conv.convert("foo", context); http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/2e44ea50/code/core/src/test/java/org/apache/tamaya/core/internal/converters/ShortConverterTest.java ---------------------------------------------------------------------- diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/ShortConverterTest.java b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/ShortConverterTest.java index 193a92e..ca9228d 100644 --- a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/ShortConverterTest.java +++ b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/ShortConverterTest.java @@ -30,7 +30,7 @@ import static org.junit.Assert.*; public class ShortConverterTest { /** - * Test conversion. The value are provided by + * Test conversion. The values are provided by * {@link ConverterTestsPropertySource}. * @throws Exception */ @@ -43,7 +43,7 @@ public class ShortConverterTest { } /** - * Test conversion. The value are provided by + * Test conversion. The values are provided by * {@link ConverterTestsPropertySource}. * @throws Exception */ @@ -56,7 +56,7 @@ public class ShortConverterTest { } /** - * Test conversion. The value are provided by + * Test conversion. The values are provided by * {@link ConverterTestsPropertySource}. * @throws Exception */ @@ -84,7 +84,7 @@ public class ShortConverterTest { } /** - * Test conversion. The value are provided by + * Test conversion. The values are provided by * {@link org.apache.tamaya.core.internal.converters.ConverterTestsPropertySource}. * @throws Exception */ @@ -97,7 +97,7 @@ public class ShortConverterTest { } /** - * Test conversion. The value are provided by + * Test conversion. The values are provided by * {@link org.apache.tamaya.core.internal.converters.ConverterTestsPropertySource}. * @throws Exception */ http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/2e44ea50/code/core/src/test/java/org/apache/tamaya/core/internal/converters/URIConverterTest.java ---------------------------------------------------------------------- diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/URIConverterTest.java b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/URIConverterTest.java index 0ac4ba7..10a5236 100644 --- a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/URIConverterTest.java +++ b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/URIConverterTest.java @@ -22,14 +22,13 @@ import org.apache.tamaya.TypeLiteral; import org.apache.tamaya.spi.ConversionContext; import org.junit.Test; -import java.math.BigDecimal; import java.net.URI; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; /** - * Tests conversion of the {@link ClassConverter}. + * Tests conversion of the {@link URI}-converter. */ public class URIConverterTest { http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/2e44ea50/code/core/src/test/java/org/apache/tamaya/core/internal/converters/URLConverterTest.java ---------------------------------------------------------------------- diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/URLConverterTest.java b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/URLConverterTest.java index e740331..3b66a98 100644 --- a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/URLConverterTest.java +++ b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/URLConverterTest.java @@ -29,7 +29,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; /** - * Tests conversion of the {@link ClassConverter}. + * Tests conversion of the {@link URL}-converter. */ public class URLConverterTest {
