git://wamblee.org
/
utils
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added SetterConfiguration class for configuring how setters correspond to required...
[utils]
/
support
/
general
/
src
/
test
/
java
/
org
/
wamblee
/
test
/
AssertionUtils.java
diff --git
a/support/general/src/test/java/org/wamblee/test/AssertionUtils.java
b/support/general/src/test/java/org/wamblee/test/AssertionUtils.java
index 0a3e41719a8121ec52f844d63ebb7c33385b30e9..824620418797fc7c42dc2688457c789b6a85a325 100644
(file)
--- a/
support/general/src/test/java/org/wamblee/test/AssertionUtils.java
+++ b/
support/general/src/test/java/org/wamblee/test/AssertionUtils.java
@@
-15,6
+15,8
@@
*/
package org.wamblee.test;
*/
package org.wamblee.test;
+import java.util.Arrays;
+import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@
-45,9
+47,10
@@
public final class AssertionUtils {
* @param aActual
* Actual object array.
*/
* @param aActual
* Actual object array.
*/
- public static
void assertEquals(Object[] aExpected, Object
[] aActual) {
+ public static
<T> void assertEquals(T[] aExpected, T
[] aActual) {
assertEquals("", aExpected, aActual);
}
assertEquals("", aExpected, aActual);
}
+
/**
* Asserts that two object arrays are equal.
/**
* Asserts that two object arrays are equal.
@@
-59,8
+62,8
@@
public final class AssertionUtils {
* @param aActual
* Actual array.
*/
* @param aActual
* Actual array.
*/
- public static
void assertEquals(String aMsg, Object
[] aExpected,
-
Object
[] aActual) {
+ public static
<T> void assertEquals(String aMsg, T
[] aExpected,
+
T
[] aActual) {
TestCase.assertEquals(aMsg + ": Array lengths ", aExpected.length,
aActual.length);
TestCase.assertEquals(aMsg + ": Array lengths ", aExpected.length,
aActual.length);
@@
-69,6
+72,7
@@
public final class AssertionUtils {
aActual[i]);
}
}
aActual[i]);
}
}
+
/**
* Asserts that two objects are equal, and in case the object is an Object[]
/**
* Asserts that two objects are equal, and in case the object is an Object[]
@@
-81,8
+85,8
@@
public final class AssertionUtils {
* @param aActual
* Actual result.
*/
* @param aActual
* Actual result.
*/
- public static
void assertEquals(String aMsg, Object
aExpected,
-
Object
aActual) {
+ public static
<T> void assertEquals(String aMsg, T
aExpected,
+
T
aActual) {
if (aExpected instanceof Object[]) {
AssertionUtils.assertEquals(aMsg, (Object[]) aExpected,
(Object[]) aActual);
if (aExpected instanceof Object[]) {
AssertionUtils.assertEquals(aMsg, (Object[]) aExpected,
(Object[]) aActual);
@@
-104,7
+108,8
@@
public final class AssertionUtils {
* @param aActual
* Actual result.
*/
* @param aActual
* Actual result.
*/
- public static void assertEquals(String aMsg, Map aExpectedMap, Map aActual) {
+ public static <Key,Value> void assertEquals(String aMsg,
+ Map<Key,Value> aExpectedMap, Map<Key,Value> aActual) {
TestCase.assertEquals("Map sizes differ", aExpectedMap.size(), aActual
.size());
TestCase.assertEquals("Map sizes differ", aExpectedMap.size(), aActual
.size());
@@
-132,6
+137,7
@@
public final class AssertionUtils {
public static void assertException(ErroneousCode aObject, Class aType) {
try {
aObject.run();
public static void assertException(ErroneousCode aObject, Class aType) {
try {
aObject.run();
+ throw new RuntimeException("No exception occurred");
} catch (Throwable t) {
if ( aType.isInstance(t)) {
return; // ok
} catch (Throwable t) {
if ( aType.isInstance(t)) {
return; // ok