git://git.nikiroo.be
/
fanfix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Text justification: tests (WIP) + code (WIP)
[fanfix.git]
/
src
/
be
/
nikiroo
/
utils
/
test
/
TestCase.java
diff --git
a/src/be/nikiroo/utils/test/TestCase.java
b/src/be/nikiroo/utils/test/TestCase.java
index b37ea987ffca27677a32eb5d31d05e2632974c52..a62cb0b79646752fb9b37ffca7c4173dc795cac7 100644
(file)
--- a/
src/be/nikiroo/utils/test/TestCase.java
+++ b/
src/be/nikiroo/utils/test/TestCase.java
@@
-15,6
+15,10
@@
abstract public class TestCase {
class AssertException extends Exception {
private static final long serialVersionUID = 1L;
class AssertException extends Exception {
private static final long serialVersionUID = 1L;
+ public AssertException(String reason, Exception source) {
+ super(reason, source);
+ }
+
public AssertException(String reason) {
super(reason);
}
public AssertException(String reason) {
super(reason);
}
@@
-38,6
+42,7
@@
abstract public class TestCase {
* @throws Exception
* in case of error
*/
* @throws Exception
* in case of error
*/
+ @SuppressWarnings("unused")
public void setUp() throws Exception {
}
public void setUp() throws Exception {
}
@@
-47,6
+52,7
@@
abstract public class TestCase {
* @throws Exception
* in case of error
*/
* @throws Exception
* in case of error
*/
+ @SuppressWarnings("unused")
public void tearDown() throws Exception {
}
public void tearDown() throws Exception {
}
@@
-109,8
+115,8
@@
abstract public class TestCase {
/**
* Check that 2 {@link Object}s are equals.
*
/**
* Check that 2 {@link Object}s are equals.
*
- * @param
th
e
- * error message to display if they differ
+ * @param
errorMessag
e
+ *
the
error message to display if they differ
* @param expected
* the expected value
* @param actual
* @param expected
* the expected value
* @param actual
@@
-121,14
+127,15
@@
abstract public class TestCase {
*/
public void assertEquals(String errorMessage, Object expected, Object actual)
throws AssertException {
*/
public void assertEquals(String errorMessage, Object expected, Object actual)
throws AssertException {
-
- if (errorMessage == null) {
- errorMessage = generateAssertMessage(expected, actual);
- }
-
if ((expected == null && actual != null)
|| (expected != null && !expected.equals(actual))) {
if ((expected == null && actual != null)
|| (expected != null && !expected.equals(actual))) {
- throw new AssertException(errorMessage);
+ if (errorMessage == null) {
+ throw new AssertException(generateAssertMessage(expected,
+ actual));
+ }
+
+ throw new AssertException(errorMessage, new AssertException(
+ generateAssertMessage(expected, actual)));
}
}
}
}
@@
-144,14
+151,14
@@
abstract public class TestCase {
* in case they differ
*/
public void assertEquals(long expected, long actual) throws AssertException {
* in case they differ
*/
public void assertEquals(long expected, long actual) throws AssertException {
- assertEquals(
new Long(expected), new Long
(actual));
+ assertEquals(
Long.valueOf(expected), Long.valueOf
(actual));
}
/**
* Check that 2 {@link Object}s are equals.
*
}
/**
* Check that 2 {@link Object}s are equals.
*
- * @param
th
e
- * error message to display if they differ
+ * @param
errorMessag
e
+ *
the
error message to display if they differ
* @param expected
* the expected value
* @param actual
* @param expected
* the expected value
* @param actual
@@
-162,7
+169,7
@@
abstract public class TestCase {
*/
public void assertEquals(String errorMessage, long expected, long actual)
throws AssertException {
*/
public void assertEquals(String errorMessage, long expected, long actual)
throws AssertException {
- assertEquals(errorMessage,
new Long(expected), new Long
(actual));
+ assertEquals(errorMessage,
Long.valueOf(expected), Long.valueOf
(actual));
}
/**
}
/**
@@
-178,14
+185,14
@@
abstract public class TestCase {
*/
public void assertEquals(boolean expected, boolean actual)
throws AssertException {
*/
public void assertEquals(boolean expected, boolean actual)
throws AssertException {
- assertEquals(
new Boolean(expected), new Boolean
(actual));
+ assertEquals(
Boolean.valueOf(expected), Boolean.valueOf
(actual));
}
/**
* Check that 2 {@link Object}s are equals.
*
}
/**
* Check that 2 {@link Object}s are equals.
*
- * @param
th
e
- * error message to display if they differ
+ * @param
errorMessag
e
+ *
the
error message to display if they differ
* @param expected
* the expected value
* @param actual
* @param expected
* the expected value
* @param actual
@@
-196,7
+203,8
@@
abstract public class TestCase {
*/
public void assertEquals(String errorMessage, boolean expected,
boolean actual) throws AssertException {
*/
public void assertEquals(String errorMessage, boolean expected,
boolean actual) throws AssertException {
- assertEquals(errorMessage, new Boolean(expected), new Boolean(actual));
+ assertEquals(errorMessage, Boolean.valueOf(expected),
+ Boolean.valueOf(actual));
}
/**
}
/**
@@
-212,14
+220,14
@@
abstract public class TestCase {
*/
public void assertEquals(double expected, double actual)
throws AssertException {
*/
public void assertEquals(double expected, double actual)
throws AssertException {
- assertEquals(
new Double(expected), new Double
(actual));
+ assertEquals(
Double.valueOf(expected), Double.valueOf
(actual));
}
/**
* Check that 2 {@link Object}s are equals.
*
}
/**
* Check that 2 {@link Object}s are equals.
*
- * @param
th
e
- * error message to display if they differ
+ * @param
errorMessag
e
+ *
the
error message to display if they differ
* @param expected
* the expected value
* @param actual
* @param expected
* the expected value
* @param actual
@@
-230,14
+238,15
@@
abstract public class TestCase {
*/
public void assertEquals(String errorMessage, double expected, double actual)
throws AssertException {
*/
public void assertEquals(String errorMessage, double expected, double actual)
throws AssertException {
- assertEquals(errorMessage, new Double(expected), new Double(actual));
+ assertEquals(errorMessage, Double.valueOf(expected),
+ Double.valueOf(actual));
}
/**
* Check that given {@link Object} is not NULL.
*
}
/**
* Check that given {@link Object} is not NULL.
*
- * @param
th
e
- * error message to display if it is NULL
+ * @param
errorMessag
e
+ *
the
error message to display if it is NULL
* @param actual
* the actual value
*
* @param actual
* the actual value
*
@@
-247,12
+256,16
@@
abstract public class TestCase {
public void assertNotNull(String errorMessage, Object actual)
throws AssertException {
if (actual == null) {
public void assertNotNull(String errorMessage, Object actual)
throws AssertException {
if (actual == null) {
+ String defaultReason = String.format("" //
+ + "Assertion failed!%n" //
+ + "Object should not have been NULL");
+
if (errorMessage == null) {
if (errorMessage == null) {
- errorMessage = String.format("" //
- + "Assertion failed!\n" //
- + "Object should have been NULL: [%s]", actual);
+ throw new AssertException(defaultReason);
}
}
- throw new AssertException(errorMessage);
+
+ throw new AssertException(errorMessage, new AssertException(
+ defaultReason));
}
}
}
}
@@
-269,8
+282,8
@@
abstract public class TestCase {
*/
public static String generateAssertMessage(Object expected, Object actual) {
return String.format("" //
*/
public static String generateAssertMessage(Object expected, Object actual) {
return String.format("" //
- + "Assertion failed!
\
n" //
- + "Expected value: [%s]
\
n" //
+ + "Assertion failed!
%
n" //
+ + "Expected value: [%s]
%
n" //
+ "Actual value: [%s]", expected, actual);
}
}
+ "Actual value: [%s]", expected, actual);
}
}