[duedates-ulaula commit] r101 - in trunk/src/edu/hawaii/duedates: configuration webApp

[codesite...@google.com]

Author: tylerwolff
Date: Mon Dec 8 03:23:46 2008
New Revision: 101

Modified:
trunk/src/edu/hawaii/duedates/configuration/User.java
trunk/src/edu/hawaii/duedates/webApp/TestResultPage.java

Log:
Issue 32, finished test cases for all pages. also fixed an unforseen bug in
the User.java class when returning all user library arguments.

Modified: trunk/src/edu/hawaii/duedates/configuration/User.java
==============================================================================
--- trunk/src/edu/hawaii/duedates/configuration/User.java (original)
+++ trunk/src/edu/hawaii/duedates/configuration/User.java Mon Dec 8
03:23:46 2008
@@ -83,7 +83,16 @@
* @return A string of library arguments.
*/
public String getLibraryArgs () {
+
+ if (("").equals(this.uhManoa) && !("").equals(this.hawaiiStateLib)) {
+ return this.hawaiiStateLib;
+ }
+ else if (!("").equals(this.uhManoa) &&
("").equals(this.hawaiiStateLib)) {
+ return this.uhManoa;
+ }
+ else {
return this.uhManoa + " " + this.hawaiiStateLib;
+ }
}

/**

Modified: trunk/src/edu/hawaii/duedates/webApp/TestResultPage.java
==============================================================================
--- trunk/src/edu/hawaii/duedates/webApp/TestResultPage.java (original)
+++ trunk/src/edu/hawaii/duedates/webApp/TestResultPage.java Mon Dec 8
03:23:46 2008
@@ -37,6 +37,11 @@
testUser.setUhManoa("-uhm " + login + " " + password);
this.config.addUser(testUser);
this.config.setSmtpServer("mail.hawaii.edu");
+
+ // hsl user
+ User testUser2 = new User("Test2", "tes...@hawaii.edu", "password2");
+ testUser2.setHawaiiStateLib("-hsl 2342 2342");
+ this.config.addUser(testUser2);
}

/**
@@ -70,18 +75,21 @@
assertNotNull("Testing wicket:id Results found.",
tester.getTagByWicketId("Results"));
assertNotNull("Testing wicket:id Alerts found",
tester.getTagByWicketId("Alerts"));
assertNotNull("Testing wicket:id Logout found",
tester.getTagByWicketId("Logout"));
-
-
+ assertNotNull("Testing wicket:id uhContainer found",
tester.getTagByWicketId("uhContainer"));
+ assertNotNull("Testing wicket:id updateUh found",
tester.getTagByWicketId("updateUh"));
+ assertNotNull("Testing wicket:id uhLabel found",
tester.getTagByWicketId("uhLabel"));
+ assertNotNull("Testing wicket:id withinUh found",
tester.getTagByWicketId("withinUh"));

// Test that the update hsl link is not there
+ tester.assertInvisible("resultForm:hslContainer");
assertFalse("no hsl info",
tester.getTagByWicketId(RESULT_FORM).getMarkup().
contains("hslContainer"));

// Test form input and update button
- FormTester formTester2 = tester.newFormTester(RESULT_FORM);
- formTester2.setValue("withinUh", "0");
- tester.dumpPage();
- formTester2.submit("updateUh");
+ FormTester formTester2 = tester.newFormTester("resultForm");
+ formTester2.setValue("uhContainer:withinUh", "0");
+ formTester2.submit("uhContainer:updateUh");
+ tester.assertRenderedPage(ResultPage.class);

// Test that data output shows up
assertTrue("items exist",
tester.getTagByWicketId(RESULT_FORM).getMarkup().
@@ -91,7 +99,7 @@
tester.debugComponentTrees();

// Test the sort links
- /*tester.clickLink("library");
+ /*tester.clickLink("resultForm:resultTable:library");
tester.assertRenderedPage(ResultPage.class);
tester.clickLink("title");
tester.assertRenderedPage(ResultPage.class);
@@ -105,6 +113,23 @@
tester.assertRenderedPage(AlertsPage.class);
tester.clickLink("Logout");
tester.assertRenderedPage(Index.class);
+
+ WicketTester tester2 = new WicketTester(new
DueDatesApplication(config));
+ tester2.startPage(Index.class);
+
+ // Tests hsl user
+ FormTester formTester3 = tester2.newFormTester("loginForm");
+ formTester3.setValue("LoginEmail", "tes...@hawaii.edu");
+ formTester3.setValue("LoginPassword", "password2");
+ formTester3.submit("Login");
+ tester2.assertRenderedPage(ResultPage.class);
+ tester2.assertInvisible("resultForm:uhContainer");
+
+ // Test form input and update button
+ FormTester formTester4 = tester2.newFormTester("resultForm");
+ formTester4.setValue("uhContainer:withinHsl", "0");
+ formTester4.submit("uhContainer:updateHsl");
+ tester2.assertRenderedPage(ResultPage.class);
}

}