From d3e598da061106992d2e7bdbcfe17cc7eb1e9248 Mon Sep 17 00:00:00 2001 From: Srinivas Reddy Date: Sun, 9 Dec 2018 11:37:09 +0800 Subject: [PATCH] Fix the missing ApiUtils tests in streams module. --- .../kafka/streams/internals/ApiUtils.java | 10 +- .../apache/kafka/streams/KeyValueTest.java | 2 +- .../kafka/streams/internals/ApiUtilsTest.java | 110 ++++++++++++++++++ 3 files changed, 117 insertions(+), 5 deletions(-) create mode 100644 streams/src/test/java/org/apache/kafka/streams/internals/ApiUtilsTest.java diff --git a/streams/src/main/java/org/apache/kafka/streams/internals/ApiUtils.java b/streams/src/main/java/org/apache/kafka/streams/internals/ApiUtils.java index dd3b691b10cd6..6977c7974421e 100644 --- a/streams/src/main/java/org/apache/kafka/streams/internals/ApiUtils.java +++ b/streams/src/main/java/org/apache/kafka/streams/internals/ApiUtils.java @@ -24,6 +24,8 @@ public final class ApiUtils { private static final String MILLISECOND_VALIDATION_FAIL_MSG_FRMT = "Invalid value for parameter \"%s\" (value was: %s). "; + private static final String VALIDATE_MILLISECOND_NULL_SUFFIX = "It shouldn't be null."; + private static final String VALIDATE_MILLISECOND_OVERFLOW_SUFFIX = "It can't be converted to milliseconds."; private ApiUtils() { } @@ -37,11 +39,11 @@ private ApiUtils() { public static long validateMillisecondDuration(final Duration duration, final String messagePrefix) { try { if (duration == null) - throw new IllegalArgumentException(messagePrefix + "It shouldn't be null."); + throw new IllegalArgumentException(messagePrefix + VALIDATE_MILLISECOND_NULL_SUFFIX); return duration.toMillis(); } catch (final ArithmeticException e) { - throw new IllegalArgumentException(messagePrefix + "It can't be converted to milliseconds.", e); + throw new IllegalArgumentException(messagePrefix + VALIDATE_MILLISECOND_OVERFLOW_SUFFIX, e); } } @@ -54,11 +56,11 @@ public static long validateMillisecondDuration(final Duration duration, final St public static long validateMillisecondInstant(final Instant instant, final String messagePrefix) { try { if (instant == null) - throw new IllegalArgumentException(messagePrefix + "It shouldn't be null."); + throw new IllegalArgumentException(messagePrefix + VALIDATE_MILLISECOND_NULL_SUFFIX); return instant.toEpochMilli(); } catch (final ArithmeticException e) { - throw new IllegalArgumentException(messagePrefix + "It can't be converted to milliseconds.", e); + throw new IllegalArgumentException(messagePrefix + VALIDATE_MILLISECOND_OVERFLOW_SUFFIX, e); } } diff --git a/streams/src/test/java/org/apache/kafka/streams/KeyValueTest.java b/streams/src/test/java/org/apache/kafka/streams/KeyValueTest.java index 7681068ed8ade..24f7d5d61714e 100644 --- a/streams/src/test/java/org/apache/kafka/streams/KeyValueTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/KeyValueTest.java @@ -24,7 +24,7 @@ public class KeyValueTest { @Test - public void shouldHaveSaneEqualsAndHashCode() { + public void shouldHaveSameEqualsAndHashCode() { final KeyValue kv = KeyValue.pair("key1", 1L); final KeyValue copyOfKV = KeyValue.pair(kv.key, kv.value); diff --git a/streams/src/test/java/org/apache/kafka/streams/internals/ApiUtilsTest.java b/streams/src/test/java/org/apache/kafka/streams/internals/ApiUtilsTest.java new file mode 100644 index 0000000000000..5fe30dd1e5b26 --- /dev/null +++ b/streams/src/test/java/org/apache/kafka/streams/internals/ApiUtilsTest.java @@ -0,0 +1,110 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.kafka.streams.internals; + +import org.junit.Test; + +import java.time.Duration; +import java.time.Instant; + +import static org.apache.kafka.streams.internals.ApiUtils.prepareMillisCheckFailMsgPrefix; +import static org.apache.kafka.streams.internals.ApiUtils.validateMillisecondDuration; +import static org.apache.kafka.streams.internals.ApiUtils.validateMillisecondInstant; +import static org.hamcrest.CoreMatchers.containsString; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.fail; + + +public class ApiUtilsTest { + + // This is the maximum limit that Duration accepts but fails when it converts to milliseconds. + private static final long MAX_ACCEPTABLE_DAYS_FOR_DURATION = 106751991167300L; + // This is the maximum limit that Duration accepts and converts to milliseconds with out fail. + private static final long MAX_ACCEPTABLE_DAYS_FOR_DURATION_TO_MILLIS = 106751991167L; + + @Test + public void shouldThrowNullPointerExceptionForNullDuration() { + final String nullDurationPrefix = prepareMillisCheckFailMsgPrefix(null, "nullDuration"); + + try { + validateMillisecondDuration(null, nullDurationPrefix); + fail("Expected exception when null passed to duration."); + } catch (final IllegalArgumentException e) { + assertThat(e.getMessage(), containsString(nullDurationPrefix)); + } + } + + @Test + public void shouldThrowArithmeticExceptionForMaxDuration() { + final Duration maxDurationInDays = Duration.ofDays(MAX_ACCEPTABLE_DAYS_FOR_DURATION); + final String maxDurationPrefix = prepareMillisCheckFailMsgPrefix(maxDurationInDays, "maxDuration"); + + try { + validateMillisecondDuration(maxDurationInDays, maxDurationPrefix); + fail("Expected exception when maximum days passed for duration, because of long overflow"); + } catch (final IllegalArgumentException e) { + assertThat(e.getMessage(), containsString(maxDurationPrefix)); + } + } + + @Test + public void shouldThrowNullPointerExceptionForNullInstant() { + final String nullInstantPrefix = prepareMillisCheckFailMsgPrefix(null, "nullInstant"); + + try { + validateMillisecondInstant(null, nullInstantPrefix); + fail("Expected exception when null value passed for instant."); + } catch (final IllegalArgumentException e) { + assertThat(e.getMessage(), containsString(nullInstantPrefix)); + } + } + + @Test + public void shouldThrowArithmeticExceptionForMaxInstant() { + final String maxInstantPrefix = prepareMillisCheckFailMsgPrefix(Instant.MAX, "maxInstant"); + + try { + validateMillisecondInstant(Instant.MAX, maxInstantPrefix); + fail("Expected exception when maximum value passed for instant, because of long overflow."); + } catch (final IllegalArgumentException e) { + assertThat(e.getMessage(), containsString(maxInstantPrefix)); + } + } + + @Test + public void shouldReturnMillisecondsOnValidDuration() { + final Duration sampleDuration = Duration.ofDays(MAX_ACCEPTABLE_DAYS_FOR_DURATION_TO_MILLIS); + + assertEquals(sampleDuration.toMillis(), validateMillisecondDuration(sampleDuration, "sampleDuration")); + } + + @Test + public void shouldReturnMillisecondsOnValidInstant() { + final Instant sampleInstant = Instant.now(); + + assertEquals(sampleInstant.toEpochMilli(), validateMillisecondInstant(sampleInstant, "sampleInstant")); + } + + @Test + public void shouldContainsNameAndValueInFailMsgPrefix() { + final String failMsgPrefix = prepareMillisCheckFailMsgPrefix("someValue", "variableName"); + + assertThat(failMsgPrefix, containsString("variableName")); + assertThat(failMsgPrefix, containsString("someValue")); + } +} \ No newline at end of file