[java-idp-integration-tests COMMIT] /trunk/src/test/java/net/shibboleth/idp/test/localstorage/LocalStorageTest.java

[noreply at shibboleth.net]

Author: tzeller
Date: Tue May 26 17:45:39 2015
New Revision: 61

URL: http://svn.shibboleth.net/view/java-idp-integration-tests?rev=61&view=rev
Log:
IDP-594 Some work on local storage write subflow. Parameterize the item key and value. Return boolean representing success as well as exception.

Modified:
    trunk/src/test/java/net/shibboleth/idp/test/localstorage/LocalStorageTest.java

Modified: trunk/src/test/java/net/shibboleth/idp/test/localstorage/LocalStorageTest.java
URL: http://svn.shibboleth.net/view/java-idp-integration-tests/trunk/src/test/java/net/shibboleth/idp/test/localstorage/LocalStorageTest.java?rev=61&r1=60&r2=61&view=diff
==============================================================================
--- trunk/src/test/java/net/shibboleth/idp/test/localstorage/LocalStorageTest.java	(original)
+++ trunk/src/test/java/net/shibboleth/idp/test/localstorage/LocalStorageTest.java	Tue May 26 17:45:39 2015
@@ -25,8 +25,6 @@
 
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.firefox.FirefoxDriver;
-import org.openqa.selenium.htmlunit.HtmlUnitDriver;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 import org.openqa.selenium.support.ui.WebDriverWait;
 import org.slf4j.Logger;
@@ -92,37 +90,48 @@
         waitForLocalStorageTestViewPage();
 
         final String localStorageViaJavaScript = wrapper.getItem(key);
-        final String localStorageViaView = driver.findElement(By.id("localStorage")).getText();
-        final String localStorageSupportViaView = driver.findElement(By.id("localStorageSupport")).getText();
+        Assert.assertNull(localStorageViaJavaScript);
 
-        Assert.assertNull(localStorageViaJavaScript);
-        if (driver instanceof FirefoxDriver) {
-            Assert.assertEquals(localStorageViaView, "");
-        } else if (driver instanceof HtmlUnitDriver) {
-            Assert.assertEquals(localStorageViaView, "null");
-        }
+        final String localStorageValue = driver.findElement(By.id("localStorageValue")).getText();
+        Assert.assertEquals(localStorageValue, "");
 
-        Assert.assertEquals(localStorageSupportViaView, "true");
+        final String localStorageSupport = driver.findElement(By.id("localStorageSupport")).getText();
+        Assert.assertEquals(localStorageSupport, "true");
+
+        // TODO more web flow attributes
     }
 
     @Test public void testWrite() throws Exception {
 
         startJettyServer();
 
-        driver.get(writeURL + "?localStorageValue=foo");
+        final String key = "key";
+        final String value = "value";
+
+        final String URL = writeURL + "?localStorageKey=" + key + "&localStorageValue=" + value;
+        driver.get(URL);
 
         waitForLocalStorageTestViewPage();
 
         final String localStorageViaJavaScript = wrapper.getItem(key);
-        final String localStorageViaView = driver.findElement(By.id("localStorage")).getText();
-        final String localStorageSupportViaView = driver.findElement(By.id("localStorageSupport")).getText();
+        Assert.assertEquals(localStorageViaJavaScript, value);
 
-        Assert.assertEquals(localStorageViaJavaScript, "foo");
-        // only set during read test flow
-        Assert.assertEquals(localStorageViaView, "");
-        Assert.assertEquals(localStorageSupportViaView, "");
+        final String localStorageKey = driver.findElement(By.id("localStorageKey")).getText();
+        Assert.assertEquals(localStorageKey, key);
+
+        final String localStorageValue = driver.findElement(By.id("localStorageValue")).getText();
+        Assert.assertEquals(localStorageValue, value);
+
+        final String localStorageSuccess = driver.findElement(By.id("localStorageSuccess")).getText();
+        Assert.assertEquals(localStorageSuccess, "true");
+
+        // TODO more web flow attributes
     }
 
     // TODO more tests
 
+    // TODO test read without key or version
+
+    // TODO test write without key or version or value
+
 }