This is an automated email from the ASF dual-hosted git repository. clebertsuconic pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit df2f48a48169da3b9af1158fbd4af54fef6910fa Author: Clebert Suconic <[email protected]> AuthorDate: Mon Aug 3 10:36:39 2020 -0400 NO-JIRA update RandomUtil.randomInterval to deal with (max==min) --- .../apache/activemq/artemis/utils/RandomUtil.java | 3 ++ .../tests/unit/core/util/RandomUtilTest.java | 39 ++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/RandomUtil.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/RandomUtil.java index 1691df1..766c1d6 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/RandomUtil.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/RandomUtil.java @@ -79,10 +79,13 @@ public class RandomUtil { } public static int randomInterval(final int min, final int max) { + if (min == max) return max; return min + random.nextInt(max - min); } public static int randomMax(final int max) { + assert max > 0; + int value = randomPositiveInt() % max; if (value == 0) { diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/util/RandomUtilTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/util/RandomUtilTest.java new file mode 100644 index 0000000..908c9e7 --- /dev/null +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/util/RandomUtilTest.java @@ -0,0 +1,39 @@ +/** + * 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.activemq.artemis.tests.unit.core.util; + +import org.apache.activemq.artemis.utils.RandomUtil; +import org.junit.Assert; +import org.junit.Test; + +public class RandomUtilTest { + + + @Test + public void testInterval() { + int i = RandomUtil.randomInterval(0, 1000); + Assert.assertTrue(i <= 1000); + Assert.assertTrue(i >= 0); + + i = RandomUtil.randomInterval(0, 0); + Assert.assertEquals(0, i); + + i = RandomUtil.randomInterval(10, 10); + Assert.assertEquals(10, i); + + } +}
