Author: doogie
Date: Mon Mar 1 03:10:12 2010
New Revision: 917360
URL:
http://svn.apache.org/viewvc?rev=917360&view=revLog:
Need to check whether the wanted object is a Set before checking if it
is a Collection.
Modified:
ofbiz/trunk/framework/base/src/org/ofbiz/base/test/GenericTestCaseBase.java
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/test/GenericTestCaseBase.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/test/GenericTestCaseBase.java?rev=917360&r1=917359&r2=917360&view=diff==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/test/GenericTestCaseBase.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/test/GenericTestCaseBase.java Mon Mar 1 03:10:12 2010
@@ -266,11 +266,11 @@
assertEquals(msg, (Map<?, ?>) wanted, got);
} else if (wanted == null) {
TestCase.assertEquals(msg, wanted, got);
+ } else if (wanted instanceof Set) {
+ assertEquals(msg, (Set<?>) wanted, got);
} else if (wanted instanceof Collection) {
System.err.println("c");
assertEquals(msg, (Collection<?>) wanted, got);
- } else if (wanted instanceof Set) {
- assertEquals(msg, (Set<?>) wanted, got);
} else if (wanted.getClass().isArray()) {
if (got == null) {
TestCase.assertEquals(msg, wanted, got);