From 5f48b13b88b0a03f61e1a41ead7ec72460a273d3 Mon Sep 17 00:00:00 2001 From: Looly Date: Thu, 6 Nov 2025 16:48:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=BC=80=E9=97=AD=E5=8C=BA?= =?UTF-8?q?=E9=97=B4=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v7/core/lang/range/FiniteBound.java | 7 +- .../hutool/v7/core/lang/range/BoundTest.java | 208 +++++++++--------- .../v7/core/lang/range/BoundedRangeTest.java | 2 +- 3 files changed, 114 insertions(+), 103 deletions(-) diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/lang/range/FiniteBound.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/range/FiniteBound.java index e8ec3221e0..75fac88f1d 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/lang/range/FiniteBound.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/range/FiniteBound.java @@ -191,7 +191,10 @@ class FiniteBound> implements Bound { } /** - * 当两个边界的值不相等时，判断它们在坐标轴上位置的先后顺序 + * 当两个边界的值相等时，判断它们在坐标轴上位置的先后顺序 + * + * @param bound 另一边界 + * @return 比较位置顺序，-1：当前边界在前，0：重合，1：当前边界在后 */ private int compareIfSameBoundValue(final Bound bound) { final BoundType bt1 = this.getType(); @@ -202,7 +205,7 @@ class FiniteBound> implements Bound { } // 一为左边界，一为右边界 if (bt1.isDislocated(bt2)) { - // 特殊情况：右闭区间与左闭区间在同一点时，认为它们重合（用于区间相交判断） + // pr#1385@Gitee 特殊情况：右闭区间与左闭区间在同一点时，认为它们重合（用于区间相交判断） if ((bt1 == BoundType.CLOSE_UPPER_BOUND && bt2 == BoundType.CLOSE_LOWER_BOUND) || (bt1 == BoundType.CLOSE_LOWER_BOUND && bt2 == BoundType.CLOSE_UPPER_BOUND)) { return 0; diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/lang/range/BoundTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/range/BoundTest.java index 6e69865661..2694fafae6 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/lang/range/BoundTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/range/BoundTest.java @@ -16,11 +16,10 @@ package cn.hutool.v7.core.lang.range; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.*; /** * test for {@link Bound} @@ -39,64 +38,72 @@ public class BoundTest { assertEquals(Bound.atMost(5), result.getUpperBound()); } + @Test + void isDisjointTest(){ + BoundedRange range1 = BoundedRange.close(1, 3); + BoundedRange range2 = BoundedRange.close(3, 5); + // 点重合，相交 + assertFalse(range1.isDisjoint(range2)); + } + @Test public void testEquals() { final Bound bound = new FiniteBound<>(1, BoundType.OPEN_UPPER_BOUND); - Assertions.assertEquals(bound, bound); - Assertions.assertEquals(new FiniteBound<>(1, BoundType.OPEN_UPPER_BOUND), bound); - Assertions.assertNotEquals(new FiniteBound<>(2, BoundType.OPEN_UPPER_BOUND), bound); - Assertions.assertNotEquals(new FiniteBound<>(1, BoundType.OPEN_LOWER_BOUND), bound); - Assertions.assertNotEquals(null, bound); + assertEquals(bound, bound); + assertEquals(new FiniteBound<>(1, BoundType.OPEN_UPPER_BOUND), bound); + assertNotEquals(new FiniteBound<>(2, BoundType.OPEN_UPPER_BOUND), bound); + assertNotEquals(new FiniteBound<>(1, BoundType.OPEN_LOWER_BOUND), bound); + assertNotEquals(null, bound); } @Test public void testHashCode() { final int hashCode = new FiniteBound<>(1, BoundType.OPEN_UPPER_BOUND).hashCode(); - Assertions.assertEquals(hashCode, new FiniteBound<>(1, BoundType.OPEN_UPPER_BOUND).hashCode()); - Assertions.assertNotEquals(hashCode, new FiniteBound<>(2, BoundType.OPEN_UPPER_BOUND).hashCode()); - Assertions.assertNotEquals(hashCode, new FiniteBound<>(1, BoundType.OPEN_LOWER_BOUND).hashCode()); + assertEquals(hashCode, new FiniteBound<>(1, BoundType.OPEN_UPPER_BOUND).hashCode()); + assertNotEquals(hashCode, new FiniteBound<>(2, BoundType.OPEN_UPPER_BOUND).hashCode()); + assertNotEquals(hashCode, new FiniteBound<>(1, BoundType.OPEN_LOWER_BOUND).hashCode()); } @Test public void testNoneLowerBound() { final Bound bound = Bound.noneLowerBound(); // negate - Assertions.assertEquals(bound, bound.negate()); + assertEquals(bound, bound.negate()); // test - Assertions.assertTrue(bound.test(Integer.MAX_VALUE)); + assertTrue(bound.test(Integer.MAX_VALUE)); // getType - Assertions.assertEquals(BoundType.OPEN_LOWER_BOUND, bound.getType()); + assertEquals(BoundType.OPEN_LOWER_BOUND, bound.getType()); // getValue - Assertions.assertNull(bound.getValue()); + assertNull(bound.getValue()); // toString - Assertions.assertEquals("(" + "-∞", bound.descBound()); + assertEquals("(" + "-∞", bound.descBound()); // compareTo - Assertions.assertEquals(0, bound.compareTo(bound)); - Assertions.assertEquals(-1, bound.compareTo(Bound.atMost(1))); + assertEquals(0, bound.compareTo(bound)); + assertEquals(-1, bound.compareTo(Bound.atMost(1))); - Assertions.assertEquals(BoundedRange.all(), bound.toRange()); - Assertions.assertEquals("{x | x > -∞}", bound.toString()); + assertEquals(BoundedRange.all(), bound.toRange()); + assertEquals("{x | x > -∞}", bound.toString()); } @Test public void testNoneUpperBound() { final Bound bound = Bound.noneUpperBound(); // negate - Assertions.assertEquals(bound, bound.negate()); + assertEquals(bound, bound.negate()); // test - Assertions.assertTrue(bound.test(Integer.MAX_VALUE)); + assertTrue(bound.test(Integer.MAX_VALUE)); // getType - Assertions.assertEquals(BoundType.OPEN_UPPER_BOUND, bound.getType()); + assertEquals(BoundType.OPEN_UPPER_BOUND, bound.getType()); // getValue - Assertions.assertNull(bound.getValue()); + assertNull(bound.getValue()); // toString - Assertions.assertEquals("+∞" + ")", bound.descBound()); + assertEquals("+∞" + ")", bound.descBound()); // compareTo - Assertions.assertEquals(0, bound.compareTo(bound)); - Assertions.assertEquals(1, bound.compareTo(Bound.atMost(1))); + assertEquals(0, bound.compareTo(bound)); + assertEquals(1, bound.compareTo(Bound.atMost(1))); - Assertions.assertEquals(BoundedRange.all(), bound.toRange()); - Assertions.assertEquals("{x | x < +∞}", bound.toString()); + assertEquals(BoundedRange.all(), bound.toRange()); + assertEquals("{x | x < +∞}", bound.toString()); } @Test @@ -105,33 +112,33 @@ public class BoundTest { Bound bound = Bound.greaterThan(0); // test - Assertions.assertTrue(bound.test(1)); - Assertions.assertFalse(bound.test(0)); - Assertions.assertFalse(bound.test(-1)); + assertTrue(bound.test(1)); + assertFalse(bound.test(0)); + assertFalse(bound.test(-1)); // getType - Assertions.assertEquals(BoundType.OPEN_LOWER_BOUND, bound.getType()); + assertEquals(BoundType.OPEN_LOWER_BOUND, bound.getType()); // getValue - Assertions.assertEquals((Integer)0, bound.getValue()); + assertEquals((Integer)0, bound.getValue()); // toString - Assertions.assertEquals("(0", bound.descBound()); - Assertions.assertEquals("{x | x > 0}", bound.toString()); + assertEquals("(0", bound.descBound()); + assertEquals("{x | x > 0}", bound.toString()); // compareTo - Assertions.assertEquals(0, bound.compareTo(bound)); - Assertions.assertEquals(-1, bound.compareTo(Bound.noneUpperBound())); - Assertions.assertEquals(1, bound.compareTo(Bound.atLeast(-1))); - Assertions.assertEquals(-1, bound.compareTo(Bound.atLeast(2))); - Assertions.assertEquals(1, bound.compareTo(Bound.lessThan(0))); - Assertions.assertEquals(1, bound.compareTo(Bound.atMost(0))); - Assertions.assertEquals(-1, bound.compareTo(Bound.atMost(2))); - Assertions.assertEquals(1, bound.compareTo(Bound.noneLowerBound())); + assertEquals(0, bound.compareTo(bound)); + assertEquals(-1, bound.compareTo(Bound.noneUpperBound())); + assertEquals(1, bound.compareTo(Bound.atLeast(-1))); + assertEquals(-1, bound.compareTo(Bound.atLeast(2))); + assertEquals(1, bound.compareTo(Bound.lessThan(0))); + assertEquals(1, bound.compareTo(Bound.atMost(0))); + assertEquals(-1, bound.compareTo(Bound.atMost(2))); + assertEquals(1, bound.compareTo(Bound.noneLowerBound())); // { x | x >= 0} bound = bound.negate(); - Assertions.assertEquals((Integer)0, bound.getValue()); - Assertions.assertEquals(BoundType.CLOSE_UPPER_BOUND, bound.getType()); + assertEquals((Integer)0, bound.getValue()); + assertEquals(BoundType.CLOSE_UPPER_BOUND, bound.getType()); - Assertions.assertNotNull(bound.toRange()); + assertNotNull(bound.toRange()); } @Test @@ -140,33 +147,34 @@ public class BoundTest { Bound bound = Bound.atLeast(0); // test - Assertions.assertTrue(bound.test(1)); - Assertions.assertTrue(bound.test(0)); - Assertions.assertFalse(bound.test(-1)); + assertTrue(bound.test(1)); + assertTrue(bound.test(0)); + assertFalse(bound.test(-1)); // getType - Assertions.assertEquals(BoundType.CLOSE_LOWER_BOUND, bound.getType()); + assertEquals(BoundType.CLOSE_LOWER_BOUND, bound.getType()); // getValue - Assertions.assertEquals((Integer)0, bound.getValue()); + assertEquals((Integer)0, bound.getValue()); // toString - Assertions.assertEquals("[0", bound.descBound()); - Assertions.assertEquals("{x | x >= 0}", bound.toString()); + assertEquals("[0", bound.descBound()); + assertEquals("{x | x >= 0}", bound.toString()); // compareTo - Assertions.assertEquals(0, bound.compareTo(bound)); - Assertions.assertEquals(-1, bound.compareTo(Bound.noneUpperBound())); - Assertions.assertEquals(1, bound.compareTo(Bound.greaterThan(-1))); - Assertions.assertEquals(-1, bound.compareTo(Bound.greaterThan(0))); - Assertions.assertEquals(1, bound.compareTo(Bound.lessThan(0))); - Assertions.assertEquals(1, bound.compareTo(Bound.atMost(0))); - Assertions.assertEquals(-1, bound.compareTo(Bound.atMost(2))); - Assertions.assertEquals(1, bound.compareTo(Bound.noneLowerBound())); + assertEquals(0, bound.compareTo(bound)); + assertEquals(-1, bound.compareTo(Bound.noneUpperBound())); + assertEquals(1, bound.compareTo(Bound.greaterThan(-1))); + assertEquals(-1, bound.compareTo(Bound.greaterThan(0))); + assertEquals(1, bound.compareTo(Bound.lessThan(0))); + // pr#1385@gitee 特殊情况：右闭区间与左闭区间在同一点时，认为这个边界相等 + assertEquals(0, bound.compareTo(Bound.atMost(0))); + assertEquals(-1, bound.compareTo(Bound.atMost(2))); + assertEquals(1, bound.compareTo(Bound.noneLowerBound())); // { x | x < 0} bound = bound.negate(); - Assertions.assertEquals((Integer)0, bound.getValue()); - Assertions.assertEquals(BoundType.OPEN_UPPER_BOUND, bound.getType()); + assertEquals((Integer)0, bound.getValue()); + assertEquals(BoundType.OPEN_UPPER_BOUND, bound.getType()); - Assertions.assertNotNull(bound.toRange()); + assertNotNull(bound.toRange()); } @Test @@ -175,33 +183,33 @@ public class BoundTest { Bound bound = Bound.lessThan(0); // test - Assertions.assertFalse(bound.test(1)); - Assertions.assertFalse(bound.test(0)); - Assertions.assertTrue(bound.test(-1)); + assertFalse(bound.test(1)); + assertFalse(bound.test(0)); + assertTrue(bound.test(-1)); // getType - Assertions.assertEquals(BoundType.OPEN_UPPER_BOUND, bound.getType()); + assertEquals(BoundType.OPEN_UPPER_BOUND, bound.getType()); // getValue - Assertions.assertEquals((Integer)0, bound.getValue()); + assertEquals((Integer)0, bound.getValue()); // toString - Assertions.assertEquals("0)", bound.descBound()); - Assertions.assertEquals("{x | x < 0}", bound.toString()); + assertEquals("0)", bound.descBound()); + assertEquals("{x | x < 0}", bound.toString()); // compareTo - Assertions.assertEquals(0, bound.compareTo(bound)); - Assertions.assertEquals(-1, bound.compareTo(Bound.noneUpperBound())); - Assertions.assertEquals(1, bound.compareTo(Bound.greaterThan(-1))); - Assertions.assertEquals(-1, bound.compareTo(Bound.greaterThan(0))); - Assertions.assertEquals(1, bound.compareTo(Bound.lessThan(-1))); - Assertions.assertEquals(-1, bound.compareTo(Bound.atMost(0))); - Assertions.assertEquals(1, bound.compareTo(Bound.atMost(-1))); - Assertions.assertEquals(1, bound.compareTo(Bound.noneLowerBound())); + assertEquals(0, bound.compareTo(bound)); + assertEquals(-1, bound.compareTo(Bound.noneUpperBound())); + assertEquals(1, bound.compareTo(Bound.greaterThan(-1))); + assertEquals(-1, bound.compareTo(Bound.greaterThan(0))); + assertEquals(1, bound.compareTo(Bound.lessThan(-1))); + assertEquals(-1, bound.compareTo(Bound.atMost(0))); + assertEquals(1, bound.compareTo(Bound.atMost(-1))); + assertEquals(1, bound.compareTo(Bound.noneLowerBound())); // { x | x >= 0} bound = bound.negate(); - Assertions.assertEquals((Integer)0, bound.getValue()); - Assertions.assertEquals(BoundType.CLOSE_LOWER_BOUND, bound.getType()); + assertEquals((Integer)0, bound.getValue()); + assertEquals(BoundType.CLOSE_LOWER_BOUND, bound.getType()); - Assertions.assertNotNull(bound.toRange()); + assertNotNull(bound.toRange()); } @Test @@ -210,33 +218,33 @@ public class BoundTest { Bound bound = Bound.atMost(0); // test - Assertions.assertFalse(bound.test(1)); - Assertions.assertTrue(bound.test(0)); - Assertions.assertTrue(bound.test(-1)); + assertFalse(bound.test(1)); + assertTrue(bound.test(0)); + assertTrue(bound.test(-1)); // getType - Assertions.assertEquals(BoundType.CLOSE_UPPER_BOUND, bound.getType()); + assertEquals(BoundType.CLOSE_UPPER_BOUND, bound.getType()); // getValue - Assertions.assertEquals((Integer)0, bound.getValue()); + assertEquals((Integer)0, bound.getValue()); // toString - Assertions.assertEquals("0]", bound.descBound()); - Assertions.assertEquals("{x | x <= 0}", bound.toString()); + assertEquals("0]", bound.descBound()); + assertEquals("{x | x <= 0}", bound.toString()); // compareTo - Assertions.assertEquals(0, bound.compareTo(bound)); - Assertions.assertEquals(-1, bound.compareTo(Bound.noneUpperBound())); - Assertions.assertEquals(1, bound.compareTo(Bound.greaterThan(-1))); - Assertions.assertEquals(-1, bound.compareTo(Bound.greaterThan(0))); - Assertions.assertEquals(1, bound.compareTo(Bound.atMost(-1))); - Assertions.assertEquals(1, bound.compareTo(Bound.lessThan(0))); - Assertions.assertEquals(1, bound.compareTo(Bound.lessThan(-1))); - Assertions.assertEquals(1, bound.compareTo(Bound.noneLowerBound())); + assertEquals(0, bound.compareTo(bound)); + assertEquals(-1, bound.compareTo(Bound.noneUpperBound())); + assertEquals(1, bound.compareTo(Bound.greaterThan(-1))); + assertEquals(-1, bound.compareTo(Bound.greaterThan(0))); + assertEquals(1, bound.compareTo(Bound.atMost(-1))); + assertEquals(1, bound.compareTo(Bound.lessThan(0))); + assertEquals(1, bound.compareTo(Bound.lessThan(-1))); + assertEquals(1, bound.compareTo(Bound.noneLowerBound())); // { x | x > 0} bound = bound.negate(); - Assertions.assertEquals((Integer)0, bound.getValue()); - Assertions.assertEquals(BoundType.OPEN_LOWER_BOUND, bound.getType()); + assertEquals((Integer)0, bound.getValue()); + assertEquals(BoundType.OPEN_LOWER_BOUND, bound.getType()); - Assertions.assertNotNull(bound.toRange()); + assertNotNull(bound.toRange()); } } diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/lang/range/BoundedRangeTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/range/BoundedRangeTest.java index c22452faa9..62f88ff05d 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/lang/range/BoundedRangeTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/range/BoundedRangeTest.java @@ -156,7 +156,7 @@ public class BoundedRangeTest { // isXXX Assertions.assertTrue(range.isDisjoint(BoundedRange.open(-5, 0))); // (-5, 0) - Assertions.assertTrue(range.isDisjoint(BoundedRange.close(-5, 0))); // [-5, 0] + Assertions.assertFalse(range.isDisjoint(BoundedRange.close(-5, 0))); // [-5, 0] Assertions.assertTrue(range.isIntersected(BoundedRange.open(-5, 1))); // [-5, 1] Assertions.assertFalse(range.isSubset(BoundedRange.open(0, 5))); // (0, 5) Assertions.assertFalse(range.isProperSubset(BoundedRange.open(0, 5))); // (0, 5)