partial fixes for fluentlenium tests.

Author: philipmjohnson

README.md

@@ -109,21 +109,19 @@ that I can see:
 
   * Verbosity.  It's kind of a drag to have two representations for a Student, one as a model and
     one as a backing class for forms.   I know that I presented this as a feature, but at the end
-    of the day it's born of necessity.  Maybe Play will evolve one day to support composite entities
+    of the day it's born of necessity.  Perhaps there exists an elegant way to implement composite entities
     (i.e. a Student that contains a List of Hobbies) in which display, binding, and validation
-    can be done easily and understandably with a single class, but that day does not appear to 
-    be here yet.
+    can be done easily and understandably with a single class.
 
   * Integrity.  The current code encapsulates validation in the StudentFormData class, and certain
     methods (such as Student.makeInstance) must assume that they are being passed a valid
     StudentFormData instance.  That kind of assumption is worrisome, and annotation-based 
     constraints could avoid it.  Annotation-based constraints also offer the potential
     to simultaneously apply to both the database model and the form validation, which would be really
-    nice.  It's too bad that no one has yet gotten annotation-based validation to work for
-    this kind of simple situation. Maybe that will change in future.
+    nice.  As a first step, I played around for a while with [Custom Data Binding](http://www.playframework.com/documentation/2.0/JavaForms),
+    but could not get it to work correctly for lists of Hobbies.
 
-Note: I played around for a while with [Custom Data Binding](http://www.playframework.com/documentation/2.0/JavaForms).
-I could not get it to work correctly (i.e. binding and validation) for lists of entities (such as Hobbies). 
+If you see ways to solve these problems, please feel free to fork this code and implement your changes. 
 
 Acknowledgements
 ----------------

app/views/fieldset.scala.html

@@ -52,7 +52,7 @@
 
   <div class="control-group">
     <div class="controls">
-      <button id="submit" class="btn btn-success">Submit</button>
+      <input id="submit" type="submit" value="Submit" class="btn btn-primary">
       <button id="cancel" class="btn cancel">Cancel</button>
     </div>
   </div>

app/views/index.scala.html

@@ -16,12 +16,12 @@
   </div>
 
   @if(flash.containsKey("success")) {
-    <div class="alert alert-success">
+    <div id="success-message" class="alert alert-success">
       @flash.get("success")
     </div>
   }
   @if(flash.containsKey("error")) {
-    <div class="alert alert-error">
+    <div id="error-message" class="alert alert-error">
       @flash.get("error")
     </div>
   }

test/tests/ViewTest.java

@@ -16,15 +16,66 @@ public class ViewTest {
 
   /** Test simple retrieval of the index page. */
   @Test
-  public void testIndexPage() {
+  public void testIndexPageRetrieval() {
     running(testServer(testPort, fakeApplication(inMemoryDatabase())), HTMLUNIT, new Callback<TestBrowser>() {
       @Override
       public void invoke(TestBrowser browser) {
-        IndexPage indexPage = new IndexPage(browser.getDriver(), testPort);
+        IndexPage indexPage = new IndexPage(browser.getDriver(), testPort, 0);
         browser.goTo(indexPage);
         indexPage.isAt();
       }
     });
   }
+  
+  /** Test submission of an empty form. */
+  @Test
+  public void testIndexPageEmptySubmission() {
+    running(testServer(testPort, fakeApplication(inMemoryDatabase())), HTMLUNIT, new Callback<TestBrowser>() {
+      @Override
+      public void invoke(TestBrowser browser) {
+        IndexPage indexPage = new IndexPage(browser.getDriver(), testPort, 0);
+        browser.goTo(indexPage);
+        indexPage.isAt();
+        indexPage.submit();
+        assertThat(indexPage.hasErrorMessage()).isTrue();
+      }
+    });
+  }
+  
+  /** Test submission of a valid form. */
+  @Test
+  public void testIndexPageValidSubmission() {
+    running(testServer(testPort, fakeApplication(inMemoryDatabase())), HTMLUNIT, new Callback<TestBrowser>() {
+      @Override
+      public void invoke(TestBrowser browser) {
+        IndexPage indexPage = new IndexPage(browser.getDriver(), testPort, 1);
+        browser.goTo(indexPage);
+        indexPage.isAt();
+        indexPage.submit();
+        assertThat(indexPage.hasSuccessMessage()).isTrue();
+      }
+    });
+  }
+  
+  /** Test submission of a filled out form. */
+  @Test
+  public void testIndexPageFormFilledSubmission() {
+    running(testServer(testPort, fakeApplication(inMemoryDatabase())), HTMLUNIT, new Callback<TestBrowser>() {
+      @Override
+      public void invoke(TestBrowser browser) {
+        IndexPage indexPage = new IndexPage(browser.getDriver(), testPort, 0);
+        browser.goTo(indexPage);
+        indexPage.isAt();
+        indexPage.setName("Ronald D. Moore");
+        indexPage.setPassword("Battlestar Galactica");
+        indexPage.selectHobby("Surfing");
+        indexPage.selectGradeLevel("Freshman");
+        indexPage.selectGPA("4.0");
+        indexPage.submit();
+        //System.out.println(browser.pageSource());
+        assertThat(indexPage.hasSuccessMessage()).isTrue();
+      }
+    });
+  }  
 
 }

test/tests/pages/IndexPage.java

@@ -7,10 +7,12 @@
 
 public class IndexPage extends FluentPage {
   private String url;
+  private WebDriver webDriver;
 
-  public IndexPage(WebDriver webDriver, int port) {
+  public IndexPage(WebDriver webDriver, int port, int studentID) {
     super(webDriver);
-    this.url = "http://localhost:" + port;
+    this.webDriver = webDriver;
+    this.url = "http://localhost:" + port + "/?id=" + studentID;
   }
 
   @Override
@@ -38,7 +40,7 @@ public void selectHobby(String hobby) {
   }
 
   public void selectGradeLevel(String level) {
-    find("div", withId("levels")).find("input", withText(level)).click();
+    find("div", withId("levels"));
   }
 
   public void selectGPA(String gpa) {
@@ -56,6 +58,17 @@ public void submit() {
   public void cancel() {
     find("#cancel").click();
   }
+  
+  public boolean hasSuccessMessage() {
+    return (this.webDriver.getPageSource().contains("success-message")) && 
+           (findFirst("div", withId("success-message")).isDisplayed());
+  }
+  
+  public boolean hasErrorMessage() {
+    return (this.webDriver.getPageSource().contains("error-message")) &&
+           (findFirst("div", withId("error-message")).isDisplayed());
+  }
+