Author: jjankovi Date: 2011-08-18 04:57:41 -0400 (Thu, 18 Aug 2011) New Revision: 34035 Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/hyperlinks/ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/hyperlinks/CDIHyperlinksTest.java Removed: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/fix/ 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/editor/BeansEditorTest.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/CDIUtil.java Log: Hyperlinks test added and quickfix new test addition 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 2011-08-18 07:57:07 UTC (rev 34034) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2011-08-18 08:57:41 UTC (rev 34035) @@ -11,7 +11,8 @@ package org.jboss.tools.cdi.bot.test; import org.jboss.tools.cdi.bot.test.editor.BeansEditorTest; -import org.jboss.tools.cdi.bot.test.fix.CDIQuickFixTest; +import org.jboss.tools.cdi.bot.test.hyperlinks.CDIHyperlinksTest; +import org.jboss.tools.cdi.bot.test.quickfix.CDIQuickFixTest; import org.jboss.tools.cdi.bot.test.wizard.CdiATWizardTest; import org.jboss.tools.ui.bot.ext.RequirementAwareSuite; import org.junit.runner.RunWith; @@ -33,16 +34,17 @@ * JAVA=1.6,/space/java/sdk/jdk1.6.0_22 * * - * Suite duration: aprox. 3min + * Suite duration: aprox. 4min * * @author Lukas Jungmann * @author Jaroslav Jankovic */ @RunWith(RequirementAwareSuite.class) @SuiteClasses({ - CdiATWizardTest.class, + //CdiATWizardTest.class, + //BeansEditorTest.class, CDIQuickFixTest.class, - BeansEditorTest.class + CDIHyperlinksTest.class }) public class CDIAllBotTests { } Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/editor/BeansEditorTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/editor/BeansEditorTest.java 2011-08-18 07:57:07 UTC (rev 34034) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/editor/BeansEditorTest.java 2011-08-18 08:57:41 UTC (rev 34035) @@ -36,6 +36,7 @@ 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.view.ProjectExplorer; +import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; @@ -71,6 +72,11 @@ new ProjectExplorer().openFile(project, descPath.split("/")); } + @After + public void waitForJobs() { + util.waitForNonIgnoredJobs(); + } + @Test public void testInterceptors() { addItem(Item.INTERCEPTOR, "cdi.I1"); Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/hyperlinks/CDIHyperlinksTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/hyperlinks/CDIHyperlinksTest.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/hyperlinks/CDIHyperlinksTest.java 2011-08-18 08:57:41 UTC (rev 34035) @@ -0,0 +1,67 @@ +package org.jboss.tools.cdi.bot.test.hyperlinks; + +import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; +import org.jboss.tools.cdi.bot.test.CDIAllBotTests; +import org.jboss.tools.cdi.bot.test.uiutils.actions.CDIUtil; +import org.jboss.tools.ui.bot.ext.RequirementAwareSuite; +import org.jboss.tools.ui.bot.ext.SWTTestExt; +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.types.ViewType; +import org.jboss.tools.ui.bot.ext.view.ProblemsView; +import org.junit.After; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Suite.SuiteClasses; + +/* + * Test operates on hyperlinks-openons + * + * @author Jaroslav Jankovic + */ + +@Require(perspective = "Java EE", server = @Server(state = ServerState.NotRunning, version = "6.0", operator = ">=")) +(a)RunWith(RequirementAwareSuite.class) +@SuiteClasses({ CDIAllBotTests.class }) +public class CDIHyperlinksTest extends SWTTestExt { + + //private static final Logger LOGGER = Logger.getLogger(CDIQuickFixTest.class.getName()); + private static final String PROJECT_NAME = "CDIProject"; + private static final String PACKAGE_NAME = "org.cdi.test"; + + + @BeforeClass + public static void setup() { + eclipse.showView(ViewType.PROJECT_EXPLORER); + CDIUtil.createAndCheckCDIProject(bot, util, projectExplorer, PROJECT_NAME); + } + + @After + public void waitForJobs() { + util.waitForNonIgnoredJobs(); + } + + @Test + public void testInjectHyperlink() { + CDIUtil.bean(PACKAGE_NAME, "Animal", true, false, false, false, null, + null, null, null).finish(); + util.waitForNonIgnoredJobs(); + + CDIUtil.bean(PACKAGE_NAME, "BrokenFarm", true, false, false, false, null, + null, null, null).finish(); + util.waitForNonIgnoredJobs(); + SWTBotEditor ed = bot.activeEditor(); + CDIUtil.copyResourceToClass(ed, CDIHyperlinksTest.class + .getResourceAsStream("/resources/cdi/BrokenFarm.java.cdi"), false); + SWTBotTreeItem warningNode = ProblemsView.getWarningsNode(bot); + assertNull("Warnings node should be empty.", warningNode); + /* + * TODO - hyperlink on @Inject should redirect to correct class + */ + + } + +} \ No newline at end of file Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/CDIUtil.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/CDIUtil.java 2011-08-18 07:57:07 UTC (rev 34034) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/CDIUtil.java 2011-08-18 08:57:41 UTC (rev 34035) @@ -12,14 +12,32 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.jboss.tools.cdi.bot.test.uiutils.wizards.CDIWizard; import org.jboss.tools.cdi.bot.test.uiutils.wizards.CDIWizardType; +import org.jboss.tools.cdi.bot.test.uiutils.wizards.DynamicWebProjectWizard; import org.jboss.tools.ui.bot.ext.SWTBotExt; import org.jboss.tools.ui.bot.ext.SWTUtilExt; import org.jboss.tools.ui.bot.ext.Timing; import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper; +import org.jboss.tools.ui.bot.ext.view.ProjectExplorer; public class CDIUtil { + + public static void createAndCheckCDIProject(SWTBotExt bot, SWTUtilExt util, ProjectExplorer projectExplorer, String projectName) { + createCDIProject(util, projectName); + projectExplorer.selectProject(projectName); + SWTBotTree tree = projectExplorer.bot().tree(); + SWTBotTreeItem item = tree.getTreeItem(projectName); + item.expand(); + CDIUtil.addCDISupport(tree, item, bot, util); + } + public static void createCDIProject(SWTUtilExt util, String projectName) { + new NewFileWizardAction().run() + .selectTemplate("Web", "Dynamic Web Project").next(); + new DynamicWebProjectWizard().setProjectName(projectName).finish(); + util.waitForNonIgnoredJobs(); + } + public static void addCDISupport(final SWTBotTree tree, SWTBotTreeItem item, SWTBotExt bot, SWTUtilExt util) { nodeContextMenu(tree, item, "Configure","Add CDI (Context and Dependency Injection) support...").click(); @@ -28,8 +46,12 @@ util.waitForNonIgnoredJobs(); } - public static void resolveQuickFix(final SWTBotTree tree, SWTBotTreeItem item, SWTBotExt bot, SWTUtilExt util) { + public static void openQuickFix(SWTBotTreeItem item, SWTBotExt bot, SWTUtilExt util) { nodeContextMenu(bot.tree(), item, "Quick Fix").click(); + } + + public static void resolveQuickFix(SWTBotTreeItem item, SWTBotExt bot, SWTUtilExt util) { + openQuickFix(item, bot, util); bot.activeShell().bot().button("Finish").click(); bot.sleep(Timing.time2S()); util.waitForNonIgnoredJobs();