JBoss Tools SVN: r21115 - in trunk/tests/tests/org.jboss.tools.tests: src/org/jboss/tools/tests and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2010-03-29 09:09:02 -0400 (Mon, 29 Mar 2010)
New Revision: 21115
Modified:
trunk/tests/tests/org.jboss.tools.tests/META-INF/MANIFEST.MF
trunk/tests/tests/org.jboss.tools.tests/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java
Log:
remove redundant dependency.
Modified: trunk/tests/tests/org.jboss.tools.tests/META-INF/MANIFEST.MF
===================================================================
--- trunk/tests/tests/org.jboss.tools.tests/META-INF/MANIFEST.MF 2010-03-29 13:02:02 UTC (rev 21114)
+++ trunk/tests/tests/org.jboss.tools.tests/META-INF/MANIFEST.MF 2010-03-29 13:09:02 UTC (rev 21115)
@@ -9,7 +9,6 @@
org.eclipse.core.resources,
org.junit,
org.eclipse.ui.ide,
- org.jboss.tools.jst.web.kb,
org.apache.xerces;bundle-version="[2.9.0,3.0.0)",
org.junit4;bundle-version="4.5.0",
org.jboss.tools.common;bundle-version="2.0.0",
Modified: trunk/tests/tests/org.jboss.tools.tests/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java
===================================================================
--- trunk/tests/tests/org.jboss.tools.tests/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java 2010-03-29 13:02:02 UTC (rev 21114)
+++ trunk/tests/tests/org.jboss.tools.tests/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java 2010-03-29 13:09:02 UTC (rev 21115)
@@ -18,7 +18,6 @@
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
-import org.jboss.tools.jst.web.kb.validation.IValidator;
import org.jboss.tools.test.util.JUnitUtils;
/**
@@ -216,7 +215,7 @@
int length = markers.length;
for (int i = 0; i < markers.length; i++) {
String groupName = markers[i].getAttribute("groupName", null);
- if(groupName==null || (!groupName.equals(messageGroup) && !groupName.equals(IValidator.MARKED_RESOURCE_MESSAGE_GROUP))) {
+ if(groupName==null || (!groupName.equals(messageGroup) && !groupName.equals("markedKbResource"))) {
length--;
}
}
14 years, 9 months
JBoss Tools SVN: r21114 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/cssselector/dnd.
by jbosstools-commits＠lists.jboss.org
Author: yzhishko
Date: 2010-03-29 09:02:02 -0400 (Mon, 29 Mar 2010)
New Revision: 21114
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/cssselector/dnd/CSSTableDropAdapter.java
Log:
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/cssselector/dnd/CSSTableDropAdapter.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/cssselector/dnd/CSSTableDropAdapter.java 2010-03-29 12:32:52 UTC (rev 21113)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/cssselector/dnd/CSSTableDropAdapter.java 2010-03-29 13:02:02 UTC (rev 21114)
@@ -97,7 +97,7 @@
}
parent.updateStyles();
}
- treeViewer.setSelection(new StructuredSelection());
+ treeViewer.getTree().deselectAll();
}
}
14 years, 9 months
JBoss Tools SVN: r21113 - in trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/cssselector: dnd and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: yzhishko
Date: 2010-03-29 08:32:52 -0400 (Mon, 29 Mar 2010)
New Revision: 21113
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/cssselector/CSSSelectorPartComposite.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/cssselector/dnd/CSSTableDropAdapter.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-6092 - some minor fixes.
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/cssselector/CSSSelectorPartComposite.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/cssselector/CSSSelectorPartComposite.java 2010-03-29 11:48:12 UTC (rev 21112)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/cssselector/CSSSelectorPartComposite.java 2010-03-29 12:32:52 UTC (rev 21113)
@@ -443,7 +443,8 @@
int selectionLength = selectedIndices.length;
for (int i = 0; i < selectionLength; i++) {
CSSSelectionEventManager.getInstance().setHandleSelection(false);
- selectedClassesTableViewer.remove(selectedItems[selectionLength - 1 - i]);
+ selectedClassesTableViewer.remove(selectedItems[selectionLength - 1
+ - i]);
if (selectedIndices[selectionLength - 1 - i] == itemsCount - 1) {
TableItem item = new TableItem(selectedClassesTableViewer
.getTable(), selectedClassesTableViewer.getTable()
@@ -461,6 +462,7 @@
selectedClassesTableViewer.refresh();
selectedClassesTableViewer.setSelection(new StructuredSelection(
selectedItems));
+ updateStyles();
}
private void handleMoveUp() {
@@ -487,6 +489,7 @@
selectedClassesTableViewer.refresh();
selectedClassesTableViewer.setSelection(new StructuredSelection(
selectedItems));
+ updateStyles();
}
public void widgetSelected(SelectionEvent e) {
@@ -536,6 +539,7 @@
}
selectedClassesTableViewer.add(itemsToMove.toArray());
updateStyles();
+ allCSSStyleClassViewer.setSelection(new StructuredSelection());
}
}
@@ -592,8 +596,6 @@
}
}
allCSSStyleClassViewer.refresh();
- allCSSStyleClassViewer.setSelection(new StructuredSelection());
- selectedClassesTableViewer.setSelection(new StructuredSelection());
}
public String getCSSStyleClasses() {
@@ -642,14 +644,17 @@
private void fireClassSelectionChanged(
final CSSClassSelectionChangedEvent event) {
- SafeRunner.run(new SafeRunnable() {
- public void run() throws Exception {
- for (int i = 0; i < changedListeners.size(); i++) {
- changedListeners.get(i).classSelectionChanged(event);
+ for (int i = 0; i < changedListeners.size(); i++) {
+ final ICSSClassSelectionChangedListener listener = changedListeners
+ .get(i);
+ SafeRunner.run(new SafeRunnable() {
+ public void run() throws Exception {
+ for (int i = 0; i < changedListeners.size(); i++) {
+ listener.classSelectionChanged(event);
+ }
}
- }
- });
-
+ });
+ }
}
public synchronized void addCSSClassSelectionChangedListener(
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/cssselector/dnd/CSSTableDropAdapter.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/cssselector/dnd/CSSTableDropAdapter.java 2010-03-29 11:48:12 UTC (rev 21112)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/cssselector/dnd/CSSTableDropAdapter.java 2010-03-29 12:32:52 UTC (rev 21113)
@@ -97,6 +97,7 @@
}
parent.updateStyles();
}
+ treeViewer.setSelection(new StructuredSelection());
}
}
@@ -188,6 +189,7 @@
} else {
handleTableMiddleInsert(event);
}
+ parent.updateStyles();
}
private int getItemIndex(TableItem item) {
@@ -221,7 +223,8 @@
}
if (pt.y < bounds.y + bounds.height / 3) {
for (int i = 0; i < selectedItems.size(); i++) {
- CSSSelectionEventManager.getInstance().setHandleSelection(false);
+ CSSSelectionEventManager.getInstance()
+ .setHandleSelection(false);
tableViewer.remove(selectedItems.get(i));
itemIndex = getItemIndex(item);
TableItem tableItem = new TableItem(tableViewer.getTable(),
@@ -233,7 +236,8 @@
true);
} else if (pt.y > bounds.y + 2 * bounds.height / 3) {
for (int i = 0; i < selectedItems.size(); i++) {
- CSSSelectionEventManager.getInstance().setHandleSelection(false);
+ CSSSelectionEventManager.getInstance()
+ .setHandleSelection(false);
tableViewer.remove(selectedItems.get(i));
itemIndex = getItemIndex(item);
itemIndex = itemIndex + i + 1;
14 years, 9 months
JBoss Tools SVN: r21112 - trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2010-03-29 07:48:12 -0400 (Mon, 29 Mar 2010)
New Revision: 21112
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ImportUnknownTagsWizardTest.java
Log:
Close import window before testing taglib Templates settings
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ImportUnknownTagsWizardTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ImportUnknownTagsWizardTest.java 2010-03-29 11:37:06 UTC (rev 21111)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ImportUnknownTagsWizardTest.java 2010-03-29 11:48:12 UTC (rev 21112)
@@ -10,16 +10,10 @@
package org.jboss.tools.vpe.ui.bot.test.wizard;
import java.io.File;
-import java.net.URL;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.jboss.tools.ui.bot.test.WidgetVariables;
import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase;
-import org.osgi.framework.Bundle;
public class ImportUnknownTagsWizardTest extends VPEAutoTestCase {
@@ -80,10 +74,12 @@
/*
* Check table values on the preferences page
*/
- taglib = bot.table().cell(0, 0);
- assertEquals("Wrong table value.", "taglibName:tagName", taglib); //$NON-NLS-1$ //$NON-NLS-2$
- taglib = bot.table().cell(1, 0);
- assertEquals("Wrong table value.", "lib:tag", taglib); //$NON-NLS-1$ //$NON-NLS-2$
+ String taglib00 = bot.table().cell(0, 0);
+ String taglib10 = bot.table().cell(1, 0);
+ bot.button(WidgetVariables.OK_BUTTON).click();
+ assertEquals("Wrong table value.", "taglibName:tagName", taglib00); //$NON-NLS-1$ //$NON-NLS-2$
+ assertEquals("Wrong table value.", "lib:tag", taglib10); //$NON-NLS-1$ //$NON-NLS-2$
+
}
}
14 years, 9 months
JBoss Tools SVN: r21111 - trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2010-03-29 07:37:06 -0400 (Mon, 29 Mar 2010)
New Revision: 21111
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/AlwaysHideSelectionBarWithoutPromptTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/BorderForUnknownTagsTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowNonVisualTagsTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowResourceBundlesUsageasELexpressionsTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowSelectionTagBarTest.java
Log:
Open Test page at the beginning of test.
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/AlwaysHideSelectionBarWithoutPromptTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/AlwaysHideSelectionBarWithoutPromptTest.java 2010-03-29 11:33:50 UTC (rev 21110)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/AlwaysHideSelectionBarWithoutPromptTest.java 2010-03-29 11:37:06 UTC (rev 21111)
@@ -9,7 +9,7 @@
public void testAlwaysHideSelectionBarWithoutPrompt(){
//Test Hide Selection Bar
-
+ openPage();
selectSelection();
checkIsHide();
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/BorderForUnknownTagsTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/BorderForUnknownTagsTest.java 2010-03-29 11:33:50 UTC (rev 21110)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/BorderForUnknownTagsTest.java 2010-03-29 11:37:06 UTC (rev 21111)
@@ -11,6 +11,7 @@
public void testBorderForUnknownTags() throws Throwable{
//Test open page
+ openPage();
editor = bot.editorByTitle(TEST_PAGE).toTextEditor();
textEditor = editor.getText();
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java 2010-03-29 11:33:50 UTC (rev 21110)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java 2010-03-29 11:37:06 UTC (rev 21111)
@@ -9,7 +9,7 @@
public void testChangeEditorTabForTheFirstOpenPage(){
//Test set default source tab
-
+ openPage();
bot.toolbarButtonWithTooltip(PREF_TOOLTIP).click();
bot.shell(PREF_FILTER_SHELL_TITLE).activate();
bot.comboBoxWithLabel(SELECT_DEFAULT_TAB).setSelection("Source"); //$NON-NLS-1$
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowNonVisualTagsTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowNonVisualTagsTest.java 2010-03-29 11:33:50 UTC (rev 21110)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowNonVisualTagsTest.java 2010-03-29 11:37:06 UTC (rev 21111)
@@ -3,7 +3,7 @@
public class ShowNonVisualTagsTest extends PreferencesTestCase{
public void testShowNonVisualTags() throws Throwable{
-
+ openPage();
checkVPE("DumpedTestPage.xml"); //$NON-NLS-1$
//Test Show Non-Visual Tags
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowResourceBundlesUsageasELexpressionsTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowResourceBundlesUsageasELexpressionsTest.java 2010-03-29 11:33:50 UTC (rev 21110)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowResourceBundlesUsageasELexpressionsTest.java 2010-03-29 11:37:06 UTC (rev 21111)
@@ -8,7 +8,8 @@
private static SWTBotEclipseEditor editor;
public void testShowResourceBundlesUsageasELexpressions() throws Throwable{
-
+
+ openPage();
editor = bot.editorByTitle(TEST_PAGE).toTextEditor();
textEditor = editor.getText();
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowSelectionTagBarTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowSelectionTagBarTest.java 2010-03-29 11:33:50 UTC (rev 21110)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowSelectionTagBarTest.java 2010-03-29 11:37:06 UTC (rev 21111)
@@ -9,7 +9,7 @@
public void testShowSelectionTagBar(){
//Test Hide Selection Bar
-
+ openPage();
selectSelection();
checkIsHide();
14 years, 9 months
JBoss Tools SVN: r21110 - trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2010-03-29 07:33:50 -0400 (Mon, 29 Mar 2010)
New Revision: 21110
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/RenameFacesConfigFileTest.java
Log:
Added delay().
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/RenameFacesConfigFileTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/RenameFacesConfigFileTest.java 2010-03-29 11:33:13 UTC (rev 21109)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/RenameFacesConfigFileTest.java 2010-03-29 11:33:50 UTC (rev 21110)
@@ -53,6 +53,7 @@
String checkResult = FileRenameHelper.checkFileRenamingWithinWebProjects(bot, OLD_FACES_CONFIG_FILE_NAME, NEW_FACES_CONFIG_FILE_NAME,
new String[]{JBT_TEST_PROJECT_NAME,IDELabel.WebProjectsTree.CONFIGURATION});
assertNull(checkResult,checkResult);
+ delay();
// web.xml file was properly modified
SWTBotTreeItem configFilesTreeItem = tree
.getTreeItem(JBT_TEST_PROJECT_NAME)
14 years, 9 months
JBoss Tools SVN: r21109 - trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2010-03-29 07:33:13 -0400 (Mon, 29 Mar 2010)
New Revision: 21109
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/ImportTagsFromTLDFileTest.java
Log:
Open JBoss Tools Palette in method ImportTagsFromTLDFileTest()
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/ImportTagsFromTLDFileTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/ImportTagsFromTLDFileTest.java 2010-03-29 11:29:56 UTC (rev 21108)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/ImportTagsFromTLDFileTest.java 2010-03-29 11:33:13 UTC (rev 21109)
@@ -14,6 +14,7 @@
public void testImportTagsFromTLDFile(){
//Test clear group
+ bot.viewByTitle("JBoss Tools Palette").setFocus(); //$NON-NLS-1$
bot.toolbarButtonWithTooltip("Palette Editor").click(); //$NON-NLS-1$
bot.shell("Palette Editor").activate(); //$NON-NLS-1$
try {
14 years, 9 months
JBoss Tools SVN: r21108 - 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: vpakan(a)redhat.com
Date: 2010-03-29 07:29:56 -0400 (Mon, 29 Mar 2010)
New Revision: 21108
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java
Log:
Remove test project from server within the tearDown() method.
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2010-03-29 11:27:42 UTC (rev 21107)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2010-03-29 11:29:56 UTC (rev 21108)
@@ -16,6 +16,7 @@
import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
import org.jboss.tools.test.TestProperties;
import org.jboss.tools.vpe.ui.bot.test.Activator;
+import org.jboss.tools.ui.bot.ext.SWTJBTExt;
import org.jboss.tools.ui.bot.test.JBTSWTBotTestCase;
import org.jboss.tools.ui.bot.test.SWTBotJSPMultiPageEditor;
import org.jboss.tools.ui.bot.test.WidgetVariables;
@@ -97,7 +98,8 @@
@Override
protected void tearDown() throws Exception {
- clearWorkbench();
+ clearWorkbench();
+ new SWTJBTExt(bot).removeProjectFromServers(JBT_TEST_PROJECT_NAME);
super.tearDown();
}
14 years, 9 months
JBoss Tools SVN: r21107 - trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2010-03-29 07:27:42 -0400 (Mon, 29 Mar 2010)
New Revision: 21107
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AddRemoveJSFCapabilitiesTest.java
Log:
Remove project from server after test is finished
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AddRemoveJSFCapabilitiesTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AddRemoveJSFCapabilitiesTest.java 2010-03-29 11:26:33 UTC (rev 21106)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AddRemoveJSFCapabilitiesTest.java 2010-03-29 11:27:42 UTC (rev 21107)
@@ -94,11 +94,11 @@
swtJbtExt.runProjectOnServer(JBT_TEST_PROJECT_NAME);
// Check Browser Content
String browserText = WidgetFinderHelper.browserInEditorText(bot, "Input User Name Page",true);
- assertTrue("Displayed HTML page has wrong content",
- browserText.indexOf("<TITLE>Input User Name Page</TITLE>") > - 1);
// Stop Application Server and remove Application Server from Server View
SWTJBTExt.stopApplicationServer(bot, 0);
SWTJBTExt.deleteApplicationServer(bot, 0);
+ assertTrue("Displayed HTML page has wrong content",
+ (browserText!= null) && (browserText.indexOf("<TITLE>Input User Name Page</TITLE>") > - 1));
setException(null);
}
else{
14 years, 9 months
JBoss Tools SVN: r21106 - trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2010-03-29 07:26:33 -0400 (Mon, 29 Mar 2010)
New Revision: 21106
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateSeamProjects.java
Log:
Remove project from server after project is created
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateSeamProjects.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateSeamProjects.java 2010-03-29 11:25:32 UTC (rev 21105)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateSeamProjects.java 2010-03-29 11:26:33 UTC (rev 21106)
@@ -1,14 +1,19 @@
package org.jboss.tools.seam.ui.bot.test.create;
import org.jboss.tools.seam.ui.bot.test.TestControl;
+import org.jboss.tools.ui.bot.ext.SWTJBTExt;
+import org.jboss.tools.ui.bot.ext.SWTUtilExt;
public class CreateSeamProjects extends TestControl{
+
+ private SWTJBTExt swtJbtExt = new SWTJBTExt(bot);
public void testCreateSeamProject12war(){
createSeamProject(seam12Settings, jbossEAPRuntime, TYPE_WAR);
waitForBlockingJobsAcomplished(240000, BUILDING_WS, VALIDATION +
" " + seam12Settings.getProperty("testProjectName")
+TYPE_WAR, DEPLOY_SOURCE, REG_IN_SERVER);
+ swtJbtExt.removeSeamProjectFromServers(seam12Settings.getProperty("testProjectName"));
}
public void testCreateSeamProject12ear(){
@@ -16,6 +21,7 @@
waitForBlockingJobsAcomplished(240000, BUILDING_WS, VALIDATION +
" " + seam12Settings.getProperty("testProjectName")
+TYPE_EAR, DEPLOY_SOURCE, REG_IN_SERVER);
+ swtJbtExt.removeSeamProjectFromServers(seam12Settings.getProperty("testProjectName"));
}
public void testCreateSeamProject2fpwar(){
@@ -23,6 +29,7 @@
waitForBlockingJobsAcomplished(240000, BUILDING_WS, VALIDATION +
" " + seam2fpSettings.getProperty("testProjectName")
+TYPE_WAR, DEPLOY_SOURCE, REG_IN_SERVER);
+ swtJbtExt.removeSeamProjectFromServers(seam2fpSettings.getProperty("testProjectName"));
}
public void testCreateSeamProject2fpear(){
@@ -30,6 +37,7 @@
waitForBlockingJobsAcomplished(240000, BUILDING_WS, VALIDATION +
" " + seam2fpSettings.getProperty("testProjectName")
+TYPE_EAR, DEPLOY_SOURCE, REG_IN_SERVER);
+ swtJbtExt.removeSeamProjectFromServers(seam2fpSettings.getProperty("testProjectName"));
}
public void testCreateSeamProject22war(){
@@ -37,6 +45,7 @@
waitForBlockingJobsAcomplished(240000, BUILDING_WS, VALIDATION +
" " + seam22Settings.getProperty("testProjectName")
+TYPE_WAR, DEPLOY_SOURCE, REG_IN_SERVER);
+ swtJbtExt.removeSeamProjectFromServers(seam22Settings.getProperty("testProjectName"));
}
public void testCreateSeamProject22ear(){
@@ -44,6 +53,8 @@
waitForBlockingJobsAcomplished(240000, BUILDING_WS, VALIDATION +
" " + seam22Settings.getProperty("testProjectName")
+TYPE_EAR, DEPLOY_SOURCE, REG_IN_SERVER);
+ swtJbtExt.removeSeamProjectFromServers(seam22Settings.getProperty("testProjectName"));
+ new SWTUtilExt(bot).waitForAll(60 * 1000L);
}
}
\ No newline at end of file
14 years, 9 months