JBoss Tools SVN: r39649 - workspace/snjeza/portlet-examples.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-03-20 06:17:15 -0400 (Tue, 20 Mar 2012)
New Revision: 39649
Modified:
workspace/snjeza/portlet-examples/testjsfportlet.zip
Log:
JBIDE-11341 Error log: Resource '/testjsfportlet/src' already exists
Modified: workspace/snjeza/portlet-examples/testjsfportlet.zip
===================================================================
(Binary files differ)
12 years, 6 months
JBoss Tools SVN: r39648 - trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-03-20 05:51:44 -0400 (Tue, 20 Mar 2012)
New Revision: 39648
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/RunPortletOnServerTemplate.java
Log:
Added @Require annotation that has been removed by mistake
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/RunPortletOnServerTemplate.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/RunPortletOnServerTemplate.java 2012-03-20 09:04:45 UTC (rev 39647)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/RunPortletOnServerTemplate.java 2012-03-20 09:51:44 UTC (rev 39648)
@@ -6,6 +6,10 @@
import org.jboss.tools.portlet.ui.bot.task.console.ConsoleClearingTask;
import org.jboss.tools.portlet.ui.bot.task.server.RunninngProjectOnServerTask;
import org.jboss.tools.portlet.ui.bot.test.testcase.SWTTaskBasedTestCase;
+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;
import org.junit.Test;
/**
@@ -15,6 +19,7 @@
* @author Lucia Jelinkova
*
*/
+@Require(clearWorkspace=false, clearProjects=false, server=(a)Server(state=ServerState.Running, type=ServerType.EPP))
public abstract class RunPortletOnServerTemplate extends SWTTaskBasedTestCase {
protected abstract String getProjectName();
12 years, 6 months
JBoss Tools SVN: r39647 - branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-03-20 05:04:45 -0400 (Tue, 20 Mar 2012)
New Revision: 39647
Modified:
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
Log:
[JBIDE-10419] corrected wizard title
Modified: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-03-20 09:02:52 UTC (rev 39646)
+++ branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-03-20 09:04:45 UTC (rev 39647)
@@ -119,7 +119,7 @@
OpenShiftExpressApplicationWizardModel wizardModel) {
super(
"Setup OpenShift Application",
- "Select an existing or create a new OpenShift Express Application.",
+ "Enter a name and select a type for your new OpenShift Express application.",
"Setup OpenShift Application", wizard);
try {
this.pageModel = new ApplicationConfigurationWizardPageModel(
@@ -234,8 +234,7 @@
.getSelectedApplication();
if (selectedApplication != null) {
try {
- pageModel
- .setExistingApplication(selectedApplication);
+ pageModel.setExistingApplicationName(selectedApplication.getName());
} catch (OpenShiftException ex) {
OpenShiftUIActivator
.log(OpenShiftUIActivator.createErrorStatus(
12 years, 6 months
JBoss Tools SVN: r39646 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-03-20 05:02:52 -0400 (Tue, 20 Mar 2012)
New Revision: 39646
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
Log:
[JBIDE-10419] corrected wizard title
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-03-20 08:45:23 UTC (rev 39645)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-03-20 09:02:52 UTC (rev 39646)
@@ -115,7 +115,8 @@
private Button uncheckAllButton;
public ApplicationConfigurationWizardPage(IWizard wizard, OpenShiftExpressApplicationWizardModel wizardModel) {
- super("Setup OpenShift Application", "Select an existing or create a new OpenShift Express Application.",
+ super("Setup OpenShift Application",
+ "Enter a name and select a type for your new OpenShift Express application.",
"Setup OpenShift Application", wizard);
try {
this.pageModel = new ApplicationConfigurationWizardPageModel(wizardModel);
12 years, 6 months
JBoss Tools SVN: r39645 - in trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot: test/server and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-03-20 04:45:23 -0400 (Tue, 20 Mar 2012)
New Revision: 39645
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/browser/BrowserUrlMatcher.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/RunAsLoadsPortalURLGatein.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/RunAsLoadsPortalURLJBPortal.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/RunAsLoadsPortalURLTemplate.java
Log:
Changed BrowserURLMatcher to take array of acceptable URLs
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/browser/BrowserUrlMatcher.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/browser/BrowserUrlMatcher.java 2012-03-20 07:34:34 UTC (rev 39644)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/browser/BrowserUrlMatcher.java 2012-03-20 08:45:23 UTC (rev 39645)
@@ -1,28 +1,30 @@
package org.jboss.tools.portlet.ui.bot.matcher.browser;
+import java.util.Arrays;
+
import org.hamcrest.Description;
import org.jboss.tools.portlet.ui.bot.matcher.AbstractSWTMatcher;
import org.jboss.tools.ui.bot.ext.SWTBotFactory;
/**
- * Checks the URL of the page laoded in the browser.
+ * Checks if the URL of the page laoded in the browser is one of the accepted URLs.
*
* @author Lucia Jelinkova
*
*/
-public class BrowserUrlMatcher extends AbstractSWTMatcher<String> {
+public class BrowserUrlMatcher extends AbstractSWTMatcher<String[]> {
private String realURL;
@Override
- public boolean matchesSafely(String expectedURL) {
+ public boolean matchesSafely(String[] acceptedURL) {
realURL = SWTBotFactory.getBot().browser().getUrl();
- return expectedURL.equals(realURL);
+ return Arrays.asList(acceptedURL).contains(realURL);
}
@Override
public void describeTo(Description description) {
- description.appendText("is loaded in browser but it was: ");
+ description.appendText("are the only allowed loaded URLs but it was:");
description.appendValue(realURL);
}
}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/RunAsLoadsPortalURLGatein.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/RunAsLoadsPortalURLGatein.java 2012-03-20 07:34:34 UTC (rev 39644)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/RunAsLoadsPortalURLGatein.java 2012-03-20 08:45:23 UTC (rev 39645)
@@ -9,7 +9,7 @@
public class RunAsLoadsPortalURLGatein extends RunAsLoadsPortalURLTemplate {
@Override
- public String getExpectedURL() {
- return "http://localhost:8080/portal/classic/";
+ public String[] getExpectedURLs() {
+ return new String[]{"http://localhost:8080/portal/classic/", "http://localhost:8080/portal/public/classic/"};
}
}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/RunAsLoadsPortalURLJBPortal.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/RunAsLoadsPortalURLJBPortal.java 2012-03-20 07:34:34 UTC (rev 39644)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/RunAsLoadsPortalURLJBPortal.java 2012-03-20 08:45:23 UTC (rev 39645)
@@ -9,7 +9,7 @@
public class RunAsLoadsPortalURLJBPortal extends RunAsLoadsPortalURLTemplate {
@Override
- public String getExpectedURL() {
- return "http://localhost:8080/portal";
+ public String[] getExpectedURLs() {
+ return new String[]{"http://localhost:8080/portal"};
}
}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/RunAsLoadsPortalURLTemplate.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/RunAsLoadsPortalURLTemplate.java 2012-03-20 07:34:34 UTC (rev 39644)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/RunAsLoadsPortalURLTemplate.java 2012-03-20 08:45:23 UTC (rev 39645)
@@ -25,14 +25,14 @@
private static final String PROJECT_NAME = "runAsURLTestProject";
- public abstract String getExpectedURL();
+ public abstract String[] getExpectedURLs();
@Test
public void runAsLoadsPortalURL(){
doPerform(createJavaPortletTask());
doPerform(runOnServerTask());
- doAssertThatInWorkspace(getExpectedURL(), new BrowserUrlMatcher());
+ doAssertThatInWorkspace(getExpectedURLs(), new BrowserUrlMatcher());
}
private SWTTask createJavaPortletTask() {
12 years, 6 months
JBoss Tools SVN: r39644 - trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/src/org/jboss/tools/freemarker/ui/bot/test.
by jbosstools-commits＠lists.jboss.org
Author: jpeterka
Date: 2012-03-20 03:34:34 -0400 (Tue, 20 Mar 2012)
New Revision: 39644
Modified:
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/src/org/jboss/tools/freemarker/ui/bot/test/FreeMarkerTest.java
Log:
FreeMarkerTest sleep and other unused code removal
Modified: trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/src/org/jboss/tools/freemarker/ui/bot/test/FreeMarkerTest.java
===================================================================
--- trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/src/org/jboss/tools/freemarker/ui/bot/test/FreeMarkerTest.java 2012-03-20 07:25:11 UTC (rev 39643)
+++ trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/src/org/jboss/tools/freemarker/ui/bot/test/FreeMarkerTest.java 2012-03-20 07:34:34 UTC (rev 39644)
@@ -14,7 +14,6 @@
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner;
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.ui.bot.ext.SWTTestExt;
import org.jboss.tools.ui.bot.ext.gen.ActionItem;
@@ -53,7 +52,7 @@
}
@Test
- public void FreeMarkerTest() {
+ public void freeMarkerTest() {
emptyErrorLog();
importTestProject();
openFTLFileInEditor();
@@ -79,8 +78,7 @@
private void openFTLFileInEditor() {
SWTBotView viewOpen = open
.viewOpen(ActionItem.View.GeneralProjectExplorer.LABEL);
-
- SWTBotTree tree = viewOpen.bot().tree();
+
Tree.open(viewOpen.bot(),prj, "ftl", "welcome.ftl" );
SWTBotEditor editor = bot.editorByTitle("welcome.ftl");
editor.setFocus();
@@ -130,25 +128,24 @@
new RuntimeException("Unable to read from resource");
}
- SWTBotView viewConsole = open.viewOpen(ActionItem.View.GeneralConsole.LABEL);
+ open.viewOpen(ActionItem.View.GeneralConsole.LABEL);
ConsoleView cv = new ConsoleView();
cv.clearConsole();
SWTBotView viewOpen = open
.viewOpen(ActionItem.View.GeneralProjectExplorer.LABEL);
- SWTBotTreeItem item = Tree.select(viewOpen.bot(), prj,"src","org.jboss.tools.freemarker.testprj","FMTest.java");
+ Tree.select(viewOpen.bot(), prj,"src","org.jboss.tools.freemarker.testprj","FMTest.java");
ContextMenuHelper.clickContextMenu(viewOpen.bot().tree(),"Run As","2 Java Application");
SWTBotShell s = bot.shell("Progress Information");
bot.waitUntil(shellCloses(s));
- SWTBotView consoleView = open.viewOpen(ActionItem.View.GeneralConsole.LABEL);
+ open.viewOpen(ActionItem.View.GeneralConsole.LABEL);
String consoleText = cv.getConsoleText(TIME_1S, TIME_10S, true);
bot.waitUntil(shellCloses(s));
assertTrue("Output equal check",consoleText.equals(outputExpected));
- bot.sleep(TIME_10S);
}
private String readTextFileToString(String filePath) throws IOException {
12 years, 6 months
JBoss Tools SVN: r39643 - in trunk/as/plugins: org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-03-20 03:25:11 -0400 (Tue, 20 Mar 2012)
New Revision: 39643
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java
Log:
JBIDE-11351 - clean up npe's
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java 2012-03-19 20:18:37 UTC (rev 39642)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java 2012-03-20 07:25:11 UTC (rev 39643)
@@ -181,14 +181,15 @@
Trace.trace(Trace.STRING_FINER, "Loading remote deployment details for server " + getServer().getName());
String connectionName = RSEUtils.getRSEConnectionName(behaviour.getServer());
IDeployableServer ds = ServerConverter.getDeployableServer(behaviour.getServer());
- this.remoteRootFolder = new Path(RSEUtils.getDeployRootFolder(ds));
+ String deployRoot = RSEUtils.getDeployRootFolder(ds);
+ if( deployRoot == null )
+ throw new CoreException(new Status(IStatus.ERROR, org.jboss.ide.eclipse.as.rse.core.RSECorePlugin.PLUGIN_ID, "Server has null deploy root folder. This may be caused by a missing runtime, or improperly configured server adapter"));
+ this.remoteRootFolder = new Path(deployRoot);
IHost host = RSEUtils.findHost(connectionName);
- if( host != null ) {
- fileSubSystem = findFileTransferSubSystem(host);
- } else {
+ if( host == null )
throw new CoreException(new Status(IStatus.ERROR, org.jboss.ide.eclipse.as.rse.core.RSECorePlugin.PLUGIN_ID, "RSE Host Not Found."));
- }
+ fileSubSystem = findFileTransferSubSystem(host);
}
/* approved files subsystems *
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java 2012-03-19 20:18:37 UTC (rev 39642)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java 2012-03-20 07:25:11 UTC (rev 39643)
@@ -72,7 +72,8 @@
public static String getRSEConfigName(IServerAttributes server) {
IJBossServerRuntime runtime = RuntimeUtils.getJBossServerRuntime(server);
- return server.getAttribute(RSEUtils.RSE_SERVER_CONFIG, runtime.getJBossConfiguration());
+ return server.getAttribute(RSEUtils.RSE_SERVER_CONFIG,
+ runtime == null ? null : runtime.getJBossConfiguration());
}
public static String getDeployRootFolder(IDeployableServer server) {
@@ -107,6 +108,8 @@
} else {
String loc = IConstants.SERVER;
String config = getRSEConfigName(server);
+ if( loc == null || config == null )
+ return null;
IPath p = new Path(loc).append(config)
.append(IJBossRuntimeResourceConstants.DEPLOY);
return makeGlobal(server, p).toString();
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java 2012-03-19 20:18:37 UTC (rev 39642)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java 2012-03-20 07:25:11 UTC (rev 39643)
@@ -89,7 +89,8 @@
ExploreActionProvider.exploreBehaviorMap.put("rse", new ExploreActionProvider.IExploreBehavior() {
public void openExplorer(IServer server, IModule[] module) {
IDeployableServer ds = ServerConverter.getDeployableServer(server);
- IPath remoteFolder = new Path(RSEUtils.getDeployRootFolder(ds));
+ String remote = RSEUtils.getDeployRootFolder(ds);
+ IPath remoteFolder = new Path(remote == null ? "/" : remote);
IJBossServerPublishMethodType type = DeploymentPreferenceLoader.getCurrentDeploymentMethodType(server);
RSEPublishMethod method = (RSEPublishMethod)type.createPublishMethod();
method.setBehaviour(ServerConverter.getDeployableServerBehavior(server));
12 years, 6 months
JBoss Tools SVN: r39642 - in trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test: diagram and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jpeterka
Date: 2012-03-19 16:18:37 -0400 (Mon, 19 Mar 2012)
New Revision: 39642
Modified:
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/console/CreateConsoleConfigurationTest.java
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/console/EditConsoleConfigurationTest.java
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/jpa/EditPersistenceXMLTest.java
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/mappingfile/EditMappingFileTest.java
Log:
HB bot tests minor configuration fixes (clear projects, prj settings, etc.)
Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/console/CreateConsoleConfigurationTest.java
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/console/CreateConsoleConfigurationTest.java 2012-03-19 20:16:58 UTC (rev 39641)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/console/CreateConsoleConfigurationTest.java 2012-03-19 20:18:37 UTC (rev 39642)
@@ -10,6 +10,7 @@
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.DB;
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;
@@ -23,7 +24,7 @@
* @author jpeterka
*
*/
-@Require(clearProjects = true)
+@Require(db = @DB, clearProjects = true)
public class CreateConsoleConfigurationTest extends HibernateBaseTest {
final String prjName = "configurationtest";
@@ -63,7 +64,7 @@
private void createMainTab(SWTBotShell shell) {
bot.cTabItem(IDELabel.HBConsoleWizard.MAIN_TAB).activate();
- bot.textWithLabel("Name:").setText(prjName + "-w");
+ bot.textWithLabel("Name:").setText(prjName);
bot.textWithLabelInGroup("","Configuration file:").setText(prjName + "/src/hibernate.cfg.xml");
}
Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/console/EditConsoleConfigurationTest.java
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/console/EditConsoleConfigurationTest.java 2012-03-19 20:16:58 UTC (rev 39641)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/console/EditConsoleConfigurationTest.java 2012-03-19 20:18:37 UTC (rev 39642)
@@ -1,5 +1,9 @@
package org.jboss.tools.hb.ui.bot.test.console;
-public class EditConsoleConfigurationTest {
+import org.jboss.tools.hb.ui.bot.test.HibernateBaseTest;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+@Require(clearProjects = true)
+public class EditConsoleConfigurationTest extends HibernateBaseTest {
+
}
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-03-19 20:16:58 UTC (rev 39641)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/diagram/MappingDiagramTest.java 2012-03-19 20:18:37 UTC (rev 39642)
@@ -21,7 +21,9 @@
@Test
public void showMappingDiagram() {
- importTestProject("/resources/prj");
+ importTestProject("/resources/prj/hibernatelib");
+ importTestProject("/resources/prj/hibernate35");
+ util.waitForAll();
openDiagram();
}
Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/jpa/EditPersistenceXMLTest.java
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/jpa/EditPersistenceXMLTest.java 2012-03-19 20:16:58 UTC (rev 39641)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/jpa/EditPersistenceXMLTest.java 2012-03-19 20:18:37 UTC (rev 39642)
@@ -22,7 +22,7 @@
* @author jpeterka
*
*/
-@Require(clearProjects = false, perspective="JPA")
+@Require(clearProjects = true, perspective="JPA")
public class EditPersistenceXMLTest extends HibernateBaseTest {
final String prj = "jpatest35";
Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/mappingfile/EditMappingFileTest.java
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/mappingfile/EditMappingFileTest.java 2012-03-19 20:16:58 UTC (rev 39641)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/mappingfile/EditMappingFileTest.java 2012-03-19 20:18:37 UTC (rev 39642)
@@ -17,7 +17,7 @@
* @author jpeterka
*
*/
-@Require(clearProjects = false)
+@Require(clearProjects = true)
public class EditMappingFileTest extends HibernateBaseTest {
final String prj = "hibernate35";
12 years, 6 months
JBoss Tools SVN: r39641 - trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite.
by jbosstools-commits＠lists.jboss.org
Author: jpeterka
Date: 2012-03-19 16:16:58 -0400 (Mon, 19 Mar 2012)
New Revision: 39641
Modified:
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite/HibernateSuite.java
Log:
Hibernate bot testsuite update (test classes added)
Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite/HibernateSuite.java
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite/HibernateSuite.java 2012-03-19 20:14:56 UTC (rev 39640)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite/HibernateSuite.java 2012-03-19 20:16:58 UTC (rev 39641)
@@ -3,6 +3,16 @@
import org.jboss.tools.hb.ui.bot.test.configuration.CreateConfigurationFileTest;
import org.jboss.tools.hb.ui.bot.test.configuration.EditConfigurationFileTest;
import org.jboss.tools.hb.ui.bot.test.console.CreateConsoleConfigurationTest;
+import org.jboss.tools.hb.ui.bot.test.console.EditConsoleConfigurationTest;
+import org.jboss.tools.hb.ui.bot.test.diagram.MappingDiagramTest;
+import org.jboss.tools.hb.ui.bot.test.generation.CreateCodeGenerationConfiguration;
+import org.jboss.tools.hb.ui.bot.test.generation.JPADDLGenerationTest;
+import org.jboss.tools.hb.ui.bot.test.generation.JPAEntitiesGenerationTest;
+import org.jboss.tools.hb.ui.bot.test.jpa.CreateJPAProjectTest;
+import org.jboss.tools.hb.ui.bot.test.jpa.EditPersistenceXMLTest;
+import org.jboss.tools.hb.ui.bot.test.mappingfile.CreateMappingFileTest;
+import org.jboss.tools.hb.ui.bot.test.mappingfile.EditMappingFileTest;
+import org.jboss.tools.hb.ui.bot.test.perspective.JPAPerspectiveTest;
import org.jboss.tools.hb.ui.bot.test.perspective.PerspectiveTest;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
import org.junit.runner.RunWith;
@@ -10,11 +20,28 @@
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({
+ /* Configuration */
CreateConfigurationFileTest.class,
EditConfigurationFileTest.class,
+ /* console */
+ CreateConsoleConfigurationTest.class,
+ EditConsoleConfigurationTest.class,
+ /* diagram */
+ MappingDiagramTest.class,
+ /* generation */
+ CreateCodeGenerationConfiguration.class,
+ JPADDLGenerationTest.class,
+ JPAEntitiesGenerationTest.class,
+ /* jpa */
+ CreateJPAProjectTest.class,
+ EditPersistenceXMLTest.class,
+ /* mappingfile */
+ CreateMappingFileTest.class,
+ EditMappingFileTest.class,
+ /* perspective */
+ JPAPerspectiveTest.class,
PerspectiveTest.class,
- CreateConsoleConfigurationTest.class
- })
+ })
public class HibernateSuite {
}
12 years, 6 months
JBoss Tools SVN: r39640 - trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/resources/prj/configurationtest.
by jbosstools-commits＠lists.jboss.org
Author: jpeterka
Date: 2012-03-19 16:14:56 -0400 (Mon, 19 Mar 2012)
New Revision: 39640
Modified:
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/resources/prj/configurationtest/.classpath
Log:
HB ui bot test resource project classpath update
Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/resources/prj/configurationtest/.classpath
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/resources/prj/configurationtest/.classpath 2012-03-19 20:13:54 UTC (rev 39639)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/resources/prj/configurationtest/.classpath 2012-03-19 20:14:56 UTC (rev 39640)
@@ -2,5 +2,8 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="lib" path="lib/hsqldb.jar"/>
+ <classpathentry kind="lib" path="lib/mysql-connector-java-5.1.13-bin.jar"/>
+ <classpathentry kind="lib" path="lib/postgresql-8.4-702.jdbc4.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
12 years, 6 months