JBoss Tools SVN: r42651 - trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples.
by jbosstools-commits＠lists.jboss.org
Author: ldimaggio
Date: 2012-07-19 11:21:32 -0400 (Thu, 19 Jul 2012)
New Revision: 42651
Modified:
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/ESBExampleTest.java
Log:
Added a new check to fixLibrary() for the ESB Runtime - it's unclear how the tests ever worked before this change was made
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/ESBExampleTest.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/ESBExampleTest.java 2012-07-19 13:48:24 UTC (rev 42650)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/ESBExampleTest.java 2012-07-19 15:21:32 UTC (rev 42651)
@@ -203,7 +203,14 @@
ContextMenuHelper.prepareTreeItemForContextMenu(tree, item);
new SWTBotMenu(ContextMenuHelper.getContextMenu(tree, IDELabel.Menu.PROPERTIES, false)).click();
SWTBotShell shell = bot.activeShell();
- shell.bot().table().select(configuredState.getServer().name);
+
+ /* ldimagi - July 2012 - added this as all tests were failing - unclear how this EVER worked before the change */
+ if (lib.contains("ESB")) {
+ shell.bot().table().select("ESB-" + configuredState.getServer().bundledESBVersion);
+ }
+ else {
+ shell.bot().table().select(configuredState.getServer().name);
+ }
open.finish(shell.bot(),IDELabel.Button.OK);
fixed=true;
break;
13 years, 8 months
JBoss Tools SVN: r42650 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe: handlers and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2012-07-19 09:48:24 -0400 (Thu, 19 Jul 2012)
New Revision: 42650
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/RotateEditorsHandler.java
Log:
https://issues.jboss.org/browse/JBIDE-12344 - Rotate editor's handler should fire the changed event, VpeController code adjustments.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2012-07-19 10:57:07 UTC (rev 42649)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2012-07-19 13:48:24 UTC (rev 42650)
@@ -1830,23 +1830,25 @@
public void refreshCommands(){
ICommandService commandService = (ICommandService)
editPart.getSite().getService(ICommandService.class);
- for (String commandId : getVpeCategoryCommands()) {
- /*
- * https://issues.jboss.org/browse/JBIDE-12290
- * In eclipse 4.2 commandService could be null.
- */
- if (commandService != null) {
+ /*
+ * https://issues.jboss.org/browse/JBIDE-12290
+ * In eclipse 4.2 commandService could be null.
+ */
+ if (commandService != null) {
+ for (String commandId : getVpeCategoryCommands()) {
commandService.refreshElements(commandId, null);
}
}
}
private List<String> getVpeCategoryCommands() {
- ICommandService commandService = (ICommandService) PlatformUI
- .getWorkbench().getService(ICommandService.class);
-
- //init VPE Commands List if its has not been initialized
+ /*
+ * initialize VPE Commands List
+ * if its has not been initialized yet
+ */
if (vpeCategoryCommands == null) {
+ ICommandService commandService = (ICommandService)
+ editPart.getSite().getService(ICommandService.class);
vpeCategoryCommands = new ArrayList<String>();
Command [] definedCommands = commandService.getDefinedCommands();
for (Command command : definedCommands) {
@@ -1860,7 +1862,6 @@
}
}
}
-
return vpeCategoryCommands;
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/RotateEditorsHandler.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/RotateEditorsHandler.java 2012-07-19 10:57:07 UTC (rev 42649)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/RotateEditorsHandler.java 2012-07-19 13:48:24 UTC (rev 42650)
@@ -19,8 +19,8 @@
import org.eclipse.core.commands.Command;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.HandlerEvent;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IEditorReference;
import org.eclipse.ui.PlatformUI;
@@ -137,6 +137,13 @@
element.setIcon(VpePlugin.imageDescriptorFromPlugin(
VpePlugin.PLUGIN_ID, layoutIcons.get(orientation)));
element.setTooltip(layoutNamesAndTooltips.get(orientation));
+ /*
+ * https://issues.jboss.org/browse/JBIDE-12344
+ * Listeners should get this event and update the icons state.
+ * This method is overridden from VisualPartAbstractHandler,
+ * so should fire the event also.
+ */
+ fireHandlerChanged(new HandlerEvent(this, true, false));
}
private void rotateEditor(IEditorPart editor, String orientation) {
13 years, 8 months
JBoss Tools SVN: r42649 - trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src.
by jbosstools-commits＠lists.jboss.org
Author: apodhrad
Date: 2012-07-19 06:57:07 -0400 (Thu, 19 Jul 2012)
New Revision: 42649
Added:
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/log4j.xml
Log:
Bpel bot test: add log4j.xml
Added: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/log4j.xml
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/log4j.xml (rev 0)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/log4j.xml 2012-07-19 10:57:07 UTC (rev 42649)
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"
+ debug="false">
+
+ <appender name="consoleAppender" class="org.apache.log4j.ConsoleAppender">
+ <param name="Target" value="System.out" />
+ <layout class="org.apache.log4j.PatternLayout">
+ <!--
+ <param name="ConversionPattern"
+ value="%d{dd MMM yyyy HH:mm:ss.SSS} - %25t - %-5p - %30c{1} - (%C{1}.java:%L) - %m%n" />
+ -->
+ <param name="ConversionPattern"
+ value="(%C{1}.java:%L) - %m%n" />
+
+ </layout>
+ </appender>
+
+ <appender name="fileAppender" class="org.apache.log4j.FileAppender">
+ <param name="File" value="target/bpel-debug.log" />
+ <param name="Append" value="false" />
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern"
+ value="%d{dd MMM yyyy HH:mm:ss.SSS} - %25t - %-5p - %30c{1} - (%C{1}.java:%L) - %m%n" />
+ </layout>
+ </appender>
+
+ <appender name="asyncAppender" class="org.apache.log4j.AsyncAppender">
+ <appender-ref ref="consoleAppender" />
+ <appender-ref ref="fileAppender" />
+ </appender>
+
+ <!-- don't log matchers, this is very high amount of chatter -->
+ <category name="org.eclipse.swtbot.swt.finder.matchers">
+ <priority value="OFF" />
+ </category>
+
+ <!--
+ don't log widget notification events, this is moderately high chatter
+ -->
+ <category name="org.eclipse.swtbot.swt.finder.widgets">
+ <priority value="OFF" />
+ </category>
+
+ <!-- don't log finders, this is moderate chatter -->
+ <category name="org.eclipse.swtbot.swt.finder.finders">
+ <priority value="DEBUG" />
+ </category>
+
+ <category name="org.eclipse.swtbot.swt.finder.keyboard">
+ <!-- set to a value higher than debug to turn on. -->
+ <priority value="DEBUG" />
+ </category>
+
+ <category name="org.eclipse.swtbot">
+ <priority value="ALL" />
+ </category>
+
+ <root>
+ <priority value="INFO" />
+ <appender-ref ref="consoleAppender" />
+ <appender-ref ref="fileAppender" />
+ </root>
+
+</log4j:configuration>
\ No newline at end of file
13 years, 8 months
JBoss Tools SVN: r42648 - in trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test: suite and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: apodhrad
Date: 2012-07-19 06:55:39 -0400 (Thu, 19 Jul 2012)
New Revision: 42648
Added:
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/examples/LoanApprovalExampleTest.java
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/examples/MathExampleTest.java
Modified:
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/suite/BPELAllTest.java
Log:
Bpel bot test: add tests for Loan and Math example
Added: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/examples/LoanApprovalExampleTest.java
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/examples/LoanApprovalExampleTest.java (rev 0)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/examples/LoanApprovalExampleTest.java 2012-07-19 10:55:39 UTC (rev 42648)
@@ -0,0 +1,70 @@
+package org.jboss.tools.bpel.ui.bot.test.examples;
+
+import org.jboss.tools.bpel.ui.bot.test.BPELTest;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+
+/**
+ *
+ * @author apodhrad
+ *
+ */
+@Require(server = @Server(type = ServerType.ALL, state = ServerState.Running), perspective = "BPEL")
+public class LoanApprovalExampleTest extends BPELExampleTest {
+
+ private static final String PROJECT_NAME = "Loan_Approval";
+ private static final String PROJECT_NAME_WS = "Loan_Approval_WS";
+
+ @Override
+ public String[] getProjectNames() {
+ return new String[] { PROJECT_NAME_WS, "JSR-109 Web Services" };
+ }
+
+ @Override
+ public String getExampleName() {
+ return "A Web Services Project called by Loan_Approval";
+ }
+
+ @Override
+ protected void postImport() {
+ new LoanApprovalExample().exampleTest();
+ }
+
+ @Override
+ protected void executeExample() {
+ deployExamples(PROJECT_NAME_WS);
+ assertTrue(BPELTest.isProjectDeployed(PROJECT_NAME_WS));
+ deployExamples(PROJECT_NAME);
+ assertTrue(BPELTest.isProjectDeployed(PROJECT_NAME));
+
+ String url = "http://localhost:8080/Quickstart_bpel_loan_approvalWS?wsdl";
+ String requestFile = "Loan_Approval_request_1.xml";
+ String responseFile = "Loan_Approval_response_1.xml";
+ testResponse(url, requestFile, responseFile);
+ requestFile = "Loan_Approval_request_2.xml";
+ responseFile = "Loan_Approval_response_2.xml";
+ testResponse(url, requestFile, responseFile);
+ requestFile = "Loan_Approval_request_3.xml";
+ responseFile = "Loan_Approval_response_3.xml";
+ // get http response 500, why?
+ // testResponse(url, requestFile, responseFile);
+
+ servers.removeAllProjectsFromServer();
+ }
+
+ private class LoanApprovalExample extends BPELExampleTest {
+
+ @Override
+ public String[] getProjectNames() {
+ return new String[] { PROJECT_NAME };
+ }
+
+ @Override
+ public String getExampleName() {
+ return "A Loan Approval BPEL example";
+ }
+ }
+
+}
Added: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/examples/MathExampleTest.java
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/examples/MathExampleTest.java (rev 0)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/examples/MathExampleTest.java 2012-07-19 10:55:39 UTC (rev 42648)
@@ -0,0 +1,43 @@
+package org.jboss.tools.bpel.ui.bot.test.examples;
+
+import org.jboss.tools.bpel.ui.bot.test.BPELTest;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+
+/**
+ *
+ * @author apodhrad
+ *
+ */
+@Require(server = @Server(type = ServerType.ALL, state = ServerState.Running), perspective = "BPEL")
+public class MathExampleTest extends BPELExampleTest {
+
+ private static final String PROJECT_NAME = "Math";
+
+ @Override
+ public String[] getProjectNames() {
+ return new String[] { PROJECT_NAME };
+ }
+
+ @Override
+ public String getExampleName() {
+ return "A Math BPEL example";
+ }
+
+ @Override
+ protected void executeExample() {
+ deployExamples(PROJECT_NAME);
+ assertTrue(BPELTest.isProjectDeployed(PROJECT_NAME));
+
+ String url = "http://localhost:8080/MathProcess?wsdl";
+ String requestFile = "Math_request.xml";
+ String responseFile = "Math_response.xml";
+ testResponse(url, requestFile, responseFile);
+
+ servers.removeAllProjectsFromServer();
+ }
+
+
+}
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/suite/BPELAllTest.java
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/suite/BPELAllTest.java 2012-07-19 09:43:36 UTC (rev 42647)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/suite/BPELAllTest.java 2012-07-19 10:55:39 UTC (rev 42648)
@@ -13,6 +13,8 @@
import org.jboss.tools.bpel.ui.bot.test.WizardTest;
import org.jboss.tools.bpel.ui.bot.test.examples.HelloWorldExampleTest;
import org.jboss.tools.bpel.ui.bot.test.examples.HelloWorldOdeExampleTest;
+import org.jboss.tools.bpel.ui.bot.test.examples.LoanApprovalExampleTest;
+import org.jboss.tools.bpel.ui.bot.test.examples.MathExampleTest;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -29,7 +31,9 @@
ToolingCompatibilityTest.class,
AssociateRuntimeTest.class,
HelloWorldExampleTest.class,
- HelloWorldOdeExampleTest.class
+ HelloWorldOdeExampleTest.class,
+ LoanApprovalExampleTest.class,
+ MathExampleTest.class
})
@RunWith(RequirementAwareSuite.class)
13 years, 8 months
JBoss Tools SVN: r42647 - 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: vpakan(a)redhat.com
Date: 2012-07-19 05:43:36 -0400 (Thu, 19 Jul 2012)
New Revision: 42647
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/CodeCompletionTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java
Log:
Fixes for JBT 3.3.1.
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/CodeCompletionTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/CodeCompletionTest.java 2012-07-19 09:19:13 UTC (rev 42646)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/CodeCompletionTest.java 2012-07-19 09:43:36 UTC (rev 42647)
@@ -109,7 +109,7 @@
" <head>\n" +
" </head>\n" +
" <body>\n" +
- " </boyd>\n" +
+ " </body>\n" +
"</html>");
bot.sleep(Timing.time2S());
final String tagToSelect = "<body>";
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java 2012-07-19 09:19:13 UTC (rev 42646)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java 2012-07-19 09:43:36 UTC (rev 42647)
@@ -22,6 +22,7 @@
import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotText;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotToolbarButton;
import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase;
import org.jboss.tools.jst.jsp.messages.JstUIMessages;
import org.jboss.tools.ui.bot.ext.SWTJBTExt;
@@ -86,14 +87,12 @@
* Select some text
*/
editor.toTextEditor().selectRange(7, 18, 4);
- util.waitForAll();
/*
* Get toolbar button
*/
- assertTrue(TOOLBAR_ICON_ENABLED, bot
- .toolbarButtonWithTooltip(TOOL_TIP)
- .isEnabled());
- bot.toolbarButtonWithTooltip(TOOL_TIP).click();
+ SWTBotToolbarButton tbButton = bot.toolbarButtonWithTooltip(TOOL_TIP);
+ util.waitForToolbarButtonEnabled(tbButton,Timing.time5S());
+ tbButton.click();
bot.shell(JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).setFocus();
bot.shell(JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).activate();
isUnusedDialogOpened = true;
@@ -181,10 +180,9 @@
/*
* Get toolbar button
*/
- assertTrue(TOOLBAR_ICON_ENABLED, bot
- .toolbarButtonWithTooltip(TOOL_TIP)
- .isEnabled());
- bot.toolbarButtonWithTooltip(TOOL_TIP).click();
+ SWTBotToolbarButton tbButton = bot.toolbarButtonWithTooltip(TOOL_TIP);
+ util.waitForToolbarButtonEnabled(tbButton,Timing.time5S());
+ tbButton.click();
bot.shell(JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).setFocus();
bot.shell(JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).activate();
isUnusedDialogOpened = true;
@@ -228,13 +226,13 @@
* Select some text
*/
editor.toTextEditor().selectRange(7, 18, 4);
- assertEquals("Replaced text is incorrect", "User", editor.toTextEditor().getSelection()); //$NON-NLS-1$ //$NON-NLS-2$
+ assertEquals("Replaced text is incorrect", "User", editor.toTextEditor().getSelection()); //$NON-NLS-1$ //$NON-NLS-2$
/*
* Get toolbar button
*/
- assertTrue(TOOLBAR_ICON_ENABLED,
- bot.toolbarButtonWithTooltip(TOOL_TIP).isEnabled());
- bot.toolbarButtonWithTooltip(TOOL_TIP).click();
+ tbButton = bot.toolbarButtonWithTooltip(TOOL_TIP);
+ util.waitForToolbarButtonEnabled(tbButton,Timing.time5S());
+ tbButton.click();
bot.shell(JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).setFocus();
bot.shell(JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).activate();
isUnusedDialogOpened = true;
@@ -285,13 +283,12 @@
* Select some text
*/
editor.toTextEditor().selectRange(7, 18, 4);
- util.waitForAll();
- /*
+ /*
* Get toolbar button
*/
- assertTrue(TOOLBAR_ICON_ENABLED, bot
- .toolbarButtonWithTooltip(TOOL_TIP).isEnabled());
- bot.toolbarButtonWithTooltip(TOOL_TIP).click();
+ SWTBotToolbarButton tbButton = bot.toolbarButtonWithTooltip(TOOL_TIP);
+ util.waitForToolbarButtonEnabled(tbButton,Timing.time5S());
+ tbButton.click();
bot.shell(JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).setFocus();
bot.shell(JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).activate();
isUnusedDialogOpened = true;
@@ -371,11 +368,10 @@
/*
* Get toolbar button
*/
- assertTrue(TOOLBAR_ICON_ENABLED, bot
- .toolbarButtonWithTooltip(TOOL_TIP)
- .isEnabled());
- bot.toolbarButtonWithTooltip(TOOL_TIP).click();
- bot.shell(JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).setFocus();
+ SWTBotToolbarButton tbButton = bot.toolbarButtonWithTooltip(TOOL_TIP);
+ util.waitForToolbarButtonEnabled(tbButton,Timing.time5S());
+ tbButton.click();
+ bot.shell(JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).setFocus();
bot.shell(JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).activate();
isUnusedDialogOpened = true;
@@ -482,19 +478,18 @@
* Select some text
*/
editor.toTextEditor().selectRange(13, 15, 1);
- util.waitForAll();
/*
* There is an exception caused by the fact that
* line delimiter was selected.
* But for this test it's ok, so just ignore this exception.
*/
setException(null);
+ SWTBotToolbarButton tbButton = bot.toolbarButtonWithTooltip(TOOL_TIP);
+ util.waitWhileToolbarButtonisDisabled(tbButton,Timing.time5S());
/*
- * Check that the toolbar buttion is disabled
+ * Check that the toolbar button is disabled
*/
- assertFalse("Toolbar button should be disabled", bot //$NON-NLS-1$
- .toolbarButtonWithTooltip(TOOL_TIP)
- .isEnabled());
+ assertFalse("Toolbar button should be disabled", tbButton.isEnabled());
/*
* Select some text
*/
@@ -507,9 +502,9 @@
/*
* Activate the dialog
*/
- assertTrue(TOOLBAR_ICON_ENABLED,
- bot.toolbarButtonWithTooltip(TOOL_TIP).isEnabled());
- bot.toolbarButtonWithTooltip(TOOL_TIP).click();
+ tbButton = bot.toolbarButtonWithTooltip(TOOL_TIP);
+ util.waitWhileToolbarButtonisDisabled(tbButton,Timing.time5S());
+ tbButton.click();
bot.shell(JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).setFocus();
bot.shell(JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).activate();
isUnusedDialogOpened = true;
@@ -926,11 +921,10 @@
/*
* Get toolbar button
*/
- assertTrue(TOOLBAR_ICON_ENABLED, bot
- .toolbarButtonWithTooltip(TOOL_TIP)
- .isEnabled());
- bot.toolbarButtonWithTooltip(TOOL_TIP).click();
- bot.shell(JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).setFocus();
+ SWTBotToolbarButton tbButton = bot.toolbarButtonWithTooltip(TOOL_TIP);
+ util.waitForToolbarButtonEnabled(tbButton,Timing.time5S());
+ tbButton.click();
+ bot.shell(JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).setFocus();
bot.shell(JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).activate();
isUnusedDialogOpened = true;
SWTBotCheckBox checkBox = bot.checkBox();
@@ -1033,10 +1027,9 @@
/*
* Get toolbar button
*/
- assertTrue(TOOLBAR_ICON_ENABLED, bot
- .toolbarButtonWithTooltip(TOOL_TIP)
- .isEnabled());
- bot.toolbarButtonWithTooltip(TOOL_TIP).click();
+ SWTBotToolbarButton tbButton = bot.toolbarButtonWithTooltip(TOOL_TIP);
+ util.waitForToolbarButtonEnabled(tbButton,Timing.time5S());
+ tbButton.click();
bot.shell(JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).setFocus();
bot.shell(JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).activate();
isUnusedDialogOpened = true;
@@ -1074,5 +1067,6 @@
bot.button(WidgetVariables.NEXT_BUTTON).click();
return editor;
- }
+ }
+
}
\ No newline at end of file
13 years, 8 months
JBoss Tools SVN: r42646 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2012-07-19 05:19:13 -0400 (Thu, 19 Jul 2012)
New Revision: 42646
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTUtilExt.java
Log:
Added methods waiting for ToolBar Button state.
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTUtilExt.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTUtilExt.java 2012-07-19 08:26:13 UTC (rev 42645)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTUtilExt.java 2012-07-19 09:19:13 UTC (rev 42646)
@@ -45,7 +45,9 @@
import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable;
import org.eclipse.swtbot.swt.finder.results.Result;
import org.eclipse.swtbot.swt.finder.results.WidgetResult;
+import org.eclipse.swtbot.swt.finder.utils.SWTBotPreferences;
import org.eclipse.swtbot.swt.finder.utils.SWTUtils;
+import org.eclipse.swtbot.swt.finder.waits.ICondition;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotToolbarButton;
@@ -891,5 +893,68 @@
}
/********** END OF CAPTURING OF STANDARD OUTPUT **********/
+
+ /**
+ * Waits until toolbarButton with timeout SWTBotPreferences.TIMEOUT
+ * @param toolbarButton
+ */
+ public void waitForToolbarButtonEnabled (SWTBotToolbarButton toolbarButton) {
+ waitForToolbarButtonEnabled(toolbarButton, SWTBotPreferences.TIMEOUT);
+ }
+ /**
+ * Waits until toolbarButton is enabled with timeout
+ * @param toolbarButton
+ */
+ public void waitForToolbarButtonEnabled (final SWTBotToolbarButton toolbarButton, final long timeout) {
+ bot.waitUntil(new ICondition() {
+
+ @Override
+ public boolean test() throws Exception {
+ return toolbarButton.isEnabled();
+ }
+
+ @Override
+ public void init(SWTBot bot) {
+ }
+
+ @Override
+ public String getFailureMessage() {
+ return "Tooolbar button with tooltip " + toolbarButton.getToolTipText() +
+ " was not enabled within " + timeout + " miliseconds";
+ }
+ },
+ timeout);
+ }
+ /**
+ * Waits while toolbarButton is disabled with timeout SWTBotPreferences.TIMEOUT
+ * @param toolbarButton
+ */
+ public void waitWhileToolbarButtonisDisabled (SWTBotToolbarButton toolbarButton) {
+ waitWhileToolbarButtonisDisabled(toolbarButton, SWTBotPreferences.TIMEOUT);
+ }
+ /**
+ * Waits while toolbarButton is disabled with timeout
+ * @param toolbarButton
+ */
+ public void waitWhileToolbarButtonisDisabled (final SWTBotToolbarButton toolbarButton, final long timeout) {
+ bot.waitWhile(new ICondition() {
+
+ @Override
+ public boolean test() throws Exception {
+ return toolbarButton.isEnabled();
+ }
+
+ @Override
+ public void init(SWTBot bot) {
+ }
+
+ @Override
+ public String getFailureMessage() {
+ return "Tooolbar button with tooltip " + toolbarButton.getToolTipText() +
+ " was not enabled within " + timeout + " miliseconds";
+ }
+ },
+ timeout);
+ }
}
\ No newline at end of file
13 years, 8 months
JBoss Tools SVN: r42645 - trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/diagram.
by jbosstools-commits＠lists.jboss.org
Author: jpeterka
Date: 2012-07-19 04:26:13 -0400 (Thu, 19 Jul 2012)
New Revision: 42645
Modified:
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/diagram/MappingDiagramTest.java
Log:
Mapping diagram editor check added into the test
Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/diagram/MappingDiagramTest.java
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/diagram/MappingDiagramTest.java 2012-07-19 00:03:07 UTC (rev 42644)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/diagram/MappingDiagramTest.java 2012-07-19 08:26:13 UTC (rev 42645)
@@ -1,5 +1,8 @@
package org.jboss.tools.hb.ui.bot.test.diagram;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.jboss.tools.hb.ui.bot.common.Tree;
@@ -18,19 +21,27 @@
public class MappingDiagramTest extends HibernateBaseTest {
final String hc = "hibernate35";
-
+
+ /**
+ * Test imports projects and check if mapping diagram can be opened
+ */
@Test
public void showMappingDiagram() {
importTestProject("/resources/prj/hibernatelib");
importTestProject("/resources/prj/hibernate35");
util.waitForAll();
openDiagram();
+ bot.sleep(TIME_10S);
}
private void openDiagram() {
SWTBotView hcv = open.viewOpen(ActionItem.View.HibernateHibernateConfigurations.LABEL);
SWTBotTreeItem item = Tree.select(hcv.bot(), hc, "Configuration");
item.contextMenu("Mapping Diagram").click();
+ String title = bot.activeEditor().getTitle();
+ Pattern pattern = Pattern.compile(hc + ".*");
+ Matcher matcher = pattern.matcher(title);
+ assertTrue("Mapping diagram editor must be found",matcher.matches());
}
}
13 years, 8 months
JBoss Tools SVN: r42644 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/include.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-07-18 20:03:07 -0400 (Wed, 18 Jul 2012)
New Revision: 42644
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/include/IncludeModel.java
Log:
JBIDE-12295
https://issues.jboss.org/browse/JBIDE-12295
Open-on of multiple declarations of ui:param with the same name are supported.
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/include/IncludeModel.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/include/IncludeModel.java 2012-07-18 23:36:46 UTC (rev 42643)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/include/IncludeModel.java 2012-07-19 00:03:07 UTC (rev 42644)
@@ -87,7 +87,12 @@
static final String STORE_ATTR_PATH = "path"; //$NON-NLS-1$
static final String STORE_ATTR_NAME = "name"; //$NON-NLS-1$
static final String STORE_ATTR_VALUE = "value"; //$NON-NLS-1$
+ static final String STORE_ATTR_OFFSET = "off"; //$NON-NLS-1$
+ static final String STORE_ATTR_LENGTH = "len"; //$NON-NLS-1$
+ static final String STORE_ELEMENT_ALIASES = "aliases"; //$NON-NLS-1$
+ static final String STORE_ELEMENT_ALIAS = "alias"; //$NON-NLS-1$
+
/*
* (non-Javadoc)
* @see org.jboss.tools.jst.web.kb.validation.IValidationContext#store(org.w3c.dom.Element)
@@ -112,19 +117,19 @@
Element varElement = XMLUtilities.createElement(includeElement, STORE_ELEMENT_VAR);
varElement.setAttribute(STORE_ATTR_NAME, var.getName());
varElement.setAttribute(STORE_ATTR_VALUE, var.getValue());
- varElement.setAttribute("off", "" + var.getDeclarationOffset());
- varElement.setAttribute("len", "" + var.getDeclarationLength());
+ varElement.setAttribute(STORE_ATTR_OFFSET, "" + var.getDeclarationOffset());
+ varElement.setAttribute(STORE_ATTR_LENGTH, "" + var.getDeclarationLength());
}
}
}
- Element aliases = XMLUtilities.getUniqueChild(root, "aliases"); //$NON-NLS-1$
+ Element aliases = XMLUtilities.getUniqueChild(root, STORE_ELEMENT_ALIASES);
if(aliases == null) {
- aliases = XMLUtilities.createElement(root, "aliases"); //$NON-NLS-1$
+ aliases = XMLUtilities.createElement(root, STORE_ELEMENT_ALIASES);
}
for (String path: pathAliases.keySet()) {
String value = pathAliases.get(path);
- Element alias = XMLUtilities.createElement(aliases, "alias"); //$NON-NLS-1$
+ Element alias = XMLUtilities.createElement(aliases, STORE_ELEMENT_ALIAS);
alias.setAttribute(STORE_ATTR_PATH, path);
alias.setAttribute(STORE_ATTR_VALUE, value);
}
@@ -157,16 +162,16 @@
String value = v.getAttribute(STORE_ATTR_VALUE);
int offset = 0;
int length = 0;
- if(v.hasAttribute("off")) {
+ if(v.hasAttribute(STORE_ATTR_OFFSET)) {
try {
- offset = Integer.parseInt(v.getAttribute("off"));
+ offset = Integer.parseInt(v.getAttribute(STORE_ATTR_OFFSET));
} catch (NumberFormatException e) {
WebKbPlugin.getDefault().logError(e);
}
}
- if(v.hasAttribute("len")) {
+ if(v.hasAttribute(STORE_ATTR_LENGTH)) {
try {
- length = Integer.parseInt(v.getAttribute("len"));
+ length = Integer.parseInt(v.getAttribute(STORE_ATTR_LENGTH));
} catch (NumberFormatException e) {
WebKbPlugin.getDefault().logError(e);
}
@@ -185,9 +190,9 @@
Map<String, String> loadAliases(Element root) {
Map<String, String> pathAliases = new HashMap<String, String>();
- Element aliases = XMLUtilities.getUniqueChild(root, "aliases"); //$NON-NLS-1$
+ Element aliases = XMLUtilities.getUniqueChild(root, STORE_ELEMENT_ALIASES);
if(aliases != null) {
- Element[] aliasArray = XMLUtilities.getChildren(aliases, "alias"); //$NON-NLS-1$
+ Element[] aliasArray = XMLUtilities.getChildren(aliases, STORE_ELEMENT_ALIAS);
for (Element alias: aliasArray) {
String path = alias.getAttribute(STORE_ATTR_PATH);
String value = alias.getAttribute(STORE_ATTR_VALUE);
13 years, 8 months
JBoss Tools SVN: r42643 - trunk/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-07-18 19:36:46 -0400 (Wed, 18 Jul 2012)
New Revision: 42643
Modified:
trunk/build/parent/pom.xml
Log:
moved build qualifier in first place to avoid conflicts
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2012-07-18 23:33:02 UTC (rev 42642)
+++ trunk/build/parent/pom.xml 2012-07-18 23:36:46 UTC (rev 42643)
@@ -89,7 +89,7 @@
<artifactId>tycho-packaging-plugin</artifactId>
<version>${tychoVersion}</version>
<configuration>
- <format>'v'yyyyMMdd-HHmm'-${BUILD_ALIAS}'</format>
+ <format>'${BUILD_ALIAS}-v'yyyyMMdd-HHmm</format>
<archiveSite>true</archiveSite>
<environments>
<environment>
@@ -635,7 +635,7 @@
<artifactId>tycho-packaging-plugin</artifactId>
<version>${tychoVersion}</version>
<configuration>
- <format>'v'yyyyMMdd-HHmm'-H${BUILD_NUMBER}-${BUILD_ALIAS}'</format>
+ <format>'${BUILD_ALIAS}-v'yyyyMMdd-HHmm'-H${BUILD_NUMBER}'</format>
<archiveSite>true</archiveSite>
</configuration>
</plugin>
13 years, 8 months
JBoss Tools SVN: r42642 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/include.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-07-18 19:33:02 -0400 (Wed, 18 Jul 2012)
New Revision: 42642
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/include/IncludeModel.java
Log:
JBIDE-12295
https://issues.jboss.org/browse/JBIDE-12295
Open-on of multiple declarations of ui:param with the same name are supported.
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/include/IncludeModel.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/include/IncludeModel.java 2012-07-18 23:32:13 UTC (rev 42641)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/include/IncludeModel.java 2012-07-18 23:33:02 UTC (rev 42642)
@@ -23,6 +23,7 @@
import org.jboss.tools.common.el.core.parser.ELParserUtil;
import org.jboss.tools.common.el.core.resolver.Var;
import org.jboss.tools.common.xml.XMLUtilities;
+import org.jboss.tools.jst.web.kb.WebKbPlugin;
import org.w3c.dom.Element;
/**
@@ -95,6 +96,9 @@
Map<String, String> pathAliases = loadAliases(root);
Element includes = XMLUtilities.createElement(root, STORE_ELEMENT_INCLUDES);
for (IPath path : directReferences.keySet()) {
+ if(!ResourcesPlugin.getWorkspace().getRoot().getFile(path).exists()) {
+ continue;
+ }
Element page = XMLUtilities.createElement(includes, STORE_ELEMENT_PAGE);
String pathAlias = ELReference.getAlias(pathAliases, path.toString());
page.setAttribute(STORE_ATTR_PATH, pathAlias);
@@ -108,6 +112,8 @@
Element varElement = XMLUtilities.createElement(includeElement, STORE_ELEMENT_VAR);
varElement.setAttribute(STORE_ATTR_NAME, var.getName());
varElement.setAttribute(STORE_ATTR_VALUE, var.getValue());
+ varElement.setAttribute("off", "" + var.getDeclarationOffset());
+ varElement.setAttribute("len", "" + var.getDeclarationLength());
}
}
}
@@ -149,7 +155,23 @@
for (Element v: vs) {
String name = v.getAttribute(STORE_ATTR_NAME);
String value = v.getAttribute(STORE_ATTR_VALUE);
- Var var = new Var(ELParserUtil.getJbossFactory(), name, value, 0, 0); //TODO
+ int offset = 0;
+ int length = 0;
+ if(v.hasAttribute("off")) {
+ try {
+ offset = Integer.parseInt(v.getAttribute("off"));
+ } catch (NumberFormatException e) {
+ WebKbPlugin.getDefault().logError(e);
+ }
+ }
+ if(v.hasAttribute("len")) {
+ try {
+ length = Integer.parseInt(v.getAttribute("len"));
+ } catch (NumberFormatException e) {
+ WebKbPlugin.getDefault().logError(e);
+ }
+ }
+ Var var = new Var(ELParserUtil.getJbossFactory(), name, value, offset, length);
if(path.segmentCount() > 1) {
var.setFile(ResourcesPlugin.getWorkspace().getRoot().getFile(path));
}
13 years, 8 months