Modified:
/trunk/gwt-mobile-webkit/storage/storage/test/com/google/code/gwt/storage/client/StorageTest.java
=======================================
---
/trunk/gwt-mobile-webkit/storage/storage/test/com/google/code/gwt/storage/client/StorageTest.java
Tue Nov 10 13:56:36 2009
+++
/trunk/gwt-mobile-webkit/storage/storage/test/com/google/code/gwt/storage/client/StorageTest.java
Sun Jan 9 15:35:14 2011
@@ -30,32 +30,15 @@
public void testStorageSupported() {
assertTrue("Storage API is NOT supported! User agent: " +
getUserAgent(),
- Storage.isSupported());
+ Storage.isLocalStorageSupported() ||
Storage.isSessionStorageSupported());
}
- public void testStorage() {
- final Storage localStorage = Storage.getLocalStorage();
- final Storage sessionStorage = Storage.getSessionStorage();
-
- assertNotNull("No support for Web Storage: no localStorage found!",
- localStorage);
- assertNotNull("No support for Web Storage: no sessionStorage found!",
- sessionStorage);
-
- localStorage.clear();
- sessionStorage.clear();
-
- localStorage.setItem("name", "Bart");
- localStorage.setItem("lastName", "Guijt");
- localStorage.setItem("email", "ba...@guijt.me");
- localStorage.setItem("country", "The Netherlands");
-
- sessionStorage.setItem("name", "Pepijn");
-
- assertEquals("There must be a name key in localStorage!", "Bart",
- localStorage.getItem("name"));
- assertEquals("There must be a name key in sessionStorage!", "Pepijn",
- sessionStorage.getItem("name"));
+ public void testLocalStorage() {
+ doStorage(Storage.getLocalStorage());
+ }
+
+ public void testSessionStorage() {
+ doStorage(Storage.getSessionStorage());
}
public void testStorageRetention() {
@@ -112,6 +95,22 @@
sessionStorage.setItem("name", "Pepijn");
}
+ public void doStorage(Storage s) {
+ assertNotNull("No support for Web Storage!", s);
+
+ s.clear();
+ assertEquals("There should be NO items in the Storage after clear()!",
0, s.getLength());
+
+ s.setItem("name", "Bart");
+ s.setItem("lastName", "Guijt");
+ s.setItem("email", "ba...@guijt.me");
+ s.setItem("country", "The Netherlands");
+
+ assertEquals("There should be 4 items in the Storage!", 4,
s.getLength());
+ assertEquals("There must be a name key in localStorage!", "Bart",
+ s.getItem("name"));
+ }
+
private final static native String getUserAgent() /*-{
return navigator.userAgent;
}-*/;