[jboss-svn-commits] JBL Code SVN: r6030 - labs/jbosslabs/trunk/portal-extensions/portal-dnd/test

[jboss-svn-commits at lists.jboss.org]

Author: szimano
Date: 2006-08-30 14:21:39 -0400 (Wed, 30 Aug 2006)
New Revision: 6030

Modified:
   labs/jbosslabs/trunk/portal-extensions/portal-dnd/test/testPortletDrop.html
Log:
ajax calls switch off in tests JBLAB-728

Modified: labs/jbosslabs/trunk/portal-extensions/portal-dnd/test/testPortletDrop.html
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-dnd/test/testPortletDrop.html	2006-08-30 16:15:09 UTC (rev 6029)
+++ labs/jbosslabs/trunk/portal-extensions/portal-dnd/test/testPortletDrop.html	2006-08-30 18:21:39 UTC (rev 6030)
@@ -65,13 +65,21 @@
 		} ();
 		YAHOO.util.Event.addListener(window, 'load', YAHOO.example.DDAppregionNumberTwo.init);
 	
-
+		function setUp() {
+			inform("setup");
+			enterTestMode();
+		}
+		
+		function tearDown() {
+			inform("teardown");
+			leaveTestMode();
+		}
+		
 		function testDragAndDrop() {
+			inform("test dnd");
 			// objects should have different parents
 			assertNotEquals("Parents do match", ddPortletregionNumberTwo0.getEl().parentNode, ddPortletregionNumberOne0.getEl().parentNode);
 			
-			// turn of ajax callbacks
-			setAjaxEnabled(false);
 			var e;
 			// execute drop
 			ddPortletregionNumberTwo0.onDragDrop(e, ddPortletregionNumberOne0.getEl().id);
@@ -82,44 +90,87 @@
 		
 		// next tests need running instance of JBPortal with ajax servlet enabled
 		
-		function testTestMode() {
-			var postdata = "action=TEST_MODE&mode=true";
+		
+		function testAjaxWrongParamsTestMode() {
+			inform("test test params");
 			
+			var postdata = "action=TEST_MODE&mod=true";
+			
 			var handle = function(o) {
-				assertEqualsAjax("Wrong response", o.responseText, "Test mode ON");
+				failAjax("TEST MODE should return error");
 			}
 			var error = function(o) {
-				failAjax("Ajax call failed");
+				// do nothing - params are wrong - weverything is ok
 			}
 			
 			invokeTestAjax(postdata, handle, error);
+		}
+		
+		function testPersistData() {
+			inform("test persistance");
 			
-			var postdata2 = "action=TEST_MODE&mode=false";
+			// try persistance with some test attributes
+			var postdata = "action=PERSIST&positionNo=0&windowId=testPortletWindow&oldRegionId=old&newRegionId=new";
 			
-			var handle2 = function(o) {
-				assertEqualsAjax("Wrong response", o.responseText, "Test mode OFF");
+			var handle = function(o) {
+				assertEqualsAjax("Wrong response", o.responseText, "Position persisted");
 			}
-			var error2 = function(o) {
+			var error = function(o) {
 				failAjax("Ajax call failed");
 			}
-
-			invokeTestAjax(postdata2, handle2, error2);
+			
+			invokeTestAjax(postdata, handle, error);
+			
+			// try persistance with wrong attributes
+			
+			//(missing positionNo attribute)
+			postdata = "action=PERSIST&windowId=testPortletWindow&oldRegionId=old&newRegionId=new";
+			
+			handle = function(o) {
+				failAjax("Persistance call should fail");
+			}
+			error = function(o) {
+				// do nothing - invocation failed
+			}
+			
+			invokeTestAjax(postdata, handle, error);
+			
 		}
 		
+		function enterTestMode() {
 		
-		function testAjaxWrongParamsTestMode() {
-			var postdata = "action=TEST_MODE&mod=true";
+			// disable calling ajax in PortalDD
+			setAjaxEnabled(false);
 			
+			var postdata = "action=TEST_MODE&mode=true";
+			
 			var handle = function(o) {
-				failAjax("TEST MODE should return error");
+				assertEqualsAjax("Wrong response", o.responseText, "Test mode ON");
 			}
 			var error = function(o) {
-				// do nothing - params are wrong - weverything is ok
+				failAjax("Ajax call failed");
 			}
 			
 			invokeTestAjax(postdata, handle, error);
 		}
 		
+		function leaveTestMode() {
+		
+			// enable calling ajax in PortalDD
+			setAjaxEnabled(true);
+			
+			var postdata = "action=TEST_MODE&mode=false";
+			
+			var handle = function(o) {
+				assertEqualsAjax("Wrong response", o.responseText, "Test mode OFF");
+			}
+			var error = function(o) {
+				failAjax("Ajax call failed");
+			}
+
+			invokeTestAjax(postdata, handle, error);
+		}
+		
     </script>
     
 </head>