Author: vpakan(a)redhat.com Date: 2012-01-03 12:45:53 -0500 (Tue, 03 Jan 2012) New Revision: 37615 Removed: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/RequirementAwareUsageWindowClosingSuite.java Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/AllTestsSuite.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/JavaPortletTestSuite.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/ExamplesSuite.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/JSFPortletTestSuite.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/SeamPortletTestSuite.java Log: Remove RequirementAwareUsageWindowClosingSuite.java. Whole logic moved to parent RequirementAwareSuite.java. Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/AllTestsSuite.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/AllTestsSuite.java 2012-01-03 17:35:37 UTC (rev 37614) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/AllTestsSuite.java 2012-01-03 17:45:53 UTC (rev 37615) @@ -18,10 +18,11 @@ import org.jboss.tools.portlet.ui.bot.test.seam.CreateSeamPortletRuntime4x; import org.jboss.tools.portlet.ui.bot.test.seam.CreateSeamPortletRuntime5x; import org.jboss.tools.portlet.ui.bot.test.seam.RunSeamPortletOnServer; +import org.jboss.tools.ui.bot.ext.RequirementAwareSuite; import org.junit.runner.RunWith; import org.junit.runners.Suite; -(a)RunWith(RequirementAwareUsageWindowClosingSuite.class) +(a)RunWith(RequirementAwareSuite.class) @Suite.SuiteClasses({ CreateJavaPortletProject.class, CreateJavaPortlet.class, Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/RequirementAwareUsageWindowClosingSuite.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/RequirementAwareUsageWindowClosingSuite.java 2012-01-03 17:35:37 UTC (rev 37614) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/RequirementAwareUsageWindowClosingSuite.java 2012-01-03 17:45:53 UTC (rev 37615) @@ -1,27 +0,0 @@ -package org.jboss.tools.portlet.ui.bot.test; - -import org.jboss.tools.ui.bot.ext.RequirementAwareSuite; -import org.jboss.tools.ui.bot.ext.SWTBotFactory; -import org.junit.runners.model.Statement; - -/** - * Normal {@link RequirementAwareSuite} with the special added functionality of - * closing the usage window. - * - * @author Lucia Jelinkova - * - */ -public class RequirementAwareUsageWindowClosingSuite extends - RequirementAwareSuite { - - public RequirementAwareUsageWindowClosingSuite(Class<?> klass) - throws Throwable { - super(klass); - } - - @Override - protected Statement withBeforeClasses(Statement statement) { - SWTBotFactory.getJbt().closeReportUsageWindowIfOpened(false); - return super.withBeforeClasses(statement); - } -} Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/JavaPortletTestSuite.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/JavaPortletTestSuite.java 2012-01-03 17:35:37 UTC (rev 37614) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/JavaPortletTestSuite.java 2012-01-03 17:45:53 UTC (rev 37615) @@ -1,10 +1,10 @@ package org.jboss.tools.portlet.ui.bot.test.core; -import org.jboss.tools.portlet.ui.bot.test.RequirementAwareUsageWindowClosingSuite; +import org.jboss.tools.ui.bot.ext.RequirementAwareSuite; import org.junit.runner.RunWith; import org.junit.runners.Suite; -(a)RunWith(RequirementAwareUsageWindowClosingSuite.class) +(a)RunWith(RequirementAwareSuite.class) @Suite.SuiteClasses({ CreateJavaPortletProject.class, CreateJavaPortlet.class, Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/ExamplesSuite.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/ExamplesSuite.java 2012-01-03 17:35:37 UTC (rev 37614) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/ExamplesSuite.java 2012-01-03 17:45:53 UTC (rev 37615) @@ -1,10 +1,10 @@ package org.jboss.tools.portlet.ui.bot.test.example; -import org.jboss.tools.portlet.ui.bot.test.RequirementAwareUsageWindowClosingSuite; +import org.jboss.tools.ui.bot.ext.RequirementAwareSuite; import org.junit.runner.RunWith; import org.junit.runners.Suite; -(a)RunWith(RequirementAwareUsageWindowClosingSuite.class) +(a)RunWith(RequirementAwareSuite.class) @Suite.SuiteClasses({ JavaPortletExampleRuntime4x.class, JSFPortletExampleRuntime4x.class, Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/JSFPortletTestSuite.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/JSFPortletTestSuite.java 2012-01-03 17:35:37 UTC (rev 37614) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/JSFPortletTestSuite.java 2012-01-03 17:45:53 UTC (rev 37615) @@ -1,10 +1,10 @@ package org.jboss.tools.portlet.ui.bot.test.jsf; -import org.jboss.tools.portlet.ui.bot.test.RequirementAwareUsageWindowClosingSuite; +import org.jboss.tools.ui.bot.ext.RequirementAwareSuite; import org.junit.runner.RunWith; import org.junit.runners.Suite; -(a)RunWith(RequirementAwareUsageWindowClosingSuite.class) +(a)RunWith(RequirementAwareSuite.class) @Suite.SuiteClasses({ CreateJSFPortletProject.class, CreateJSFPortletRuntime4x.class, Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/SeamPortletTestSuite.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/SeamPortletTestSuite.java 2012-01-03 17:35:37 UTC (rev 37614) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/SeamPortletTestSuite.java 2012-01-03 17:45:53 UTC (rev 37615) @@ -1,10 +1,10 @@ package org.jboss.tools.portlet.ui.bot.test.seam; -import org.jboss.tools.portlet.ui.bot.test.RequirementAwareUsageWindowClosingSuite; +import org.jboss.tools.ui.bot.ext.RequirementAwareSuite; import org.junit.runner.RunWith; import org.junit.runners.Suite; -(a)RunWith(RequirementAwareUsageWindowClosingSuite.class) +(a)RunWith(RequirementAwareSuite.class) @Suite.SuiteClasses({ CreateSeamPortletProject.class, CreateSeamPortletRuntime4x.class,