JBoss Tools SVN: r37621 - trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/helpers.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-01-03 19:38:59 -0500 (Tue, 03 Jan 2012)
New Revision: 37621
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/helpers/WebAppHelper.java
Log:
JBIDE-10579
https://issues.joss.org/browse/JBIDE-10579
Method WebAppHelper.getFilters is fixed.
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/helpers/WebAppHelper.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/helpers/WebAppHelper.java 2012-01-03 23:44:22 UTC (rev 37620)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/helpers/WebAppHelper.java 2012-01-04 00:38:59 UTC (rev 37621)
@@ -54,6 +54,7 @@
if(entity.equals("FileWebApp")) return "2.3"; //$NON-NLS-1$ //$NON-NLS-2$
if(entity.equals("FileWebApp24")) return "2.4"; //$NON-NLS-1$ //$NON-NLS-2$
if(entity.equals("FileWebApp25")) return "2.5"; //$NON-NLS-1$ //$NON-NLS-2$
+ if(entity.equals("FileWebApp30")) return "3.0"; //$NON-NLS-1$ //$NON-NLS-2$
return "2.4"; //$NON-NLS-1$
}
@@ -335,7 +336,7 @@
XModelObject folder = webxml.getChildByPath(FILTER_FOLDER);
if(folder == null) folder = webxml;
if(folder.getModelEntity().getChild(FILTER_30_ENTITY) != null) {
- folder.getChildren(FILTER_30_ENTITY);
+ return folder.getChildren(FILTER_30_ENTITY);
}
return folder.getChildren(FILTER_ENTITY);
}
@@ -344,7 +345,7 @@
if(webxml == null) return null;
XModelObject folder = webxml.getChildByPath(FILTER_FOLDER);
if(folder == null) folder = webxml;
- String entity = (folder != webxml && folder.getModelEntity().getName().endsWith("24")) //$NON-NLS-1$
+ String entity = (folder.getModelEntity().getChild(FILTER_MAPPING_24_ENTITY) != null)
? FILTER_MAPPING_24_ENTITY : FILTER_MAPPING_ENTITY;
return folder.getChildren(entity);
}
12 years, 12 months
JBoss Tools SVN: r37620 - trunk/jsf/docs/userguide/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-01-03 18:44:22 -0500 (Tue, 03 Jan 2012)
New Revision: 37620
Modified:
trunk/jsf/docs/userguide/en-US/browsers.xml
Log:
moved warning to chapter rather than sections
Modified: trunk/jsf/docs/userguide/en-US/browsers.xml
===================================================================
--- trunk/jsf/docs/userguide/en-US/browsers.xml 2012-01-03 23:35:30 UTC (rev 37619)
+++ trunk/jsf/docs/userguide/en-US/browsers.xml 2012-01-03 23:44:22 UTC (rev 37620)
@@ -4,6 +4,11 @@
<para>
Different browsers are available for testing the look of a web page or site before going to production. This chapter outlines each browser type available and how to utilize them.
</para>
+ <note>
+ <para>
+ These web browsers are only for testing, contents may appear diferently depending on the browser used to view your page or site outside of the workbench environment.
+ </para>
+ </note>
<section>
<title>Generic web browser</title>
<para>
@@ -23,11 +28,6 @@
<para>
A new tab will launch in your workbench, displaying the contents of the page you selected.
</para>
- <note>
- <para>
- This web browser is only for testing, contents may appear diferently depending on the browser used to view your page or site outside of the workbench environment.
- </para>
- </note>
</section>
<section>
<title>Mobile web browser</title>
@@ -48,10 +48,5 @@
<para>
A new window will launch, displaying the contents of the page you selected as it will appear on mobile devices.
</para>
- <note>
- <para>
- This web browser is only for testing, contents may appear diferently depending on the browser used to view your page or site outside of the workbench environment.
- </para>
- </note>
</section>
</chapter>
12 years, 12 months
JBoss Tools SVN: r37619 - trunk/jsf/docs/userguide/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-01-03 18:35:30 -0500 (Tue, 03 Jan 2012)
New Revision: 37619
Modified:
trunk/jsf/docs/userguide/en-US/browsers.xml
Log:
updated with note concerning browsers showing things differently
Modified: trunk/jsf/docs/userguide/en-US/browsers.xml
===================================================================
--- trunk/jsf/docs/userguide/en-US/browsers.xml 2012-01-03 23:26:50 UTC (rev 37618)
+++ trunk/jsf/docs/userguide/en-US/browsers.xml 2012-01-03 23:35:30 UTC (rev 37619)
@@ -21,8 +21,13 @@
</mediaobject>
</figure>
<para>
- A new tab will launch in your workbench, displaying the contents of the page you selected. This web browser is only for testing, contents may appear diferently depending on the browser used to view your page or site outside of the workbench environment.
+ A new tab will launch in your workbench, displaying the contents of the page you selected.
</para>
+ <note>
+ <para>
+ This web browser is only for testing, contents may appear diferently depending on the browser used to view your page or site outside of the workbench environment.
+ </para>
+ </note>
</section>
<section>
<title>Mobile web browser</title>
@@ -43,5 +48,10 @@
<para>
A new window will launch, displaying the contents of the page you selected as it will appear on mobile devices.
</para>
+ <note>
+ <para>
+ This web browser is only for testing, contents may appear diferently depending on the browser used to view your page or site outside of the workbench environment.
+ </para>
+ </note>
</section>
</chapter>
12 years, 12 months
JBoss Tools SVN: r37618 - in trunk/jsf/docs/userguide/en-US: images/browsers and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-01-03 18:26:50 -0500 (Tue, 03 Jan 2012)
New Revision: 37618
Added:
trunk/jsf/docs/userguide/en-US/images/browsers/mobile_browser_02.png
Modified:
trunk/jsf/docs/userguide/en-US/browsers.xml
Log:
updated with new content
Modified: trunk/jsf/docs/userguide/en-US/browsers.xml
===================================================================
--- trunk/jsf/docs/userguide/en-US/browsers.xml 2012-01-03 23:02:35 UTC (rev 37617)
+++ trunk/jsf/docs/userguide/en-US/browsers.xml 2012-01-03 23:26:50 UTC (rev 37618)
@@ -7,13 +7,27 @@
<section>
<title>Generic web browser</title>
<para>
-
+ A generic web browser is available for testing within your workbench environment. To access the browser, right-click on your <filename>HTML</filename>, <filename>XHTML</filename> or other web page extention file and navigate through the context menu to <menuchoice>
+ <guimenuitem>Open With</guimenuitem>
+ <guimenuitem>Web Browser</guimenuitem>
+ </menuchoice>.
</para>
+ <figure>
+ <title>Mobile web browser simulator</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/browsers/mobile_browser_02.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>
+ A new tab will launch in your workbench, displaying the contents of the page you selected. This web browser is only for testing, contents may appear diferently depending on the browser used to view your page or site outside of the workbench environment.
+ </para>
</section>
<section>
<title>Mobile web browser</title>
<para>
- The moblie web browser, called <guilabel>BrowserSim</guilabel>, simulates a mobile web browser so you can see how your web page or site will be viewable on mobile devices.
+ <guilabel>BrowserSim</guilabel> simulates a mobile web browser so you can see how your web page or site will be viewable on mobile devices.
</para>
<para>
To test your page or site using <guilabel>BrowserSim</guilabel>, right-click on your <filename>HTML</filename>, <filename>XHTML</filename> or other web page extention file and navigate through the context menu to <menuchoice><guimenuitem>Open With</guimenuitem><guimenuitem>BrowserSim</guimenuitem></menuchoice>.
Added: trunk/jsf/docs/userguide/en-US/images/browsers/mobile_browser_02.png
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/docs/userguide/en-US/images/browsers/mobile_browser_02.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
12 years, 12 months
JBoss Tools SVN: r37617 - in trunk/jsf/docs/userguide/en-US: images and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-01-03 18:02:35 -0500 (Tue, 03 Jan 2012)
New Revision: 37617
Added:
trunk/jsf/docs/userguide/en-US/browsers.xml
trunk/jsf/docs/userguide/en-US/images/browsers/
trunk/jsf/docs/userguide/en-US/images/browsers/mobile_browser_01.png
Modified:
trunk/jsf/docs/userguide/en-US/Book_Info.xml
trunk/jsf/docs/userguide/en-US/Visual_Web_Tools_Reference_Guide.xml
Log:
updated - adding in new browsers chapter
Modified: trunk/jsf/docs/userguide/en-US/Book_Info.xml
===================================================================
--- trunk/jsf/docs/userguide/en-US/Book_Info.xml 2012-01-03 19:02:51 UTC (rev 37616)
+++ trunk/jsf/docs/userguide/en-US/Book_Info.xml 2012-01-03 23:02:35 UTC (rev 37617)
@@ -7,7 +7,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>5.0</productnumber>
<edition>5.0.0</edition>
-<pubsnumber>2</pubsnumber>
+<pubsnumber>3</pubsnumber>
<abstract>
<para>The Visual Web Tools Reference Guide explains extensive collection of specialized wizards, editors and views that can be used in various scenarios while developing Web applications.</para>
</abstract>
Modified: trunk/jsf/docs/userguide/en-US/Visual_Web_Tools_Reference_Guide.xml
===================================================================
--- trunk/jsf/docs/userguide/en-US/Visual_Web_Tools_Reference_Guide.xml 2012-01-03 19:02:51 UTC (rev 37616)
+++ trunk/jsf/docs/userguide/en-US/Visual_Web_Tools_Reference_Guide.xml 2012-01-03 23:02:35 UTC (rev 37617)
@@ -7,6 +7,8 @@
<xi:include href="Visual_Web_Tools.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
<!--<xi:include href="spring_tools.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> -->
<xi:include href="editors.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+<xi:include href="browsers.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+</xi:include>
<xi:include href="palette.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
<xi:include href="css_perspective.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
<xi:include href="richfaces_support.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
Added: trunk/jsf/docs/userguide/en-US/browsers.xml
===================================================================
--- trunk/jsf/docs/userguide/en-US/browsers.xml (rev 0)
+++ trunk/jsf/docs/userguide/en-US/browsers.xml 2012-01-03 23:02:35 UTC (rev 37617)
@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<chapter id="browsers">
+ <title>Browsers</title>
+ <para>
+ Different browsers are available for testing the look of a web page or site before going to production. This chapter outlines each browser type available and how to utilize them.
+ </para>
+ <section>
+ <title>Generic web browser</title>
+ <para>
+
+ </para>
+ </section>
+ <section>
+ <title>Mobile web browser</title>
+ <para>
+ The moblie web browser, called <guilabel>BrowserSim</guilabel>, simulates a mobile web browser so you can see how your web page or site will be viewable on mobile devices.
+ </para>
+ <para>
+ To test your page or site using <guilabel>BrowserSim</guilabel>, right-click on your <filename>HTML</filename>, <filename>XHTML</filename> or other web page extention file and navigate through the context menu to <menuchoice><guimenuitem>Open With</guimenuitem><guimenuitem>BrowserSim</guimenuitem></menuchoice>.
+ </para>
+ <figure>
+ <title>Mobile web browser simulator</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/browsers/mobile_browser_01.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>
+ A new window will launch, displaying the contents of the page you selected as it will appear on mobile devices.
+ </para>
+ </section>
+</chapter>
Added: trunk/jsf/docs/userguide/en-US/images/browsers/mobile_browser_01.png
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/docs/userguide/en-US/images/browsers/mobile_browser_01.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
12 years, 12 months
JBoss Tools SVN: r37616 - trunk/jsf/tests/org.jboss.tools.jsf.ui.test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-01-03 14:02:51 -0500 (Tue, 03 Jan 2012)
New Revision: 37616
Added:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/plugin.xml
Log:
fix for jsf.ui.test error in JSFNaturesInfoDialog_JBIDE5701.testJSFNaturesChecker
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/plugin.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/plugin.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/plugin.xml 2012-01-03 19:02:51 UTC (rev 37616)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+ <extension
+ id="org.jboss.tools.jsf.KbRequire"
+ point="org.jboss.tools.jst.web.kb.KbRequire">
+ <require
+ description="%KB_REQUIRED_FOR_FACET"
+ forNature="org.eclipse.wst.common.project.facet.core.nature">
+ </require>
+ </extension>
+
+</plugin>
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/plugin.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
12 years, 12 months
JBoss Tools SVN: r37615 - in trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test: core and 3 other directories.
by jbosstools-commits＠lists.jboss.org
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,
12 years, 12 months
JBoss Tools SVN: r37614 - trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/src/org/jboss/tools/jbpm/ui/bot/test/suite.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2012-01-03 12:35:37 -0500 (Tue, 03 Jan 2012)
New Revision: 37614
Modified:
trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/src/org/jboss/tools/jbpm/ui/bot/test/suite/JBPMTest.java
Log:
Fix renaming method closeReportUsageWindowIfOpened to manageBlockingWindows.
Modified: trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/src/org/jboss/tools/jbpm/ui/bot/test/suite/JBPMTest.java
===================================================================
--- trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/src/org/jboss/tools/jbpm/ui/bot/test/suite/JBPMTest.java 2012-01-03 16:25:30 UTC (rev 37613)
+++ trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/src/org/jboss/tools/jbpm/ui/bot/test/suite/JBPMTest.java 2012-01-03 17:35:37 UTC (rev 37614)
@@ -1,5 +1,6 @@
package org.jboss.tools.jbpm.ui.bot.test.suite;
+import org.jboss.tools.ui.bot.ext.SWTJBTExt;
import org.jboss.tools.ui.bot.ext.SWTTestExt;
import org.jboss.tools.ui.bot.ext.types.IDELabel;
@@ -8,7 +9,7 @@
public static void prepare() {
log.info("jBPM All Test started...");
- jbt.closeReportUsageWindowIfOpened(true);
+ SWTJBTExt.manageBlockingWidows(false, false);
eclipse.maximizeActiveShell();
eclipse.closeView(IDELabel.View.WELCOME);
bot.closeAllEditors();
12 years, 12 months
JBoss Tools SVN: r37613 - in trunk: tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2012-01-03 11:25:30 -0500 (Tue, 03 Jan 2012)
New Revision: 37613
Modified:
trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/DroolsAllBotTests.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/RequirementAwareSuite.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTOpenExt.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTTestExt.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/gen/ActionItem.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java
Log:
Manage all possible Usage Reporting Windows to not block UI.
Modified: trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/DroolsAllBotTests.java
===================================================================
--- trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/DroolsAllBotTests.java 2012-01-03 15:49:30 UTC (rev 37612)
+++ trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/DroolsAllBotTests.java 2012-01-03 16:25:30 UTC (rev 37613)
@@ -25,6 +25,7 @@
import org.jboss.tools.drools.ui.bot.test.smoke.OpenDroolsPerspective;
import org.jboss.tools.drools.ui.bot.test.smoke.RuleFlowTest;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
+import org.jboss.tools.ui.bot.ext.SWTJBTExt;
import org.jboss.tools.ui.bot.ext.SWTTestExt;
import org.jboss.tools.ui.bot.ext.SWTUtilExt;
import org.jboss.tools.ui.bot.ext.types.IDELabel;
@@ -114,7 +115,7 @@
@BeforeClass
public static void setUpTest() {
- jbt.closeReportUsageWindowIfOpened(false);
+ SWTJBTExt.manageBlockingWidows(false, false);
props = util.loadProperties(Activator.PLUGIN_ID);
String guvnorRepositoryUrl = props.getProperty(DroolsAllBotTests.GUVNOR_REPOSITORY_URL_PROPERTY_NAME);
if (guvnorRepositoryUrl != null){
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/RequirementAwareSuite.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/RequirementAwareSuite.java 2012-01-03 15:49:30 UTC (rev 37612)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/RequirementAwareSuite.java 2012-01-03 16:25:30 UTC (rev 37613)
@@ -5,7 +5,6 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
-import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
import java.util.Map.Entry;
@@ -43,6 +42,7 @@
* @author lzoubek(a)redhat.com
*/
public class RequirementAwareSuite extends Suite {
+ private static boolean runManageBlockingWindow = true;
// we have one global instance of cleanup listener
final static DoAfterAllTestsRunListener cleanUp = new DoAfterAllTestsRunListener();
@@ -184,6 +184,10 @@
@Override
protected Statement withBeforeClasses(Statement statement) {
+ if (RequirementAwareSuite.runManageBlockingWindow){
+ SWTJBTExt.manageBlockingWidows(false, false);
+ RequirementAwareSuite.runManageBlockingWindow = false;
+ }
if (!this.config.equals(TestConfigurator.currentConfig)) {
TestConfigurator.currentConfig = this.config;
}
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java 2012-01-03 15:49:30 UTC (rev 37612)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java 2012-01-03 16:25:30 UTC (rev 37613)
@@ -23,10 +23,13 @@
import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable;
import org.eclipse.swtbot.swt.finder.results.WidgetResult;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotCheckBox;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
+import org.jboss.tools.ui.bot.ext.gen.ActionItem;
import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper;
import org.jboss.tools.ui.bot.ext.types.IDELabel;
import org.jboss.tools.ui.bot.ext.types.ViewType;
@@ -43,7 +46,7 @@
private static final boolean runningOnMacOs = Platform.getOS().equalsIgnoreCase("macosx");
SWTWorkbenchBot bot;
- Logger log = Logger.getLogger(SWTJBTExt.class);
+ static Logger log = Logger.getLogger(SWTJBTExt.class);
public SWTJBTExt(SWTWorkbenchBot bot) {
this.bot = bot;
@@ -499,32 +502,80 @@
return SWTJBTExt.getDefinedServerRuntimeVersion(bot,index);
}
-
+ /**
+ * Closes Report Usage Windows and enable Atlassian Connector Usage Reporting Window.
+ * Did not find other way how to disable Atlassian Connector Usage Reporting Window displaying
+ * @param reportJbtUsage
+ * @param reportSubclipseUsage
+ */
+ public static void manageBlockingWidows(boolean reportJbtUsage,
+ boolean reportSubclipseUsage) {
+ // Manage JBT/JBDS and Subclipse Usage Reporting
+ SWTWorkbenchBot bot = new SWTWorkbenchBot();
+ SWTBotShell shJbtUsage = null;
+ SWTBotShell shSubclipseUsage = null;
+ SWTBotShell[] shells = bot.shells();
+ int index = 0;
+ while ((shJbtUsage == null || shSubclipseUsage == null)
+ && index < shells.length) {
+ if (shells[index].getText().equals(IDELabel.Shell.JBOSS_DEVELOPER_STUDIO_USAGE)
+ || shells[index].getText().equals(IDELabel.Shell.JBOSS_TOOLS_USAGE)) {
+ shJbtUsage = shells[index];
+ } else if (shells[index].getText().equals(IDELabel.Shell.SUBCLIPSE_USAGE)) {
+ shSubclipseUsage = shells[index];
+ }
+ index++;
+ }
+ if (shJbtUsage != null && shJbtUsage.isActive()) {
+ closeJBossToolsUsageWindow(shJbtUsage, reportJbtUsage);
+ if (shSubclipseUsage != null) {
+ closeSubclipseUsageWindow(shSubclipseUsage, reportSubclipseUsage);
+ }
+ } else if (shSubclipseUsage != null && shSubclipseUsage.isActive()) {
+ closeSubclipseUsageWindow(shSubclipseUsage, reportSubclipseUsage);
+ if (shJbtUsage != null) {
+ closeJBossToolsUsageWindow(shJbtUsage, reportJbtUsage);
+ }
+ }
+ // Manage Atlassian Connector Usage Reporting
+ try{
+ SWTBot prefBot = new SWTOpenExt(new SWTBotExt())
+ .preferenceOpen(ActionItem.Preference.AtlassianConnectorUsageData.LABEL);
+ SWTBotCheckBox chbEnableMonitoring = prefBot.checkBox();
+ if (!chbEnableMonitoring.isChecked()){
+ chbEnableMonitoring.click();
+ }
+ prefBot.button(IDELabel.Button.OK).click();
+ } catch (WidgetNotFoundException wnfe){
+ // do nothing there is no Atlassian Connector installed
+ }
+ }
/**
- * Closes RH Report Usage Dialog if found
- *
- * @param cancel
- * select if ok or cancel button is used
+ * Closes JBoss Tools / JBoss Developer Studio Report Usage Window
+ * @param shell
+ * @param report
*/
- public void closeReportUsageWindowIfOpened(boolean cancel) {
+ private static void closeJBossToolsUsageWindow(SWTBotShell shell , boolean report) {
+ shell.bot().button(report ? IDELabel.Button.YES : IDELabel.Button.NO).click();
+ log.info("JBT/JBDS Report Usage window closed");
+ }
+ /**
+ * Closes Subclipse Report Usage Window
+ * @param shell
+ * @param report
+ */
+ private static void closeSubclipseUsageWindow(SWTBotShell shell , boolean report) {
+ SWTBot shellBot = shell.bot();
+ SWTBotCheckBox chbReportUsage = shellBot
+ .checkBox(IDELabel.SubclipseUsageDialog.REPORT_USAGE_CHECK_BOX);
+ if ((report && (!chbReportUsage.isChecked())) ||
+ ((!report) && chbReportUsage.isChecked())) {
+ chbReportUsage.click();
+ }
+ shellBot.button(IDELabel.Button.OK).click();
+ log.info("Sublcipse Report Usage window closed");
+ }
- String title;
- if (isJBDSRun()) {
- title = "JBoss Developer Studio Usage";
- } else {
- title = "JBoss Tools Usage";
- }
- try {
-
- bot.shell(title).activate();
- bot.button(cancel ? IDELabel.Button.NO : IDELabel.Button.YES)
- .click();
- log.info("Report usage window closed");
- } catch (WidgetNotFoundException wnfe) {
- log.info("Report usage window didn't appear");
- }
- }
-
/**
* Selects textToSelect within Source Pane of editor with title editorTitle
* @param bot
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTOpenExt.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTOpenExt.java 2012-01-03 15:49:30 UTC (rev 37612)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTOpenExt.java 2012-01-03 16:25:30 UTC (rev 37613)
@@ -25,6 +25,7 @@
import org.jboss.tools.ui.bot.ext.gen.IPerspective;
import org.jboss.tools.ui.bot.ext.gen.IPreference;
import org.jboss.tools.ui.bot.ext.gen.IView;
+import org.jboss.tools.ui.bot.ext.types.IDELabel;
/**
* this class represents
@@ -150,7 +151,12 @@
}
SWTBotShell shell = bot.shell("Preferences");
shell.activate();
+ try{
selectTreeNode(pref);
+ }catch (WidgetNotFoundException wnfe){
+ shell.bot().button(IDELabel.Button.CANCEL).click();
+ throw wnfe;
+ }
return shell.bot();
}
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTTestExt.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTTestExt.java 2012-01-03 15:49:30 UTC (rev 37612)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTTestExt.java 2012-01-03 16:25:30 UTC (rev 37613)
@@ -69,7 +69,6 @@
public static int TIME_20S = Timing.time20S();
protected void setUp() throws Exception {
- // close Report Usage Window
- jbt.closeReportUsageWindowIfOpened(false);
+ super.setUp();
}
}
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/gen/ActionItem.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/gen/ActionItem.java 2012-01-03 15:49:30 UTC (rev 37612)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/gen/ActionItem.java 2012-01-03 16:25:30 UTC (rev 37613)
@@ -10393,7 +10393,19 @@
}
};
}
-
+ public static class AtlassianConnectorUsageData {
+ /**
+ * represents item : Atlassian Connector -> Usage Data
+ */
+ public static final IPreference LABEL = new IPreference() {
+ public String getName() { return "Usage Data";}
+ public List<String> getGroupPath() {
+ List<String> l = new Vector<String>();
+ l.add("Atlassian Connector");
+ return l;
+ }
+ };
+ }
}
public static class ServerRuntime {
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2012-01-03 15:49:30 UTC (rev 37612)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2012-01-03 16:25:30 UTC (rev 37613)
@@ -195,6 +195,9 @@
public static final String CLEAN = "Clean";
public static final String SELECT_CLASS = "Select Class";
public static final String CREATING_COMPOSITE_COMPONENT = "Creating composite component";
+ public static final String JBOSS_DEVELOPER_STUDIO_USAGE = "JBoss Developer Studio Usage";
+ public static final String JBOSS_TOOLS_USAGE = "JBoss Tools Usage";
+ public static final String SUBCLIPSE_USAGE = "Subclipse Usage";
}
public class EntityGroup {
@@ -820,4 +823,11 @@
public static final String CLEAN_ALL_PROJECTS_RADIO = "Clean all projects";
}
+
+ public static class SubclipseUsageDialog{
+
+ public static final String REPORT_USAGE_CHECK_BOX = "Report usage of Subclipse to Subclipse team.";
+
+ }
+
}
12 years, 12 months
JBoss Tools SVN: r37611 - trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-01-03 08:48:07 -0500 (Tue, 03 Jan 2012)
New Revision: 37611
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExampleRuntime5x.java
Log:
Removed unnecessary test step
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExampleRuntime5x.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExampleRuntime5x.java 2012-01-03 01:35:49 UTC (rev 37610)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExampleRuntime5x.java 2012-01-03 13:48:07 UTC (rev 37611)
@@ -1,6 +1,5 @@
package org.jboss.tools.portlet.ui.bot.test.example;
-import org.jboss.tools.portlet.ui.bot.task.dialog.property.seam.SeamRuntimeChangingTask;
import org.jboss.tools.ui.bot.ext.config.Annotations.DB;
import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
import org.jboss.tools.ui.bot.ext.config.Annotations.Seam;
@@ -42,10 +41,4 @@
}
return new String[]{PROJECT_NAME_EAR, PROJECT_NAME_EJB, PROJECT_NAME_WAR};
}
-
- @Override
- protected void executeExample() {
- doPerform(new SeamRuntimeChangingTask(PROJECT_NAME_WAR, configuredState.getSeam().name));
- super.executeExample();
- }
}
12 years, 12 months