JBoss Tools SVN: r39560 - in trunk/vpe/plugins/org.jboss.tools.vpe: src/org/jboss/tools/vpe/editor/mozilla and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2012-03-16 09:50:39 -0400 (Fri, 16 Mar 2012)
New Revision: 39560
Added:
trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/scroll_lock.gif
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java
Log:
https://issues.jboss.org/browse/JBIDE-11302 - scroll lock icon was added to the toolbar.
Added: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/scroll_lock.gif
===================================================================
(Binary files differ)
Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/scroll_lock.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2012-03-16 12:46:57 UTC (rev 39559)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2012-03-16 13:50:39 UTC (rev 39560)
@@ -122,6 +122,7 @@
public static final String ICON_NON_VISUAL_TAGS = "icons/non-visusal-tags.gif"; //$NON-NLS-1$
public static final String ICON_TEXT_FORMATTING = "icons/text-formatting.gif"; //$NON-NLS-1$
public static final String ICON_BUNDLE_AS_EL= "icons/bundle-as-el.gif"; //$NON-NLS-1$
+ public static final String ICON_SCROLL_LOCK= "icons/scroll_lock.gif"; //$NON-NLS-1$
private XulRunnerEditor xulRunnerEditor;
private nsIDOMElement contentArea;
@@ -148,7 +149,7 @@
private Action showNonVisualTagsAction;
private Action showTextFormattingAction;
private Action showBundleAsELAction;
-
+ private Action scrollLockAction;
static {
/*
@@ -418,12 +419,34 @@
setValue(IVpePreferencesPage.SHOW_RESOURCE_BUNDLES_USAGE_AS_EL, this.isChecked());
}
};
- showBundleAsELAction.setImageDescriptor(ImageDescriptor.createFromFile(MozillaEditor.class,
- ICON_BUNDLE_AS_EL));
+ showBundleAsELAction.setImageDescriptor(ImageDescriptor.createFromFile(
+ MozillaEditor.class, ICON_BUNDLE_AS_EL));
showBundleAsELAction.setToolTipText(VpeUIMessages.SHOW_BUNDLES_AS_EL);
toolBarManager.add(showBundleAsELAction);
/*
+ * https://issues.jboss.org/browse/JBIDE-11302
+ * Create SYNCHRONIZE_SCROLLING_BETWEEN_SOURCE_VISUAL_PANES tool bar item
+ */
+ scrollLockAction = new Action(
+ VpeUIMessages.SYNCHRONIZE_SCROLLING_BETWEEN_SOURCE_VISUAL_PANES,
+ IAction.AS_CHECK_BOX) {
+ @Override
+ public void run() {
+ /*
+ * Change the enabled state, listeners in VpeController will do the rest
+ */
+ JspEditorPlugin.getDefault().getPreferenceStore().setValue(
+ IVpePreferencesPage.SYNCHRONIZE_SCROLLING_BETWEEN_SOURCE_VISUAL_PANES,
+ this.isChecked());
+ }
+ };
+ scrollLockAction.setImageDescriptor(ImageDescriptor.createFromFile(
+ MozillaEditor.class, ICON_SCROLL_LOCK));
+ scrollLockAction.setToolTipText(VpeUIMessages.SYNCHRONIZE_SCROLLING_BETWEEN_SOURCE_VISUAL_PANES);
+ toolBarManager.add(scrollLockAction);
+
+ /*
* Create EXTERNALIZE STRINGS tool bar item
*/
// externalizeStringsAction = new Action(JstUIMessages.EXTERNALIZE_STRINGS,
@@ -447,7 +470,7 @@
// ICON_EXTERNALIZE_STRINGS));
// externalizeStringsAction.setToolTipText(JstUIMessages.EXTERNALIZE_STRINGS);
// toolBarManager.add(externalizeStringsAction);
-
+
updateToolbarItemsAccordingToPreferences();
toolBarManager.update(true);
@@ -1020,6 +1043,8 @@
.getBoolean(IVpePreferencesPage.SHOW_TEXT_FORMATTING);
boolean prefsShowBundlesAsEL = JspEditorPlugin.getDefault().getPreferenceStore()
.getBoolean(IVpePreferencesPage.SHOW_RESOURCE_BUNDLES_USAGE_AS_EL);
+ boolean scrollLockEditors = JspEditorPlugin.getDefault().getPreferenceStore()
+ .getBoolean(IVpePreferencesPage.SYNCHRONIZE_SCROLLING_BETWEEN_SOURCE_VISUAL_PANES);
if (showBorderAction != null) {
showBorderAction.setChecked(prefsShowBorderForUnknownTags);
@@ -1033,6 +1058,9 @@
if (showBundleAsELAction != null) {
showBundleAsELAction.setChecked(prefsShowBundlesAsEL);
}
+ if (scrollLockAction != null) {
+ scrollLockAction.setChecked(scrollLockEditors);
+ }
if (rotateEditorsAction != null) {
currentOrientationIndex = prefsOrientationIndex;
rotateEditorsAction.setImageDescriptor(ImageDescriptor.createFromFile(
14 years
JBoss Tools SVN: r39559 - in trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples: filetransfer and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-03-16 08:46:57 -0400 (Fri, 16 Mar 2012)
New Revision: 39559
Modified:
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/dialog/DownloadRuntimeDialog.java
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/filetransfer/ECFExamplesTransport.java
Log:
JBIDE-11125 Runtime download should be able to work in background
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/dialog/DownloadRuntimeDialog.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/dialog/DownloadRuntimeDialog.java 2012-03-16 11:02:34 UTC (rev 39558)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/dialog/DownloadRuntimeDialog.java 2012-03-16 12:46:57 UTC (rev 39559)
@@ -23,6 +23,7 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.IDialogSettings;
@@ -31,7 +32,6 @@
import org.eclipse.jface.fieldassist.ControlDecoration;
import org.eclipse.jface.fieldassist.FieldDecoration;
import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
-import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
@@ -51,6 +51,7 @@
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.browser.IWorkbenchBrowserSupport;
+import org.eclipse.ui.progress.IProgressService;
import org.jboss.tools.project.examples.ProjectExamplesActivator;
import org.jboss.tools.project.examples.filetransfer.ECFExamplesTransport;
import org.jboss.tools.project.examples.runtimes.DownloadRuntime;
@@ -353,26 +354,22 @@
}
private void downloadRuntime(final String selectedDirectory,
- final String destinationDirectory, final boolean deleteOnExit) {
- final ProgressMonitorDialog dialog = new ProgressMonitorDialog(getShell());
- dialog.setBlockOnOpen(false);
- dialog.setCancelable(true);
- dialog.open();
- final IProgressMonitor monitor = dialog.getProgressMonitor();
- monitor.beginTask("Download '" + downloadRuntime.getName() + "' ...", 100);
-
- IRunnableWithProgress runnable = new IRunnableWithProgress() {
- public void run(IProgressMonitor monitor) {
+ final String destinationDirectory, final boolean deleteOnExit) {
+ Job downloadJob = new Job("Download '" + downloadRuntime.getName()) {
+
+ @Override
+ public IStatus run(IProgressMonitor monitor) {
+ monitor.beginTask("Download '" + downloadRuntime.getName() + "' ...", 100);
downloadAndInstall(selectedDirectory,
destinationDirectory, deleteOnExit, monitor);
+ return Status.OK_STATUS;
}
+
};
- try {
- dialog.run(true, true, runnable);
- } catch (Exception e) {
- ProjectExamplesActivator.log(e);
- MessageDialog.openError(getActiveShell(), "Error", e.getMessage());
- }
+ downloadJob.setUser(false);
+ downloadJob.schedule();
+ IProgressService progressService= PlatformUI.getWorkbench().getProgressService();
+ progressService.showInDialog(getActiveShell(), downloadJob);
}
private IStatus downloadAndInstall(String selectedDirectory, String destinationDirectory, boolean deleteOnExit, IProgressMonitor monitor) {
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/filetransfer/ECFExamplesTransport.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/filetransfer/ECFExamplesTransport.java 2012-03-16 11:02:34 UTC (rev 39558)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/filetransfer/ECFExamplesTransport.java 2012-03-16 12:46:57 UTC (rev 39559)
@@ -279,7 +279,11 @@
IIncomingFileTransfer source = ((IIncomingFileTransferReceiveDataEvent) event).getSource();
if (monitor != null) {
if (monitor.isCanceled()) {
- source.cancel();
+ try {
+ source.cancel();
+ } catch (Throwable e) {
+ ProjectExamplesActivator.log("Operation canceled");
+ }
return;
}
long fileLength = source.getFileLength();
14 years
JBoss Tools SVN: r39558 - in trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test: src/org/jboss/tools/hb/ui/bot/suite and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jpeterka
Date: 2012-03-16 07:02:34 -0400 (Fri, 16 Mar 2012)
New Revision: 39558
Added:
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/launcher/Perspective.launch
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite/PerspectiveSuite.java
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/perspective/
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/perspective/PerspectiveTest.java
Log:
Hibernate perspective/views test added
Added: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/launcher/Perspective.launch
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/launcher/Perspective.launch (rev 0)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/launcher/Perspective.launch 2012-03-16 11:02:34 UTC (rev 39558)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.swtbot.eclipse.ui.launcher.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite/PerspectiveSuite.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<mapAttribute key="org.eclipse.debug.core.environmentVariables">
+<mapEntry key="DISPLAY" value=":1"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.tools.hb.ui.bot.suite.PerspectiveSuite"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.tools.hibernate.ui.bot.test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Xms40m -Xmx512m -Xmx1024M -XX:PermSize=128M -XX:MaxPermSize=256M -Dusage_reporting_enabled=false -Dtest.configurations.dir=/home/jpeterka/etc/hb"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="com.jboss.jbds.product.product"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>
Property changes on: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/launcher/Perspective.launch
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite/PerspectiveSuite.java
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite/PerspectiveSuite.java (rev 0)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite/PerspectiveSuite.java 2012-03-16 11:02:34 UTC (rev 39558)
@@ -0,0 +1,12 @@
+package org.jboss.tools.hb.ui.bot.suite;
+
+import org.jboss.tools.hb.ui.bot.test.perspective.PerspectiveTest;
+import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite.SuiteClasses;
+
+(a)RunWith(RequirementAwareSuite.class)
+(a)SuiteClasses({PerspectiveTest.class})
+public class PerspectiveSuite {
+
+}
Property changes on: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite/PerspectiveSuite.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/perspective/PerspectiveTest.java
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/perspective/PerspectiveTest.java (rev 0)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/perspective/PerspectiveTest.java 2012-03-16 11:02:34 UTC (rev 39558)
@@ -0,0 +1,28 @@
+package org.jboss.tools.hb.ui.bot.test.perspective;
+
+import org.jboss.tools.hb.ui.bot.test.HibernateBaseTest;
+import org.jboss.tools.hibernate.ui.bot.testsuite.HibernateTest;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.gen.ActionItem;
+import org.jboss.tools.ui.bot.ext.types.IDELabel;
+import org.junit.Test;
+
+/**
+ * Hibernate perspective ui bot test
+ *
+ * @author jpeterka
+ *
+ */
+@Require(clearProjects = false, perspective = "Hibernate")
+public class PerspectiveTest extends HibernateBaseTest {
+
+ @Test
+ public void openPerspectiveElements() {
+ eclipse.closeView(IDELabel.View.WELCOME);
+
+ open.perspective(ActionItem.Perspective.HIBERNATE.LABEL);
+ open.viewOpen(ActionItem.View.HibernateHibernateConfigurations.LABEL);
+ open.viewOpen(ActionItem.View.HibernateHibernateDynamicSQLPreview.LABEL);
+ open.viewOpen(ActionItem.View.HibernateHibernateQueryResult.LABEL);
+ }
+}
Property changes on: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/perspective/PerspectiveTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years
JBoss Tools SVN: r39557 - trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test.
by jbosstools-commits＠lists.jboss.org
Author: jpeterka
Date: 2012-03-16 07:00:15 -0400 (Fri, 16 Mar 2012)
New Revision: 39557
Modified:
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/HibernateBaseTest.java
Log:
Commit of missing HibernateBaseTest file
Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/HibernateBaseTest.java
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/HibernateBaseTest.java 2012-03-16 10:58:34 UTC (rev 39556)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/HibernateBaseTest.java 2012-03-16 11:00:15 UTC (rev 39557)
@@ -8,13 +8,32 @@
import org.jboss.tools.ui.bot.ext.helper.FileHelper;
import org.jboss.tools.ui.bot.ext.helper.ImportHelper;
import org.jboss.tools.ui.bot.ext.helper.ResourceHelper;
+import org.jboss.tools.ui.bot.ext.types.IDELabel;
import org.jboss.tools.ui.bot.ext.view.ErrorLogView;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
public class HibernateBaseTest extends SWTTestExt {
+ @BeforeClass
+ public static void hbBaseBeforeClass() {
+ eclipse.closeView(IDELabel.View.WELCOME);
+ eclipse.closeView(IDELabel.View.JBOSS_CENTRAL);
+ eclipse.closeAllEditors();
+ util.waitForAll();
+ }
+
+ @Test
+ public void emptyTest() {
+
+ }
+
public void emptyErrorLog() {
ErrorLogView el = new ErrorLogView();
- el.delete();
+ if (el.getRecordCount() > 0) {
+ el.delete();
+ }
util.waitForNonIgnoredJobs();
}
@@ -44,6 +63,12 @@
ImportHelper.importAllProjects(wpath);
util.waitForNonIgnoredJobs();
}
+
+ @AfterClass
+ public static void afterClass() {
+ // wait for all jobs
+ util.waitForAll();
+ }
}
14 years
JBoss Tools SVN: r39556 - in trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot: suite and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jpeterka
Date: 2012-03-16 06:58:34 -0400 (Fri, 16 Mar 2012)
New Revision: 39556
Added:
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/common/ConfigurationFile.java
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/configuration/
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/configuration/CreateConfigurationFileTest.java
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/configuration/EditConfigurationFileTest.java
Removed:
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/ConfigurationFileTest.java
Modified:
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite/ConfigurationFileSuite.java
Log:
Hibernate isolated create/edit configuration file tests added
Added: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/common/ConfigurationFile.java
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/common/ConfigurationFile.java (rev 0)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/common/ConfigurationFile.java 2012-03-16 10:58:34 UTC (rev 39556)
@@ -0,0 +1,20 @@
+package org.jboss.tools.hb.ui.bot.common;
+
+import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
+import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
+import org.jboss.tools.ui.bot.ext.SWTBotExt;
+import org.jboss.tools.ui.bot.ext.SWTOpenExt;
+import org.jboss.tools.ui.bot.ext.gen.ActionItem;
+
+public class ConfigurationFile {
+
+ public static void open(String... path) {
+ SWTOpenExt open = new SWTOpenExt(new SWTBotExt());
+ SWTBotView pv = open
+ .viewOpen(ActionItem.View.GeneralProjectExplorer.LABEL);
+
+ Tree.open(pv.bot(), path);
+ SWTWorkbenchBot bot = new SWTWorkbenchBot();
+ bot.editorByTitle(path[path.length - 1]).show();
+ }
+}
Property changes on: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/common/ConfigurationFile.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite/ConfigurationFileSuite.java
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite/ConfigurationFileSuite.java 2012-03-16 10:28:27 UTC (rev 39555)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite/ConfigurationFileSuite.java 2012-03-16 10:58:34 UTC (rev 39556)
@@ -1,12 +1,15 @@
package org.jboss.tools.hb.ui.bot.suite;
-import org.jboss.tools.hb.ui.bot.test.ConfigurationFileTest;
+import org.jboss.tools.hb.ui.bot.test.configuration.CreateConfigurationFileTest;
+import org.jboss.tools.hb.ui.bot.test.configuration.EditConfigurationFileTest;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
import org.junit.runner.RunWith;
import org.junit.runners.Suite.SuiteClasses;
@RunWith(RequirementAwareSuite.class)
-(a)SuiteClasses({ConfigurationFileTest.class})
+//(a)SuiteClasses({CreateConfigurationFileTest.class})
+//(a)SuiteClasses({EditConfigurationFileTest.class})
+(a)SuiteClasses({CreateConfigurationFileTest.class, EditConfigurationFileTest.class})
public class ConfigurationFileSuite {
}
Deleted: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/ConfigurationFileTest.java
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/ConfigurationFileTest.java 2012-03-16 10:28:27 UTC (rev 39555)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/ConfigurationFileTest.java 2012-03-16 10:58:34 UTC (rev 39556)
@@ -1,105 +0,0 @@
-package org.jboss.tools.hb.ui.bot.test;
-
-import static org.eclipse.swtbot.swt.finder.waits.Conditions.shellCloses;
-
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swtbot.eclipse.finder.matchers.WidgetMatcherFactory;
-import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotCheckBox;
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
-import org.hamcrest.Matcher;
-import org.jboss.tools.hb.ui.bot.common.Tree;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.config.TestConfigurator;
-import org.jboss.tools.ui.bot.ext.gen.ActionItem;
-import org.jboss.tools.ui.bot.ext.helper.DatabaseHelper;
-import org.jboss.tools.ui.bot.ext.types.EntityType;
-import org.jboss.tools.ui.bot.ext.types.IDELabel;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Hibernate configuration ui bot test
- * @author jpeterka
- *
- */
-@Require
-public class ConfigurationFileTest extends HibernateBaseTest {
-
- @BeforeClass
- public static void beforeClass() {
- eclipse.closeView(IDELabel.View.WELCOME);
- eclipse.closeView(IDELabel.View.JBOSS_CENTRAL);
- eclipse.closeAllEditors();
- util.waitForAll();
- }
-
- @Test
- public void emptyTest() {
- assertTrue(true);
- }
-
- @Test
- public void configurationFileTest() {
- emptyErrorLog();
- importTestProject("/resources/prj/hibernate35");
- createHBConfiguration();
- openHBConfiguration();
- checkErrorLog();
- }
-
- private void createHBConfiguration() {
- SWTBotView pv = open
- .viewOpen(ActionItem.View.GeneralProjectExplorer.LABEL);
- Tree.select(pv.bot(), "hibernate35", "cfg");
-
- eclipse.createNew(EntityType.HIBERNATE_CONFIGURATION_FILE);
- bot.textWithLabel(IDELabel.HBConfigurationWizard.FILE_NAME).setText(
- "hibernate.cfg.xml");
- bot.button(IDELabel.Button.NEXT).click();
-
- // Create new configuration file
- String dialect = DatabaseHelper
- .getDialect(TestConfigurator.currentConfig.getDB().dbType);
- bot.comboBoxWithLabel(IDELabel.HBConsoleWizard.DATABASE_DIALECT)
- .setSelection(dialect);
- String drvClass = DatabaseHelper
- .getDriverClass(TestConfigurator.currentConfig.getDB().dbType);
- bot.comboBoxWithLabel(IDELabel.HBConsoleWizard.DRIVER_CLASS)
- .setSelection(drvClass);
- String jdbc = TestConfigurator.currentConfig.getDB().jdbcString;
- bot.comboBoxWithLabel(IDELabel.HBConsoleWizard.CONNECTION_URL).setText(
- jdbc);
-
- // Create console configuration
- Matcher<Button> matcher = WidgetMatcherFactory
- .withText(IDELabel.HBConsoleWizard.CREATE_CONSOLE_CONFIGURATION);
- Button button = bot.widget(matcher);
- SWTBotCheckBox cb = new SWTBotCheckBox(button);
-
- if (!cb.isChecked())
- cb.click();
-
- SWTBotShell shell = bot.activeShell();
- log.info("Active shell:" + shell.getText());
- bot.button(IDELabel.Button.FINISH).click();
-
- bot.waitUntil(shellCloses(shell));
- }
-
- private void openHBConfiguration() {
-
- SWTBotView pv = open
- .viewOpen(ActionItem.View.GeneralProjectExplorer.LABEL);
- Tree.select(pv.bot(), "hibernate35", "cfg", "hibernate.cfg.xml");
- bot.editorByTitle("hibernate.cfg.xml").show();
-
- }
-
- @AfterClass
- public static void afterClass() {
- // wait for all jobs
- util.waitForAll();
- }
-}
\ No newline at end of file
Copied: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/configuration/CreateConfigurationFileTest.java (from rev 39553, trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/ConfigurationFileTest.java)
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/configuration/CreateConfigurationFileTest.java (rev 0)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/configuration/CreateConfigurationFileTest.java 2012-03-16 10:58:34 UTC (rev 39556)
@@ -0,0 +1,83 @@
+package org.jboss.tools.hb.ui.bot.test.configuration;
+
+import static org.eclipse.swtbot.swt.finder.waits.Conditions.shellCloses;
+
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swtbot.eclipse.finder.matchers.WidgetMatcherFactory;
+import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotCheckBox;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
+import org.hamcrest.Matcher;
+import org.jboss.tools.hb.ui.bot.common.ConfigurationFile;
+import org.jboss.tools.hb.ui.bot.common.Tree;
+import org.jboss.tools.hb.ui.bot.test.HibernateBaseTest;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.TestConfigurator;
+import org.jboss.tools.ui.bot.ext.gen.ActionItem;
+import org.jboss.tools.ui.bot.ext.helper.DatabaseHelper;
+import org.jboss.tools.ui.bot.ext.types.EntityType;
+import org.jboss.tools.ui.bot.ext.types.IDELabel;
+import org.junit.Test;
+
+/**
+ * Hibernate create configuration ui bot test
+ *
+ * @author jpeterka
+ *
+ */
+@Require
+public class CreateConfigurationFileTest extends HibernateBaseTest {
+
+ @Test
+ public void configurationFileTest() {
+ emptyErrorLog();
+ importTestProject("/resources/prj/hibernate35");
+ createHBConfiguration();
+ openHBConfiguration();
+ checkErrorLog();
+ }
+
+ private void createHBConfiguration() {
+ SWTBotView pv = open
+ .viewOpen(ActionItem.View.GeneralProjectExplorer.LABEL);
+ Tree.select(pv.bot(), "hibernate35", "cfg");
+
+ eclipse.createNew(EntityType.HIBERNATE_CONFIGURATION_FILE);
+ bot.textWithLabel(IDELabel.HBConfigurationWizard.FILE_NAME).setText(
+ "hibernate.cfg.xml");
+ bot.button(IDELabel.Button.NEXT).click();
+
+ // Create new configuration file
+ String dialect = DatabaseHelper
+ .getDialect(TestConfigurator.currentConfig.getDB().dbType);
+ bot.comboBoxWithLabel(IDELabel.HBConsoleWizard.DATABASE_DIALECT)
+ .setSelection(dialect);
+ String drvClass = DatabaseHelper
+ .getDriverClass(TestConfigurator.currentConfig.getDB().dbType);
+ bot.comboBoxWithLabel(IDELabel.HBConsoleWizard.DRIVER_CLASS)
+ .setSelection(drvClass);
+ String jdbc = TestConfigurator.currentConfig.getDB().jdbcString;
+ bot.comboBoxWithLabel(IDELabel.HBConsoleWizard.CONNECTION_URL).setText(
+ jdbc);
+
+ // Create console configuration
+ Matcher<Button> matcher = WidgetMatcherFactory
+ .withText(IDELabel.HBConsoleWizard.CREATE_CONSOLE_CONFIGURATION);
+ Button button = bot.widget(matcher);
+ SWTBotCheckBox cb = new SWTBotCheckBox(button);
+
+ if (!cb.isChecked())
+ cb.click();
+
+ SWTBotShell shell = bot.activeShell();
+ log.info("Active shell:" + shell.getText());
+ bot.button(IDELabel.Button.FINISH).click();
+
+ bot.waitUntil(shellCloses(shell));
+ }
+
+ private void openHBConfiguration() {
+ ConfigurationFile.open("hibernate35", "cfg", "hibernate.cfg.xml");
+ }
+
+}
\ No newline at end of file
Property changes on: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/configuration/CreateConfigurationFileTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/configuration/EditConfigurationFileTest.java
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/configuration/EditConfigurationFileTest.java (rev 0)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/configuration/EditConfigurationFileTest.java 2012-03-16 10:58:34 UTC (rev 39556)
@@ -0,0 +1,109 @@
+package org.jboss.tools.hb.ui.bot.test.configuration;
+
+import java.util.List;
+
+import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
+import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
+import org.eclipse.swtbot.swt.finder.SWTBot;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
+import org.jboss.tools.hb.ui.bot.common.Tree;
+import org.jboss.tools.hb.ui.bot.test.HibernateBaseTest;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+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.parts.ObjectMultiPageEditorBot;
+import org.jboss.tools.ui.bot.ext.types.IDELabel;
+import org.junit.Test;
+
+/**
+ * Hibernate edit configuration ui bot test
+ *
+ * @author jpeterka
+ *
+ */
+@Require(clearWorkspace = true, clearProjects = true)
+public class EditConfigurationFileTest extends HibernateBaseTest {
+
+ private final String hbcfg = "hibernate.cfg.xml";
+
+ @Test
+ public void emptyTest() {
+ assertTrue(true);
+ }
+
+ @Test
+ public void configurationFileTest() {
+ emptyErrorLog();
+ importTestProject("/resources/prj/hibernate35");
+ openHBConfiguration();
+ editHBConfiguration();
+ checkErrorLog();
+ }
+
+ private void openHBConfiguration() {
+
+ SWTBotView pv = open
+ .viewOpen(ActionItem.View.GeneralProjectExplorer.LABEL);
+ Tree.open(pv.bot(), "hibernate35", "src", hbcfg);
+ bot.editorByTitle(hbcfg).show();
+
+ }
+
+ private void editHBConfiguration() {
+ SWTBotEditor editor = bot.editorByTitle(hbcfg);
+ ObjectMultiPageEditorBot multiBot = new ObjectMultiPageEditorBot(hbcfg);
+
+ // Tabs availability
+ String[] pages = { "Session Factory", "Security", "Source" };
+ for (String page : pages) {
+ multiBot.selectPage(page);
+ }
+
+ // Create new security element
+ SWTBot localBot = editor.bot();
+ multiBot.selectPage(pages[1]);
+ SWTBotTree secTree = localBot.tree().select("Security");
+
+ ContextMenuHelper.clickContextMenu(secTree, "New", "Grant...");
+
+ // Filling Role, Entity-Name and Check action All *
+ String roleName = "role1";
+ String entityName = "entity1";
+
+ bot.textWithLabel("Role:*").setText("role1");
+ bot.textWithLabel("Entity-Name:*").setText("entity1");
+ SWTBotShell shell = bot.shell("Add Grant");
+
+ assertNotNull(shell);
+ SWTBot shellBot = new SWTBot(shell.widget);
+
+ SWTBotTree tree = shellBot.tree();
+ SWTBotTreeItem[] items = tree.getAllItems();
+ items[0].check();
+
+ shellBot.button(IDELabel.Button.FINISH).click();
+
+ // Click on Source tab for check
+ multiBot.selectPage(pages[2]);
+ List<String> lines = editor.toTextEditor().getLines();
+
+ boolean found = false;
+ String wanted = "<grant actions=\"*\" entity-name=\"" + entityName
+ + "\" role=\"" + roleName + "\"/>";
+ System.out.println("Looking for:" + wanted);
+
+ for (String line : lines) {
+ System.out.println(line);
+ if (line.trim().equals(wanted)) {
+ found = true;
+ System.out.println("Found");
+ }
+ }
+
+ editor.saveAndClose();
+ assertTrue("Security element not found in xml", found);
+ }
+
+}
\ No newline at end of file
Property changes on: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/configuration/EditConfigurationFileTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years
JBoss Tools SVN: r39555 - in trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot: testsuite and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: jpeterka
Date: 2012-03-16 06:28:27 -0400 (Fri, 16 Mar 2012)
New Revision: 39555
Removed:
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/BasicHibernateTest.java
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/ConfigurationContextTest.java
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/HibernatePerspectiveTest.java
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/JIRATest.java
Modified:
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testsuite/HibernateAllTests.java
Log:
Hibernate bot test cleanup, removing unused test classes
Deleted: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/BasicHibernateTest.java
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/BasicHibernateTest.java 2012-03-16 09:35:28 UTC (rev 39554)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/BasicHibernateTest.java 2012-03-16 10:28:27 UTC (rev 39555)
@@ -1,35 +0,0 @@
-package org.jboss.tools.hibernate.ui.bot.testcase;
-
-import org.jboss.tools.hibernate.ui.bot.testsuite.HibernateTest;
-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.gen.ActionItem.Perspective;
-import org.jboss.tools.ui.bot.ext.gen.ActionItem.View.HibernateHibernateConfigurations;
-import org.jboss.tools.ui.bot.ext.types.IDELabel;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Basic Hibernate tests
- */
-@Require( db=@DB,perspective="Hibernate")
-public class BasicHibernateTest extends HibernateTest {
- @BeforeClass
- /**
- * Setup prerequisites for this test
- */
- public static void setUpTest() {
-
- eclipse.maximizeActiveShell();
- eclipse.closeView(IDELabel.View.WELCOME);
-
- prepareProject();
- util.waitForNonIgnoredJobs();
- }
-
- @Test
- public void testItI() {
- open.viewOpen(HibernateHibernateConfigurations.LABEL);
- open.perspective(Perspective.HIBERNATE.LABEL);
- }
-}
Deleted: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/ConfigurationContextTest.java
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/ConfigurationContextTest.java 2012-03-16 09:35:28 UTC (rev 39554)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/ConfigurationContextTest.java 2012-03-16 10:28:27 UTC (rev 39555)
@@ -1,28 +0,0 @@
- /*******************************************************************************
- * Copyright (c) 2007-2009 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.hibernate.ui.bot.testcase;
-
-import org.jboss.tools.hibernate.ui.bot.testsuite.HibernateTest;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.junit.Test;
-
-@Require( clearProjects = false, perspective="Hibernate")
-public class ConfigurationContextTest extends HibernateTest {
-
- /**
- * TC 18
- */
- @Test
- public void checkHibernateConfiguration() {
-
- }
-
-}
Deleted: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/HibernatePerspectiveTest.java
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/HibernatePerspectiveTest.java 2012-03-16 09:35:28 UTC (rev 39554)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/HibernatePerspectiveTest.java 2012-03-16 10:28:27 UTC (rev 39555)
@@ -1,46 +0,0 @@
- /*******************************************************************************
- * Copyright (c) 2007-2009 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.hibernate.ui.bot.testcase;
-
-import org.jboss.tools.hibernate.ui.bot.testsuite.HibernateTest;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.gen.ActionItem;
-import org.jboss.tools.ui.bot.ext.types.IDELabel;
-import org.junit.Test;
-
-@Require(clearProjects = false, perspective="Hibernate")
-public class HibernatePerspectiveTest extends HibernateTest {
-
- /**
- * TC 17 - Check presence of basic hibernate views
- */
- @Test
- public void openPerspectiveElements() {
- eclipse.closeView(IDELabel.View.WELCOME);
-
- open.perspective(ActionItem.Perspective.HIBERNATE.LABEL);
- bot.sleep(TIME_1S);
- open.viewOpen(ActionItem.View.HibernateHibernateConfigurations.LABEL);
- bot.sleep(TIME_1S);
- open.viewOpen(ActionItem.View.HibernateHibernateDynamicSQLPreview.LABEL);
- bot.sleep(TIME_1S);
- open.viewOpen(ActionItem.View.HibernateHibernateQueryResult.LABEL);
- bot.sleep(TIME_1S);
- }
-
- @Test
- public void checkHibernateTree() {
- open.perspective(ActionItem.Perspective.HIBERNATE.LABEL);
- bot.sleep(TIME_1S);
-
- open.viewOpen(ActionItem.View.HibernateHibernateConfigurations.LABEL);
- }
-}
Deleted: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/JIRATest.java
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/JIRATest.java 2012-03-16 09:35:28 UTC (rev 39554)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/JIRATest.java 2012-03-16 10:28:27 UTC (rev 39555)
@@ -1,29 +0,0 @@
- /*******************************************************************************
- * Copyright (c) 2007-2009 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.hibernate.ui.bot.testcase;
-
-import org.jboss.tools.hibernate.ui.bot.testsuite.HibernateTest;
-import org.jboss.tools.ui.bot.ext.config.Annotations.DB;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.junit.Test;
-
-@Require( clearProjects = false, db=@DB, perspective="Hibernate")
-public class JIRATest extends HibernateTest {
-
- /**
- * TC 99
- */
- @Test
- public void issue1() {
- // TODO
- }
-
-}
Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testsuite/HibernateAllTests.java
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testsuite/HibernateAllTests.java 2012-03-16 09:35:28 UTC (rev 39554)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testsuite/HibernateAllTests.java 2012-03-16 10:28:27 UTC (rev 39555)
@@ -11,13 +11,11 @@
package org.jboss.tools.hibernate.ui.bot.testsuite;
import org.jboss.tools.hibernate.ui.bot.testcase.CodeGenerationLauncherTest;
-import org.jboss.tools.hibernate.ui.bot.testcase.ConfigurationContextTest;
import org.jboss.tools.hibernate.ui.bot.testcase.ConfigurationFileTest;
import org.jboss.tools.hibernate.ui.bot.testcase.ConsolePerspectiveTest;
import org.jboss.tools.hibernate.ui.bot.testcase.ConsoleTest;
import org.jboss.tools.hibernate.ui.bot.testcase.CriteriaEditorsTest;
import org.jboss.tools.hibernate.ui.bot.testcase.DaliTest;
-import org.jboss.tools.hibernate.ui.bot.testcase.JIRATest;
import org.jboss.tools.hibernate.ui.bot.testcase.MappingFileTest;
import org.jboss.tools.hibernate.ui.bot.testcase.MappingsDiagramTest;
import org.jboss.tools.hibernate.ui.bot.testcase.ReverseEngineerFileTest;
@@ -29,13 +27,15 @@
import org.junit.runners.Suite.SuiteClasses;
@RunWith(RequirementAwareSuite.class)
+
@SuiteClasses({ CodeGenerationLauncherTest.class,
- ConfigurationContextTest.class, ConfigurationFileTest.class,
+ ConfigurationFileTest.class,
ConsolePerspectiveTest.class, ConsoleTest.class,
- CriteriaEditorsTest.class, DaliTest.class, JIRATest.class,
+ CriteriaEditorsTest.class, DaliTest.class,
MappingFileTest.class, MappingsDiagramTest.class,
ReverseEngineerFileTest.class, ViewsTest.class })
+
public class HibernateAllTests extends HibernateTest {
14 years
JBoss Tools SVN: r39554 - trunk/build/aggregate/site/sources.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-03-16 05:35:28 -0400 (Fri, 16 Mar 2012)
New Revision: 39554
Modified:
trunk/build/aggregate/site/sources/site.xml
Log:
JBIDE-8838:
Fix Birt source feature name
Modified: trunk/build/aggregate/site/sources/site.xml
===================================================================
--- trunk/build/aggregate/site/sources/site.xml 2012-03-16 00:30:13 UTC (rev 39553)
+++ trunk/build/aggregate/site/sources/site.xml 2012-03-16 09:35:28 UTC (rev 39554)
@@ -94,7 +94,7 @@
<category name="AllSources" />
</feature>
-->
- <feature url="features/org.jboss.tools.birt.source.feature_0.0.0.jar" id="org.jboss.tools.birt.source.feature" version="0.0.0">
+ <feature url="features/org.jboss.tools.birt.feature.source_0.0.0.jar" id="org.jboss.tools.birt.feature.source" version="0.0.0">
<category name="AllSources" />
</feature>
<!--
14 years
JBoss Tools SVN: r39553 - in trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates: jsf-2.0/JSFBlankWithoutLibs/WebContent/WEB-INF and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-03-15 20:30:13 -0400 (Thu, 15 Mar 2012)
New Revision: 39553
Modified:
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0/JSFBlankWithLibs/WebContent/WEB-INF/web.xml
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0/JSFBlankWithoutLibs/WebContent/WEB-INF/web.xml
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0/JSFKickStartWithoutLibs/WebContent/WEB-INF/web.xml
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/struts/1.1/Blank/WebContent/WEB-INF/web.xml
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/struts/1.2/Blank/WebContent/WEB-INF/web.xml
Log:
JBIDE-11253
https://issues.jboss.org/browse/JBIDE-11253
References to welcome file missing in the project removed from web.xml.
Modified: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0/JSFBlankWithLibs/WebContent/WEB-INF/web.xml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0/JSFBlankWithLibs/WebContent/WEB-INF/web.xml 2012-03-15 23:55:43 UTC (rev 39552)
+++ trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0/JSFBlankWithLibs/WebContent/WEB-INF/web.xml 2012-03-16 00:30:13 UTC (rev 39553)
@@ -22,14 +22,11 @@
#end
<display-name>${project.name}</display-name>
+<!--
<welcome-file-list>
<welcome-file>index.html</welcome-file>
- <welcome-file>index.htm</welcome-file>
- <welcome-file>index.jsp</welcome-file>
- <welcome-file>default.html</welcome-file>
- <welcome-file>default.htm</welcome-file>
- <welcome-file>default.jsp</welcome-file>
</welcome-file-list>
+-->
<servlet>
<servlet-name>Faces Servlet</servlet-name>
<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
Modified: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0/JSFBlankWithoutLibs/WebContent/WEB-INF/web.xml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0/JSFBlankWithoutLibs/WebContent/WEB-INF/web.xml 2012-03-15 23:55:43 UTC (rev 39552)
+++ trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0/JSFBlankWithoutLibs/WebContent/WEB-INF/web.xml 2012-03-16 00:30:13 UTC (rev 39553)
@@ -22,14 +22,11 @@
#end
<display-name>${project.name}</display-name>
+<!--
<welcome-file-list>
<welcome-file>index.html</welcome-file>
- <welcome-file>index.htm</welcome-file>
- <welcome-file>index.jsp</welcome-file>
- <welcome-file>default.html</welcome-file>
- <welcome-file>default.htm</welcome-file>
- <welcome-file>default.jsp</welcome-file>
</welcome-file-list>
+-->
<servlet>
<servlet-name>Faces Servlet</servlet-name>
<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
Modified: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0/JSFKickStartWithoutLibs/WebContent/WEB-INF/web.xml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0/JSFKickStartWithoutLibs/WebContent/WEB-INF/web.xml 2012-03-15 23:55:43 UTC (rev 39552)
+++ trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0/JSFKickStartWithoutLibs/WebContent/WEB-INF/web.xml 2012-03-16 00:30:13 UTC (rev 39553)
@@ -24,11 +24,6 @@
<display-name>${project.name}</display-name>
<welcome-file-list>
<welcome-file>index.html</welcome-file>
- <welcome-file>index.htm</welcome-file>
- <welcome-file>index.jsp</welcome-file>
- <welcome-file>default.html</welcome-file>
- <welcome-file>default.htm</welcome-file>
- <welcome-file>default.jsp</welcome-file>
</welcome-file-list>
<servlet>
<servlet-name>Faces Servlet</servlet-name>
Modified: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/struts/1.1/Blank/WebContent/WEB-INF/web.xml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/struts/1.1/Blank/WebContent/WEB-INF/web.xml 2012-03-15 23:55:43 UTC (rev 39552)
+++ trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/struts/1.1/Blank/WebContent/WEB-INF/web.xml 2012-03-16 00:30:13 UTC (rev 39553)
@@ -31,8 +31,10 @@
<url-pattern>*.do</url-pattern>
</servlet-mapping>
- <welcome-file-list>
- <welcome-file>index.jsp</welcome-file>
- </welcome-file-list>
+<!--
+ <welcome-file-list>
+ <welcome-file>index.jsp</welcome-file>
+ </welcome-file-list>
+-->
</web-app>
Modified: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/struts/1.2/Blank/WebContent/WEB-INF/web.xml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/struts/1.2/Blank/WebContent/WEB-INF/web.xml 2012-03-15 23:55:43 UTC (rev 39552)
+++ trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/struts/1.2/Blank/WebContent/WEB-INF/web.xml 2012-03-16 00:30:13 UTC (rev 39553)
@@ -34,7 +34,9 @@
</servlet-mapping>
<!-- The Usual Welcome File List -->
+<!--
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
</welcome-file-list>
+-->
</web-app>
14 years
JBoss Tools SVN: r39552 - trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-03-15 19:55:43 -0400 (Thu, 15 Mar 2012)
New Revision: 39552
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server/ServerManager.java
Log:
JBIDE-11306
https://issues.jboss.org/browse/JBIDE-11306
'Run on Server' on struts/jsf objects. - default server is updated from AS preferences,and updated on event.
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server/ServerManager.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server/ServerManager.java 2012-03-15 22:37:38 UTC (rev 39551)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server/ServerManager.java 2012-03-15 23:55:43 UTC (rev 39552)
@@ -15,7 +15,9 @@
import org.eclipse.core.runtime.preferences.DefaultScope;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener;
import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent;
import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.IRuntimeLifecycleListener;
import org.eclipse.wst.server.core.IServer;
@@ -23,6 +25,7 @@
import org.eclipse.wst.server.core.IServerListener;
import org.eclipse.wst.server.core.ServerCore;
import org.eclipse.wst.server.core.ServerEvent;
+import org.jboss.tools.jst.web.WebModelPlugin;
public class ServerManager {
private static ServerManager instance;
@@ -51,6 +54,16 @@
ServerResourceListenerImpl listener = new ServerResourceListenerImpl();
ServerCore.addRuntimeLifecycleListener(listener);
ServerCore.addServerLifecycleListener(listener);
+ IEclipsePreferences p = getInstancePreferences();
+ if(p != null) {
+ p.addPreferenceChangeListener(new IPreferenceChangeListener() {
+ public void preferenceChange(PreferenceChangeEvent event) {
+ if(DEFAULT_WEB_SERVER.equals(event.getKey())) {
+ loadSelectedServer();
+ }
+ }
+ });
+ }
}
private void loadSelectedServer() {
@@ -167,11 +180,19 @@
}
static IEclipsePreferences getInstancePreferences() {
- return new InstanceScope().getNode("org.jboss.ide.eclipse.as.ui");
+ IEclipsePreferences result = InstanceScope.INSTANCE.getNode("org.jboss.ide.eclipse.as.ui");
+ if(result == null) {
+ result = InstanceScope.INSTANCE.getNode(WebModelPlugin.PLUGIN_ID);
+ }
+ return result;
}
static IEclipsePreferences getDefaultPreferences() {
- return new DefaultScope().getNode("org.jboss.ide.eclipse.as.ui");
+ IEclipsePreferences result = DefaultScope.INSTANCE.getNode("org.jboss.ide.eclipse.as.ui");
+ if(result == null) {
+ result = DefaultScope.INSTANCE.getNode(WebModelPlugin.PLUGIN_ID);
+ }
+ return result;
}
static String getInstancePreference(String key) {
14 years
JBoss Tools SVN: r39551 - trunk/common/plugins/org.jboss.tools.common.model.ui.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-03-15 18:37:38 -0400 (Thu, 15 Mar 2012)
New Revision: 39551
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.properties
Log:
https://issues.jboss.org/browse/JBIDE-11328 remove Red Hat web site from Help since Ron says so
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.properties
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.properties 2012-03-15 21:24:56 UTC (rev 39550)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.properties 2012-03-15 22:37:38 UTC (rev 39551)
@@ -27,8 +27,6 @@
action.reportproblem.label=Report Problem
-action.visitsite.label=Red Hat Web Site
-
MainPreferencePage=JBoss Tools
PreferencePage_Editors=Editors
PreferencePage_LabelDecorations=Label Decorations
14 years