The patch makes the Api of our implementation of Assert the same as junit's.
This change was necessary because class files for test cases are generated
using junit's Assert.java, and they are run using GWT's Assert.java in hosted
mode.
Patch by: amitmanjhi
Review by: spoon
git-svn-id: https://google-web-toolkit.googlecode.com/svn/releases/1.6@4197 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/user/super/com/google/gwt/junit/translatable/junit/framework/Assert.java b/user/super/com/google/gwt/junit/translatable/junit/framework/Assert.java
index 0d0d66e..fd3a5e1 100644
--- a/user/super/com/google/gwt/junit/translatable/junit/framework/Assert.java
+++ b/user/super/com/google/gwt/junit/translatable/junit/framework/Assert.java
@@ -51,6 +51,10 @@
assertEquals("", obj1, obj2);
}
+ public static void assertEquals(short expected, short actual) {
+ assertEquals("", expected, actual);
+ }
+
public static void assertEquals(String str, boolean obj1, boolean obj2) {
assertEquals(str, Boolean.valueOf(obj1), Boolean.valueOf(obj2));
}
@@ -107,6 +111,18 @@
fail(msg + " expected=" + obj1 + " actual=" + obj2);
}
+ public static void assertEquals(String str, short obj1, short obj2) {
+ assertEquals(str, new Short(obj1), new Short(obj2));
+ }
+
+ public static void assertEquals(String obj1, String obj2) {
+ assertEquals("", obj1, obj2);
+ }
+
+ public static void assertEquals(String message, String expected, String actual) {
+ assertEquals(message, (Object) expected, (Object) actual);
+ }
+
public static void assertFalse(boolean condition) {
assertFalse(null, condition);
}
@@ -181,6 +197,32 @@
throw new AssertionFailedError(message);
}
+ public static void failNotEquals(String message, Object expected,
+ Object actual) {
+ String formatted = "";
+ if (message != null) {
+ formatted = message + " ";
+ }
+ fail(formatted + "expected :<" + expected + "> was not:<" + actual + ">");
+ }
+
+ public static void failNotSame(String message, Object expected, Object actual) {
+ String formatted = "";
+ if (message != null) {
+ formatted = message + " ";
+ }
+ fail(formatted + "expected same:<" + expected + "> was not:<" + actual
+ + ">");
+ }
+
+ public static void failSame(String message) {
+ String formatted = "";
+ if (message != null) {
+ formatted = message + " ";
+ }
+ fail(formatted + "expected not same");
+ }
+
/**
* Utility class, no public constructor needed.
*/
