JBoss Tools SVN: r21944 - branches/modular_build/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-05-06 14:17:18 -0400 (Thu, 06 May 2010)
New Revision: 21944
Modified:
branches/modular_build/build/build.xml
Log:
add modeshape to list of default components to build
Modified: branches/modular_build/build/build.xml
===================================================================
--- branches/modular_build/build/build.xml 2010-05-06 17:43:16 UTC (rev 21943)
+++ branches/modular_build/build/build.xml 2010-05-06 18:17:18 UTC (rev 21944)
@@ -8,7 +8,7 @@
value="tests,common;
flow,jbpm;
jmx,archives,as;
- drools,bpel,smooks,freemarker,profiler,portlet;
+ drools,bpel,smooks,freemarker,profiler,portlet,modeshape;
xulrunner,jst,vpe,jsf;
esb,tptp,ws;
cdi,struts,hibernatetools,seam;
15 years, 11 months
JBoss Tools SVN: r21943 - branches/modular_build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-05-06 13:43:16 -0400 (Thu, 06 May 2010)
New Revision: 21943
Modified:
branches/modular_build/parent-pom.xml
Log:
fix typos and add scm plugin - experimenting w/ bootstrapping sources from mvn instead of svnant (windows support)
Modified: branches/modular_build/parent-pom.xml
===================================================================
--- branches/modular_build/parent-pom.xml 2010-05-06 16:12:23 UTC (rev 21942)
+++ branches/modular_build/parent-pom.xml 2010-05-06 17:43:16 UTC (rev 21943)
@@ -16,7 +16,7 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.tycho</groupId>
+ <groupId>org.sonatype.tycho</groupId>
<artifactId>maven-osgi-packaging-plugin</artifactId>
<version>${tychoVersion}</version>
<configuration>
@@ -32,6 +32,17 @@
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-plugin</artifactId>
+ <version>1.0</version>
+ <configuration>
+ <!-- <goals>install</goals> -->
+ <skipCheckoutIfExists>true</skipCheckoutIfExists>
+ <checkoutDirectory>sources</checkoutDirectory>
+ </configuration>
+ </plugin>
+
+ <plugin>
<groupId>org.sonatype.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tychoVersion}</version>
@@ -41,6 +52,11 @@
<environment>
<os>macosx</os>
<ws>cocoa</ws>
+ <arch>x86_64</arch>
+ </environment>
+ <environment>
+ <os>macosx</os>
+ <ws>cocoa</ws>
<arch>x86</arch>
</environment>
<environment>
@@ -134,7 +150,7 @@
</connection>
<developerConnection>scm:svn:http://anonsvn.jboss.org/repos/jbosstools/${scmBranch}
</developerConnection>
- <url>http://anonsvn.jboss.org/repos/jbosstools/branches/${scmBranch}
+ <url>http://anonsvn.jboss.org/repos/jbosstools/${scmBranch}
</url>
</scm>
@@ -248,6 +264,7 @@
</profiles>
<repositories>
+ <!-- TODO: add JBT nightly update site so we can build against binaries -->
<repository>
<id>galileo</id>
<url>http://download.eclipse.org/releases/galileo/</url>
@@ -365,7 +382,7 @@
</pluginRepository>
<pluginRepository>
<id>tycho</id>
- <url>http://repository.sonatype.org/content/repositories/snapshots/
+ <url>https://repository.sonatype.org/content/repositories/snapshots/
</url>
<snapshots>
<enabled>true</enabled>
15 years, 11 months
JBoss Tools SVN: r21942 - trunk/drools/docs/guvnor_ref/en-US.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2010-05-06 12:12:23 -0400 (Thu, 06 May 2010)
New Revision: 21942
Modified:
trunk/drools/docs/guvnor_ref/en-US/functionality_overview.xml
trunk/drools/docs/guvnor_ref/en-US/guvnor_preferences.xml
trunk/drools/docs/guvnor_ref/en-US/introduction.xml
Log:
https://jira.jboss.org/jira/browse/TOOLSDOC-63 Eclipse Guvnor Tools Reference Guide restructureing and update. The minor structure and text changes have been made.
Modified: trunk/drools/docs/guvnor_ref/en-US/functionality_overview.xml
===================================================================
--- trunk/drools/docs/guvnor_ref/en-US/functionality_overview.xml 2010-05-06 15:30:31 UTC (rev 21941)
+++ trunk/drools/docs/guvnor_ref/en-US/functionality_overview.xml 2010-05-06 16:12:23 UTC (rev 21942)
@@ -28,10 +28,10 @@
<orderedlist>
<listitem>
- <para>Drag-and-drop from the <property>Guvnor Repositories view</property></para>
+ <para>Drag-and-drop from the <link linkend="guvnor_repositories_view">Guvnor Repositories view</link></para>
</listitem>
<listitem>
- <para>Using the <link linkend="resources_from_guvnor">Import from Guvnor
+ <para>Using the <link linkend="resources_from_guvnor">Resource from Guvnor
wizard</link>, as described further in this document</para>
</listitem>
</orderedlist>
@@ -234,14 +234,7 @@
<para>If a local change is based on an older revision of a file that is currently in the
Guvnor repository (for example, someone else changed the same file), then the <emphasis>
<property>Commit</property>
- </emphasis> action will<figure>
- <title>Add to Guvnor Wizard</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/functionality_overview/add_toGuvnor_wizard.png"/>
- </imageobject>
- </mediaobject>
- </figure> ask whether you wish to overwrite the current version in the
+ </emphasis> action will ask whether you wish to overwrite the current version in the
Guvnor repository with the local content. When such conflicts occur, however, you
should use the Eclipse Guvnor version tools, along with Eclipse standard tools, to
determine the differences and merge content based on the current version in the
Modified: trunk/drools/docs/guvnor_ref/en-US/guvnor_preferences.xml
===================================================================
--- trunk/drools/docs/guvnor_ref/en-US/guvnor_preferences.xml 2010-05-06 15:30:31 UTC (rev 21941)
+++ trunk/drools/docs/guvnor_ref/en-US/guvnor_preferences.xml 2010-05-06 16:12:23 UTC (rev 21942)
@@ -15,8 +15,8 @@
<title>Guvnor Repository Exploring Perspective</title>
<para>The <property>Guvnor Repository Exploring perspective</property> contains two views
- supplied by <property>EGT</property> – <link linkend="guvnor_repositories_view">Guvnor Repositories</link> and
- <link linkend="guvnor_history_view">Guvnor Resource History</link>, that will be the center of most interactions
+ supplied by <property>EGT</property> – <link linkend="guvnor_repositories_view">Guvnor Repositories view</link> and
+ <link linkend="guvnor_history_view">Guvnor Resource History view</link>, that will be the center of most interactions
with Guvnor, and Eclipse standard views such as <property>Properties</property> and
<property>Resource Navigator</property> that are also useful.</para>
@@ -163,7 +163,7 @@
</section>
<section id="resources_from_guvnor">
- <title>Import from Guvnor wizard</title>
+ <title>Resource from Guvnor Wizard</title>
<para>In addition to the single file drag-and-drop from the <property>Guvnor Repositories
view</property>, the <property>EGT</property> also includes a wizard for copying one
@@ -350,7 +350,7 @@
Resource History view</property> updates to show the revision history:</para>
<figure>
- <title>IGuvnor Resource History View</title>
+ <title>Guvnor Resource History View</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/functionality_overview/resource_history_view2.png"/>
Modified: trunk/drools/docs/guvnor_ref/en-US/introduction.xml
===================================================================
--- trunk/drools/docs/guvnor_ref/en-US/introduction.xml 2010-05-06 15:30:31 UTC (rev 21941)
+++ trunk/drools/docs/guvnor_ref/en-US/introduction.xml 2010-05-06 16:12:23 UTC (rev 21942)
@@ -74,15 +74,14 @@
<row>
<entry>
- <para>Resources from Guvnor Wizard</para>
+ <para>Resource from Guvnor wizard</para>
</entry>
<entry>
<para>The wizard helps to get local copies of Guvnor repository
resources.</para>
</entry>
<entry>
- <link linkend="resources_from_guvnor">Importing Guvnor Repository
- Resources</link>
+ <link linkend="resources_from_guvnor">Resource from Guvnor wizard</link>
</entry>
</row>
@@ -98,7 +97,7 @@
and those not associated.</para>
</entry>
<entry>
- <link linkend="actions">Actions for Local Guvnor Resources</link>
+ <link linkend="actions">Managing Guvnor Resources</link>
</entry>
</row>
@@ -135,7 +134,7 @@
</listitem>
</itemizedlist>
<para>To have JBoss Server with Guvnor repository deployed, you should
- download <ulink url="http://www.jboss.org/drools/downloads.html">Guvnor</ulink>.
+ download <ulink url="http://www.jboss.org/drools/downloads.html">Drools Guvnor</ulink>.
When downloading you may choose either web based Guvnor to deploy to your
JBoss Server or Standalone Guvnor with JBoss AS.</para>
<para>If you use a JBoss AS 5 and a <property>Guvnor Tools</property> doesn't work when deployed to the server,
15 years, 11 months
JBoss Tools SVN: r21941 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test: resources/jsfTest/WebContent/pages/JBIDE/6131 and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2010-05-06 11:30:31 -0400 (Thu, 06 May 2010)
New Revision: 21941
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/6131/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/6131/6131test.xhtml
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-6131, check for templates proposals in ca has been added
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/6131/6131test.xhtml
===================================================================
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java 2010-05-06 15:03:07 UTC (rev 21940)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java 2010-05-06 15:30:31 UTC (rev 21941)
@@ -64,7 +64,30 @@
throw getException();
}
}
+ //added by Maksim Areshkau, as test case for JBIE-6131.
+ //source code templates should be in ca proposals.
+ public void testCAforSourceCodeTemplatesProposals() throws Throwable {
+ // wait
+ TestUtil.waitForJobs();
+ // set exception
+ setException(null);
+ ICompletionProposal[] results = checkOfCAByStartString(CA_NAME, "JBIDE/6131/6131test.xhtml","Common",1,1,false); //$NON-NLS-1$ //$NON-NLS-2$
+ boolean proposalExists=false;
+ for (ICompletionProposal completionProposal : results) {
+ String displayString = ((ICompletionProposal) completionProposal).getDisplayString();
+ if(displayString.contains("Common Facelet Page")) { //$NON-NLS-1$
+ proposalExists = true;
+ break;
+ }
+ }
+ assertTrue("Common " + " should be in proposals", proposalExists);
+ // check exception
+ if (getException() != null) {
+
+ throw getException();
+ }
+ }
/**
* Tests Path proposals of CA
*/
15 years, 11 months
JBoss Tools SVN: r21940 - branches/modular_build/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-05-06 11:03:07 -0400 (Thu, 06 May 2010)
New Revision: 21940
Modified:
branches/modular_build/build/build.xml
Log:
workaround for windows and svnant server suck
Modified: branches/modular_build/build/build.xml
===================================================================
--- branches/modular_build/build/build.xml 2010-05-06 14:54:04 UTC (rev 21939)
+++ branches/modular_build/build/build.xml 2010-05-06 15:03:07 UTC (rev 21940)
@@ -163,9 +163,21 @@
<target name="get.svnant" unless="svnant.jar.exists">
<property name="SVNANT_MIRROR" value="http://www.tigris.org/files/documents/906/46267" />
<!-- ant <get> does not work due to redirection; on Windows just download this file manually -->
- <exec executable="wget" dir="${COMMON_TOOLS}">
- <arg line="${SVNANT_MIRROR}/svnant-1.3.0.zip --no-clobber" />
- </exec>
+ <if>
+ <os family="windows" />
+ <then>
+ <get src="${SVNANT_MIRROR}/svnant-1.3.0.zip"
+ dest="${COMMON_TOOLS}/svnant-1.3.0.zip"
+ verbose="true"
+ usetimestamp="true"
+ />
+ </then>
+ <else>
+ <exec executable="wget" dir="${COMMON_TOOLS}">
+ <arg line="${SVNANT_MIRROR}/svnant-1.3.0.zip --no-clobber" />
+ </exec>
+ </else>
+ </if>
<touch file="${COMMON_TOOLS}/svnant-1.3.0.zip" />
<mkdir dir="${java.io.tmpdir}/svnant-1.3.0.zip_" />
<unzip src="${COMMON_TOOLS}/svnant-1.3.0.zip" dest="${java.io.tmpdir}/svnant-1.3.0.zip_" overwrite="true" />
@@ -774,7 +786,7 @@
<var name="zip.contents" unset="true" />
<var name="zip.features" unset="true" />
<echo level="info">
-</echo>
+ </echo>
</sequential>
</for>
</target>
15 years, 11 months
JBoss Tools SVN: r21939 - branches/modular_build/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-05-06 10:54:04 -0400 (Thu, 06 May 2010)
New Revision: 21939
Modified:
branches/modular_build/build/build.xml
Log:
support using true/false/other path values of maven.repo.local
Modified: branches/modular_build/build/build.xml
===================================================================
--- branches/modular_build/build/build.xml 2010-05-06 14:23:43 UTC (rev 21938)
+++ branches/modular_build/build/build.xml 2010-05-06 14:54:04 UTC (rev 21939)
@@ -108,7 +108,7 @@
<param name="noXvfb" value="true" />
</antcall>
<delete dir="${WORKINGDIR}/purge" includeemptydirs="true" quiet="true" />
- <delete dir="${COMMON_TOOLS}/m2-repository/org/jboss/tools" includeemptydirs="true" quiet="true"/>
+ <delete dir="${COMMON_TOOLS}/m2-repository/org/jboss/tools" includeemptydirs="true" quiet="true" />
</target>
<target name="run"
@@ -515,6 +515,30 @@
<echo level="verbose">Exe: ${COMMON_TOOLS}/apache-maven-${maven.version}/bin/${mvnExe}</echo>
<echo level="verbose">Pom: ${WORKINGDIR}/${COMPONENT}/pom.xml</echo>
<property name="MAVEN_DIR" value="${WORKINGDIR}/${COMPONENT}" />
+ <!-- support using true/false/other path values of maven.repo.local -->
+ <if>
+ <isset property="maven.repo.local" />
+ <then>
+ <if>
+ <isfalse value="${maven.repo.local}" />
+ <then>
+ <var name="maven.repo.local" value="" />
+ </then>
+ <elseif>
+ <istrue value="${maven.repo.local}" />
+ <then>
+ <var name="maven.repo.local" value=" -Dmaven.repo.local=${COMMON_TOOLS}/m2-repository" />
+ </then>
+ </elseif>
+ <else>
+ <var name="maven.repo.local" value=" -Dmaven.repo.local=${maven.repo.local}" />
+ </else>
+ </if>
+ </then>
+ <else>
+ <var name="maven.repo.local" value=" -Dmaven.repo.local=${COMMON_TOOLS}/m2-repository" />
+ </else>
+ </if>
<!-- 3 hr timeout = 10800000ms -->
<exec executable="${COMMON_TOOLS}/apache-maven-${maven.version}/bin/${mvnExe}"
dir="${MAVEN_DIR}"
@@ -749,7 +773,8 @@
</if>
<var name="zip.contents" unset="true" />
<var name="zip.features" unset="true" />
- <echo level="info"></echo>
+ <echo level="info">
+</echo>
</sequential>
</for>
</target>
15 years, 11 months
JBoss Tools SVN: r21938 - trunk/jst/plugins/org.jboss.tools.jst.web.ui.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2010-05-06 10:23:43 -0400 (Thu, 06 May 2010)
New Revision: 21938
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml
Log:
class name mistake in plugin has been adjusted
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2010-05-06 14:22:07 UTC (rev 21937)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2010-05-06 14:23:43 UTC (rev 21938)
@@ -47,7 +47,7 @@
<page
name="%VPE_Templates"
category="org.jboss.tools.vpe.editor"
- class="org.jboss.tools.jst.web.ui.editor.pref.template.VPE1TemplatePreferencePage"
+ class="org.jboss.tools.jst.web.ui.editor.pref.template.VPETemplatePreferencePage"
id="org.jboss.tools.jsf.ui.editor.pref.template">
<keywordReference id="org.eclipse.wst.html.ui.templates"/>
</page>
15 years, 11 months
JBoss Tools SVN: r21937 - trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2010-05-06 10:22:07 -0400 (Thu, 06 May 2010)
New Revision: 21937
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-6131, test has been adjusted
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java 2010-05-06 14:21:19 UTC (rev 21936)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java 2010-05-06 14:22:07 UTC (rev 21937)
@@ -31,27 +31,27 @@
public static Test suite(){
TestSuite suite = new TestSuite("VPE All Tests"); //$NON-NLS-1$
-// suite.addTestSuite(CancelTagLibDefenitionTest.class);
-// suite.addTestSuite(ImportTagsFromTLDFileTest.class);
-// suite.addTestSuite(ToggleCommentTest.class);
-// suite.addTestSuite(BlockCommentTest.class);
-// suite.addTestSuite(ChangeEditorTabForTheFirstOpenPageTest.class);
-// suite.addTestSuite(JBIDE4556Test.class);
-// suite.addTestSuite(VerificationOfNameSpacesTest.class);
-// suite.addTestSuite(BorderForUnknownTagsTest.class);
-// suite.addTestSuite(ShowResourceBundlesUsageasELexpressionsTest.class);
-// suite.addTestSuite(ShowSelectionTagBarTest.class);
-// suite.addTestSuite(AlwaysHideSelectionBarWithoutPromptTest.class);
-// suite.addTestSuite(ShowNonVisualTagsTest.class);
-// suite.addTestSuite(AddSubstitutedELExpressionFolderScopeTest.class);
-// suite.addTestSuite(EditorSynchronizationTest.class);
-// suite.addTestSuite(JSPPageCreationTest.class);
-// suite.addTestSuite(XHTMLPageCreationTest.class);
-// suite.addTestSuite(RenameFacesConfigFileTest.class);
-// suite.addTestSuite(RenameJSPFileTest.class);
-// suite.addTestSuite(RenameXHTMLFileTest.class);
-// suite.addTestSuite(ImportUnknownTagsWizardTest.class);
-// suite.addTestSuite(NewXHTMLPageWizardTest.class);
+ suite.addTestSuite(CancelTagLibDefenitionTest.class);
+ suite.addTestSuite(ImportTagsFromTLDFileTest.class);
+ suite.addTestSuite(ToggleCommentTest.class);
+ suite.addTestSuite(BlockCommentTest.class);
+ suite.addTestSuite(ChangeEditorTabForTheFirstOpenPageTest.class);
+ suite.addTestSuite(JBIDE4556Test.class);
+ suite.addTestSuite(VerificationOfNameSpacesTest.class);
+ suite.addTestSuite(BorderForUnknownTagsTest.class);
+ suite.addTestSuite(ShowResourceBundlesUsageasELexpressionsTest.class);
+ suite.addTestSuite(ShowSelectionTagBarTest.class);
+ suite.addTestSuite(AlwaysHideSelectionBarWithoutPromptTest.class);
+ suite.addTestSuite(ShowNonVisualTagsTest.class);
+ suite.addTestSuite(AddSubstitutedELExpressionFolderScopeTest.class);
+ suite.addTestSuite(EditorSynchronizationTest.class);
+ suite.addTestSuite(JSPPageCreationTest.class);
+ suite.addTestSuite(XHTMLPageCreationTest.class);
+ suite.addTestSuite(RenameFacesConfigFileTest.class);
+ suite.addTestSuite(RenameJSPFileTest.class);
+ suite.addTestSuite(RenameXHTMLFileTest.class);
+ suite.addTestSuite(ImportUnknownTagsWizardTest.class);
+ suite.addTestSuite(NewXHTMLPageWizardTest.class);
suite.addTestSuite(VPESourceCodeTemplatesPreferencePageTest.class);
return new TestSetup(suite);
}
15 years, 11 months
JBoss Tools SVN: r21936 - in trunk: vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2010-05-06 10:21:19 -0400 (Thu, 06 May 2010)
New Revision: 21936
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/VPESourceCodeTemplatesPreferencePageTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-6131, test has been adjusted
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2010-05-06 14:08:46 UTC (rev 21935)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2010-05-06 14:21:19 UTC (rev 21936)
@@ -47,7 +47,7 @@
<page
name="%VPE_Templates"
category="org.jboss.tools.vpe.editor"
- class="org.jboss.tools.jst.web.ui.editor.pref.template.VPETemplatePreferencePage"
+ class="org.jboss.tools.jst.web.ui.editor.pref.template.VPE1TemplatePreferencePage"
id="org.jboss.tools.jsf.ui.editor.pref.template">
<keywordReference id="org.eclipse.wst.html.ui.templates"/>
</page>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java 2010-05-06 14:08:46 UTC (rev 21935)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java 2010-05-06 14:21:19 UTC (rev 21936)
@@ -31,27 +31,27 @@
public static Test suite(){
TestSuite suite = new TestSuite("VPE All Tests"); //$NON-NLS-1$
- suite.addTestSuite(CancelTagLibDefenitionTest.class);
- suite.addTestSuite(ImportTagsFromTLDFileTest.class);
- suite.addTestSuite(ToggleCommentTest.class);
- suite.addTestSuite(BlockCommentTest.class);
- suite.addTestSuite(ChangeEditorTabForTheFirstOpenPageTest.class);
- suite.addTestSuite(JBIDE4556Test.class);
- suite.addTestSuite(VerificationOfNameSpacesTest.class);
- suite.addTestSuite(BorderForUnknownTagsTest.class);
- suite.addTestSuite(ShowResourceBundlesUsageasELexpressionsTest.class);
- suite.addTestSuite(ShowSelectionTagBarTest.class);
- suite.addTestSuite(AlwaysHideSelectionBarWithoutPromptTest.class);
- suite.addTestSuite(ShowNonVisualTagsTest.class);
- suite.addTestSuite(AddSubstitutedELExpressionFolderScopeTest.class);
- suite.addTestSuite(EditorSynchronizationTest.class);
- suite.addTestSuite(JSPPageCreationTest.class);
- suite.addTestSuite(XHTMLPageCreationTest.class);
- suite.addTestSuite(RenameFacesConfigFileTest.class);
- suite.addTestSuite(RenameJSPFileTest.class);
- suite.addTestSuite(RenameXHTMLFileTest.class);
- suite.addTestSuite(ImportUnknownTagsWizardTest.class);
- suite.addTestSuite(NewXHTMLPageWizardTest.class);
+// suite.addTestSuite(CancelTagLibDefenitionTest.class);
+// suite.addTestSuite(ImportTagsFromTLDFileTest.class);
+// suite.addTestSuite(ToggleCommentTest.class);
+// suite.addTestSuite(BlockCommentTest.class);
+// suite.addTestSuite(ChangeEditorTabForTheFirstOpenPageTest.class);
+// suite.addTestSuite(JBIDE4556Test.class);
+// suite.addTestSuite(VerificationOfNameSpacesTest.class);
+// suite.addTestSuite(BorderForUnknownTagsTest.class);
+// suite.addTestSuite(ShowResourceBundlesUsageasELexpressionsTest.class);
+// suite.addTestSuite(ShowSelectionTagBarTest.class);
+// suite.addTestSuite(AlwaysHideSelectionBarWithoutPromptTest.class);
+// suite.addTestSuite(ShowNonVisualTagsTest.class);
+// suite.addTestSuite(AddSubstitutedELExpressionFolderScopeTest.class);
+// suite.addTestSuite(EditorSynchronizationTest.class);
+// suite.addTestSuite(JSPPageCreationTest.class);
+// suite.addTestSuite(XHTMLPageCreationTest.class);
+// suite.addTestSuite(RenameFacesConfigFileTest.class);
+// suite.addTestSuite(RenameJSPFileTest.class);
+// suite.addTestSuite(RenameXHTMLFileTest.class);
+// suite.addTestSuite(ImportUnknownTagsWizardTest.class);
+// suite.addTestSuite(NewXHTMLPageWizardTest.class);
suite.addTestSuite(VPESourceCodeTemplatesPreferencePageTest.class);
return new TestSetup(suite);
}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/VPESourceCodeTemplatesPreferencePageTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/VPESourceCodeTemplatesPreferencePageTest.java 2010-05-06 14:08:46 UTC (rev 21935)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/VPESourceCodeTemplatesPreferencePageTest.java 2010-05-06 14:21:19 UTC (rev 21936)
@@ -11,7 +11,9 @@
package org.jboss.tools.vpe.ui.bot.test.wizard;
import org.eclipse.swtbot.swt.finder.SWTBotTestCase;
+import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
+import org.jboss.tools.ui.bot.test.WidgetVariables;
/**
* This test class open vpe preference page
@@ -32,8 +34,13 @@
.expandNode("Editors") //$NON-NLS-1$
.expandNode("Visual Page Editor") //$NON-NLS-1$
.select("Templates").click(); //$NON-NLS-1$
- this.bot.button("New...").click(); //$NON-NLS-1$
- this.bot.button("Cancel").click(); //$NON-NLS-1$
- System.out.println(this.bot.activeShell().getText());
+ try{
+ this.bot.button("New...").click(); //$NON-NLS-1$
+ this.bot.button("Cancel").click(); //$NON-NLS-1$
+ } catch(WidgetNotFoundException ex){
+ fail("Preference Page has not been created"+ex);//$NON-NLS-1$
+ }finally{
+ this.bot.button(WidgetVariables.OK_BUTTON).click();
+ }
}
}
15 years, 11 months
JBoss Tools SVN: r21935 - in trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test: wizard and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2010-05-06 10:08:46 -0400 (Thu, 06 May 2010)
New Revision: 21935
Added:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/VPESourceCodeTemplatesPreferencePageTest.java
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-6131, simple test case in which pref page are opened has been added
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java 2010-05-06 13:27:44 UTC (rev 21934)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java 2010-05-06 14:08:46 UTC (rev 21935)
@@ -25,6 +25,7 @@
import org.jboss.tools.vpe.ui.bot.test.smoke.XHTMLPageCreationTest;
import org.jboss.tools.vpe.ui.bot.test.wizard.ImportUnknownTagsWizardTest;
import org.jboss.tools.vpe.ui.bot.test.wizard.NewXHTMLPageWizardTest;
+import org.jboss.tools.vpe.ui.bot.test.wizard.VPESourceCodeTemplatesPreferencePageTest;
public class VPEAllBotTests extends SWTBotTestCase{
public static Test suite(){
@@ -51,6 +52,7 @@
suite.addTestSuite(RenameXHTMLFileTest.class);
suite.addTestSuite(ImportUnknownTagsWizardTest.class);
suite.addTestSuite(NewXHTMLPageWizardTest.class);
+ suite.addTestSuite(VPESourceCodeTemplatesPreferencePageTest.class);
return new TestSetup(suite);
}
}
Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/VPESourceCodeTemplatesPreferencePageTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/VPESourceCodeTemplatesPreferencePageTest.java (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/VPESourceCodeTemplatesPreferencePageTest.java 2010-05-06 14:08:46 UTC (rev 21935)
@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.vpe.ui.bot.test.wizard;
+
+import org.eclipse.swtbot.swt.finder.SWTBotTestCase;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
+
+/**
+ * This test class open vpe preference page
+ * Window->Preferences->JBoss Tools->Web->Editors->Visual Page Editor->Templates
+ *
+ * @author mareshkau
+ *
+ */
+public class VPESourceCodeTemplatesPreferencePageTest extends SWTBotTestCase{
+
+ //just open a VPE Source Code templates preference test page
+ public void testSourceCodeTemplatesPreferencePage() {
+ this.bot.menu("Window").menu("Preferences").click(); //$NON-NLS-1$ //$NON-NLS-2$
+ SWTBotTree preferenceTree = this.bot.tree();
+ preferenceTree
+ .expandNode("JBoss Tools") //$NON-NLS-1$
+ .expandNode("Web") //$NON-NLS-1$
+ .expandNode("Editors") //$NON-NLS-1$
+ .expandNode("Visual Page Editor") //$NON-NLS-1$
+ .select("Templates").click(); //$NON-NLS-1$
+ this.bot.button("New...").click(); //$NON-NLS-1$
+ this.bot.button("Cancel").click(); //$NON-NLS-1$
+ System.out.println(this.bot.activeShell().getText());
+ }
+}
15 years, 11 months