June 2012 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r41922 - in trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test: tests and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: jjankovi Date: 2012-06-13 04:41:44 -0400 (Wed, 13 Jun 2012) New Revision: 41922 Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/base/Seam3TestBase.java trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/DefaultBeansTest.java trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/ExactAnnotationTest.java trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/FullyQualifiedTest.java trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/GenericOpenOnTest.java trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/NamedPackagesTest.java trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/RequiresAnnotationTest.java trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/ResourceOpenOnTest.java trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/VetoAnnotationTest.java trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/util/LibraryHelper.java trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/util/SeamLibrary.java Log: Support for testing Seam 3.1.0 in seam3 bot tests Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/base/Seam3TestBase.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/base/Seam3TestBase.java 2012-06-13 08:38:19 UTC (rev 41921) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/base/Seam3TestBase.java 2012-06-13 08:41:44 UTC (rev 41922) @@ -12,6 +12,8 @@ package org.jboss.tools.cdi.seam3.bot.test.base; import java.io.IOException; +import java.util.Collection; +import java.util.Iterator; import java.util.logging.Level; import org.jboss.tools.cdi.bot.test.CDITestBase; @@ -59,7 +61,6 @@ } - /** * * @param projectName @@ -94,8 +95,7 @@ */ protected static void addAndCheckLibraryInProject(String projectName, SeamLibrary library) { - addLibraryIntoProject(projectName, library.getName()); - checkLibraryInProject(projectName, library.getName()); + addLibraryIntoProject(projectName, library.getLibrariesNames()); } /** @@ -103,26 +103,21 @@ * @param projectName * @param libraryName */ - private static void addLibraryIntoProject(String projectName, String libraryName) { + private static void addLibraryIntoProject(String projectName, Collection<String> libraryName) { try { - libraryHelper.addLibraryIntoProject(projectName, libraryName); - LOGGER.info("Library: \"" + libraryName + "\" copied"); - util.waitForNonIgnoredJobs(); - libraryHelper.addLibraryToProjectsClassPath(projectName, libraryName); - LOGGER.info("Library: \"" + libraryName + "\" on class path of project\"" + projectName + "\""); + Iterator<String> iter = libraryName.iterator(); + while (iter.hasNext()) { + String temp = iter.next(); + libraryHelper.addLibraryIntoProjectFolder(projectName, temp); + LOGGER.info("Library: \"" + libraryName + "\" copied"); + util.waitForNonIgnoredJobs(); + libraryHelper.addLibraryToProjectsClassPath(projectName, temp); + LOGGER.info("Library: \"" + libraryName + "\" on class path of project\"" + projectName + "\""); + } } catch (IOException exc) { LOGGER.log(Level.SEVERE, "Error while adding " + libraryName + " library into project"); LOGGER.log(Level.SEVERE, exc.getMessage()); } } - /** - * - * @param projectName - * @param libraryName - */ - private static void checkLibraryInProject(String projectName, String libraryName) { - assertTrue(libraryHelper.isLibraryInProjectClassPath(projectName, libraryName)); - } - } Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/DefaultBeansTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/DefaultBeansTest.java 2012-06-13 08:38:19 UTC (rev 41921) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/DefaultBeansTest.java 2012-06-13 08:41:44 UTC (rev 41922) @@ -37,7 +37,7 @@ @Test public void testProperAssign() { - importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER); + importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3); packageExplorer.openFile(projectName, CDIConstants.SRC, getPackageName(), APPLICATION_CLASS); @@ -53,7 +53,7 @@ @Test public void testProperAssignAlternativesDeactive() { - importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER); + importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3); wizardExt.bean(getPackageName(), "ManagerImpl", true, false, false, false, true, false, null, "Manager", null, null).finish(); @@ -85,7 +85,7 @@ @Test public void testProperUnassign() { - importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER); + importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3); wizardExt.bean(getPackageName(), "ManagerImpl", true, false, false, false, false, false, null, "Manager", null, null).finish(); @@ -117,7 +117,7 @@ @Test public void testProperUnassignAlternativesActive() { - importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER); + importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3); wizardExt.bean(getPackageName(), "ManagerImpl", true, false, false, false, true, true, null, "Manager", null, null).finish(); Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/ExactAnnotationTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/ExactAnnotationTest.java 2012-06-13 08:38:19 UTC (rev 41921) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/ExactAnnotationTest.java 2012-06-13 08:41:44 UTC (rev 41922) @@ -52,7 +52,7 @@ String peopleManager = "PeopleManager"; String otherManager = "OtherManager"; - importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER); + importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3); setEd(packageExplorer.openFile(projectName, CDIConstants.SRC, getPackageName(), APPLICATION_CLASS).toTextEditor()); Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/FullyQualifiedTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/FullyQualifiedTest.java 2012-06-13 08:38:19 UTC (rev 41921) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/FullyQualifiedTest.java 2012-06-13 08:41:44 UTC (rev 41922) @@ -40,7 +40,7 @@ String projectName = "fullyQualified1"; - importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER); + importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3); setEd(packageExplorer.openFile(projectName, CDIConstants.SRC, getPackageName(), APPLICATION_CLASS).toTextEditor()); @@ -57,7 +57,7 @@ String projectName = "fullyQualified2"; - importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER); + importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3); setEd(packageExplorer.openFile(projectName, CDIConstants.SRC, getPackageName(), APPLICATION_CLASS).toTextEditor()); @@ -83,7 +83,7 @@ String projectName = "fullyQualified3"; - importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER); + importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3); setEd(packageExplorer.openFile(projectName, CDIConstants.SRC, getPackageName(), APPLICATION_CLASS).toTextEditor()); @@ -104,7 +104,7 @@ String projectName = "fullyQualified4"; String myBean1 = "MyBean1.java"; - importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER); + importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3); setEd(packageExplorer.openFile(projectName, CDIConstants.SRC, getPackageName(), myBean1).toTextEditor()); @@ -129,7 +129,7 @@ String projectName = "fullyQualified5"; - importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER); + importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3); setEd(packageExplorer.openFile(projectName, CDIConstants.SRC, getPackageName(), APPLICATION_CLASS).toTextEditor()); @@ -166,7 +166,7 @@ String projectName = "fullyQualified6"; - importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER); + importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3); setEd(packageExplorer.openFile(projectName, CDIConstants.SRC, getPackageName(), APPLICATION_CLASS).toTextEditor()); @@ -222,7 +222,7 @@ String projectName = "fullyQualified7"; - importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER); + importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3); setEd(packageExplorer.openFile(projectName, CDIConstants.SRC, getPackageName(), APPLICATION_CLASS).toTextEditor()); Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/GenericOpenOnTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/GenericOpenOnTest.java 2012-06-13 08:38:19 UTC (rev 41921) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/GenericOpenOnTest.java 2012-06-13 08:41:44 UTC (rev 41922) @@ -36,7 +36,7 @@ @BeforeClass public static void setup() { - importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER); + importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3); } /** Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/NamedPackagesTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/NamedPackagesTest.java 2012-06-13 08:38:19 UTC (rev 41921) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/NamedPackagesTest.java 2012-06-13 08:41:44 UTC (rev 41922) @@ -46,7 +46,7 @@ @Test public void testNoNamedPackaged() { - importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER); + importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3); setEd(packageExplorer.openFile(projectName, CDIConstants.SRC, ORG_JBOSS_PACKAGE, MANAGER_JAVA).toTextEditor()); @@ -61,7 +61,7 @@ @Test public void testOneNamedPackage() { - importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER); + importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3); editResourceUtil.renameFileInExplorerBase(packageExplorer, PACKAGE_INFO_JAVA_CDI, projectName + "/" + CDIConstants.SRC + "/" + CDI_SEAM_PACKAGE, PACKAGE_INFO_JAVA); @@ -82,7 +82,7 @@ @Test public void testBothNamedPackages() { - importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER); + importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3); editResourceUtil.renameFileInExplorerBase(packageExplorer, PACKAGE_INFO_JAVA_CDI, projectName + "/" + CDIConstants.SRC + "/" + CDI_SEAM_PACKAGE, PACKAGE_INFO_JAVA); Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/RequiresAnnotationTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/RequiresAnnotationTest.java 2012-06-13 08:38:19 UTC (rev 41921) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/RequiresAnnotationTest.java 2012-06-13 08:41:44 UTC (rev 41922) @@ -36,7 +36,7 @@ String manager = "Manager"; String projectName = "requires1"; - importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER); + importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3); setEd(packageExplorer.openFile(projectName, CDIConstants.SRC, getPackageName(), APPLICATION_CLASS).toTextEditor()); @@ -59,7 +59,7 @@ String manager = "Manager"; String projectName = "requires2"; - importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER); + importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3); setEd(packageExplorer.openFile(projectName, CDIConstants.SRC, getPackageName(), APPLICATION_CLASS).toTextEditor()); @@ -82,7 +82,7 @@ String manager = "Manager"; String projectName = "requires3"; - importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER); + importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3); setEd(packageExplorer.openFile(projectName, CDIConstants.SRC, getPackageName(), APPLICATION_CLASS).toTextEditor()); @@ -106,7 +106,7 @@ String manager = "Manager"; String projectName = "requires4"; - importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER); + importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3); setEd(packageExplorer.openFile(projectName, CDIConstants.SRC, getPackageName(), APPLICATION_CLASS).toTextEditor()); @@ -131,7 +131,7 @@ String projectName = "requires5"; String eventAttribute = "eventAttribute"; - importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER); + importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3); setEd(packageExplorer.openFile(projectName, CDIConstants.SRC, getPackageName(), APPLICATION_CLASS).toTextEditor()); Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/ResourceOpenOnTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/ResourceOpenOnTest.java 2012-06-13 08:38:19 UTC (rev 41921) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/ResourceOpenOnTest.java 2012-06-13 08:41:44 UTC (rev 41922) @@ -30,7 +30,7 @@ @BeforeClass public static void setup() { - importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER); + importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3); } /** Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/VetoAnnotationTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/VetoAnnotationTest.java 2012-06-13 08:38:19 UTC (rev 41921) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/VetoAnnotationTest.java 2012-06-13 08:41:44 UTC (rev 41922) @@ -36,7 +36,7 @@ String otherBean = "OtherBean"; String projectName = "veto1"; - importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER); + importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3); setEd(packageExplorer.openFile(projectName, CDIConstants.SRC, getPackageName(), APPLICATION_CLASS).toTextEditor()); @@ -59,7 +59,7 @@ String otherBean = "OtherBean"; String projectName = "veto2"; - importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER); + importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3); setEd(packageExplorer.openFile(projectName, CDIConstants.SRC, getPackageName(), APPLICATION_CLASS).toTextEditor()); @@ -81,7 +81,7 @@ String vetoBean = "Bean"; String projectName = "veto3"; - importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER); + importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3); setEd(packageExplorer.openFile(projectName, CDIConstants.SRC, getPackageName(), APPLICATION_CLASS).toTextEditor()); @@ -103,7 +103,7 @@ String vetoBean = "Bean"; String projectName = "veto4"; - importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER); + importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3); setEd(packageExplorer.openFile(projectName, CDIConstants.SRC, getPackageName(), APPLICATION_CLASS).toTextEditor()); @@ -126,7 +126,7 @@ String projectName = "veto5"; String eventAttribute = "eventAttribute"; - importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER); + importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3); setEd(packageExplorer.openFile(projectName, CDIConstants.SRC, getPackageName(), APPLICATION_CLASS).toTextEditor()); Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/util/LibraryHelper.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/util/LibraryHelper.java 2012-06-13 08:38:19 UTC (rev 41921) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/util/LibraryHelper.java 2012-06-13 08:41:44 UTC (rev 41922) @@ -18,9 +18,7 @@ import java.nio.channels.FileChannel; import org.eclipse.core.runtime.Platform; -import org.eclipse.swtbot.swt.finder.SWTBot; import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; import org.jboss.tools.cdi.bot.test.CDIConstants; import org.jboss.tools.cdi.seam3.bot.test.Activator; @@ -83,7 +81,7 @@ * @param libraryName * @throws IOException */ - public void addLibraryIntoProject(String projectName, String libraryName) throws IOException { + public void addLibraryIntoProjectFolder(String projectName, String libraryName) throws IOException { File in = null; FileChannel inChannel = null; FileChannel outChannel = null; @@ -103,35 +101,4 @@ if (outChannel != null) outChannel.close(); } - /** - * Method checks if library named "libraryName" is set on classpath - * of project named "projectName" - * @param projectName - * @param libraryName - * @return boolean - represents fact if library is/isn't set on project classpath - */ - public boolean isLibraryInProjectClassPath(String projectName, String libraryName) { - SWTBotTree tree = projectExplorer.bot().tree(); - - ContextMenuHelper.prepareTreeItemForContextMenu(tree); - new SWTBotMenu(ContextMenuHelper.getContextMenu(tree, CDIConstants.PROPERTIES, false)).click(); - - SWTBotShell shell = bot.shell("Properties for " + projectName); - SWTBot bot = shell.bot(); - - bot.tree().expandNode(CDIConstants.JAVA_BUILD_PATH).select(); - - bot.tabItem(CDIConstants.LIBRARIES).activate(); - - boolean libraryInProject = false; - for (int i = 0; i < bot.tree(1).rowCount(); i++) { - if (bot.tree(1).getAllItems()[i].getText().contains(libraryName)) { - libraryInProject = true; - break; - } - } - bot.button(IDELabel.Button.CANCEL).click(); - return libraryInProject; - } - } Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/util/SeamLibrary.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/util/SeamLibrary.java 2012-06-13 08:38:19 UTC (rev 41921) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/util/SeamLibrary.java 2012-06-13 08:41:44 UTC (rev 41922) @@ -11,6 +11,9 @@ package org.jboss.tools.cdi.seam3.bot.test.util; +import java.util.ArrayList; +import java.util.Collection; + /** * * @author jjankovi @@ -18,14 +21,27 @@ */ public enum SeamLibrary { - SOLDER, INTERNATIONAL, UNKNOWN; + SOLDER_3, SOLDER_3_1, INTERNATIONAL, UNKNOWN; - public String getName() { + private Collection<String> libraries; + + public Collection<String> getLibrariesNames() { switch (this) { - case SOLDER: - return "seam-solder.jar"; + case SOLDER_3: + libraries = new ArrayList<String>(); + libraries.add("seam-solder.jar"); + return libraries; case INTERNATIONAL: - return "seam-international.jar"; + libraries = new ArrayList<String>(); + libraries.add("seam-international.jar"); + return libraries; + case SOLDER_3_1: + libraries = new ArrayList<String>(); + libraries.add("solder-api.jar"); + libraries.add("solder-impl.jar"); + libraries.add("solder-logging.jar"); + libraries.add("solder-tooling.jar"); + return libraries; case UNKNOWN: default: throw new AssertionError("Unknown libraries");

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r41921 - in trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources: projects and 7 other directories.

by jbosstools-commits＠lists.jboss.org

Author: jjankovi Date: 2012-06-13 04:38:19 -0400 (Wed, 13 Jun 2012) New Revision: 41921 Added: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/libraries/solder-api.jar trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/libraries/solder-impl.jar trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/libraries/solder-logging.jar trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/libraries/solder-tooling.jar trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/logger1/ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/logger1/.classpath trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/logger1/.project trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/logger1/.settings/ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/logger1/.settings/.jsdtscope trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/logger1/.settings/org.eclipse.jdt.core.prefs trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/logger1/.settings/org.eclipse.wst.common.component trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/logger1/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/logger1/.settings/org.eclipse.wst.jsdt.ui.superType.container trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/logger1/.settings/org.eclipse.wst.jsdt.ui.superType.name trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/logger1/WebContent/ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/logger1/WebContent/META-INF/ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/logger1/WebContent/META-INF/MANIFEST.MF trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/logger1/WebContent/WEB-INF/ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/logger1/WebContent/WEB-INF/lib/ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/logger1/build/ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/logger1/src/ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/logger1/src/test/ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/logger1/src/test/TestBean.java Log: new test project for seam3 bot test Added: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/libraries/solder-api.jar =================================================================== (Binary files differ) Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/libraries/solder-api.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/libraries/solder-impl.jar =================================================================== (Binary files differ) Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/libraries/solder-impl.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/libraries/solder-logging.jar =================================================================== (Binary files differ) Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/libraries/solder-logging.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/libraries/solder-tooling.jar =================================================================== (Binary files differ) Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/libraries/solder-tooling.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/logger1/.classpath =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/logger1/.classpath (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/logger1/.classpath 2012-06-13 08:38:19 UTC (rev 41921) @@ -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/JBoss 7.1.0 Runtime "> + <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.seam3.bot.test/resources/projects/logger1/.project =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/logger1/.project (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/logger1/.project 2012-06-13 08:38:19 UTC (rev 41921) @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>logger1</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.seam3.bot.test/resources/projects/logger1/.settings/.jsdtscope =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/logger1/.settings/.jsdtscope (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/logger1/.settings/.jsdtscope 2012-06-13 08:38:19 UTC (rev 41921) @@ -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.seam3.bot.test/resources/projects/logger1/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/logger1/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/logger1/.settings/org.eclipse.jdt.core.prefs 2012-06-13 08:38:19 UTC (rev 41921) @@ -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.seam3.bot.test/resources/projects/logger1/.settings/org.eclipse.wst.common.component =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/logger1/.settings/org.eclipse.wst.common.component (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/logger1/.settings/org.eclipse.wst.common.component 2012-06-13 08:38:19 UTC (rev 41921) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0"> + <wb-module deploy-name="logger1"> + <wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/> + <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/> + <property name="context-root" value="logger1"/> + <property name="java-output-path" value="/logger1/build/classes"/> + </wb-module> +</project-modules> Added: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/logger1/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/logger1/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/logger1/.settings/org.eclipse.wst.common.project.facet.core.xml 2012-06-13 08:38:19 UTC (rev 41921) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faceted-project> + <runtime name="JBoss 7.1.0 Runtime "/> + <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.seam3.bot.test/resources/projects/logger1/.settings/org.eclipse.wst.jsdt.ui.superType.container =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/logger1/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/logger1/.settings/org.eclipse.wst.jsdt.ui.superType.container 2012-06-13 08:38:19 UTC (rev 41921) @@ -0,0 +1 @@ +org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file Added: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/logger1/.settings/org.eclipse.wst.jsdt.ui.superType.name =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/logger1/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/logger1/.settings/org.eclipse.wst.jsdt.ui.superType.name 2012-06-13 08:38:19 UTC (rev 41921) @@ -0,0 +1 @@ +Window \ No newline at end of file Added: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/logger1/WebContent/META-INF/MANIFEST.MF =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/logger1/WebContent/META-INF/MANIFEST.MF (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/logger1/WebContent/META-INF/MANIFEST.MF 2012-06-13 08:38:19 UTC (rev 41921) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Added: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/logger1/src/test/TestBean.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/logger1/src/test/TestBean.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/logger1/src/test/TestBean.java 2012-06-13 08:38:19 UTC (rev 41921) @@ -0,0 +1,11 @@ +package test; + +import javax.inject.Inject; + +import org.jboss.solder.logging.Logger; + +public class TestBean { + + @Inject Logger log; + +}

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r41920 - in trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test: quickfix/base and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: jjankovi Date: 2012-06-13 04:17:19 -0400 (Wed, 13 Jun 2012) New Revision: 41920 Removed: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/QuickFixTestBase.java Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/beansxml/BeansXMLValidationTest.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/BeansXMLQuickFixTestBase.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/EligibleInjectionQuickFixTestBase.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/BeanValidationQuickFixTest.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/DecoratorValidationQuickFixTest.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/IBindingValidationQuickFixTest.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/InterceptorValidationQuickFixTest.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/QualifierValidationQuickFixTest.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/ScopeValidationQuickFixTest.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/StereotypeValidationQuickFixTest.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/QuickFixHelper.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/OpenOnOptionsDialog.java Log: quick fix bot test for cdi refactored Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/beansxml/BeansXMLValidationTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/beansxml/BeansXMLValidationTest.java 2012-06-13 06:45:57 UTC (rev 41919) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/beansxml/BeansXMLValidationTest.java 2012-06-13 08:17:19 UTC (rev 41920) @@ -67,11 +67,13 @@ beansHelper.createBeansXMLWithInterceptor(getProjectName(), nonExistingPackage, className); assertFalse(isBeanXMLValidationErrorEmpty()); - assertNotNull(getProblem(ValidationType.NO_CLASS)); + assertNotNull(quickFixHelper.getProblem(ValidationType.NO_CLASS, + getProjectName(), getValidationProvider())); beansHelper.createBeansXMLWithInterceptor(getProjectName(), getPackageName(), someBean); assertFalse(isBeanXMLValidationErrorEmpty()); - assertNotNull(getProblem(ValidationType.NO_INTERCEPTOR)); + assertNotNull(quickFixHelper.getProblem(ValidationType.NO_INTERCEPTOR, + getProjectName(), getValidationProvider())); } @@ -93,11 +95,13 @@ beansHelper.createBeansXMLWithDecorator(getProjectName(), nonExistingPackage, className); assertFalse(isBeanXMLValidationErrorEmpty()); - assertNotNull(getProblem(ValidationType.NO_CLASS)); + assertNotNull(quickFixHelper.getProblem(ValidationType.NO_CLASS, + getProjectName(), getValidationProvider())); beansHelper.createBeansXMLWithDecorator(getProjectName(), getPackageName(), someBean); assertFalse(isBeanXMLValidationErrorEmpty()); - assertNotNull(getProblem(ValidationType.NO_DECORATOR)); + assertNotNull(quickFixHelper.getProblem(ValidationType.NO_DECORATOR, + getProjectName(), getValidationProvider())); } @Test @@ -118,11 +122,13 @@ beansHelper.createBeansXMLWithAlternative(getProjectName(), nonExistingPackage, className); assertFalse(isBeanXMLValidationErrorEmpty()); - assertNotNull(getProblem(ValidationType.NO_CLASS)); + assertNotNull(quickFixHelper.getProblem(ValidationType.NO_CLASS, + getProjectName(), getValidationProvider())); beansHelper.createBeansXMLWithAlternative(getProjectName(), getPackageName(), someBean); assertFalse(isBeanXMLValidationErrorEmpty()); - assertNotNull(getProblem(ValidationType.NO_ALTERNATIVE)); + assertNotNull(quickFixHelper.getProblem(ValidationType.NO_ALTERNATIVE, + getProjectName(), getValidationProvider())); } Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/BeansXMLQuickFixTestBase.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/BeansXMLQuickFixTestBase.java 2012-06-13 06:45:57 UTC (rev 41919) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/BeansXMLQuickFixTestBase.java 2012-06-13 08:17:19 UTC (rev 41920) @@ -12,6 +12,7 @@ package org.jboss.tools.cdi.bot.test.quickfix.base; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; +import org.jboss.tools.cdi.bot.test.CDITestBase; import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType; import org.jboss.tools.cdi.bot.test.annotations.ValidationType; import org.jboss.tools.cdi.bot.test.quickfix.validators.BeansXmlValidationProvider; @@ -20,32 +21,15 @@ import org.jboss.tools.cdi.bot.test.uiutils.wizards.QuickFixDialogWizard; import org.jboss.tools.ui.bot.ext.view.ProblemsView; -public class BeansXMLQuickFixTestBase extends QuickFixTestBase { +public class BeansXMLQuickFixTestBase extends CDITestBase { - private static IValidationProvider validationProvider = new BeansXmlValidationProvider(); + private IValidationProvider validationProvider = new BeansXmlValidationProvider(); - public IValidationProvider validationProvider() { + public IValidationProvider getValidationProvider() { return validationProvider; } /** - * Method firstly gets beans.xml validation problem. Then - * it opens quick fix wizard, selects default value and - * press finishWithWait button - */ - private void openBeanXMLValidationProblem(ValidationType validationProblemType) { - - SWTBotTreeItem validationProblem = getProblem(validationProblemType); - assertNotNull(validationProblem); - - quickFixHelper.openQuickFix(validationProblem); - QuickFixDialogWizard qfWizard = new QuickFixDialogWizard(); - qfWizard.setFix(qfWizard.getAvailableFixes().get(0)); - qfWizard.setResource(qfWizard.getResources().get(0)); - qfWizard.finishWithWait(); - } - - /** * Method checks if there is no beans.xml validation error * @return */ @@ -64,7 +48,7 @@ */ public void resolveAddNewAlternative(String name, String pkg) { - openBeanXMLValidationProblem(ValidationType.NO_CLASS); + openBeanXMLValidationProblem(ValidationType.NO_CLASS, getProjectName()); CDIWizardBase cdiWizardBase = new CDIWizardBase(CDIWizardType.BEAN); if (cdiWizardBase.isAlternative() && cdiWizardBase.canFinish()) { cdiWizardBase.setName(name).setPackage(pkg).finishWithWait(); @@ -84,7 +68,7 @@ */ public void resolveAddNewStereotype(String name, String pkg) { - openBeanXMLValidationProblem(ValidationType.NO_ANNOTATION); + openBeanXMLValidationProblem(ValidationType.NO_ANNOTATION, getProjectName()); CDIWizardBase cdiWizardBase = new CDIWizardBase(CDIWizardType.STEREOTYPE); if (cdiWizardBase.isAlternative() && cdiWizardBase.canFinish()) { cdiWizardBase.setName(name).setPackage(pkg).finishWithWait(); @@ -104,7 +88,7 @@ */ public void resolveAddNewDecorator(String name, String pkg) { - openBeanXMLValidationProblem(ValidationType.NO_CLASS); + openBeanXMLValidationProblem(ValidationType.NO_CLASS, getProjectName()); CDIWizardBase cdiWizardBase = new CDIWizardBase(CDIWizardType.DECORATOR); cdiWizardBase.addInterface("java.util.List"); if (cdiWizardBase.canFinish()) { @@ -125,7 +109,7 @@ */ public void resolveAddNewInterceptor(String name, String pkg) { - openBeanXMLValidationProblem(ValidationType.NO_CLASS); + openBeanXMLValidationProblem(ValidationType.NO_CLASS, getProjectName()); CDIWizardBase cdiWizardBase = new CDIWizardBase(CDIWizardType.INTERCEPTOR); if (cdiWizardBase.canFinish()) { cdiWizardBase.setName(name).setPackage(pkg).finishWithWait(); @@ -143,7 +127,7 @@ */ public void resolveAddAlternativeToBean(String name) { - openBeanXMLValidationProblem(ValidationType.NO_ALTERNATIVE); + openBeanXMLValidationProblem(ValidationType.NO_ALTERNATIVE, getProjectName()); String content = bot.editorByTitle(name + ".java").toTextEditor().getText(); assertTrue(content.contains("@Alternative")); @@ -157,10 +141,28 @@ */ public void resolveAddAlternativeToStereotype(String name) { - openBeanXMLValidationProblem(ValidationType.NO_ALTERNATIVE_STEREOTYPE); + openBeanXMLValidationProblem(ValidationType.NO_ALTERNATIVE_STEREOTYPE, getProjectName()); String content = bot.editorByTitle(name + ".java").toTextEditor().getText(); assertTrue(content.contains("@Alternative")); } + /** + * Method firstly gets beans.xml validation problem. Then + * it opens quick fix wizard, selects default value and + * press finishWithWait button + */ + private void openBeanXMLValidationProblem(ValidationType validationProblemType, String projectName) { + + SWTBotTreeItem validationProblem = quickFixHelper.getProblem(validationProblemType, + projectName, validationProvider); + assertNotNull(validationProblem); + + quickFixHelper.openQuickFix(validationProblem); + QuickFixDialogWizard qfWizard = new QuickFixDialogWizard(); + qfWizard.setFix(qfWizard.getAvailableFixes().get(0)); + qfWizard.setResource(qfWizard.getResources().get(0)); + qfWizard.finishWithWait(); + } + } Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/EligibleInjectionQuickFixTestBase.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/EligibleInjectionQuickFixTestBase.java 2012-06-13 06:45:57 UTC (rev 41919) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/EligibleInjectionQuickFixTestBase.java 2012-06-13 08:17:19 UTC (rev 41920) @@ -12,6 +12,7 @@ package org.jboss.tools.cdi.bot.test.quickfix.base; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; +import org.jboss.tools.cdi.bot.test.CDITestBase; import org.jboss.tools.cdi.bot.test.annotations.ValidationType; import org.jboss.tools.cdi.bot.test.quickfix.injection.QualifierOperation; import org.jboss.tools.cdi.bot.test.quickfix.validators.BeanValidationProvider; @@ -20,7 +21,7 @@ import org.jboss.tools.cdi.bot.test.uiutils.wizards.SpecifyBeanDialogWizard; import org.jboss.tools.ui.bot.ext.Timing; -public class EligibleInjectionQuickFixTestBase extends QuickFixTestBase{ +public class EligibleInjectionQuickFixTestBase extends CDITestBase { private static IValidationProvider validationProvider = new BeanValidationProvider(); @@ -39,7 +40,8 @@ public void resolveMultipleBeans(ValidationType validationType, String classToQualify, String qualifier, QualifierOperation operation) { - SWTBotTreeItem validationProblem = getProblem(validationType); + SWTBotTreeItem validationProblem = quickFixHelper.getProblem( + validationType, getProjectName(), validationProvider()); assertNotNull(validationProblem); quickFixHelper.openQuickFix(validationProblem); Deleted: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/QuickFixTestBase.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/QuickFixTestBase.java 2012-06-13 06:45:57 UTC (rev 41919) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/QuickFixTestBase.java 2012-06-13 08:17:19 UTC (rev 41920) @@ -1,104 +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.quickfix.base; - - -import java.util.List; - -import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; -import org.jboss.tools.cdi.bot.test.CDITestBase; -import org.jboss.tools.cdi.bot.test.annotations.ProblemsType; -import org.jboss.tools.cdi.bot.test.annotations.ValidationType; -import org.jboss.tools.cdi.bot.test.quickfix.validators.IValidationProvider; -import org.jboss.tools.cdi.bot.test.uiutils.wizards.QuickFixDialogWizard; -import org.junit.BeforeClass; - -/** - * Test base for all QuickFix-like tests - * - * @author Jaroslav Jankovic - */ - -public abstract class QuickFixTestBase extends CDITestBase { - - @BeforeClass - public static void setup() { - problems.show(); - } - - protected abstract IValidationProvider validationProvider(); - - /** - * checkQuickFix is the most important method in this class. It - * gets validation error prior to component type and annotation type, - * then it resolve validation error through quick fix - * wizard and finally check if validation errors was fixed through - * this wizard - * @param validationType - * @param compType - */ - public void checkQuickFix(ValidationType validationType) { - SWTBotTreeItem validationProblem = getProblem(validationType); - assertNotNull(validationProblem); - resolveQuickFix(validationProblem); - validationProblem = getProblem(validationType); - assertNull(validationProblem); - } - - /** - * Methods gets the particular validation problem located in Problems View by - * using specific ValidationErrorsProvider - * @param validationType - * @param compType - * @return - */ - protected SWTBotTreeItem getProblem(ValidationType validationType) { - IValidationProvider validationErrorsProvider = validationProvider(); - List<String> validationProblems = null; - SWTBotTreeItem[] problemsInProblemsView = null; - if (validationErrorsProvider.getAllWarningsAnnotation().contains(validationType)) { - validationProblems = validationErrorsProvider.getAllWarningForAnnotationType(validationType); - problemsInProblemsView = quickFixHelper.getProblems(ProblemsType.WARNINGS, getProjectName()); - } else { - validationProblems = validationErrorsProvider.getAllErrorsForAnnotationType(validationType); - problemsInProblemsView = quickFixHelper.getProblems(ProblemsType.ERRORS, getProjectName()); - } - for (SWTBotTreeItem ti: problemsInProblemsView) { - for (String validationProblem: validationProblems) { - if (ti.getText().contains(validationProblem)) { - return ti; - } - } - } - return null; - } - - /** - * Method resolves particular validation problem (parameter ti). - * It simply open context menu for param "ti", open menu "Quick Fix" and - * chooses first option and confirms it (resolve it) - * @param ti - */ - private void resolveQuickFix(SWTBotTreeItem ti) { - quickFixHelper.openQuickFix(ti); - - QuickFixDialogWizard qfWizard = new QuickFixDialogWizard(); - - String firstFix = qfWizard.getAvailableFixes().get(0); - String firstResource = qfWizard.getResources().get(0); - - qfWizard.setFix(firstFix).setResource(firstResource).finish(); - - util.waitForNonIgnoredJobs(); - } - -} Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/BeanValidationQuickFixTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/BeanValidationQuickFixTest.java 2012-06-13 06:45:57 UTC (rev 41919) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/BeanValidationQuickFixTest.java 2012-06-13 08:17:19 UTC (rev 41920) @@ -12,9 +12,9 @@ package org.jboss.tools.cdi.bot.test.quickfix.test; +import org.jboss.tools.cdi.bot.test.CDITestBase; import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType; import org.jboss.tools.cdi.bot.test.annotations.ValidationType; -import org.jboss.tools.cdi.bot.test.quickfix.base.QuickFixTestBase; import org.jboss.tools.cdi.bot.test.quickfix.validators.BeanValidationProvider; import org.jboss.tools.cdi.bot.test.quickfix.validators.IValidationProvider; import org.junit.Test; @@ -25,7 +25,7 @@ * @author Jaroslav Jankovic */ -public class BeanValidationQuickFixTest extends QuickFixTestBase { +public class BeanValidationQuickFixTest extends CDITestBase { private static IValidationProvider validationProvider = new BeanValidationProvider(); @@ -48,7 +48,7 @@ getPackageName(), null, "/resources/quickfix/bean/SerializableBean.java.cdi"); editResourceUtil.replaceInEditor("BeanComponent", className); - checkQuickFix(ValidationType.SERIALIZABLE); + quickFixHelper.checkQuickFix(ValidationType.SERIALIZABLE, getProjectName(), validationProvider()); } @@ -62,9 +62,9 @@ getPackageName(), null, "/resources/quickfix/bean/ConstructorWithParam.java.cdi"); editResourceUtil.replaceInEditor("BeanComponent", className); - checkQuickFix(ValidationType.DISPOSES); + quickFixHelper.checkQuickFix(ValidationType.DISPOSES, getProjectName(), validationProvider()); - editResourceUtil.replaceClassContentByResource(QuickFixTestBase.class + editResourceUtil.replaceClassContentByResource(BeanValidationQuickFixTest.class .getResourceAsStream("/resources/quickfix/bean/ConstructorWithParam.java.cdi"), false); editResourceUtil.replaceInEditor("@Disposes", "@Observes"); @@ -72,7 +72,7 @@ "import javax.enterprise.event.Observes;"); editResourceUtil.replaceInEditor("BeanComponent", className); - checkQuickFix(ValidationType.OBSERVES); + quickFixHelper.checkQuickFix(ValidationType.OBSERVES, getProjectName(), validationProvider()); } // https://issues.jboss.org/browse/JBIDE-7665 @@ -86,9 +86,9 @@ editResourceUtil.replaceInEditor("BeanComponent", className); - checkQuickFix(ValidationType.DISPOSES); + quickFixHelper.checkQuickFix(ValidationType.DISPOSES, getProjectName(), validationProvider()); - editResourceUtil.replaceClassContentByResource(QuickFixTestBase.class + editResourceUtil.replaceClassContentByResource(BeanValidationQuickFixTest.class .getResourceAsStream("/resources/quickfix/bean/ProducerWithParam.java.cdi"), false); editResourceUtil.replaceInEditor("BeanComponent", className); @@ -96,7 +96,7 @@ editResourceUtil.replaceInEditor("import javax.enterprise.inject.Disposes;", "import javax.enterprise.event.Observes;"); - checkQuickFix(ValidationType.OBSERVES); + quickFixHelper.checkQuickFix(ValidationType.OBSERVES, getProjectName(), validationProvider()); } @@ -111,7 +111,7 @@ editResourceUtil.replaceInEditor("BeanComponent", className); - checkQuickFix(ValidationType.DISPOSES); + quickFixHelper.checkQuickFix(ValidationType.DISPOSES, getProjectName(), validationProvider()); } @@ -129,7 +129,7 @@ editResourceUtil.replaceInEditor("@Disposes", "@Observes"); editResourceUtil.replaceInEditor("BeanComponent", className); - checkQuickFix(ValidationType.OBSERVES); + quickFixHelper.checkQuickFix(ValidationType.OBSERVES, getProjectName(), validationProvider()); } @@ -144,7 +144,7 @@ editResourceUtil.replaceInEditor("BeanComponent", className); - checkQuickFix(ValidationType.PRODUCES); + quickFixHelper.checkQuickFix(ValidationType.PRODUCES, getProjectName(), validationProvider()); } @@ -159,7 +159,7 @@ editResourceUtil.replaceInEditor("BeanComponent", className); - checkQuickFix(ValidationType.OBSERVES); + quickFixHelper.checkQuickFix(ValidationType.OBSERVES, getProjectName(), validationProvider()); } Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/DecoratorValidationQuickFixTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/DecoratorValidationQuickFixTest.java 2012-06-13 06:45:57 UTC (rev 41919) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/DecoratorValidationQuickFixTest.java 2012-06-13 08:17:19 UTC (rev 41920) @@ -12,9 +12,9 @@ package org.jboss.tools.cdi.bot.test.quickfix.test; +import org.jboss.tools.cdi.bot.test.CDITestBase; import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType; import org.jboss.tools.cdi.bot.test.annotations.ValidationType; -import org.jboss.tools.cdi.bot.test.quickfix.base.QuickFixTestBase; import org.jboss.tools.cdi.bot.test.quickfix.validators.DecoratorValidationProvider; import org.jboss.tools.cdi.bot.test.quickfix.validators.IValidationProvider; import org.junit.Test; @@ -25,7 +25,7 @@ * @author Jaroslav Jankovic */ -public class DecoratorValidationQuickFixTest extends QuickFixTestBase { +public class DecoratorValidationQuickFixTest extends CDITestBase { private static IValidationProvider validationProvider = new DecoratorValidationProvider(); @@ -51,7 +51,7 @@ editResourceUtil.replaceInEditor("DecoratorComponent", className); - checkQuickFix(ValidationType.STATELESS); + quickFixHelper.checkQuickFix(ValidationType.STATELESS, getProjectName(), validationProvider()); } @@ -67,7 +67,7 @@ editResourceUtil.replaceInEditor("DecoratorComponent", className); - checkQuickFix(ValidationType.NAMED); + quickFixHelper.checkQuickFix(ValidationType.NAMED, getProjectName(), validationProvider()); } @@ -83,7 +83,7 @@ editResourceUtil.replaceInEditor("DecoratorComponent", className); - checkQuickFix(ValidationType.PRODUCES); + quickFixHelper.checkQuickFix(ValidationType.PRODUCES, getProjectName(), validationProvider()); } @@ -99,7 +99,7 @@ editResourceUtil.replaceInEditor("DecoratorComponent", className); - checkQuickFix(ValidationType.DISPOSES); + quickFixHelper.checkQuickFix(ValidationType.DISPOSES, getProjectName(), validationProvider()); } @@ -118,7 +118,7 @@ editResourceUtil.replaceInEditor("@Disposes", "@Observes"); editResourceUtil.replaceInEditor("DecoratorComponent", className); - checkQuickFix(ValidationType.OBSERVES); + quickFixHelper.checkQuickFix(ValidationType.OBSERVES, getProjectName(), validationProvider()); } @@ -134,7 +134,7 @@ editResourceUtil.replaceInEditor("DecoratorComponent", className); - checkQuickFix(ValidationType.SPECIALIZES); + quickFixHelper.checkQuickFix(ValidationType.SPECIALIZES, getProjectName(), validationProvider()); } Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/IBindingValidationQuickFixTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/IBindingValidationQuickFixTest.java 2012-06-13 06:45:57 UTC (rev 41919) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/IBindingValidationQuickFixTest.java 2012-06-13 08:17:19 UTC (rev 41920) @@ -12,9 +12,9 @@ package org.jboss.tools.cdi.bot.test.quickfix.test; +import org.jboss.tools.cdi.bot.test.CDITestBase; import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType; import org.jboss.tools.cdi.bot.test.annotations.ValidationType; -import org.jboss.tools.cdi.bot.test.quickfix.base.QuickFixTestBase; import org.jboss.tools.cdi.bot.test.quickfix.validators.IValidationProvider; import org.jboss.tools.cdi.bot.test.quickfix.validators.InterceptorBindingValidationProvider; import org.junit.Test; @@ -25,7 +25,7 @@ * @author Jaroslav Jankovic */ -public class IBindingValidationQuickFixTest extends QuickFixTestBase { +public class IBindingValidationQuickFixTest extends CDITestBase { private static IValidationProvider validationProvider = new InterceptorBindingValidationProvider(); @@ -51,14 +51,14 @@ editResourceUtil.replaceInEditor("IBindingComponent", className); - checkQuickFix(ValidationType.NONBINDING); + quickFixHelper.checkQuickFix(ValidationType.NONBINDING, getProjectName(), validationProvider()); - editResourceUtil.replaceClassContentByResource(QuickFixTestBase.class + editResourceUtil.replaceClassContentByResource(IBindingValidationQuickFixTest.class .getResourceAsStream("/resources/quickfix/interceptorBinding/IBindingWithStringArray.java.cdi"), false); editResourceUtil.replaceInEditor("IBindingComponent", className); - checkQuickFix(ValidationType.NONBINDING); + quickFixHelper.checkQuickFix(ValidationType.NONBINDING, getProjectName(), validationProvider()); } } Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/InterceptorValidationQuickFixTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/InterceptorValidationQuickFixTest.java 2012-06-13 06:45:57 UTC (rev 41919) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/InterceptorValidationQuickFixTest.java 2012-06-13 08:17:19 UTC (rev 41920) @@ -12,9 +12,9 @@ package org.jboss.tools.cdi.bot.test.quickfix.test; +import org.jboss.tools.cdi.bot.test.CDITestBase; import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType; import org.jboss.tools.cdi.bot.test.annotations.ValidationType; -import org.jboss.tools.cdi.bot.test.quickfix.base.QuickFixTestBase; import org.jboss.tools.cdi.bot.test.quickfix.validators.IValidationProvider; import org.jboss.tools.cdi.bot.test.quickfix.validators.InterceptorValidationProvider; import org.junit.Test; @@ -25,7 +25,7 @@ * @author Jaroslav Jankovic */ -public class InterceptorValidationQuickFixTest extends QuickFixTestBase { +public class InterceptorValidationQuickFixTest extends CDITestBase { private static IValidationProvider validationProvider = new InterceptorValidationProvider(); @@ -50,7 +50,7 @@ editResourceUtil.replaceInEditor("InterceptorComponent", className); - checkQuickFix(ValidationType.STATELESS); + quickFixHelper.checkQuickFix(ValidationType.STATELESS, getProjectName(), validationProvider()); } @@ -66,7 +66,7 @@ editResourceUtil.replaceInEditor("InterceptorComponent", className); - checkQuickFix(ValidationType.NAMED); + quickFixHelper.checkQuickFix(ValidationType.NAMED, getProjectName(), validationProvider()); } @@ -82,7 +82,7 @@ editResourceUtil.replaceInEditor("InterceptorComponent", className); - checkQuickFix(ValidationType.PRODUCES); + quickFixHelper.checkQuickFix(ValidationType.PRODUCES, getProjectName(), validationProvider()); } @@ -98,7 +98,7 @@ editResourceUtil.replaceInEditor("InterceptorComponent", className); - checkQuickFix(ValidationType.DISPOSES); + quickFixHelper.checkQuickFix(ValidationType.DISPOSES, getProjectName(), validationProvider()); } @@ -117,7 +117,7 @@ editResourceUtil.replaceInEditor("@Disposes", "@Observes"); editResourceUtil.replaceInEditor("InterceptorComponent", className); - checkQuickFix(ValidationType.OBSERVES); + quickFixHelper.checkQuickFix(ValidationType.OBSERVES, getProjectName(), validationProvider()); } @@ -133,7 +133,7 @@ editResourceUtil.replaceInEditor("InterceptorComponent", className); - checkQuickFix(ValidationType.SPECIALIZES); + quickFixHelper.checkQuickFix(ValidationType.SPECIALIZES, getProjectName(), validationProvider()); } Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/QualifierValidationQuickFixTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/QualifierValidationQuickFixTest.java 2012-06-13 06:45:57 UTC (rev 41919) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/QualifierValidationQuickFixTest.java 2012-06-13 08:17:19 UTC (rev 41920) @@ -12,11 +12,11 @@ package org.jboss.tools.cdi.bot.test.quickfix.test; +import org.jboss.tools.cdi.bot.test.CDITestBase; import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType; import org.jboss.tools.cdi.bot.test.annotations.ValidationType; -import org.jboss.tools.cdi.bot.test.quickfix.base.QuickFixTestBase; +import org.jboss.tools.cdi.bot.test.quickfix.validators.IValidationProvider; import org.jboss.tools.cdi.bot.test.quickfix.validators.QualifierValidationProvider; -import org.jboss.tools.cdi.bot.test.quickfix.validators.IValidationProvider; import org.junit.Test; /** @@ -25,7 +25,7 @@ * @author Jaroslav Jankovic */ -public class QualifierValidationQuickFixTest extends QuickFixTestBase { +public class QualifierValidationQuickFixTest extends CDITestBase { private static IValidationProvider validationProvider = new QualifierValidationProvider(); @@ -49,11 +49,11 @@ editResourceUtil.replaceInEditor("@Target({ TYPE, METHOD, PARAMETER, FIELD })", "@Target({ TYPE, FIELD })"); - checkQuickFix(ValidationType.TARGET); + quickFixHelper.checkQuickFix(ValidationType.TARGET, getProjectName(), validationProvider()); editResourceUtil.replaceInEditor("@Target({TYPE, METHOD, FIELD, PARAMETER})", ""); - checkQuickFix(ValidationType.TARGET); + quickFixHelper.checkQuickFix(ValidationType.TARGET, getProjectName(), validationProvider()); } // https://issues.jboss.org/browse/JBIDE-7631 @@ -66,11 +66,11 @@ editResourceUtil.replaceInEditor("@Retention(RUNTIME)", "@Retention(CLASS)"); - checkQuickFix(ValidationType.RETENTION); + quickFixHelper.checkQuickFix(ValidationType.RETENTION, getProjectName(), validationProvider()); editResourceUtil.replaceInEditor("@Retention(RUNTIME)", ""); - checkQuickFix(ValidationType.RETENTION); + quickFixHelper.checkQuickFix(ValidationType.RETENTION, getProjectName(), validationProvider()); } @@ -87,12 +87,12 @@ editResourceUtil.replaceInEditor("QualifierComponent", className); - checkQuickFix(ValidationType.NONBINDING); + quickFixHelper.checkQuickFix(ValidationType.NONBINDING, getProjectName(), validationProvider()); - editResourceUtil.replaceClassContentByResource(QuickFixTestBase.class + editResourceUtil.replaceClassContentByResource(QualifierValidationQuickFixTest.class .getResourceAsStream("/resources/quickfix/qualifier/QualifierWithStringArray.java.cdi"), false); editResourceUtil.replaceInEditor("QualifierComponent", className); - checkQuickFix(ValidationType.NONBINDING); + quickFixHelper.checkQuickFix(ValidationType.NONBINDING, getProjectName(), validationProvider()); } } Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/ScopeValidationQuickFixTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/ScopeValidationQuickFixTest.java 2012-06-13 06:45:57 UTC (rev 41919) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/ScopeValidationQuickFixTest.java 2012-06-13 08:17:19 UTC (rev 41920) @@ -12,11 +12,11 @@ package org.jboss.tools.cdi.bot.test.quickfix.test; +import org.jboss.tools.cdi.bot.test.CDITestBase; import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType; import org.jboss.tools.cdi.bot.test.annotations.ValidationType; -import org.jboss.tools.cdi.bot.test.quickfix.base.QuickFixTestBase; +import org.jboss.tools.cdi.bot.test.quickfix.validators.IValidationProvider; import org.jboss.tools.cdi.bot.test.quickfix.validators.ScopeValidationProvider; -import org.jboss.tools.cdi.bot.test.quickfix.validators.IValidationProvider; import org.junit.Test; /** @@ -25,7 +25,7 @@ * @author Jaroslav Jankovic */ -public class ScopeValidationQuickFixTest extends QuickFixTestBase { +public class ScopeValidationQuickFixTest extends CDITestBase { private static IValidationProvider validationProvider = new ScopeValidationProvider(); @@ -49,11 +49,11 @@ editResourceUtil.replaceInEditor("@Target({ TYPE, METHOD, FIELD })", "@Target({ TYPE, FIELD })"); - checkQuickFix(ValidationType.TARGET); + quickFixHelper.checkQuickFix(ValidationType.TARGET, getProjectName(), validationProvider()); editResourceUtil.replaceInEditor("@Target({TYPE, METHOD, FIELD})", ""); - checkQuickFix(ValidationType.TARGET); + quickFixHelper.checkQuickFix(ValidationType.TARGET, getProjectName(), validationProvider()); } // https://issues.jboss.org/browse/JBIDE-7631 @@ -66,11 +66,11 @@ editResourceUtil.replaceInEditor("@Retention(RUNTIME)", "@Retention(CLASS)"); - checkQuickFix(ValidationType.RETENTION); + quickFixHelper.checkQuickFix(ValidationType.RETENTION, getProjectName(), validationProvider()); editResourceUtil.replaceInEditor("@Retention(RUNTIME)", ""); - checkQuickFix(ValidationType.RETENTION); + quickFixHelper.checkQuickFix(ValidationType.RETENTION, getProjectName(), validationProvider()); } Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/StereotypeValidationQuickFixTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/StereotypeValidationQuickFixTest.java 2012-06-13 06:45:57 UTC (rev 41919) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/StereotypeValidationQuickFixTest.java 2012-06-13 08:17:19 UTC (rev 41920) @@ -12,11 +12,11 @@ package org.jboss.tools.cdi.bot.test.quickfix.test; +import org.jboss.tools.cdi.bot.test.CDITestBase; import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType; import org.jboss.tools.cdi.bot.test.annotations.ValidationType; -import org.jboss.tools.cdi.bot.test.quickfix.base.QuickFixTestBase; +import org.jboss.tools.cdi.bot.test.quickfix.validators.IValidationProvider; import org.jboss.tools.cdi.bot.test.quickfix.validators.StereotypeValidationProvider; -import org.jboss.tools.cdi.bot.test.quickfix.validators.IValidationProvider; import org.junit.Test; /** @@ -25,7 +25,7 @@ * @author Jaroslav Jankovic */ -public class StereotypeValidationQuickFixTest extends QuickFixTestBase { +public class StereotypeValidationQuickFixTest extends CDITestBase { private static IValidationProvider validationProvider = new StereotypeValidationProvider(); @@ -49,11 +49,11 @@ editResourceUtil.replaceInEditor("@Target({ TYPE, METHOD, FIELD })", "@Target({ TYPE, FIELD })"); - checkQuickFix(ValidationType.TARGET); + quickFixHelper.checkQuickFix(ValidationType.TARGET, getProjectName(), validationProvider()); editResourceUtil.replaceInEditor("@Target({TYPE, METHOD, FIELD})", ""); - checkQuickFix(ValidationType.TARGET); + quickFixHelper.checkQuickFix(ValidationType.TARGET, getProjectName(), validationProvider()); } // https://issues.jboss.org/browse/JBIDE-7631 @@ -66,11 +66,11 @@ editResourceUtil.replaceInEditor("@Retention(RUNTIME)", "@Retention(CLASS)"); - checkQuickFix(ValidationType.RETENTION); + quickFixHelper.checkQuickFix(ValidationType.RETENTION, getProjectName(), validationProvider()); editResourceUtil.replaceInEditor("@Retention(RUNTIME)", ""); - checkQuickFix(ValidationType.RETENTION); + quickFixHelper.checkQuickFix(ValidationType.RETENTION, getProjectName(), validationProvider()); } @@ -85,7 +85,7 @@ editResourceUtil.replaceInEditor("StereotypeComponent", className); - checkQuickFix(ValidationType.NAMED); + quickFixHelper.checkQuickFix(ValidationType.NAMED, getProjectName(), validationProvider()); } @@ -100,7 +100,7 @@ editResourceUtil.replaceInEditor("StereotypeComponent", className); - checkQuickFix(ValidationType.TYPED); + quickFixHelper.checkQuickFix(ValidationType.TYPED, getProjectName(), validationProvider()); } Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/QuickFixHelper.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/QuickFixHelper.java 2012-06-13 06:45:57 UTC (rev 41919) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/QuickFixHelper.java 2012-06-13 08:17:19 UTC (rev 41920) @@ -10,24 +10,105 @@ ******************************************************************************/ package org.jboss.tools.cdi.bot.test.uiutils; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; + +import java.util.List; + import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.jboss.tools.cdi.bot.test.CDIConstants; -import org.jboss.tools.cdi.bot.test.CDITestBase; import org.jboss.tools.cdi.bot.test.annotations.ProblemsType; +import org.jboss.tools.cdi.bot.test.annotations.ValidationType; +import org.jboss.tools.cdi.bot.test.quickfix.validators.IValidationProvider; import org.jboss.tools.cdi.bot.test.uiutils.wizards.OpenOnOptionsDialog; +import org.jboss.tools.cdi.bot.test.uiutils.wizards.QuickFixDialogWizard; +import org.jboss.tools.ui.bot.ext.SWTBotExt; +import org.jboss.tools.ui.bot.ext.SWTBotFactory; import org.jboss.tools.ui.bot.ext.SWTEclipseExt; import org.jboss.tools.ui.bot.ext.SWTJBTExt; +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.types.IDELabel; import org.jboss.tools.ui.bot.ext.types.ViewType; import org.jboss.tools.ui.bot.ext.view.ProblemsView; -public class QuickFixHelper extends CDITestBase { +public class QuickFixHelper { + private SWTUtilExt util = SWTBotFactory.getUtil(); + private SWTBotExt bot = SWTBotFactory.getBot(); + /** + * checkQuickFix is the most important method in this class. It + * gets validation error prior to component type and annotation type, + * then it resolve validation error through quick fix + * wizard and finally check if validation errors was fixed through + * this wizard + * @param validationType + * @param compType + */ + public void checkQuickFix(ValidationType validationType, String projectName, + IValidationProvider validationProvider) { + SWTBotTreeItem validationProblem = getProblem( + validationType, projectName, validationProvider); + assertNotNull(validationProblem); + resolveQuickFix(validationProblem); + validationProblem = getProblem( + validationType, projectName, validationProvider); + assertNull(validationProblem); + } + + /** + * Methods gets the particular validation problem located in Problems View by + * using specific ValidationErrorsProvider + * @param validationType + * @param compType + * @return + */ + public SWTBotTreeItem getProblem(ValidationType validationType, String projectName, + IValidationProvider validationProvider) { + IValidationProvider validationErrorsProvider = validationProvider; + List<String> validationProblems = null; + SWTBotTreeItem[] problemsInProblemsView = null; + if (validationErrorsProvider.getAllWarningsAnnotation().contains(validationType)) { + validationProblems = validationErrorsProvider.getAllWarningForAnnotationType(validationType); + problemsInProblemsView = getProblems(ProblemsType.WARNINGS, projectName); + } else { + validationProblems = validationErrorsProvider.getAllErrorsForAnnotationType(validationType); + problemsInProblemsView = getProblems(ProblemsType.ERRORS, projectName); + } + for (SWTBotTreeItem ti: problemsInProblemsView) { + for (String validationProblem: validationProblems) { + if (ti.getText().contains(validationProblem)) { + return ti; + } + } + } + return null; + } + + /** + * Method resolves particular validation problem (parameter ti). + * It simply open context menu for param "ti", open menu "Quick Fix" and + * chooses first option and confirms it (resolve it) + * @param ti + */ + private void resolveQuickFix(SWTBotTreeItem ti) { + openQuickFix(ti); + + QuickFixDialogWizard qfWizard = new QuickFixDialogWizard(); + + String firstFix = qfWizard.getAvailableFixes().get(0); + String firstResource = qfWizard.getResources().get(0); + + qfWizard.setFix(firstFix).setResource(firstResource).finish(); + + util.waitForNonIgnoredJobs(); + } + + /** * Method select openOnString and then open proposal dialog which * is returned as object * @param openOnString @@ -35,8 +116,8 @@ * @return */ public OpenOnOptionsDialog openOnDialog(String openOnString, String titleName) { - setEd(SWTJBTExt.selectTextInSourcePane(bot, titleName, - openOnString, 0, openOnString.length())); + SWTJBTExt.selectTextInSourcePane(bot, titleName, + openOnString, 0, openOnString.length()); bot.menu(IDELabel.Menu.EDIT).menu(IDELabel.Menu.QUICK_FIX).click(); bot.sleep(Timing.time1S()); Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/OpenOnOptionsDialog.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/OpenOnOptionsDialog.java 2012-06-13 06:45:57 UTC (rev 41919) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/OpenOnOptionsDialog.java 2012-06-13 08:17:19 UTC (rev 41920) @@ -46,13 +46,14 @@ } public String setProposalOption(SWTBotTableItem ti) { - String styledText = getProposalText(ti).getText(); + ti.select(); + String styledText = getProposalText().getText(); + ti.setFocus(); ti.pressShortcut(Keystrokes.LF); return styledText; } - public SWTBotStyledText getProposalText(SWTBotTableItem proposalItem) { - proposalItem.select(); + public SWTBotStyledText getProposalText() { return getShellWithOnlyStyledText().bot().styledText(); }

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r41919 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2012-06-13 02:45:57 -0400 (Wed, 13 Jun 2012) New Revision: 41919 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7RuntimeWizardFragment.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java Log: JBIDE-12162 to trunk Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7RuntimeWizardFragment.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7RuntimeWizardFragment.java 2012-06-13 06:45:29 UTC (rev 41918) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7RuntimeWizardFragment.java 2012-06-13 06:45:57 UTC (rev 41919) @@ -52,11 +52,6 @@ } @Override - protected void updateModels() { - updateJREs(); - } - - @Override protected void createWidgets(Composite main) { createExplanation(main); createNameComposite(main); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2012-06-13 06:45:29 UTC (rev 41918) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2012-06-13 06:45:57 UTC (rev 41919) @@ -131,6 +131,9 @@ } protected void updateModels() { + // clean state from last time this fragment was used + // (fragments apparently do not have new instances constructed. ugh) + homeDir = null; updateJREs(); }

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r41918 - branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2012-06-13 02:45:29 -0400 (Wed, 13 Jun 2012) New Revision: 41918 Modified: branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7RuntimeWizardFragment.java branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java Log: JBIDE-12162 to ga Modified: branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7RuntimeWizardFragment.java =================================================================== --- branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7RuntimeWizardFragment.java 2012-06-13 06:24:11 UTC (rev 41917) +++ branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7RuntimeWizardFragment.java 2012-06-13 06:45:29 UTC (rev 41918) @@ -52,11 +52,6 @@ } @Override - protected void updateModels() { - updateJREs(); - } - - @Override protected void createWidgets(Composite main) { createExplanation(main); createNameComposite(main); Modified: branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java =================================================================== --- branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2012-06-13 06:24:11 UTC (rev 41917) +++ branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2012-06-13 06:45:29 UTC (rev 41918) @@ -131,6 +131,9 @@ } protected void updateModels() { + // clean state from last time this fragment was used + // (fragments apparently do not have new instances constructed. ugh) + homeDir = null; updateJREs(); }

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r41917 - trunk/build/publish.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2012-06-13 02:24:11 -0400 (Wed, 13 Jun 2012) New Revision: 41917 Modified: trunk/build/publish/publish.sh Log: use default target folder; move result Modified: trunk/build/publish/publish.sh =================================================================== --- trunk/build/publish/publish.sh 2012-06-13 05:51:25 UTC (rev 41916) +++ trunk/build/publish/publish.sh 2012-06-13 06:24:11 UTC (rev 41917) @@ -272,7 +272,8 @@ pushd ${WORKSPACE}/sources/results >/dev/null export JAVA_HOME=$(find /qa/tools/opt -maxdepth 1 -mindepth 1 -type d -name "jdk1.6.0_*" | sort | tail -1) export M2_HOME=$(find /qa/tools/opt -maxdepth 1 -mindepth 1 -type d -name "apache-maven-3.0.*" | sort | tail -1) - ${M2_HOME}/bin/mvn -q -B install -DJOB_NAME=${JOB_NAME} -DBUILD_NUMBER=${BUILD_NUMBER} -DBUILD_ID=${BUILD_ID} -Dtarget.dir=${STAGINGDIR} + ${M2_HOME}/bin/mvn -q -B install -DJOB_NAME=${JOB_NAME} -DBUILD_NUMBER=${BUILD_NUMBER} -DBUILD_ID=${BUILD_ID} + mv target/index.html ${STAGINGDIR}/index.html; rm -fr target popd >/dev/null fi

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r41916 - trunk/build/publish.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2012-06-13 01:51:25 -0400 (Wed, 13 Jun 2012) New Revision: 41916 Modified: trunk/build/publish/publish.sh Log: ensure /all exists before writing to it; make maven quieter Modified: trunk/build/publish/publish.sh =================================================================== --- trunk/build/publish/publish.sh 2012-06-13 05:33:33 UTC (rev 41915) +++ trunk/build/publish/publish.sh 2012-06-13 05:51:25 UTC (rev 41916) @@ -272,7 +272,7 @@ pushd ${WORKSPACE}/sources/results >/dev/null export JAVA_HOME=$(find /qa/tools/opt -maxdepth 1 -mindepth 1 -type d -name "jdk1.6.0_*" | sort | tail -1) export M2_HOME=$(find /qa/tools/opt -maxdepth 1 -mindepth 1 -type d -name "apache-maven-3.0.*" | sort | tail -1) - ${M2_HOME}/bin/mvn install -DJOB_NAME=${JOB_NAME} -DBUILD_NUMBER=${BUILD_NUMBER} -DBUILD_ID=${BUILD_ID} -Dtarget.dir=${STAGINGDIR} + ${M2_HOME}/bin/mvn -q -B install -DJOB_NAME=${JOB_NAME} -DBUILD_NUMBER=${BUILD_NUMBER} -DBUILD_ID=${BUILD_ID} -Dtarget.dir=${STAGINGDIR} popd >/dev/null fi @@ -407,6 +407,7 @@ # /builds/staging.previous/${JOB_NAME}/all/repo/ # /builds/staging.previous/${JOB_NAME}.2/all/repo/ now=$(date +%s000) + mkdir -p ${STAGINGDIR}/all echo "<?xml version='1.0' encoding='UTF-8'?> <?compositeMetadataRepository version='1.0.0'?> <repository name='JBoss Tools Staging - ${JOB_NAME} Composite' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r41915 - trunk/build/publish.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2012-06-13 01:33:33 -0400 (Wed, 13 Jun 2012) New Revision: 41915 Modified: trunk/build/publish/publish.sh Log: export value for M2_HOME to make maven3 work Modified: trunk/build/publish/publish.sh =================================================================== --- trunk/build/publish/publish.sh 2012-06-13 05:08:08 UTC (rev 41914) +++ trunk/build/publish/publish.sh 2012-06-13 05:33:33 UTC (rev 41915) @@ -271,8 +271,8 @@ if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]] && [[ -d ${WORKSPACE}/sources/results ]]; then pushd ${WORKSPACE}/sources/results >/dev/null export JAVA_HOME=$(find /qa/tools/opt -maxdepth 1 -mindepth 1 -type d -name "jdk1.6.0_*" | sort | tail -1) - mvn=$(find /qa/tools/opt -maxdepth 1 -mindepth 1 -type d -name "apache-maven-3.0.*" | sort | tail -1)/bin/mvn - ${mvn} install -DJOB_NAME=${JOB_NAME} -DBUILD_NUMBER=${BUILD_NUMBER} -DBUILD_ID=${BUILD_ID} -Dtarget.dir=${STAGINGDIR} + export M2_HOME=$(find /qa/tools/opt -maxdepth 1 -mindepth 1 -type d -name "apache-maven-3.0.*" | sort | tail -1) + ${M2_HOME}/bin/mvn install -DJOB_NAME=${JOB_NAME} -DBUILD_NUMBER=${BUILD_NUMBER} -DBUILD_ID=${BUILD_ID} -Dtarget.dir=${STAGINGDIR} popd >/dev/null fi

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r41914 - in trunk/openshift/docs/reference/en-US: images and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: irooskov(a)redhat.com Date: 2012-06-13 01:08:08 -0400 (Wed, 13 Jun 2012) New Revision: 41914 Added: trunk/openshift/docs/reference/en-US/Import_existing_application.xml trunk/openshift/docs/reference/en-US/images/Import_Existing_Application/ trunk/openshift/docs/reference/en-US/images/Import_Existing_Application/import_existing_application_01.png trunk/openshift/docs/reference/en-US/images/Import_Existing_Application/import_existing_application_02.png trunk/openshift/docs/reference/en-US/images/Import_Existing_Application/import_existing_application_03.png trunk/openshift/docs/reference/en-US/images/Import_Existing_Application/import_existing_application_04.png Modified: trunk/openshift/docs/reference/en-US/Book_Info.xml trunk/openshift/docs/reference/en-US/OpenShift_Tools_Reference_Guide.xml Log: updated with new chapter Modified: trunk/openshift/docs/reference/en-US/Book_Info.xml =================================================================== --- trunk/openshift/docs/reference/en-US/Book_Info.xml 2012-06-13 04:53:46 UTC (rev 41913) +++ trunk/openshift/docs/reference/en-US/Book_Info.xml 2012-06-13 05:08:08 UTC (rev 41914) @@ -13,7 +13,7 @@ <edition>5.0.0</edition> - <pubsnumber>11</pubsnumber> + <pubsnumber>12</pubsnumber> <abstract> <para> Added: trunk/openshift/docs/reference/en-US/Import_existing_application.xml =================================================================== --- trunk/openshift/docs/reference/en-US/Import_existing_application.xml (rev 0) +++ trunk/openshift/docs/reference/en-US/Import_existing_application.xml 2012-06-13 05:08:08 UTC (rev 41914) @@ -0,0 +1,108 @@ +<?xml version='1.0' encoding='utf-8' ?> + +<chapter id="chap-OpenSift_Tools_Reference_Guide-Import_existing_application"> + <title>Import an existing application</title> + <para> + To import an existing OpenShift application to your workbench, from <guilabel>JBoss Central</guilabel> navigate to the <guilabel>Create Projects</guilabel> section and click on <guilabel>OpenShift Application</guilabel>. + </para> + <figure id="application_creation_01-import_existing_application"> + <title>Selecting the OpenShift Application wizard</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/Creating_an_OpenShift_Express_Application/application_creation_01.png" format="PNG" /> + </imageobject> + <textobject> + <phrase> + JBoss Central home screen. + </phrase> + </textobject> + </mediaobject> + </figure> + <para> + Enter your OpenShift credentials and click the <guibutton>Next</guibutton> button. + </para> + <figure id="application_creation_02-import_existing_application"> + <title>Input OpenShift credentials</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/Creating_an_OpenShift_Express_Application/application_creation_02.png" format="PNG" /> + </imageobject> + <textobject> + <phrase> + Sever connection screen where you will input your username and password for OpenShift or you can sign up for an account. + </phrase> + </textobject> + </mediaobject> + </figure> + <para> + On the <guilabel>Setup OpenShift Application</guilabel> screen click the checkbox beside <guilabel>Use existing application</guilabel> and click the <guibutton>Browse</guibutton> button. + </para> + <figure id="import_existing_application_01"> + <title>Setup OpenShift Application screen</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/Import_Existing_Application/import_existing_application_01.png" format="PNG" /> + </imageobject> + <textobject> + <phrase> + Selecting to use an existing application from the setup OpenShift application screen. + </phrase> + </textobject> + </mediaobject> + </figure> + <para> + A dialog will open where you will see all your OpenShift applications listed, for the current domain. + </para> + <figure id="import_existing_application_02"> + <title>Setup OpenShift Application screen</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/Import_Existing_Application/import_existing_application_02.png" format="PNG" /> + </imageobject> + <textobject> + <phrase> + Selecting to use an existing application from the setup OpenShift application screen. + </phrase> + </textobject> + </mediaobject> + </figure> + <para> + By selecting an application from the list and clicking the <guibutton>Details</guibutton> button you can see all relevant application information. Click the <guibutton>OK</guibutton> to return to the application selection screen. + </para> + <figure id="import_existing_application_03"> + <title>Setup OpenShift Application screen</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/Import_Existing_Application/import_existing_application_03.png" format="PNG" /> + </imageobject> + <textobject> + <phrase> + Selecting to use an existing application from the setup OpenShift application screen. + </phrase> + </textobject> + </mediaobject> + </figure> + <para> + Select the application to import and click the <guibutton>OK</guibutton> button. + </para> + <para> + You will be returned to the <guilabel>Setup OpenShift Application</guilabel> screen and the <guilabel>Use existing application</guilabel> field will be populated with the name of the application you selected. + </para> + <figure id="import_existing_application_04"> + <title>Setup OpenShift Application screen</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/Import_Existing_Application/import_existing_application_04.png" format="PNG" /> + </imageobject> + <textobject> + <phrase> + Selecting to use an existing application from the setup OpenShift application screen. + </phrase> + </textobject> + </mediaobject> + </figure> + <para> + To complete importing the application click the <guibutton>Next</guibutton> button and continue follow the instructions after the <guilabel>Setup OpenShift Application</guilabel> screen that are available in the <emphasis>Creating an OpenShift Express Application</emphasis> chapter: <xref linkend="application_creation_07" />. + </para> +</chapter> + Modified: trunk/openshift/docs/reference/en-US/OpenShift_Tools_Reference_Guide.xml =================================================================== --- trunk/openshift/docs/reference/en-US/OpenShift_Tools_Reference_Guide.xml 2012-06-13 04:53:46 UTC (rev 41913) +++ trunk/openshift/docs/reference/en-US/OpenShift_Tools_Reference_Guide.xml 2012-06-13 05:08:08 UTC (rev 41914) @@ -6,8 +6,9 @@ <xi:include href="Preface.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href="Introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href="Creating_an_OpenShift_Express_Application.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> + <xi:include href="Import_existing_application.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> + <xi:include href="Modifying_your_web_application_to_deploy_to_OpenShift_Express.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href="Port_forwarding.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - <xi:include href="Modifying_your_web_application_to_deploy_to_OpenShift_Express.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href="Debugging.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href="Deleting_applications_and_domains.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href="Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> Added: trunk/openshift/docs/reference/en-US/images/Import_Existing_Application/import_existing_application_01.png =================================================================== (Binary files differ) Property changes on: trunk/openshift/docs/reference/en-US/images/Import_Existing_Application/import_existing_application_01.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/openshift/docs/reference/en-US/images/Import_Existing_Application/import_existing_application_02.png =================================================================== (Binary files differ) Property changes on: trunk/openshift/docs/reference/en-US/images/Import_Existing_Application/import_existing_application_02.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/openshift/docs/reference/en-US/images/Import_Existing_Application/import_existing_application_03.png =================================================================== (Binary files differ) Property changes on: trunk/openshift/docs/reference/en-US/images/Import_Existing_Application/import_existing_application_03.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/openshift/docs/reference/en-US/images/Import_Existing_Application/import_existing_application_04.png =================================================================== (Binary files differ) Property changes on: trunk/openshift/docs/reference/en-US/images/Import_Existing_Application/import_existing_application_04.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r41913 - trunk/build/publish.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2012-06-13 00:53:46 -0400 (Wed, 13 Jun 2012) New Revision: 41913 Modified: trunk/build/publish/publish.sh Log: append /bin/mvn onto found path. duh. Modified: trunk/build/publish/publish.sh =================================================================== --- trunk/build/publish/publish.sh 2012-06-13 02:52:32 UTC (rev 41912) +++ trunk/build/publish/publish.sh 2012-06-13 04:53:46 UTC (rev 41913) @@ -271,7 +271,7 @@ if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]] && [[ -d ${WORKSPACE}/sources/results ]]; then pushd ${WORKSPACE}/sources/results >/dev/null export JAVA_HOME=$(find /qa/tools/opt -maxdepth 1 -mindepth 1 -type d -name "jdk1.6.0_*" | sort | tail -1) - mvn=$(find /qa/tools/opt -maxdepth 1 -mindepth 1 -type d -name "apache-maven-3.0.*" | sort | tail -1) + mvn=$(find /qa/tools/opt -maxdepth 1 -mindepth 1 -type d -name "apache-maven-3.0.*" | sort | tail -1)/bin/mvn ${mvn} install -DJOB_NAME=${JOB_NAME} -DBUILD_NUMBER=${BUILD_NUMBER} -DBUILD_ID=${BUILD_ID} -Dtarget.dir=${STAGINGDIR} popd >/dev/null fi

13 years, 10 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits June 2012