diff options
author | Andreas Beeker <kiwiwings@apache.org> | 2020-12-24 18:42:29 +0000 |
---|---|---|
committer | Andreas Beeker <kiwiwings@apache.org> | 2020-12-24 18:42:29 +0000 |
commit | a0fa9e19b1196bc10034f15474d27ce23bf5865a (patch) | |
tree | 499c1eb427ebff72f7e447d13dd1de1552df8146 /src/testcases/org/apache/poi/ss/util/TestCellRangeUtil.java | |
parent | fb012041e8dd788637e68737199bc313b3e90098 (diff) | |
download | poi-a0fa9e19b1196bc10034f15474d27ce23bf5865a.tar.gz poi-a0fa9e19b1196bc10034f15474d27ce23bf5865a.zip |
#65026 - Migrate tests to Junit 5
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1884783 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/testcases/org/apache/poi/ss/util/TestCellRangeUtil.java')
-rw-r--r-- | src/testcases/org/apache/poi/ss/util/TestCellRangeUtil.java | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/testcases/org/apache/poi/ss/util/TestCellRangeUtil.java b/src/testcases/org/apache/poi/ss/util/TestCellRangeUtil.java index 377f78d82a..0de86405da 100644 --- a/src/testcases/org/apache/poi/ss/util/TestCellRangeUtil.java +++ b/src/testcases/org/apache/poi/ss/util/TestCellRangeUtil.java @@ -17,13 +17,14 @@ package org.apache.poi.ss.util; -import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import java.util.HashSet; + +import org.junit.jupiter.api.Test; /** * Tests CellRangeUtil. @@ -31,7 +32,7 @@ import java.util.HashSet; * @see org.apache.poi.ss.util.CellRangeUtil */ public final class TestCellRangeUtil { - + private static final CellRangeAddress A1 = new CellRangeAddress(0, 0, 0, 0); private static final CellRangeAddress B1 = new CellRangeAddress(0, 0, 1, 1); private static final CellRangeAddress A2 = new CellRangeAddress(1, 1, 0, 0); @@ -39,7 +40,7 @@ public final class TestCellRangeUtil { private static final CellRangeAddress A1_B2 = new CellRangeAddress(0, 1, 0, 1); private static final CellRangeAddress A1_B1 = new CellRangeAddress(0, 0, 0, 1); private static final CellRangeAddress A1_A2 = new CellRangeAddress(0, 1, 0, 0); - + @Test public void testMergeCellRanges() { // Note that the order of the output array elements does not matter @@ -56,7 +57,7 @@ public final class TestCellRangeUtil { // Partially mergeable: multiple possible merges // A B // 1 x x A1,A2,B1 --> A1:B1,A2 or A1:A2,B1 - // 2 x + // 2 x assertCellRangesEqual(asArray(A1_B1, A2), merge(A1, B1, A2)); assertCellRangesEqual(asArray(A1_A2, B1), merge(A2, A1, B1)); assertCellRangesEqual(asArray(A1_B1, A2), merge(B1, A2, A1)); |