[portal-commits] JBoss Portal SVN: r11979 - in branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium: cms and 1 other directory.

[portal-commits at lists.jboss.org]

Author: vrockai
Date: 2008-09-25 07:41:52 -0400 (Thu, 25 Sep 2008)
New Revision: 11979

Modified:
   branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java
   branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSSecureTestCase.java
Log:
timeout fix

Modified: branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java	2008-09-25 10:44:44 UTC (rev 11978)
+++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java	2008-09-25 11:41:52 UTC (rev 11979)
@@ -62,9 +62,18 @@
 		selenium.setTimeout("0");
 		selenium.open("/portal/");
 		selenium.waitForPageToLoad(PAGE_LOAD);
-
+		
 		selenium.click("link=Login");
 		selenium.selectFrame("login-content");
+		
+		try {
+			Thread.sleep(2000);
+		} catch (InterruptedException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		
+		//selenium.waitForPageToLoad(PAGE_LOAD);
 		selenium.type("j_username", username);
 		selenium.type("j_password", password);
 		Assert.assertTrue(selenium.isElementPresent("login"));

Modified: branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSSecureTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSSecureTestCase.java	2008-09-25 10:44:44 UTC (rev 11978)
+++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSSecureTestCase.java	2008-09-25 11:41:52 UTC (rev 11979)
@@ -32,7 +32,6 @@
 		resetSecurity();
 	}
 
-	// @AfterMethod()
 	private void resetSecurity() {
 		login("admin", "admin");
 		selenium.click("link=Admin");
@@ -109,16 +108,11 @@
 		logout();
 
 		Assert.assertTrue(selenium.isTextPresent("Access Denied"));
-		//Assert.assertTrue(selenium.isTextPresent("You are not allowed to access the following resource - /default/index.html"));
-
 		login("user", "user");
 
 		Assert.assertTrue(selenium.isTextPresent("Access Denied"));
-		//Assert.assertTrue(selenium.isTextPresent("You are not allowed to access the following resource - /default/index.html"));
-
 		logout();
 
-		resetSecurity();
 	}
 
 	@Test(enabled = true, description = "Set user read permissions, login as user.")
@@ -146,16 +140,11 @@
 		logout();
 
 		Assert.assertTrue(selenium.isTextPresent("Access Denied"));
-		//Assert.assertTrue(selenium.isTextPresent("You are not allowed to access the following resource - /default/index.html"));
-
 		login("user", "user");
 
 		Assert.assertFalse(selenium.isTextPresent("Access Denied"));
-		//Assert.assertFalse(selenium.isTextPresent("You are not allowed to access the following resource - /default/index.html"));
-
 		logout();
 
-		resetSecurity();
 	}
 
 	@Test(enabled = true, description = "Set admin/secRole read permissions, login as user w secRole.")
@@ -185,16 +174,11 @@
 		logout();
 
 		Assert.assertTrue(selenium.isTextPresent("Access Denied"));
-		//Assert.assertTrue(selenium.isTextPresent("You are not allowed to access the following resource - /default/index.html"));
-
 		login("user", "user");
 
 		Assert.assertFalse(selenium.isTextPresent("Access Denied"));
-		//Assert.assertFalse(selenium.isTextPresent("You are not allowed to access the following resource - /default/index.html"));
-
 		logout();
 
-		resetSecurity();
 	}
 
 	@Test(enabled = true, description = "Set admin/secRole read permissions, login as user w/o secRole.")
@@ -224,16 +208,12 @@
 		logout();
 
 		Assert.assertTrue(selenium.isTextPresent("Access Denied"));
-		//Assert.assertTrue(selenium.isTextPresent("You are not allowed to access the following resource - /default/index.html"));
-
+		
 		login("user", "user");
 
 		Assert.assertTrue(selenium.isTextPresent("Access Denied"));
-		//Assert.assertTrue(selenium.isTextPresent("You are not allowed to access the following resource - /default/index.html"));
-
 		logout();
 
-		resetSecurity();
 	}
 
 	@Test(enabled = false, description = "Recursive permission test")
@@ -261,7 +241,6 @@
 		selenium.waitForPageToLoad(PAGE_LOAD);
 
 		logout();
-		resetSecurity();
 	}
 
 	@Test(enabled = true, description = "Subpage permission test")
@@ -305,7 +284,6 @@
 		Assert.assertTrue(selenium
 				.isTextPresent("Thank you for downloading and deploying JBoss Portal. We hope your enjoy working with it as much as we enjoy developing it!"));
 
-		resetSecurity();
 	}
 
 	void assignRole(String user, String email, String role, String roleDisplay) {