Author: onealj
Date: Sun Apr 16 06:10:23 2017
New Revision: 1791570
URL: http://svn.apache.org/viewvc?rev=1791570&view=rev
Log:
roll back to hamcrest-core
Modified:
poi/trunk/build.xml
poi/trunk/maven/poi.pom
poi/trunk/src/testcases/org/apache/poi/POITestCase.java
Modified: poi/trunk/build.xml
URL:
http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1791570&r1=1791569&r2=1791570&view=diff
==============================================================================
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Sun Apr 16 06:10:23 2017
@@ -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-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.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.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"/>
Modified: poi/trunk/maven/poi.pom
URL:
http://svn.apache.org/viewvc/poi/trunk/maven/poi.pom?rev=1791570&r1=1791569&r2=1791570&view=diff
==============================================================================
--- poi/trunk/maven/poi.pom (original)
+++ poi/trunk/maven/poi.pom Sun Apr 16 06:10:23 2017
@@ -81,7 +81,7 @@
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
+ <artifactId>hamcrest-core</artifactId>
<scope>test</scope>
<version>1.3</version>
</dependency>
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=1791570&r1=1791569&r2=1791570&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/POITestCase.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/POITestCase.java Sun Apr 16 06:10:23
2017
@@ -30,10 +30,6 @@ import static org.hamcrest.CoreMatchers.
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;
@@ -266,11 +262,16 @@ public final class POITestCase {
}
public static void assertBetween(String message, int value, int min, int
max) {
- assertThat(message, value, greaterThanOrEqualTo(min));
- assertThat(message, value, lessThanOrEqualTo(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);
}
public static void assertStrictlyBetween(String message, int value, int
min, int max) {
- assertThat(message, value, greaterThan(min));
- assertThat(message, value, lessThan(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);
}
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
