Author: vrockai Date: 2008-12-01 06:23:27 -0500 (Mon, 01 Dec 2008) New Revision: 12327 Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossSeleniumTestListener.java branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSArchiveUploadTestCase.java branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSDirectoryTestCase.java branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileTestCase.java branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileUploadTestCase.java branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileWorkflowTestCase.java branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/DashboardsTestCase.java branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletDefinitionsTestCase.java branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java Log: screenshots fix Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java 2008-12-01 10:29:25 UTC (rev 12326) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java 2008-12-01 11:23:27 UTC (rev 12327) @@ -30,12 +30,13 @@ @BeforeMethod(groups = { "log" }) public void loginBeforeTest() { + logoutIfPossible(); login("admin", "admin"); } @AfterMethod(groups = { "log" }) public void logoutAfterTest() { - logout(); + } @Test(enabled = true) Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java 2008-12-01 10:29:25 UTC (rev 12326) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java 2008-12-01 11:23:27 UTC (rev 12327) @@ -3,9 +3,7 @@ import java.text.MessageFormat; import org.testng.Assert; -import org.testng.annotations.AfterClass; import org.testng.annotations.AfterMethod; -import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -88,12 +86,13 @@ @BeforeMethod(groups = { "log" }) public void loginBeforeTest() { + logoutIfPossible(); login("admin", "admin"); } @AfterMethod(groups = { "log" }) public void logoutAfterTest() { - logoutIfPossible(); + } /* Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossSeleniumTestListener.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossSeleniumTestListener.java 2008-12-01 10:29:25 UTC (rev 12326) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossSeleniumTestListener.java 2008-12-01 11:23:27 UTC (rev 12327) @@ -1,23 +1,29 @@ package org.jboss.portal.test.selenium; +import java.awt.event.InputMethodEvent; +import java.awt.event.InputMethodListener; import java.io.BufferedWriter; import java.io.FileWriter; import java.io.IOException; import java.io.PrintWriter; +import java.util.List; +import org.testng.IMethodInstance; +import org.testng.IMethodInterceptor; +import org.testng.ITestContext; import org.testng.ITestResult; import org.testng.TestListenerAdapter; import com.thoughtworks.selenium.Selenium; -public class JBossSeleniumTestListener extends TestListenerAdapter { +public class JBossSeleniumTestListener extends TestListenerAdapter {//extends ITestListener { protected static Selenium selenium; protected static int count; - + @Override public void onTestFailure(ITestResult tr) { - + System.out.println("F"); String name = "F_"+tr.getName()+"-" + count ; try { PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(name + ".html"))); @@ -29,5 +35,5 @@ selenium.captureScreenshot(name + ".jpg"); count++; } - + } Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java 2008-12-01 10:29:25 UTC (rev 12326) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java 2008-12-01 11:23:27 UTC (rev 12327) @@ -48,13 +48,13 @@ public static String WSRP_CONSUMER_TABLE = "//table[contains(@id,':consumer-list-form:consumersList')]"; @BeforeMethod(groups = { "log" }) public void loginBeforeTest() { - + logoutIfPossible(); login("admin", "admin"); } @AfterMethod(groups = { "log" }) public void logoutAfterTest() { - logout(); + //logout(); } @Test(enabled = true, description = "Creating a standard BEA consumer.") Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSArchiveUploadTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSArchiveUploadTestCase.java 2008-12-01 10:29:25 UTC (rev 12326) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSArchiveUploadTestCase.java 2008-12-01 11:23:27 UTC (rev 12327) @@ -32,12 +32,13 @@ @BeforeMethod( groups = { "log" }) public void loginBeforeTest() { + logoutIfPossible(); login("admin", "admin"); } @AfterMethod( groups = { "log" }) public void logoutAfterTest() { - logout(); + } @Test(enabled = true, description = "Test archive consisting of two files upload.") Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSDirectoryTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSDirectoryTestCase.java 2008-12-01 10:29:25 UTC (rev 12326) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSDirectoryTestCase.java 2008-12-01 11:23:27 UTC (rev 12327) @@ -24,12 +24,13 @@ @BeforeMethod( groups = { "log" }) public void loginBeforeTest() { + logoutIfPossible(); login("admin", "admin"); } @AfterMethod(groups = { "log" }) public void logoutAfterTest() { - logout(); + } @Test(enabled = true, description="Directory creation.") Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileTestCase.java 2008-12-01 10:29:25 UTC (rev 12326) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileTestCase.java 2008-12-01 11:23:27 UTC (rev 12327) @@ -19,12 +19,13 @@ @BeforeMethod(groups = { "log" }) public void loginBeforeTest() { + logoutIfPossible(); login("admin", "admin"); } @AfterMethod( groups = { "log" }) public void logoutAfterTest() { - logout(); + } @Test(enabled = true, description = "Common file structure browsing test.") Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileUploadTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileUploadTestCase.java 2008-12-01 10:29:25 UTC (rev 12326) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileUploadTestCase.java 2008-12-01 11:23:27 UTC (rev 12327) @@ -24,12 +24,13 @@ @BeforeMethod(groups = { "log" }) public void loginBeforeTest() { + logoutIfPossible(); login("admin", "admin"); } @AfterMethod(groups = { "log" }) public void logoutAfterTest() { - logout(); + } @Test(enabled = true, description = "canceling of file upload") Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileWorkflowTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileWorkflowTestCase.java 2008-12-01 10:29:25 UTC (rev 12326) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileWorkflowTestCase.java 2008-12-01 11:23:27 UTC (rev 12327) @@ -26,12 +26,13 @@ @BeforeMethod(groups = { "log" }) public void loginBeforeTest() { + logoutIfPossible(); login("admin", "admin"); } @AfterMethod( groups = { "log" }) public void logoutAfterTest() { - logout(); + } @Test(enabled = true, description = "Simple file creation.") Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java 2008-12-01 10:29:25 UTC (rev 12326) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java 2008-12-01 11:23:27 UTC (rev 12327) @@ -51,12 +51,13 @@ @BeforeMethod(groups = { "log" }) public void loginBeforeTest() { + logoutIfPossible(); login("admin", "admin"); } @AfterMethod(groups = { "log" }) public void logoutAfterTest() { - logout(); + } @Test(enabled = true) Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/DashboardsTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/DashboardsTestCase.java 2008-12-01 10:29:25 UTC (rev 12326) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/DashboardsTestCase.java 2008-12-01 11:23:27 UTC (rev 12327) @@ -41,13 +41,14 @@ @BeforeMethod(groups = { "log" }) public void loginBeforeTest() { + logoutIfPossible(); login("admin", "admin"); goToDash(); } @AfterMethod(groups = { "log" }) public void logoutAfterTest() { - logout(); + } @Test(enabled = true) Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletDefinitionsTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletDefinitionsTestCase.java 2008-12-01 10:29:25 UTC (rev 12326) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletDefinitionsTestCase.java 2008-12-01 11:23:27 UTC (rev 12327) @@ -25,6 +25,7 @@ @BeforeMethod(groups = { "log" }) public void loginBeforeTest() { + logoutIfPossible(); login("admin", "admin"); goToPD(); } Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java 2008-12-01 10:29:25 UTC (rev 12326) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java 2008-12-01 11:23:27 UTC (rev 12327) @@ -42,13 +42,14 @@ @BeforeMethod(groups = { "log" }) public void loginBeforeTest() { + logoutIfPossible(); login("admin", "admin"); goToPI(); } @AfterMethod(groups = { "log" }) public void logoutAfterTest() { - logout(); + } @Test(enabled = true)