April 2012 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r40070 - trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test.

by jbosstools-commits＠lists.jboss.org

Author: jjankovi Date: 2012-04-05 06:40:36 -0400 (Thu, 05 Apr 2012) New Revision: 40070 Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSTestBase.java Log: importing ws project from resource added into WSTestBase Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSTestBase.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSTestBase.java 2012-04-05 10:39:31 UTC (rev 40069) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSTestBase.java 2012-04-05 10:40:36 UTC (rev 40070) @@ -19,6 +19,7 @@ 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.ServerType; +import org.jboss.tools.ui.bot.ext.helper.ImportHelper; import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.WsWizardBase.Slider_Level; import org.jboss.tools.ws.ui.bot.test.utils.DeploymentHelper; import org.jboss.tools.ws.ui.bot.test.utils.ProjectHelper; @@ -105,5 +106,9 @@ public static String getSoapRequest(String body) { return MessageFormat.format(SOAP_REQUEST_TEMPLATE, body); } + + protected void importWSTestProject(String projectLocation, String dir) { + ImportHelper.importProject(projectLocation, dir, Activator.PLUGIN_ID); + } }

13 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r40069 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper.

by jbosstools-commits＠lists.jboss.org

Author: jjankovi Date: 2012-04-05 06:39:31 -0400 (Thu, 05 Apr 2012) New Revision: 40069 Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ImportHelper.java Log: method for importing project from resource folder of bot test added Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ImportHelper.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ImportHelper.java 2012-04-05 10:33:33 UTC (rev 40068) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ImportHelper.java 2012-04-05 10:39:31 UTC (rev 40069) @@ -1,23 +1,29 @@ package org.jboss.tools.ui.bot.ext.helper; import static org.eclipse.swtbot.swt.finder.waits.Conditions.shellCloses; +import static org.junit.Assert.fail; +import java.io.File; +import java.io.IOException; + import org.eclipse.swtbot.swt.finder.SWTBot; import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; import org.jboss.tools.ui.bot.ext.SWTBotExt; +import org.jboss.tools.ui.bot.ext.SWTUtilExt; import org.jboss.tools.ui.bot.ext.types.IDELabel; /** * Heper class for project imports */ public class ImportHelper { - + + private static SWTBotExt bot = new SWTBotExt(); + /** * Import all projects from from given path to current workspace */ public static void importAllProjects(String path) { int timeout = 100000; // 100s max timeout - SWTBotExt bot = new SWTBotExt(); bot.menu("File").menu("Import...").click(); SWTBot dlgBot = bot.shell("Import").activate().bot(); @@ -33,4 +39,27 @@ dlgBot.button(IDELabel.Button.FINISH).click(); bot.waitUntil(shellCloses(s),timeout); } + + /** + * Import project from given location to destination directory + * @param projectLocation + * @param dir + * @param activatorPlugIn + */ + public static void importProject(String projectLocation, String dir, String activatorPlugIn) { + String rpath = ResourceHelper.getResourceAbsolutePath(activatorPlugIn, projectLocation); + String wpath = ResourceHelper.getWorkspaceAbsolutePath() + "/" + dir; + File rfile = new File(rpath); + File wfile = new File(wpath); + + wfile.mkdirs(); + try { + FileHelper.copyFilesBinaryRecursively(rfile, wfile, null); + } catch (IOException e) { + fail("Unable to copy test project"); + } + ImportHelper.importAllProjects(wpath); + SWTUtilExt util = new SWTUtilExt(bot); + util.waitForNonIgnoredJobs(); + } }

13 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r40068 - trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test.

by jbosstools-commits＠lists.jboss.org

Author: ljelinko Date: 2012-04-05 06:33:33 -0400 (Thu, 05 Apr 2012) New Revision: 40068 Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/pom.xml Log: Added debug profile Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/pom.xml =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/pom.xml 2012-04-05 10:06:22 UTC (rev 40067) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/pom.xml 2012-04-05 10:33:33 UTC (rev 40068) @@ -17,12 +17,21 @@ <jbosstools.test.jboss-seam-2.2.home>${requirement.build.root}/jboss-seam-2.2.1.Final</jbosstools.test.jboss-seam-2.2.home> <jbosstools.test.jboss-portal.home>${requirement.build.root}/jboss-portal-2.7.2</jbosstools.test.jboss-portal.home> <jbosstools.test.jboss-seam-2.0.home>${requirement.build.root}/jboss-seam-2.0.1.GA</jbosstools.test.jboss-seam-2.0.home> -  <configurations.dir>resources/project_config_files</configurations.dir> - <systemProperties>-Djbosstools.test.jboss-gatein.home=${jbosstools.test.jboss-gatein.home} -Djbosstools.test.jboss-seam-2.2.home=${jbosstools.test.jboss-seam-2.2.home} -Djbosstools.test.jboss-portal.home=${jbosstools.test.jboss-portal.home} -Djbosstools.test.jboss-seam-2.0.home=${jbosstools.test.jboss-seam-2.0.home} -Dtest.configurations.dir=${configurations.dir} -Dorg.eclipse.swtbot.screenshots.dir=${project.build.directory}/screenshots</systemProperties> + <additionalSystemProperties></additionalSystemProperties> + <systemProperties>${additionalSystemProperties} -Djbosstools.test.jboss-gatein.home=${jbosstools.test.jboss-gatein.home} -Djbosstools.test.jboss-seam-2.2.home=${jbosstools.test.jboss-seam-2.2.home} -Djbosstools.test.jboss-portal.home=${jbosstools.test.jboss-portal.home} -Djbosstools.test.jboss-seam-2.0.home=${jbosstools.test.jboss-seam-2.0.home} -Dtest.configurations.dir=${configurations.dir} -Dorg.eclipse.swtbot.screenshots.dir=${project.build.directory}/screenshots</systemProperties> <test.class>org.jboss.tools.portlet.ui.bot.test.AllTestsSuite</test.class> </properties> + <profiles> + <profile> + <id>debug</id> + <properties> + <additionalSystemProperties>-Xdebug -Xrunjdwp:transport=dt_socket,address=8001,server=y,suspend=y </additionalSystemProperties> + </properties> + </profile> + </profiles> + <build> <plugins> <plugin>

13 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r40067 - trunk/build/parent.

by jbosstools-commits＠lists.jboss.org

Author: mickael_istria Date: 2012-04-05 06:06:22 -0400 (Thu, 05 Apr 2012) New Revision: 40067 Modified: trunk/build/parent/pom.xml Log: JBIDE-11462 More system property to argLine instead of appArgLine Modified: trunk/build/parent/pom.xml =================================================================== --- trunk/build/parent/pom.xml 2012-04-05 10:04:52 UTC (rev 40066) +++ trunk/build/parent/pom.xml 2012-04-05 10:06:22 UTC (rev 40067) @@ -176,7 +176,7 @@ <useUIHarness>true</useUIHarness> <useUIThread>true</useUIThread>  - <appArgLine>${memoryOptions1} ${memoryOptions2} ${systemProperties} -Dusage_reporting_enabled=false</appArgLine> + <argLine>${memoryOptions1} ${memoryOptions2} ${systemProperties} -Dusage_reporting_enabled=false</argLine>

13 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r40066 - trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test.

by jbosstools-commits＠lists.jboss.org

Author: jjankovi Date: 2012-04-05 06:04:52 -0400 (Thu, 05 Apr 2012) New Revision: 40066 Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java Log: modifying to contain new cdi bot test Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2012-04-05 10:03:26 UTC (rev 40065) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2012-04-05 10:04:52 UTC (rev 40066) @@ -12,6 +12,7 @@ import org.jboss.tools.cdi.bot.test.beansxml.BeansXMLCompletionTest; import org.jboss.tools.cdi.bot.test.beansxml.BeansXMLValidationTest; +import org.jboss.tools.cdi.bot.test.decorator.DecoratorFromWebBeanTest; import org.jboss.tools.cdi.bot.test.editor.BeansEditorTest; import org.jboss.tools.cdi.bot.test.named.NamedComponentsSearchingTest; import org.jboss.tools.cdi.bot.test.named.NamedRefactoringTest; @@ -76,6 +77,7 @@ NamedComponentsSearchingTest.class, BeansXMLValidationTest.class, BeansXMLCompletionTest.class, + DecoratorFromWebBeanTest.class, ProblemEligibleInjectionTest.class, AllAssignableDialogTest.class, AssignableDialogFilterTest.class,

13 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r40065 - trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/decorator.

by jbosstools-commits＠lists.jboss.org

Author: jjankovi Date: 2012-04-05 06:03:26 -0400 (Thu, 05 Apr 2012) New Revision: 40065 Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/decorator/DecoratorFromWebBeanTest.java Removed: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/decorator/DecoratorCreatingTest.java Log: new cdi bot test implemented Deleted: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/decorator/DecoratorCreatingTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/decorator/DecoratorCreatingTest.java 2012-04-05 10:02:44 UTC (rev 40064) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/decorator/DecoratorCreatingTest.java 2012-04-05 10:03:26 UTC (rev 40065) @@ -1,33 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.cdi.bot.test.decorator; - -import org.jboss.tools.cdi.bot.test.CDITestBase; - -/** - * Test operates on creating new decorator - * - * @author Jaroslav Jankovic - * - */ - -public class DecoratorCreatingTest extends CDITestBase { - - //https://issues.jboss.org/browse/JBIDE-3136 - - @Override - public String getProjectName() { - return "CDIDecoratorCreating"; - } - - - -} Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/decorator/DecoratorFromWebBeanTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/decorator/DecoratorFromWebBeanTest.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/decorator/DecoratorFromWebBeanTest.java 2012-04-05 10:03:26 UTC (rev 40065) @@ -0,0 +1,144 @@ +/******************************************************************************* + * Copyright (c) 2010-2012 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.cdi.bot.test.decorator; + +import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot; +import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor; +import org.jboss.tools.cdi.bot.test.CDIConstants; +import org.jboss.tools.cdi.bot.test.CDITestBase; +import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType; +import org.jboss.tools.cdi.bot.test.editor.BeansEditor; +import org.jboss.tools.cdi.bot.test.uiutils.actions.NewCDIFileWizard; +import org.jboss.tools.cdi.bot.test.uiutils.wizards.CDIWizardBase; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +/** + * Test operates on creating new decorator from web bean + * implementing some existing interface + * + * @author Jaroslav Jankovic + * + */ + +public class DecoratorFromWebBeanTest extends CDITestBase { + + private final String ACCOUNT = "Account"; + + private final String ACCOUNT_JAVA = ACCOUNT + ".java"; + + private final String ACCOUNT_DECORATOR = "AccountDecorator"; + + private final String ACCOUNT_DECORATOR_JAVA = ACCOUNT_DECORATOR + ".java"; + + @Override + public String getProjectName() { + return "DecoratorFromWebBean"; + } + + @Before + public void prepareWorkspace() { + if (!projectHelper.projectExists(getProjectName())) { + importCDITestProject("/resources/projects/" + + getProjectName(), getProjectName()); + eclipse.cleanAllProjects(); + } + } + + @After + public void waitForJobs() { + projectExplorer.deleteProject(getProjectName(), true); + } + + @Test + public void testCreatingDecoratorWithMenu() { + + String[] path = (getProjectName() + "/" + CDIConstants.SRC + + "/" + getPackageName()).split("/"); + + packageExplorer.show(); + packageExplorer.selectTreeItem(ACCOUNT_JAVA, path); + + CDIWizardBase decoratorWizard = new NewCDIFileWizard( + CDIWizardType.DECORATOR).run(); + + assertTrue(decoratorWizard.getName().equals(ACCOUNT_DECORATOR)); + + assertTrue(decoratorWizard.getDecoratedInterfaces().size() == 1); + + assertTrue(decoratorWizard.getDecoratedInterfaces(). + get(0).equals(getPackageName() + "." + ACCOUNT)); + + assertTrue(decoratorWizard.canFinish()); + + decoratorWizard.finishWithWait(); + + packageExplorer.openFile(getProjectName(), + CDIConstants.WEB_INF_BEANS_XML_PATH.split("/")); + + SWTBotEditor editor = new SWTWorkbenchBot().activeEditor(); + BeansEditor be = new BeansEditor(editor.getReference(), new SWTWorkbenchBot()); + be.activatePage("Source"); + setEd(bot.activeEditor().toTextEditor()); + + assertTrue(getEd().getText().contains("\n <decorators>\n " + + "<class>cdi.AccountDecorator</class>\n </decorators>")); + + setEd(packageExplorer.openFile(getProjectName(), CDIConstants.SRC, + getPackageName(), ACCOUNT_DECORATOR_JAVA).toTextEditor()); + + assertTrue(getEd().getText().contains("@Decorator")); + assertTrue(getEd().getText().contains("@Inject\n\t@Delegate\n\t@Any" + + "\n\tprivate Account account;")); + assertTrue(getEd().getText().contains("BigDecimal getBalance()")); + assertTrue(getEd().getText().contains("User getOwner()")); + assertTrue(getEd().getText().contains("void withdraw(BigDecimal amount)")); + assertTrue(getEd().getText().contains("void deposit(BigDecimal amount)")); + + + } + + @Test + public void testCreatingDecoratorWithWizard() { + + CDIWizardBase decoratorWizard = new NewCDIFileWizard( + CDIWizardType.DECORATOR).run(); + decoratorWizard.setName(ACCOUNT_DECORATOR). + setPackage(getPackageName()). + addInterface(getPackageName() + "." + ACCOUNT). + finishWithWait(); + + packageExplorer.openFile(getProjectName(), + CDIConstants.WEB_INF_BEANS_XML_PATH.split("/")); + + SWTBotEditor editor = new SWTWorkbenchBot().activeEditor(); + BeansEditor be = new BeansEditor(editor.getReference(), new SWTWorkbenchBot()); + be.activatePage("Source"); + setEd(bot.activeEditor().toTextEditor()); + + assertTrue(getEd().getText().contains("\n <decorators>\n " + + "<class>cdi.AccountDecorator</class>\n </decorators>")); + + setEd(packageExplorer.openFile(getProjectName(), CDIConstants.SRC, + getPackageName(), ACCOUNT_DECORATOR_JAVA).toTextEditor()); + + assertTrue(getEd().getText().contains("@Decorator")); + assertTrue(getEd().getText().contains("@Inject\n\t@Delegate\n\t@Any" + + "\n\tprivate Account account;")); + assertTrue(getEd().getText().contains("BigDecimal getBalance()")); + assertTrue(getEd().getText().contains("User getOwner()")); + assertTrue(getEd().getText().contains("void withdraw(BigDecimal amount)")); + assertTrue(getEd().getText().contains("void deposit(BigDecimal amount)")); + + } + +}

13 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r40064 - trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards.

by jbosstools-commits＠lists.jboss.org

Author: jjankovi Date: 2012-04-05 06:02:44 -0400 (Thu, 05 Apr 2012) New Revision: 40064 Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/CDIWizardBase.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/Wizard.java Log: new features into CDIWizardBase added Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/CDIWizardBase.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/CDIWizardBase.java 2012-04-05 10:01:36 UTC (rev 40063) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/CDIWizardBase.java 2012-04-05 10:02:44 UTC (rev 40064) @@ -11,6 +11,7 @@ package org.jboss.tools.cdi.bot.test.uiutils.wizards; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -43,6 +44,14 @@ } return this; } + + public String getName() { + if (CDIWizardType.BEANS_XML == type) { + return getTextInTextBox("File name:"); + } else { + return getTextInTextBox("Name:"); + } + } public CDIWizardBase setPackage(String pkg) { setText("Package:", pkg); @@ -328,6 +337,14 @@ } return this; } + + public List<String> getDecoratedInterfaces() { + List<String> decoratedInterfaces = new ArrayList<String>(); + for (int i = 0; i < bot().table().rowCount(); i++) { + decoratedInterfaces.add(bot().table().getTableItem(i).getText()); + } + return decoratedInterfaces; + } public CDIWizardBase addQualifier(String qualifier) { setFocus(); @@ -428,5 +445,9 @@ SWTBotCombo c = bot().comboBoxWithLabel(label); c.setSelection(value); } - + + private String getTextInTextBox(String textBox) { + return bot().textWithLabel(textBox).getText(); + } + } Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/Wizard.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/Wizard.java 2012-04-05 10:01:36 UTC (rev 40063) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/Wizard.java 2012-04-05 10:02:44 UTC (rev 40064) @@ -40,4 +40,5 @@ } return false; } + }

13 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r40063 - in trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects: DecoratorFromWebBean and 6 other directories.

by jbosstools-commits＠lists.jboss.org

Author: jjankovi Date: 2012-04-05 06:01:36 -0400 (Thu, 05 Apr 2012) New Revision: 40063 Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/.classpath trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/.project trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/.settings/ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/.settings/.jsdtscope trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/.settings/org.eclipse.jdt.core.prefs trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/.settings/org.eclipse.wst.common.component trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/.settings/org.eclipse.wst.jsdt.ui.superType.container trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/.settings/org.eclipse.wst.jsdt.ui.superType.name trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/WebContent/ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/WebContent/META-INF/ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/WebContent/META-INF/MANIFEST.MF trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/WebContent/WEB-INF/ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/WebContent/WEB-INF/beans.xml trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/WebContent/WEB-INF/lib/ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/build/ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/src/ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/src/cdi/ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/src/cdi/Account.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/src/cdi/User.java Log: resource project for new cdi bot test added Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/.classpath =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/.classpath (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/.classpath 2012-04-05 10:01:36 UTC (rev 40063) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-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/jdk1.6.0_29"> + <attributes> + <attribute name="owner.project.facets" value="java"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget/AS-7.0"> + <attributes> + <attribute name="owner.project.facets" value="jst.web"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/> + <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> + <classpathentry kind="output" path="build/classes"/> +</classpath> Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/.project =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/.project (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/.project 2012-04-05 10:01:36 UTC (rev 40063) @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>DecoratorFromWebBean</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.wst.jsdt.core.javascriptValidator</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.common.project.facet.core.builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.jboss.tools.jst.web.kb.kbbuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.jboss.tools.cdi.core.cdibuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.validation.validationbuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> + <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> + <nature>org.eclipse.wst.common.project.facet.core.nature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.wst.jsdt.core.jsNature</nature> + <nature>org.jboss.tools.jst.web.kb.kbnature</nature> + <nature>org.jboss.tools.cdi.core.cdinature</nature> + </natures> +</projectDescription> Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/.settings/.jsdtscope =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/.settings/.jsdtscope (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/.settings/.jsdtscope 2012-04-05 10:01:36 UTC (rev 40063) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="WebContent"/> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject"> + <attributes> + <attribute name="hide" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/> + <classpathentry kind="output" path=""/> +</classpath> Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/.settings/org.eclipse.jdt.core.prefs 2012-04-05 10:01:36 UTC (rev 40063) @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/.settings/org.eclipse.wst.common.component =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/.settings/org.eclipse.wst.common.component (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/.settings/org.eclipse.wst.common.component 2012-04-05 10:01:36 UTC (rev 40063) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project-modules id="moduleCoreId" project-version="1.5.0"> + <wb-module deploy-name="DecoratorFromWebBean"> + <wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/> + <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/> + <property name="context-root" value="DecoratorFromWebBean"/> + <property name="java-output-path" value="/DecoratorFromWebBean/build/classes"/> + </wb-module> +</project-modules> Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/.settings/org.eclipse.wst.common.project.facet.core.xml 2012-04-05 10:01:36 UTC (rev 40063) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faceted-project> + <runtime name="AS-7.0"/> + <fixed facet="java"/> + <fixed facet="wst.jsdt.web"/> + <fixed facet="jst.web"/> + <installed facet="java" version="1.6"/> + <installed facet="jst.web" version="3.0"/> + <installed facet="wst.jsdt.web" version="1.0"/> +</faceted-project> Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/.settings/org.eclipse.wst.jsdt.ui.superType.container =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/.settings/org.eclipse.wst.jsdt.ui.superType.container 2012-04-05 10:01:36 UTC (rev 40063) @@ -0,0 +1 @@ +org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/.settings/org.eclipse.wst.jsdt.ui.superType.name =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/.settings/org.eclipse.wst.jsdt.ui.superType.name 2012-04-05 10:01:36 UTC (rev 40063) @@ -0,0 +1 @@ +Window \ No newline at end of file Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/WebContent/META-INF/MANIFEST.MF =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/WebContent/META-INF/MANIFEST.MF (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/WebContent/META-INF/MANIFEST.MF 2012-04-05 10:01:36 UTC (rev 40063) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/WebContent/WEB-INF/beans.xml =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/WebContent/WEB-INF/beans.xml (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/WebContent/WEB-INF/beans.xml 2012-04-05 10:01:36 UTC (rev 40063) @@ -0,0 +1,3 @@ +<?xml version="1.0"?> +<beans xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://jboss.org/schema/cdi/beans_1_0.xsd"/> Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/src/cdi/Account.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/src/cdi/Account.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/src/cdi/Account.java 2012-04-05 10:01:36 UTC (rev 40063) @@ -0,0 +1,15 @@ +package cdi; + +import java.math.BigDecimal; + +public interface Account { + + public BigDecimal getBalance(); + + public User getOwner(); + + public void withdraw(BigDecimal amount); + + public void deposit(BigDecimal amount); + +} Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/src/cdi/User.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/src/cdi/User.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/DecoratorFromWebBean/src/cdi/User.java 2012-04-05 10:01:36 UTC (rev 40063) @@ -0,0 +1,25 @@ +package cdi; + +public class User { + + private String firstName; + + private String secondName; + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getSecondName() { + return secondName; + } + + public void setSecondName(String secondName) { + this.secondName = secondName; + } + +}

13 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r40062 - trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test.

by jbosstools-commits＠lists.jboss.org

Author: jjankovi Date: 2012-04-05 04:12:02 -0400 (Thu, 05 Apr 2012) New Revision: 40062 Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java Log: include new cdi bot test Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2012-04-05 08:11:46 UTC (rev 40061) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2012-04-05 08:12:02 UTC (rev 40062) @@ -18,6 +18,7 @@ import org.jboss.tools.cdi.bot.test.openon.FindObserverForEventTest; import org.jboss.tools.cdi.bot.test.openon.OpenOnTest; import org.jboss.tools.cdi.bot.test.quickfix.dialog.AllAssignableDialogTest; +import org.jboss.tools.cdi.bot.test.quickfix.dialog.AssignableDialogFilterTest; import org.jboss.tools.cdi.bot.test.quickfix.injection.ProblemEligibleInjectionTest; import org.jboss.tools.cdi.bot.test.quickfix.test.BeanValidationQuickFixTest; import org.jboss.tools.cdi.bot.test.quickfix.test.BeansXMLValidationQuickFixTest; @@ -77,6 +78,7 @@ BeansXMLCompletionTest.class, ProblemEligibleInjectionTest.class, AllAssignableDialogTest.class, + AssignableDialogFilterTest.class, QuickFixProposalsDescriptionTest.class, BeansXMLValidationQuickFixTest.class, StereotypeValidationQuickFixTest.class,

13 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r40061 - trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/dialog.

by jbosstools-commits＠lists.jboss.org

Author: jjankovi Date: 2012-04-05 04:11:46 -0400 (Thu, 05 Apr 2012) New Revision: 40061 Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/dialog/AssignableDialogFilterTest.java Log: New cdi bot test implemented Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/dialog/AssignableDialogFilterTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/dialog/AssignableDialogFilterTest.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/dialog/AssignableDialogFilterTest.java 2012-04-05 08:11:46 UTC (rev 40061) @@ -0,0 +1,119 @@ +/******************************************************************************* + * Copyright (c) 2010-2012 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ + +package org.jboss.tools.cdi.bot.test.quickfix.dialog; + +import org.jboss.tools.cdi.bot.test.CDIConstants; +import org.jboss.tools.cdi.bot.test.CDITestBase; +import org.jboss.tools.cdi.bot.test.uiutils.wizards.AssignableBeansDialog; +import org.junit.Before; +import org.junit.Test; + +public class AssignableDialogFilterTest extends CDITestBase { + + private String appClass = "App.java"; + + @Override + public String getProjectName() { + return "AssignableDialogFilterTest"; + } + + @Before + public void prepareWorkspace() { + if (!projectHelper.projectExists(getProjectName())) { + importCDITestProject("/resources/projects/" + + getProjectName(), getProjectName()); + eclipse.cleanAllProjects(); + } + } + + @Test + public void testFilterAssignableBeans() { + + setEd(packageExplorer.openFile(getProjectName(), CDIConstants.SRC, + getPackageName(), appClass).toTextEditor()); + + assertTrue(openOnUtil.openOnByOption("animal", appClass, CDIConstants.SHOW_ALL_ASSIGNABLE)); + + AssignableBeansDialog assignDialog = new AssignableBeansDialog(bot.shell("Assignable Beans")); + + /** test lower and upper case */ + assignDialog.typeInFilter("cat"); + assertTrue(assignDialog.getAllBeans().size() == 1); + assertTrue(assignDialog.getAllBeans().get(0). + equals("Cat - " + getPackageName() + " - /" + + getProjectName() + "/src")); + + assignDialog.typeInFilter("CAT"); + assertTrue(assignDialog.getAllBeans().size() == 1); + assertTrue(assignDialog.getAllBeans().get(0). + equals("Cat - " + getPackageName() + " - /" + + getProjectName() + "/src")); + + /** test '*' asterisk */ + assignDialog.typeInFilter("*at"); + assertTrue(assignDialog.getAllBeans().size() == 2); + assertTrue(assignDialog.getAllBeans().contains("Cat - " + + getPackageName() + " - /" + + getProjectName() + "/src")); + assertTrue(assignDialog.getAllBeans().contains("@Decorator AnimalDecorator - " + + getPackageName() + " - /" + + getProjectName() + "/src")); + + /** test '?' asterisk */ + assignDialog.typeInFilter("??g"); + assertTrue(assignDialog.getAllBeans().size() == 1); + assertTrue(assignDialog.getAllBeans().get(0).equals("Dog - " + + getPackageName() + " - /" + + getProjectName() + "/src")); + + /** test non-existing bean */ + assignDialog.typeInFilter("?*?s"); + assertTrue(assignDialog.getAllBeans().size() == 0); + + } + + @Test + public void testFilterNonAssignableBeans() { + + setEd(packageExplorer.openFile(getProjectName(), CDIConstants.SRC, + getPackageName(), appClass).toTextEditor()); + + assertTrue(openOnUtil.openOnByOption("animal", appClass, CDIConstants.SHOW_ALL_ASSIGNABLE)); + + AssignableBeansDialog assignDialog = new AssignableBeansDialog(bot.shell("Assignable Beans")); + + assignDialog.hideDecorators(); + + /** test lower and upper case */ + assignDialog.typeInFilter("animaldecorator"); + assertTrue(assignDialog.getAllBeans().size() == 0); + + assignDialog.typeInFilter("ANIMALDECORATOR"); + assertTrue(assignDialog.getAllBeans().size() == 0); + + /** test '*' asterisk */ + assignDialog.typeInFilter("*at"); + assertTrue(assignDialog.getAllBeans().size() == 1); + assertTrue(assignDialog.getAllBeans().contains("Cat - " + + getPackageName() + " - /" + + getProjectName() + "/src")); + assertFalse(assignDialog.getAllBeans().contains("@Decorator AnimalDecorator - " + + getPackageName() + " - /" + + getProjectName() + "/src")); + + /** test '?' asterisk */ + assignDialog.typeInFilter("??i"); + assertTrue(assignDialog.getAllBeans().size() == 0); + + } + +}

13 years, 8 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits April 2012