Author: onealj
Date: Fri Jan 20 05:37:12 2017
New Revision: 1779565
URL: http://svn.apache.org/viewvc?rev=1779565&view=rev
Log:
fix copy-paste typo in unit test found by Andrzej Witecki
Modified:
poi/trunk/src/testcases/org/apache/poi/POITestCase.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
Modified: poi/trunk/src/testcases/org/apache/poi/POITestCase.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/POITestCase.java?rev=1779565&r1=1779564&r2=1779565&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/POITestCase.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/POITestCase.java Fri Jan 20 05:37:12
2017
@@ -241,4 +241,17 @@ public final class POITestCase {
public static void testPassesNow(int bug) {
fail("This test passes now. Please update the unit test and bug " +
bug + ".");
}
+
+ public static void assertBetween(String message, int value, int min, int
max) {
+ assertTrue(message + ": " + value + " is less than minimum value of "
+ min,
+ min <= value);
+ assertTrue(message + ": " + value + " is greater than maximum value of
" + max,
+ value <= max);
+ }
+ public static void assertStrictlyBetween(String message, int value, int
min, int max) {
+ assertTrue(message + ": " + value + " is less or equal to than minimum
value of " + min,
+ min < value);
+ assertTrue(message + ": " + value + " is greater or equal to than
maximum value of " + max,
+ value < max);
+ }
}
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java?rev=1779565&r1=1779564&r2=1779565&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
Fri Jan 20 05:37:12 2017
@@ -25,6 +25,7 @@ import static org.junit.Assert.assertNul
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import static org.apache.poi.POITestCase.assertBetween;
import java.io.IOException;
import java.util.List;
@@ -704,10 +705,8 @@ public final class TestHSSFSheet extends
s.autoSizeColumn((short)1);
// Size ranges due to different fonts on different machines
- assertTrue("Single number column too small: " + s.getColumnWidth(0),
s.getColumnWidth(0) > 350);
- assertTrue("Single number column too big: " + s.getColumnWidth(0),
s.getColumnWidth(0) < 550);
- assertTrue("6 digit number column too small: " + s.getColumnWidth(1),
s.getColumnWidth(1) > 1500);
- assertTrue("6 digit number column too big: " + s.getColumnWidth(1),
s.getColumnWidth(1) < 2000);
+ assertBetween("Single number column width", s.getColumnWidth(0), 350,
550);
+ assertBetween("6 digit number column width", s.getColumnWidth(1), 1500,
2000);
// Set a date format
HSSFCellStyle cs = wb.createCellStyle();
@@ -723,10 +722,8 @@ public final class TestHSSFSheet extends
s.autoSizeColumn((short)0);
s.autoSizeColumn((short)1);
- assertTrue("Date column too small: " + s.getColumnWidth(0),
s.getColumnWidth(0) > 4750);
- assertTrue("Date column too small: " + s.getColumnWidth(1),
s.getColumnWidth(1) > 4750);
- assertTrue("Date column too big: " + s.getColumnWidth(0),
s.getColumnWidth(0) < 6500);
- assertTrue("Date column too big: " + s.getColumnWidth(0),
s.getColumnWidth(0) < 6500);
+ assertBetween("Date column width", s.getColumnWidth(0), 4750, 7000);
+ assertBetween("Date column width", s.getColumnWidth(1), 4750, 7000);
wb.close();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]