moparisthebest
/
poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

change from hamcrest-core-1.3 to hamcrest-all-1.3 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1791444 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Javen O'Neal 2017-04-15 03:19:27 +00:00
parent e7ca1594da
commit ef8c9329cf
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build.xml
View File

@ -163,8 +163,8 @@ under the License.
<property name="main.log4j.url" value="${repository.m2}/maven2/log4j/log4j/1.2.17/log4j-1.2.17.jar"/>
<property name="main.junit.jar" location="${main.lib}/junit-4.12.jar"/>
<property name="main.junit.url" value="${repository.m2}/maven2/junit/junit/4.12/junit-4.12.jar"/>
<property name="main.hamcrest.jar" location="${main.lib}/hamcrest-core-1.3.jar"/>
<property name="main.hamcrest.url" value="${repository.m2}/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
<property name="main.hamcrest.jar" location="${main.lib}/hamcrest-all-1.3.jar"/>
<property name="main.hamcrest.url" value="${repository.m2}/maven2/org/hamcrest/hamcrest-all/1.3/hamcrest-all-1.3.jar"/>
<property name="main.ant.jar" location="${main.lib}/ant-1.9.4.jar"/>
<property name="main.ant.url" value="${repository.m2}/maven2/org/apache/ant/ant/1.9.4/ant-1.9.4.jar"/>
<property name="main.antlauncher.jar" location="${main.lib}/ant-launcher-1.9.4.jar"/>
@ -567,6 +567,7 @@ under the License.
<include name="forbiddenapis-1.*.jar"/>
<include name="forbiddenapis-2.0.jar"/>
<include name="apache-rat-0.11.jar"/>
<include name="hamcrest-core-1.3.jar"/>
</fileset>
<fileset dir="${ooxml.lib}">
<!-- remove jars from previous versions, but not the current version -->

28
src/testcases/org/apache/poi/POITestCase.java
View File

@ -30,6 +30,10 @@ import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.startsWith;
import static org.hamcrest.CoreMatchers.endsWith;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.Matchers.lessThan;
import static org.hamcrest.Matchers.lessThanOrEqualTo;
import static org.hamcrest.Matchers.greaterThan;
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
import java.lang.reflect.AccessibleObject;
import java.lang.reflect.Field;
@ -57,6 +61,12 @@ public final class POITestCase {
assertThat(string, startsWith(prefix));
}
public static void assertStartsWith(String message, String string, String prefix) {
assertNotNull(message, string);
assertNotNull(message, prefix);
assertThat(message, string, startsWith(prefix));
}
public static void assertEndsWith(String string, String suffix) {
assertNotNull(string);
assertNotNull(suffix);
@ -69,6 +79,12 @@ public final class POITestCase {
assertThat(haystack, containsString(needle));
}
public static void assertContains(String message, String haystack, String needle) {
assertNotNull(message, haystack);
assertNotNull(message, needle);
assertThat(message, haystack, containsString(needle));
}
public static void assertContainsIgnoreCase(String haystack, String needle, Locale locale) {
assertNotNull(haystack);
assertNotNull(needle);
@ -250,15 +266,11 @@ public final class POITestCase {
}
public static void assertBetween(String message, int value, int min, int max) {
assertTrue(message + ": " + value + " is less than the minimum value of " + min,
min <= value);
assertTrue(message + ": " + value + " is greater than the maximum value of " + max,
value <= max);
assertThat(message, value, greaterThanOrEqualTo(min));
assertThat(message, value, lessThanOrEqualTo(max));
}
public static void assertStrictlyBetween(String message, int value, int min, int max) {
assertTrue(message + ": " + value + " is less than or equal to the minimum value of " + min,
min < value);
assertTrue(message + ": " + value + " is greater than or equal to the maximum value of " + max,
value < max);
assertThat(message, value, greaterThan(min));
assertThat(message, value, lessThan(max));
}
}