[Ils-source] r1270 - trunk/webapp/testsuite/classes/Title

[asmith at crosswire.org]

Author: asmith
Date: 2014-10-09 12:42:58 -0700 (Thu, 09 Oct 2014)
New Revision: 1270

Modified:
   trunk/webapp/testsuite/classes/Title/init.jsp
   trunk/webapp/testsuite/classes/Title/test.js
   trunk/webapp/testsuite/classes/Title/test.jsp
Log:
Updated iniit.jsp and title.jsp to check for failed modified titles,
changed description for QUnit test in test.js

Modified: trunk/webapp/testsuite/classes/Title/init.jsp
===================================================================
--- trunk/webapp/testsuite/classes/Title/init.jsp	2014-10-08 23:37:52 UTC (rev 1269)
+++ trunk/webapp/testsuite/classes/Title/init.jsp	2014-10-09 19:42:58 UTC (rev 1270)
@@ -22,6 +22,7 @@
 	Title modTitle = Title.getTitle(ilsSession, "modTestTitle");
 	if (modTitle != null) {
 		Title.deleteTitle(ilsSession, modTitle.getTitleID());
+		modTitle = Title.getTitle(ilsSession, "modTestTitle");
 
 	} if (title != null) {
 %>

Modified: trunk/webapp/testsuite/classes/Title/test.js
===================================================================
--- trunk/webapp/testsuite/classes/Title/test.js	2014-10-08 23:37:52 UTC (rev 1269)
+++ trunk/webapp/testsuite/classes/Title/test.js	2014-10-09 19:42:58 UTC (rev 1270)
@@ -13,8 +13,8 @@
 
 			var modTitle = $(complete).find('modifiedTitleTest', 'DataObject');
 			assert.ok(modTitle, 'found modTitle');
-			assert.equal($(modTitle).find('EMPTITLEDESC').text(), 'A modified title for the testing suite', 'modTitleDesc ok');
-			assert.equal($(modTitle).find('EMPTITLENAME').text(), 'modTestTitle', 'modTitleName ok');
+			assert.equal($(modTitle).find('EMPTITLEDESC').text(), 'A modified title for the testing suite', 'modified titleDesc ok');
+			assert.equal($(modTitle).find('EMPTITLENAME').text(), 'modTestTitle', 'modified titleName ok');
 
 			QUnit.start();
 		});

Modified: trunk/webapp/testsuite/classes/Title/test.jsp
===================================================================
--- trunk/webapp/testsuite/classes/Title/test.jsp	2014-10-08 23:37:52 UTC (rev 1269)
+++ trunk/webapp/testsuite/classes/Title/test.jsp	2014-10-09 19:42:58 UTC (rev 1270)
@@ -12,13 +12,20 @@
 		return;
 	}
 
-	// assert we don't already have a test title
+	// assert we don't already have a test title or modified test title
 	Title testTitle = Title.getTitle(ilsSession, "titleTest");
+	Title modTitle = Title.getTitle(ilsSession, "modTestTitle");
 	if (testTitle != null) {
 %>
 		<error message="test title already exists" />
 <%
 		return;
+
+	}  else if (modTitle != null) {
+%>
+		<error message="modified test title already exists" />
+<%
+		return;	
 	}
 
 	// Create a test title
@@ -50,12 +57,13 @@
 	modifiedTestTitle = Title.getTitle(ilsSession, testTitle.getTitleID());
 	if (modifiedTestTitle == null) {
 %>
-		<error message="couldn't retrieve modified test user" />
+		<error message="couldn't retrieve modified test title" />
 <%
 		return;
 	}
 	// Clean it up and test deletion
 	Title.deleteTitle(ilsSession, testTitle.getTitleID());
+
 	if (Title.getTitle(ilsSession, testTitle.getTitleID()) != null) {
 %>
 		<error message="couldn't delete test title" />