JBoss Tools SVN: r33715 - in trunk: cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2011-08-09 07:36:01 -0400 (Tue, 09 Aug 2011)
New Revision: 33715
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/.project
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/CdiATWizardTest.java
trunk/jst/tests/org.jboss.tools.jst.jsp.test/.project
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/jbt/SampleWSTest.java
Log:
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/.project
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/.project 2011-08-09 10:43:35 UTC (rev 33714)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/.project 2011-08-09 11:36:01 UTC (rev 33715)
@@ -20,9 +20,26 @@
<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.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.jboss.tools.jst.web.kb.kbnature</nature>
+ <nature>org.jboss.tools.cdi.core.cdinature</nature>
</natures>
</projectDescription>
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2011-08-09 10:43:35 UTC (rev 33714)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2011-08-09 11:36:01 UTC (rev 33715)
@@ -11,6 +11,7 @@
package org.jboss.tools.cdi.bot.test;
import org.jboss.tools.cdi.bot.test.editor.BeansEditorTest;
+import org.jboss.tools.cdi.bot.test.fix.QuickFixTest;
import org.jboss.tools.cdi.bot.test.wizard.CdiATWizardTest;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
import org.junit.runner.RunWith;
@@ -38,7 +39,9 @@
*/
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({
- CdiATWizardTest.class,
- BeansEditorTest.class})
+ //CdiATWizardTest.class,
+ //BeansEditorTest.class,
+ QuickFixTest.class
+ })
public class CDIAllBotTests {
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/CdiATWizardTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/CdiATWizardTest.java 2011-08-09 10:43:35 UTC (rev 33714)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/CdiATWizardTest.java 2011-08-09 11:36:01 UTC (rev 33715)
@@ -326,12 +326,12 @@
public void testBeansXml() {
CDIWizard w = new NewCDIFileWizard(CDIWizardType.BEANS_XML).run();
w.setSourceFolder(PROJECT_NAME + "/WebContent/WEB-INF");
- assertFalse(w.canFinish());
+ assertTrue(w.canFinish());
w.setSourceFolder(PROJECT_NAME + "/src/cdi");
assertTrue(w.canFinish());
w.finish();
w = new NewCDIFileWizard(CDIWizardType.BEANS_XML).run();
- assertFalse(w.canFinish());
+ assertTrue(w.canFinish());
w.cancel();
}
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/.project
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/.project 2011-08-09 10:43:35 UTC (rev 33714)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/.project 2011-08-09 11:36:01 UTC (rev 33715)
@@ -31,4 +31,11 @@
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
</natures>
+ <linkedResources>
+ <link>
+ <name>lib-org.jboss.tools.jst.web.kb_3.3.0.v20110807-2237-H432-M3</name>
+ <type>2</type>
+ <location>/home/jjankovi/Dokumenty/JBDS/JBDS_5.0.0.M3/studio/plugins/org.jboss.tools.jst.web.kb_3.3.0.v20110807-2237-H432-M3</location>
+ </link>
+ </linkedResources>
</projectDescription>
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/jbt/SampleWSTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/jbt/SampleWSTest.java 2011-08-09 10:43:35 UTC (rev 33714)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/jbt/SampleWSTest.java 2011-08-09 11:36:01 UTC (rev 33715)
@@ -23,10 +23,13 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
+import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
+import org.jboss.tools.ui.bot.ext.SWTEclipseExt;
import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires;
import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.entity.JavaProjectEntity;
import org.jboss.tools.ws.ui.bot.test.uiutils.actions.NewSampleWSWizardAction;
import org.jboss.tools.ws.ui.bot.test.uiutils.actions.TreeItemAction;
import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.SampleWSWizard;
@@ -64,7 +67,7 @@
protected String getWsName() {
return null;
}
-
+
@Test
public void testSampleSoapWS() {
IFile dd = getDD(getWsProjectName());
@@ -79,6 +82,7 @@
checkSOAPService(getWsProjectName(), "GreetService", "greeter", "Greeter", "Tester");
}
+
@Test
public void testSampleRestWS() {
if ("JBOSS_AS".equals(configuredState.getServer().type)) {
@@ -94,7 +98,33 @@
createSampleRESTWS(project, "RESTSample", "rest.sample", "Sample", "RESTApp");
checkRESTService(project, "RESTSample", "rest.sample", "Sample", "Hello World!", "RESTApp");
}
-
+
+
+
+ /*
+ * Adding Rest support through context menu is available from JBT 3.3.0 M2
+ */
+ @Test
+ public void testImportRestSupport() {
+ String projectName = "RestLessProject";
+ JavaProjectEntity javaProject = new JavaProjectEntity();
+ javaProject.setProjectName(projectName);
+ eclipse.createJavaProject(javaProject);
+
+ SWTBotTree tree = projectExplorer.bot().tree();
+ assertTrue("Project " + projectName + " was not created properly",
+ SWTEclipseExt.treeContainsItemWithLabel(tree, projectName));
+ SWTBotTreeItem ti = tree.expandNode(projectName);
+ new TreeItemAction(ti, "Configure","Add JAX-RS 1.1 support...").run();
+ bot.sleep(500);
+ util.waitForNonIgnoredJobs();
+ try {
+ ti.getNode("RESTful Web Services");
+ }catch (WidgetNotFoundException exc) {
+ fail("REST support was not configured properly");
+ }
+ }
+
private void createDD(String project) {
SWTBotTree tree = projectExplorer.bot().tree();
SWTBotTreeItem ti = tree.expandNode(project);
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r33714 - trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-08-09 06:43:35 -0400 (Tue, 09 Aug 2011)
New Revision: 33714
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7Manager.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBoss7ManagerService.java
Log:
[JBIDE-9345] moved #isRunning from JBoss7ManagerService to AS7Manager
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7Manager.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7Manager.java 2011-08-09 10:27:42 UTC (rev 33713)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7Manager.java 2011-08-09 10:43:35 UTC (rev 33714)
@@ -163,6 +163,14 @@
return toJBoss7ServerState(response);
}
+ public boolean isRunning() {
+ try {
+ return getServerState() == JBoss7ServerState.RUNNING;
+ } catch (Exception e) {
+ return false;
+ }
+ }
+
private JBoss7ServerState toJBoss7ServerState(ModelNode response) throws JBoss7ManangerException {
try {
return JBoss7ServerState.valueOfIgnoreCase(response.asString());
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBoss7ManagerService.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBoss7ManagerService.java 2011-08-09 10:27:42 UTC (rev 33713)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBoss7ManagerService.java 2011-08-09 10:43:35 UTC (rev 33714)
@@ -62,12 +62,8 @@
return manager.getServerState();
}
- public boolean isRunning(String host, int port) {
- try {
- return getServerState(host, port) == JBoss7ServerState.RUNNING;
- } catch (Exception e) {
- return false;
- }
+ public boolean isRunning(String host, int port) throws Exception {
+ return new AS7Manager(host, port).isRunning();
}
@Deprecated
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r33713 - in trunk/vpe/plugins/org.jboss.tools.vpe.docbook: templates and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2011-08-09 06:27:42 -0400 (Tue, 09 Aug 2011)
New Revision: 33713
Added:
trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/DocbookTextTemplate.java
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-docbook.xml
Log:
https://issues.jboss.org/browse/JBIDE-9457 : test failures in org.jboss.tools.vpe.docbook.test
- copied #text template into org.jboss.tools.vpe.docbook
Added: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/DocbookTextTemplate.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/DocbookTextTemplate.java (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/DocbookTextTemplate.java 2011-08-09 10:27:42 UTC (rev 33713)
@@ -0,0 +1,84 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2008 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
+package org.jboss.tools.vpe.docbook.template;
+
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.Region;
+import org.eclipse.swt.graphics.Point;
+import org.jboss.tools.vpe.editor.context.VpePageContext;
+import org.jboss.tools.vpe.editor.mapping.NodeData;
+import org.jboss.tools.vpe.editor.mapping.VpeElementData;
+import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate;
+import org.jboss.tools.vpe.editor.template.VpeCreationData;
+import org.jboss.tools.vpe.editor.util.TextUtil;
+import org.jboss.tools.vpe.editor.util.VisualDomUtil;
+import org.mozilla.interfaces.nsIDOMDocument;
+import org.mozilla.interfaces.nsIDOMElement;
+import org.mozilla.interfaces.nsIDOMNode;
+import org.w3c.dom.Node;
+
+/**
+ * This is an exact copy of {@link org.jboss.tools.vpe.html.template.HtmlTextTemplate}.
+ * Copied to not create dependencies on the {@code org.jboss.tools.vpe.html}.
+ *
+ * @author mareshkau
+ * @author Yahor Radtsevich (yradtsevich)
+ */
+public class DocbookTextTemplate extends VpeAbstractTemplate {
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.vpe.editor.template.VpeTemplate#create(org.jboss.tools.vpe.editor.context.VpePageContext, org.w3c.dom.Node, org.mozilla.interfaces.nsIDOMDocument)
+ */
+ public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
+ nsIDOMDocument visualDocument) {
+ String sourceText = sourceNode.getNodeValue();
+
+ if (sourceText.trim().length() <= 0) {
+ return new VpeCreationData(visualDocument.createTextNode("")); //$NON-NLS-1$
+ }
+ String visualText = TextUtil.visualText(sourceText);
+
+ nsIDOMNode visualNewTextNode = visualDocument
+ .createTextNode(visualText);
+ //Max Areshkau without this container, we can't select text element
+ nsIDOMElement element = VisualDomUtil.createBorderlessContainer(visualDocument);
+ element.appendChild(visualNewTextNode);
+
+ VpeElementData textElementData = new VpeElementData();
+ NodeData nodeData = new NodeData(sourceNode, visualNewTextNode);
+ textElementData.addNodeData(nodeData);
+ VpeCreationData result = new VpeCreationData(element);
+ result.setElementData(textElementData);
+
+ return result;
+ }
+
+// /* (non-Javadoc)
+// * @see org.jboss.tools.vpe.editor.template.VpeAbstractTemplate#getSourceRegionForOpenOn(org.w3c.dom.Node, org.mozilla.interfaces.nsIDOMNode)
+// */
+ @Override
+ public IRegion getSourceRegionForOpenOn(VpePageContext pageContext, Node sourceNode, nsIDOMNode domNode) {
+
+ Point selection = pageContext.getSourceBuilder().getSelectionRange();
+ //processing for el expressions
+ int offset = TextUtil.getStartELDocumentPosition(sourceNode);
+ IRegion resultRegion;
+ if(offset >= 0) {
+ resultRegion = new Region(offset,0);
+ } else {
+ resultRegion = new Region(selection.x,0);
+ }
+ return resultRegion;
+ }
+
+
+}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-docbook.xml
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-docbook.xml 2011-08-09 08:44:16 UTC (rev 33712)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-docbook.xml 2011-08-09 10:27:42 UTC (rev 33713)
@@ -2277,4 +2277,10 @@
<span id="{@id}"/>
</vpe:template>
</vpe:tag>
+
+ <vpe:tag name="#text" case-sensitive="no">
+ <vpe:template children="no" modify="yes"
+ class="org.jboss.tools.vpe.docbook.template.DocbookTextTemplate">
+ </vpe:template>
+ </vpe:tag>
</vpe:templates>
\ No newline at end of file
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r33712 - in trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test: META-INF and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: psrna
Date: 2011-08-09 04:44:16 -0400 (Tue, 09 Aug 2011)
New Revision: 33712
Modified:
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/.classpath
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/.project
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/META-INF/MANIFEST.MF
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/org.jboss.tools.bpel.ui.bot.test.properties
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/ActivityModelingTest.java
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/AssignActivityTest.java
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/OdeDeployTest.java
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/WizardTest.java
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/assertion/BPELValidator.java
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/suite/BPELTest.java
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/wizard/NewWizardTest.java
Log:
bpel bot test fixes
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/.classpath
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/.classpath 2011-08-09 01:50:39 UTC (rev 33711)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/.classpath 2011-08-09 08:44:16 UTC (rev 33712)
@@ -1,7 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="lib" path="/home/psrna/data/testing/bin/5.0.0.M2/studio/plugins/org.hamcrest.core_1.1.0.v20090501071000"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/.project
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/.project 2011-08-09 01:50:39 UTC (rev 33711)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/.project 2011-08-09 08:44:16 UTC (rev 33712)
@@ -31,4 +31,11 @@
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
</natures>
+ <linkedResources>
+ <link>
+ <name>lib-org.hamcrest.core_1.1.0.v20090501071000</name>
+ <type>2</type>
+ <location>/home/psrna/data/testing/bin/5.0.0.M2/studio/plugins/org.hamcrest.core_1.1.0.v20090501071000</location>
+ </link>
+ </linkedResources>
</projectDescription>
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/META-INF/MANIFEST.MF 2011-08-09 01:50:39 UTC (rev 33711)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/META-INF/MANIFEST.MF 2011-08-09 08:44:16 UTC (rev 33712)
@@ -12,8 +12,8 @@
org.junit,
org.eclipse.core.resources,
org.apache.log4j;bundle-version="1.2.15",
- org.eclipse.bpel.model;bundle-version="0.6.0",
- org.eclipse.gef;bundle-version="3.6.2",
+ org.eclipse.bpel.model;bundle-version="0.4.0",
+ org.eclipse.gef;bundle-version="3.6.1",
org.eclipse.wst.wsdl;bundle-version="1.2.103",
org.eclipse.emf.ecore;bundle-version="2.6.1",
org.jboss.tools.ui.bot.ext;bundle-version="3.2.0",
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/org.jboss.tools.bpel.ui.bot.test.properties
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/org.jboss.tools.bpel.ui.bot.test.properties 2011-08-09 01:50:39 UTC (rev 33711)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/org.jboss.tools.bpel.ui.bot.test.properties 2011-08-09 08:44:16 UTC (rev 33712)
@@ -5,7 +5,7 @@
#EAP|JBOSS_AS|EPP|SOA,<server version>,<jre version to run with>|default,<server home>
# note : when server is type of SOA, version is version of SOA (not the bundled EAP)
#SERVER=JBOSS_AS,5.0,1.6,/home/psrna/data/jboss/jboss/jboss-as
-SERVER=SOA,5.1,1.6,/home/psrna/data/jboss/soa-5.1.0/jboss-as
+SERVER=SOA,5.1,1.6,/home/psrna/data/jboss/soa-5.2/jboss-as
#<seam version>,<seam runtime home>
#SEAM=2.2,/home/psrna/data/jboss/soa-5.1.0.ER6-eds/seam
#<esb versoin>,<esb runtime home>
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/ActivityModelingTest.java
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/ActivityModelingTest.java 2011-08-09 01:50:39 UTC (rev 33711)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/ActivityModelingTest.java 2011-08-09 08:44:16 UTC (rev 33712)
@@ -21,7 +21,7 @@
import org.junit.Before;
import org.junit.Test;
-@SWTBotTestRequires(clearProjects = true, /*server = @Server(type = ServerType.SOA, state = ServerState.Present),*/ perspective="BPEL Perspective")
+@SWTBotTestRequires(clearProjects = true, /*server = @Server(type = ServerType.SOA, state = ServerState.Present),*/ perspective="BPEL")
public class ActivityModelingTest extends BPELTest {
static final String BUNDLE = "org.jboss.tools.bpel.ui.bot.test";
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/AssignActivityTest.java
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/AssignActivityTest.java 2011-08-09 01:50:39 UTC (rev 33711)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/AssignActivityTest.java 2011-08-09 08:44:16 UTC (rev 33712)
@@ -31,7 +31,7 @@
import org.junit.Before;
import org.junit.Test;
-@SWTBotTestRequires(clearProjects = true, server = @Server(type = ServerType.SOA, state = ServerState.Running), perspective="BPEL Perspective")
+@SWTBotTestRequires(clearProjects = true, server = @Server(type = ServerType.SOA, state = ServerState.Running), perspective="BPEL")
public class AssignActivityTest extends BPELTest {
static String BUNDLE = "org.jboss.tools.bpel.ui.bot.test";
@@ -155,13 +155,7 @@
Assert.assertFalse(console.getConsoleText().contains("[ASSIGN] Assignment Fault:"));
Assert.assertEquals("Fixed Expression", response);
*/
- log.info("############## START SLEEPING ################");
- bot.sleep(TIME_20S);
- bot.sleep(TIME_20S);
- bot.sleep(TIME_20S);
- bot.sleep(TIME_20S);
- bot.sleep(TIME_20S);
- bot.sleep(TIME_20S);
+
}
void openFile(String projectName, String... path) throws Exception {
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/OdeDeployTest.java
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/OdeDeployTest.java 2011-08-09 01:50:39 UTC (rev 33711)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/OdeDeployTest.java 2011-08-09 08:44:16 UTC (rev 33712)
@@ -26,7 +26,7 @@
* @author psrna
*
*/
-@SWTBotTestRequires(server = @Server(type = ServerType.SOA, state = ServerState.Running), perspective="BPEL Perspective")
+@SWTBotTestRequires(server = @Server(type = ServerType.SOA, state = ServerState.Running), perspective="BPEL")
public class OdeDeployTest extends BPELTest {
final static String BUNDLE = "org.jboss.tools.bpel.ui.bot.test";
@@ -59,6 +59,7 @@
bot.viewByTitle("Servers").setFocus();
SWTBotTree tree = bot.viewByTitle("Servers").bot().tree();
+ bot.sleep(TIME_5S);
SWTBotTreeItem server = tree.getTreeItem(serverName + " [Started, Synchronized]").select();
ContextMenuHelper.prepareTreeItemForContextMenu(tree, server);
@@ -117,10 +118,21 @@
@Test
public void deployProjectTest() throws Exception {
+ bot.sleep(TIME_20S);
+ bot.sleep(TIME_20S);
+ bot.sleep(TIME_20S);
+ bot.sleep(TIME_20S);
+ bot.sleep(TIME_20S);
+ bot.sleep(TIME_20S);
+ bot.sleep(TIME_20S);
+ bot.sleep(TIME_20S);
+ bot.sleep(TIME_20S);
+
+
String serverName = OdeDeployTest.configuredState.getServer().name;
// Publish the process
projExplorer.runOnServer("say_hello");
- bot.sleep(TIME_5S);
+
Assert.assertFalse(console.getConsoleText().contains("DEPLOYMENTS IN ERROR:"));
bot.viewByTitle("Servers").show();
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/WizardTest.java
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/WizardTest.java 2011-08-09 01:50:39 UTC (rev 33711)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/WizardTest.java 2011-08-09 08:44:16 UTC (rev 33712)
@@ -20,7 +20,7 @@
import org.junit.Assert;
import org.junit.Test;
-@SWTBotTestRequires(clearProjects = true, server = @Server(type = ServerType.SOA, state = ServerState.Present), perspective="BPEL Perspective")
+@SWTBotTestRequires(clearProjects = true, server = @Server(type = ServerType.SOA, state = ServerState.Present), perspective="BPEL")
public class WizardTest extends BPELTest {
@@ -120,6 +120,7 @@
SWTBotShell shell = bot.shell("Properties for " + projectName).activate();
bot.tree().select("Targeted Runtimes");
+ bot.checkBox("Show &all runtimes").select();
boolean hasRuntime = bot.table().containsItem(configuredState.getServer().name);
shell.close();
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/assertion/BPELValidator.java
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/assertion/BPELValidator.java 2011-08-09 01:50:39 UTC (rev 33711)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/assertion/BPELValidator.java 2011-08-09 08:44:16 UTC (rev 33712)
@@ -12,6 +12,7 @@
import org.eclipse.bpel.model.impl.ElseImpl;
import org.eclipse.bpel.model.impl.EmptyImpl;
import org.eclipse.bpel.model.impl.ExitImpl;
+import org.eclipse.wst.wsdl.internal.impl.ExtensibleElementImpl;
import org.eclipse.bpel.model.impl.FaultHandlerImpl;
import org.eclipse.bpel.model.impl.FlowImpl;
import org.eclipse.bpel.model.impl.ForEachImpl;
@@ -30,7 +31,6 @@
import org.eclipse.bpel.model.impl.ValidateImpl;
import org.eclipse.bpel.model.impl.WaitImpl;
import org.eclipse.bpel.model.impl.WhileImpl;
-import org.eclipse.wst.wsdl.internal.impl.ExtensibleElementImpl;
import org.junit.Assert;
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/suite/BPELTest.java
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/suite/BPELTest.java 2011-08-09 01:50:39 UTC (rev 33711)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/suite/BPELTest.java 2011-08-09 08:44:16 UTC (rev 33712)
@@ -55,7 +55,8 @@
bot.shell("New").activate();
SWTBotTree tree = bot.tree();
- tree.expandNode("BPEL 2.0").expandNode("New BPEL Process File").select();
+ tree.expandNode("BPEL 2.0").expandNode("BPEL Process File").select();
+ //tree.expandNode("BPEL 2.0").expandNode("New BPEL Process File").select();
assertTrue(bot.button("Next >").isEnabled());
bot.button("Next >").click();
@@ -108,7 +109,8 @@
bot.shell("New").activate();
SWTBotTree tree = bot.tree();
- tree.expandNode("BPEL 2.0").expandNode("Apache ODE Deployment Descriptor").select();
+ tree.expandNode("BPEL 2.0").expandNode("BPEL Deployment Descriptor").select();
+ //tree.expandNode("BPEL 2.0").expandNode("Apache ODE Deployment Descriptor").select();
assertTrue(bot.button("Next >").isEnabled());
bot.button("Next >").click();
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/wizard/NewWizardTest.java
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/wizard/NewWizardTest.java 2011-08-09 01:50:39 UTC (rev 33711)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/wizard/NewWizardTest.java 2011-08-09 08:44:16 UTC (rev 33712)
@@ -30,7 +30,8 @@
bot.menu("File").menu("New").menu("Other...").click();
bot.shell("New").activate();
SWTBotTree tree = bot.tree();
- tree.expandNode("BPEL 2.0").expandNode("New BPEL Process File").select();
+ tree.expandNode("BPEL 2.0").expandNode("BPEL Process File").select();
+ //tree.expandNode("BPEL 2.0").expandNode("New BPEL Process File").select();
assertTrue(bot.button("Next >").isEnabled());
bot.button("Next >").click();
@@ -60,7 +61,7 @@
tree.expandNode("BPEL 2.0").expandNode("BPEL Project").select();
assertTrue(bot.button("Next >").isEnabled());
bot.button("Next >").click();
- bot.shell("New BPEL Project").activate();
+ bot.shell("BPEL Project").activate();
assertFalse(bot.button("Finish").isEnabled());
bot.textWithLabel("Project name:").setText("A");
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r33711 - in trunk: cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-08-08 21:50:39 -0400 (Mon, 08 Aug 2011)
New Revision: 33711
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/Parameter.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/RemoveJarFromClasspathTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/BuilderOrderValidationTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DependentProjectValidationTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DisableCDISupportTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/ELValidationTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/IncrementalValidationTest.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/META-INF/MANIFEST.MF
trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test/TestUtil.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ContextValidationHelper.java
Log:
https://issues.jboss.org/browse/JBIDE-9394
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2011-08-09 00:34:11 UTC (rev 33710)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2011-08-09 01:50:39 UTC (rev 33711)
@@ -119,7 +119,7 @@
ICDIProject result = definition.getDeclaringProject().getDelegate();
if(result == null) {
result = getCDIProject();
- System.out.println("Failed to get declaring project.");
+// System.out.println("Failed to get declaring project.");
}
return result;
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/Parameter.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/Parameter.java 2011-08-09 00:34:11 UTC (rev 33710)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/Parameter.java 2011-08-09 01:50:39 UTC (rev 33711)
@@ -31,9 +31,6 @@
}
public void setDefinition(ParameterDefinition definition) {
- if(beanMethod.getMethod().getElementName().equals("obs")) {
- System.out.println("!!");
- }
super.setDefinition(definition);
this.definition = definition;
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/RemoveJarFromClasspathTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/RemoveJarFromClasspathTest.java 2011-08-09 00:34:11 UTC (rev 33710)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/RemoveJarFromClasspathTest.java 2011-08-09 01:50:39 UTC (rev 33711)
@@ -7,7 +7,6 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
@@ -19,7 +18,6 @@
import org.jboss.tools.common.model.filesystems.FileSystemsHelper;
import org.jboss.tools.common.model.filesystems.impl.Libs;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
-import org.jboss.tools.jst.jsp.test.TestUtil;
import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager;
import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ResourcesUtils;
@@ -37,9 +35,7 @@
public void setUp() throws Exception {
project = ResourcesUtils.importProject(PLUGIN_ID, "/projects/RemoveJarTest");
- JobUtils.waitForIdle();
- project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
- JobUtils.waitForIdle();
+ project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null);
}
/**
@@ -95,7 +91,6 @@
*/
public static void replaceFile(IProject project, String sourcePath, String targetPath) throws CoreException {
boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
- JobUtils.waitForIdle();
try {
IFile target = project.getFile(new Path(targetPath));
IFile source = project.getFile(new Path(sourcePath));
@@ -106,10 +101,7 @@
} else {
target.setContents(source.getContents(), true, false, new NullProgressMonitor());
}
- JobUtils.waitForIdle();
project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
- JobUtils.waitForIdle();
- TestUtil.waitForValidation();
} finally {
ResourcesUtils.setBuildAutomatically(saveAutoBuild);
JobUtils.waitForIdle();
@@ -118,9 +110,7 @@
public void tearDown() throws Exception {
boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
- JobUtils.waitForIdle();
project.delete(true, true, null);
- JobUtils.waitForIdle();
ResourcesUtils.setBuildAutomatically(saveAutoBuild);
JobUtils.waitForIdle();
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/BuilderOrderValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/BuilderOrderValidationTest.java 2011-08-09 00:34:11 UTC (rev 33710)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/BuilderOrderValidationTest.java 2011-08-09 01:50:39 UTC (rev 33711)
@@ -16,10 +16,8 @@
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.ui.IMarkerResolution;
import org.eclipse.ui.ide.IDE;
import org.jboss.tools.cdi.core.preferences.CDIPreferences;
@@ -27,7 +25,6 @@
import org.jboss.tools.jst.jsp.test.TestUtil;
import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager;
import org.jboss.tools.jst.web.kb.preferences.ELSeverityPreferences;
-import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ResourcesUtils;
public class BuilderOrderValidationTest extends TestCase {
@@ -39,7 +36,7 @@
project = ResourcesPlugin.getWorkspace().getRoot().getProject("CDITestBrokenBuilderOrder");
assertNotNull("Can't load CDITestBrokenBuilderOrder", project); //$NON-NLS-1$
saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
- rebuild();
+ TestUtil._waitForValidation(project);
}
public void tearDown() throws CoreException {
@@ -47,29 +44,23 @@
}
private void checkResolution(IProject project, String markerType, String resolutionClassName) throws CoreException {
- try{
- IMarker[] markers = getBuilderOrderMarkers();
- assertTrue(markers.length > 0);
- for (int i = 0; i < markers.length; i++) {
- IMarker marker = markers[i];
- IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry().getResolutions(marker);
- for (int j = 0; j < resolutions.length; j++) {
- IMarkerResolution resolution = resolutions[j];
- if (resolution.getClass().getName().equals(resolutionClassName)) {
- ValidatorManager.setStatus(ValidatorManager.RUNNING);
- resolution.run(marker);
- JobUtils.waitForIdle();
- TestUtil.waitForValidation();
- IMarker[] newMarkers = project.findMarkers(markerType, true, IResource.DEPTH_INFINITE);
- assertTrue("Marker resolution did not decrease number of problems. was: "+markers.length+" now: "+newMarkers.length, newMarkers.length < markers.length);
- return;
- }
- fail("Marker resolution: "+resolutionClassName+" not found");
+ IMarker[] markers = getBuilderOrderMarkers();
+ assertTrue(markers.length > 0);
+ for (int i = 0; i < markers.length; i++) {
+ IMarker marker = markers[i];
+ IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry().getResolutions(marker);
+ for (int j = 0; j < resolutions.length; j++) {
+ IMarkerResolution resolution = resolutions[j];
+ if (resolution.getClass().getName().equals(resolutionClassName)) {
+ ValidatorManager.setStatus(ValidatorManager.RUNNING);
+ resolution.run(marker);
+ TestUtil._waitForValidation(project);
+ IMarker[] newMarkers = project.findMarkers(markerType, true, IResource.DEPTH_INFINITE);
+ assertTrue("Marker resolution did not decrease number of problems. was: "+markers.length+" now: "+newMarkers.length, newMarkers.length < markers.length);
+ return;
}
+ fail("Marker resolution: "+resolutionClassName+" not found");
}
- } finally {
- JobUtils.waitForIdle();
-// TestUtil.waitForValidation(project);
}
}
@@ -102,17 +93,9 @@
ps.put(ELSeverityPreferences.WRONG_BUILDER_ORDER_PREFERENCE_NAME, value);
ps = (EclipsePreferences)ELSeverityPreferences.getInstance().getProjectPreferences(project);
ps.put(ELSeverityPreferences.WRONG_BUILDER_ORDER_PREFERENCE_NAME, value);
- rebuild();
+ TestUtil._waitForValidation(project);
}
- void rebuild() throws CoreException {
- ValidatorManager.setStatus(ValidatorManager.RUNNING);
- project.build(IncrementalProjectBuilder.CLEAN_BUILD, new NullProgressMonitor());
- JobUtils.waitForIdle();
- project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
- TestUtil.waitForValidation();
- }
-
public void testBuilderOrderResolution() throws CoreException {
checkResolution(project,
ValidatorManager.ORDER_PROBLEM_MARKER_TYPE,
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DependentProjectValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DependentProjectValidationTest.java 2011-08-09 00:34:11 UTC (rev 33710)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DependentProjectValidationTest.java 2011-08-09 01:50:39 UTC (rev 33711)
@@ -15,12 +15,11 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.jboss.tools.cdi.internal.core.validation.CDIValidationMessages;
+import org.jboss.tools.jst.jsp.test.TestUtil;
import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ResourcesUtils;
import org.jboss.tools.tests.AbstractResourceMarkerTest;
@@ -40,24 +39,15 @@
public void setUp() throws Exception {
project1 = ResourcesUtils.importProject(PLUGIN_ID, "/projects/CDITest1");
- project1.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
- JobUtils.waitForIdle();
-
+ TestUtil._waitForValidation(project1);
project2 = ResourcesUtils.importProject(PLUGIN_ID, "/projects/CDITest2");
- project2.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
- JobUtils.waitForIdle();
-
+ TestUtil._waitForValidation(project2);
project3 = ResourcesUtils.importProject(PLUGIN_ID, "/projects/CDITest3");
- project3.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
- JobUtils.waitForIdle();
-
+ TestUtil._waitForValidation(project3);
project4 = ResourcesUtils.importProject(PLUGIN_ID, "/projects/CDITest4");
- project4.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
- JobUtils.waitForIdle();
-
+ TestUtil._waitForValidation(project4);
project5 = ResourcesUtils.importProject(PLUGIN_ID, "/projects/CDITest5");
- project5.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
- JobUtils.waitForIdle();
+ TestUtil._waitForValidation(project5);
}
/**
@@ -65,8 +55,6 @@
*/
public void testDependentProjects() throws CoreException, IOException {
boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
- JobUtils.waitForIdle();
-
IFile testBean3 = project3.getFile("src/cdi/test3/TestBean3.java");
AbstractResourceMarkerTest.assertMarkerIsNotCreated(testBean3, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_PRIMITIVE_TYPE, "boolean", "TestBean3.foo()"), 10);
@@ -78,43 +66,28 @@
IFile scope = project2.getFile(new Path("src/test/TestScope.java"));
IFile normalScope = project2.getFile(new Path("src/test/TestNormalScope.validation"));
+
scope.setContents(normalScope.getContents(), IFile.FORCE, new NullProgressMonitor());
- JobUtils.waitForIdle(1000);
- project2.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
- JobUtils.waitForIdle(1000);
+ TestUtil.validate(scope);
- testBean3 = project3.getFile("src/cdi/test3/TestBean3.java");
AbstractResourceMarkerTest.assertMarkerIsCreated(testBean3, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_PRIMITIVE_TYPE, "boolean", "TestBean3.foo()"), 10);
-
- testBean4 = project4.getFile("src/cdi/test4/TestBean4.java");
AbstractResourceMarkerTest.assertMarkerIsCreated(testBean4, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_PRIMITIVE_TYPE, "int", "TestBean4.foo()"), 10);
-
- testBean5 = project5.getFile("src/cdi/test5/TestBean5.java");
AbstractResourceMarkerTest.assertMarkerIsCreated(testBean5, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_PRIMITIVE_TYPE, "boolean", "TestBean5.foo()"), 10);
normalScope = project2.getFile(new Path("src/test/TestScope.java"));
scope = project2.getFile(new Path("src/test/TestScope.validation"));
+
normalScope.setContents(scope.getContents(), IFile.FORCE, new NullProgressMonitor());
- JobUtils.waitForIdle(1000);
- project2.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
- JobUtils.waitForIdle(1000);
+ TestUtil.validate(normalScope);
- testBean3 = project3.getFile("src/cdi/test3/TestBean3.java");
AbstractResourceMarkerTest.assertMarkerIsNotCreated(testBean3, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_PRIMITIVE_TYPE, "boolean", "TestBean3.foo()"), 10);
-
- testBean4 = project4.getFile("src/cdi/test4/TestBean4.java");
AbstractResourceMarkerTest.assertMarkerIsNotCreated(testBean4, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_PRIMITIVE_TYPE, "int", "TestBean4.foo()"), 10);
-
- testBean5 = project5.getFile("src/cdi/test5/TestBean5.java");
AbstractResourceMarkerTest.assertMarkerIsNotCreated(testBean5, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_PRIMITIVE_TYPE, "boolean", "TestBean5.foo()"), 10);
-
ResourcesUtils.setBuildAutomatically(saveAutoBuild);
- JobUtils.waitForIdle();
}
public void tearDown() throws Exception {
boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
- JobUtils.waitForIdle();
project1.delete(true, true, null);
project2.delete(true, true, null);
project3.delete(true, true, null);
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DisableCDISupportTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DisableCDISupportTest.java 2011-08-09 00:34:11 UTC (rev 33710)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DisableCDISupportTest.java 2011-08-09 01:50:39 UTC (rev 33711)
@@ -16,6 +16,7 @@
import org.jboss.tools.cdi.core.CDIUtil;
import org.jboss.tools.cdi.core.test.tck.TCKTest;
import org.jboss.tools.cdi.internal.core.validation.CDICoreValidator;
+import org.jboss.tools.jst.jsp.test.TestUtil;
import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ResourcesUtils;
import org.jboss.tools.tests.AbstractResourceMarkerTest;
@@ -34,6 +35,7 @@
@Override
protected void setUp() throws Exception {
tckProject = TCKTest.importPreparedProject("/");
+ TestUtil._waitForValidation(tckProject);
}
/*
@@ -43,7 +45,6 @@
@Override
protected void tearDown() throws Exception {
boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
- JobUtils.waitForIdle();
tckProject.delete(true, true, null);
JobUtils.waitForIdle();
ResourcesUtils.setBuildAutomatically(saveAutoBuild);
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/ELValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/ELValidationTest.java 2011-08-09 00:34:11 UTC (rev 33710)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/ELValidationTest.java 2011-08-09 01:50:39 UTC (rev 33711)
@@ -13,10 +13,9 @@
import java.text.MessageFormat;
import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.jboss.tools.jst.jsp.test.TestUtil;
import org.jboss.tools.jst.web.kb.internal.validation.ELValidationMessages;
-import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ResourcesUtils;
import org.jboss.tools.tests.AbstractResourceMarkerTest;
@@ -27,7 +26,6 @@
public void testEls() throws Exception {
boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
- JobUtils.waitForIdle();
try {
IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/el/TestBean.java");
@@ -38,9 +36,7 @@
IFile namedBean = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/el/NamedBean.java");
IFile newNamedBean = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/el/NewNamedBean.validation");
namedBean.setContents(newNamedBean.getContents(), IFile.FORCE, new NullProgressMonitor());
- JobUtils.waitForIdle(1000);
- tckProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
- JobUtils.waitForIdle(1000);
+ TestUtil.validate(namedBean);
file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/el/TestBean.java");
AbstractResourceMarkerTest.assertMarkerIsCreated(file, MessageFormat.format(ELValidationMessages.UNKNOWN_EL_VARIABLE_PROPERTY_NAME, "foo"), 6);
@@ -50,9 +46,7 @@
newNamedBean = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/el/NamedBean.java");
namedBean = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/el/NamedBean.validation");
newNamedBean.setContents(namedBean.getContents(), IFile.FORCE, new NullProgressMonitor());
- JobUtils.waitForIdle(1000);
- tckProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
- JobUtils.waitForIdle(1000);
+ TestUtil.validate(newNamedBean);
file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/el/TestBean.java");
AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, MessageFormat.format(ELValidationMessages.UNKNOWN_EL_VARIABLE_PROPERTY_NAME, "foo"), 6);
@@ -62,12 +56,9 @@
IFile newNamedBean = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/el/NamedBean.java");
IFile namedBean = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/el/NamedBean.validation");
newNamedBean.setContents(namedBean.getContents(), IFile.FORCE, new NullProgressMonitor());
- JobUtils.waitForIdle();
- tckProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
- JobUtils.waitForIdle();
+ TestUtil.validate(newNamedBean);
ResourcesUtils.setBuildAutomatically(saveAutoBuild);
- JobUtils.waitForIdle();
}
}
}
\ No newline at end of file
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/IncrementalValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/IncrementalValidationTest.java 2011-08-09 00:34:11 UTC (rev 33710)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/IncrementalValidationTest.java 2011-08-09 01:50:39 UTC (rev 33711)
@@ -11,12 +11,9 @@
package org.jboss.tools.cdi.core.test.tck.validation;
import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.jboss.tools.cdi.internal.core.validation.CDIValidationMessages;
import org.jboss.tools.jst.jsp.test.TestUtil;
-import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager;
-import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ResourcesUtils;
import org.jboss.tools.tests.AbstractResourceMarkerTest;
@@ -31,7 +28,6 @@
*/
public void testInjectionPointRevalidation() throws Exception {
boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
- JobUtils.waitForIdle();
IFile testInjection = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/TestBeanBroken.java");
AbstractResourceMarkerTest.assertMarkerIsNotCreated(testInjection, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS, 7);
@@ -40,24 +36,19 @@
IFile testBean = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/TestBeanImpl2.java");
IFile testBeanImpl = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/TestBeanImpl2.validation");
testBean.setContents(testBeanImpl.getContents(), IFile.FORCE, new NullProgressMonitor());
- JobUtils.waitForIdle(1000);
- tckProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
- JobUtils.waitForIdle(1000);
+ TestUtil.validate(testBean);
AbstractResourceMarkerTest.assertMarkerIsCreated(testInjection, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS, 7);
testBeanImpl = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/TestBeanImpl2.java");
testBean = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/TestBeanImpl2Original.validation");
testBeanImpl.setContents(testBean.getContents(), IFile.FORCE, new NullProgressMonitor());
- JobUtils.waitForIdle(1000);
- tckProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
- JobUtils.waitForIdle(1000);
+ TestUtil.validate(testBeanImpl);
AbstractResourceMarkerTest.assertMarkerIsNotCreated(testInjection, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS, 7);
AbstractResourceMarkerTest.assertMarkerIsNotCreated(testInjection, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 7);
ResourcesUtils.setBuildAutomatically(saveAutoBuild);
- JobUtils.waitForIdle();
}
/**
@@ -66,7 +57,6 @@
*/
public void testInjectionPointResolvedToProducerRevalidation() throws Exception {
boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
- JobUtils.waitForIdle();
IFile testInjection = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/TestBeanForProducerBroken.java");
AbstractResourceMarkerTest.assertMarkerIsNotCreated(testInjection, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS, 7);
@@ -74,25 +64,22 @@
IFile testBean = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/MarketPlace.java");
IFile testBeanImpl = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/MarketPlace.validation");
- ValidatorManager.setStatus("TESTING");
+
testBean.setContents(testBeanImpl.getContents(), IFile.FORCE, new NullProgressMonitor());
- tckProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
- TestUtil.waitForValidation();
+ TestUtil.validate(testBean);
AbstractResourceMarkerTest.assertMarkerIsCreated(testInjection, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS, 7);
testBeanImpl = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/MarketPlace.java");
testBean = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/MarketPlaceOriginal.validation");
- ValidatorManager.setStatus("TESTING");
+
testBeanImpl.setContents(testBean.getContents(), IFile.FORCE, new NullProgressMonitor());
- tckProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
- TestUtil.waitForValidation();
+ TestUtil.validate(testBeanImpl);
AbstractResourceMarkerTest.assertMarkerIsNotCreated(testInjection, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS, 7);
AbstractResourceMarkerTest.assertMarkerIsNotCreated(testInjection, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 7);
ResourcesUtils.setBuildAutomatically(saveAutoBuild);
- JobUtils.waitForIdle();
}
/**
@@ -101,7 +88,6 @@
*/
public void testAlternativesInBeansXml() throws Exception {
boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
- JobUtils.waitForIdle();
try {
IFile bean = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/beansxml/incremental/Test3.java");
@@ -110,26 +96,22 @@
IFile beansXml = tckProject.getFile("JavaSource/META-INF/beans.xml");
IFile emptyBeansXml = tckProject.getFile("JavaSource/META-INF/beans.xml.empty");
- ValidatorManager.setStatus("TESTING ALTERNATIVES 1");
beansXml.setContents(emptyBeansXml.getContents(), IFile.FORCE, new NullProgressMonitor());
- tckProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
- TestUtil.waitForValidation();
+ TestUtil.validate(beansXml);
AbstractResourceMarkerTest.assertMarkerIsCreated(bean, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 8);
IFile beansXmlWithAlternative = tckProject.getFile("JavaSource/META-INF/beans.xml.with.alternative");
- ValidatorManager.setStatus("TESTING ALTERNATIVES 2");
beansXml.setContents(beansXmlWithAlternative.getContents(), IFile.FORCE, new NullProgressMonitor());
- tckProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
- TestUtil.waitForValidation();
+ TestUtil.validate(beansXml);
AbstractResourceMarkerTest.assertMarkerIsNotCreated(bean, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 8);
} finally {
IFile beansXml = tckProject.getFile("JavaSource/META-INF/beans.xml");
IFile beansXmlWithAlternative = tckProject.getFile("JavaSource/META-INF/beans.xml.with.alternative");
beansXml.setContents(beansXmlWithAlternative.getContents(), IFile.FORCE, new NullProgressMonitor());
+ TestUtil.validate(beansXml);
ResourcesUtils.setBuildAutomatically(saveAutoBuild);
- JobUtils.waitForIdle();
}
}
}
\ No newline at end of file
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/META-INF/MANIFEST.MF 2011-08-09 00:34:11 UTC (rev 33710)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/META-INF/MANIFEST.MF 2011-08-09 01:50:39 UTC (rev 33711)
@@ -21,6 +21,7 @@
org.jboss.tools.jst.web.kb,
org.jboss.tools.cdi.xml,
org.jboss.tools.cdi.seam.solder.core,
- org.eclipse.jst.standard.schemas
+ org.eclipse.jst.standard.schemas,
+ org.jboss.tools.jst.jsp.test
Export-Package: org.jboss.tools.cdi.seam.config.core.test
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test/TestUtil.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test/TestUtil.java 2011-08-09 00:34:11 UTC (rev 33710)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test/TestUtil.java 2011-08-09 01:50:39 UTC (rev 33711)
@@ -83,13 +83,14 @@
}
}
- public static void waitForValidation() throws CoreException{
+ public static boolean waitForValidation() throws CoreException{
for (int i = 0; i < 50; i++) {
if(ValidatorManager.getStatus().equals(ValidatorManager.SLEEPING)) {
- break;
+ return true;
}
JobUtils.delay(100);
JobUtils.waitForIdle();
}
+ return false;
}
}
\ No newline at end of file
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ContextValidationHelper.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ContextValidationHelper.java 2011-08-09 00:34:11 UTC (rev 33710)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ContextValidationHelper.java 2011-08-09 01:50:39 UTC (rev 33711)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.jst.web.kb.internal.validation;
+import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -131,10 +132,15 @@
}
private Set<IProject> getAllProjects() {
+ IProject project = getProject();
+ if(!project.isAccessible()) {
+ return Collections.emptySet();
+ }
+
List<IValidator> validators = getValidationContextManager().getValidators();
Set<IProject> projects = new HashSet<IProject>();
for (IValidator validator : validators) {
- IValidatingProjectTree tree = validator.getValidatingProjects(getProject());
+ IValidatingProjectTree tree = validator.getValidatingProjects(project);
projects.addAll(tree.getAllProjects());
}
return projects;
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r33710 - trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-08-08 20:34:11 -0400 (Mon, 08 Aug 2011)
New Revision: 33710
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTest.java
Log:
JBIDE-9484
https://issues.jboss.org/browse/JBIDE-9484
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTest.java 2011-08-09 00:33:42 UTC (rev 33709)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTest.java 2011-08-09 00:34:11 UTC (rev 33710)
@@ -6,7 +6,6 @@
import junit.framework.TestCase;
-import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
@@ -15,11 +14,9 @@
import org.jboss.tools.cdi.core.ICDIProject;
import org.jboss.tools.cdi.core.IInjectionPoint;
import org.jboss.tools.cdi.core.test.DependentProjectTest;
-import org.jboss.tools.cdi.internal.core.validation.CDIValidationMessages;
import org.jboss.tools.jst.jsp.test.TestUtil;
import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager;
import org.jboss.tools.test.util.ResourcesUtils;
-import org.jboss.tools.tests.AbstractResourceMarkerTest;
public class SeamPersistenceTest extends TestCase {
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r33709 - in trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core: generic and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-08-08 20:33:42 -0400 (Mon, 08 Aug 2011)
New Revision: 33709
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderLoggerExtension.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderServiceHandlerExtension.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolderGenericBeanExtension.java
Log:
JBIDE-9484
https://issues.jboss.org/browse/JBIDE-9484
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderLoggerExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderLoggerExtension.java 2011-08-09 00:33:22 UTC (rev 33708)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderLoggerExtension.java 2011-08-09 00:33:42 UTC (rev 33709)
@@ -39,13 +39,8 @@
*
*/
public class CDISeamSolderLoggerExtension implements ICDIExtension, IBuildParticipantFeature {
- CDICoreNature project;
LoggerDefinitionContext context = new LoggerDefinitionContext();
- public void setProject(CDICoreNature n) {
- project = n;
- }
-
public IDefinitionContextExtension getContext() {
return context;
}
@@ -94,8 +89,8 @@
}
}
- public void buildBeans() {
- CDIProject p = ((CDIProject)project.getDelegate());
+ public void buildBeans(CDIProject target) {
+ CDIProject p = target;
Map<String, TypeDefinition> loggers = context.getMessageLoggers();
for (TypeDefinition d: loggers.values()) {
ClassBean b = new ClassBean();
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderServiceHandlerExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderServiceHandlerExtension.java 2011-08-09 00:33:22 UTC (rev 33708)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderServiceHandlerExtension.java 2011-08-09 00:33:42 UTC (rev 33709)
@@ -47,13 +47,8 @@
*
*/
public class CDISeamSolderServiceHandlerExtension implements ICDIExtension, IBuildParticipantFeature {
- CDICoreNature project;
ServiceHandlerDefinitionContext context = new ServiceHandlerDefinitionContext();
- public void setProject(CDICoreNature n) {
- project = n;
- }
-
public IDefinitionContextExtension getContext() {
return context;
}
@@ -90,8 +85,8 @@
}
}
- public void buildBeans() {
- CDIProject p = ((CDIProject)project.getDelegate());
+ public void buildBeans(CDIProject target) {
+ CDIProject p = target;
Map<String, TypeDefinition> services = context.getServices();
for (TypeDefinition d: services.values()) {
ClassBean b = new ClassBean();
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolderGenericBeanExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolderGenericBeanExtension.java 2011-08-09 00:33:22 UTC (rev 33708)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolderGenericBeanExtension.java 2011-08-09 00:33:42 UTC (rev 33709)
@@ -11,7 +11,6 @@
package org.jboss.tools.cdi.seam.solder.core.generic;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -58,13 +57,8 @@
*
*/
public class CDISeamSolderGenericBeanExtension implements ICDIExtension, IBuildParticipantFeature, IProcessAnnotatedTypeFeature, IValidatorFeature, CDISeamSolderConstants {
- CDICoreNature project;
GenericBeanDefinitionContext context = new GenericBeanDefinitionContext();
- public void setProject(CDICoreNature n) {
- project = n;
- }
-
public IDefinitionContextExtension getContext() {
return context;
}
@@ -84,8 +78,8 @@
public void buildDefinitions(FileSet fileSet) {
}
- public void buildBeans() {
- CDIProject p = ((CDIProject)project.getDelegate());
+ public void buildBeans(CDIProject target) {
+ CDIProject p = target;
for (GenericConfiguration c: context.getGenericConfigurations().values()) {
//Create fake bean for injection of generic type annotation.
@@ -154,7 +148,7 @@
}
AnnotationDeclaration gd = f.getAnnotation(GENERIC_QUALIFIER_TYPE_NAME);
f.removeAnnotation(gd);
- f.addAnnotation(createInjectGenericAnnotation(gd), context.getRootContext());
+ f.addAnnotation(createInjectGenericAnnotation(gd, context.getRootContext().getProject()), context.getRootContext());
}
}
@@ -173,7 +167,7 @@
AnnotationDeclaration gd = p.getAnnotation(GENERIC_QUALIFIER_TYPE_NAME);
if(gd != null) {
p.removeAnnotation(gd);
- p.addAnnotation(createInjectGenericAnnotation(gd), context.getRootContext());
+ p.addAnnotation(createInjectGenericAnnotation(gd, context.getRootContext().getProject()), context.getRootContext());
}
}
}
@@ -181,7 +175,7 @@
}
}
- private IJavaAnnotation createInjectGenericAnnotation(AnnotationDeclaration genericAnnotation) {
+ private IJavaAnnotation createInjectGenericAnnotation(AnnotationDeclaration genericAnnotation, CDICoreNature project) {
IType type = project.getType(INJECT_GENERIC_ANNOTATION_TYPE_NAME);
return (type != null) ? new AnnotationLiteral(genericAnnotation.getResource(),
genericAnnotation.getStartPosition(), genericAnnotation.getLength(), null, 0, type)
@@ -274,7 +268,7 @@
}
public void validateResource(IFile file, CDICoreValidator validator) {
- new GenericBeanValidator().validateResource(file, validator, project, context);
+ new GenericBeanValidator().validateResource(file, validator, context.getRootContext().getProject(), context);
}
public SeverityPreferences getSeverityPreferences() {
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r33708 - in trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core: persistence and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-08-08 20:33:22 -0400 (Mon, 08 Aug 2011)
New Revision: 33708
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/CDISeamInternationalExtension.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/persistence/CDISeamPersistenceExtension.java
Log:
JBIDE-9484
https://issues.jboss.org/browse/JBIDE-9484
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/CDISeamInternationalExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/CDISeamInternationalExtension.java 2011-08-09 00:33:04 UTC (rev 33707)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/CDISeamInternationalExtension.java 2011-08-09 00:33:22 UTC (rev 33708)
@@ -20,6 +20,7 @@
import org.jboss.tools.cdi.core.extension.ICDIExtension;
import org.jboss.tools.cdi.core.extension.feature.IBuildParticipant2Feature;
import org.jboss.tools.cdi.core.extension.feature.IBuildParticipantFeature;
+import org.jboss.tools.cdi.internal.core.impl.CDIProject;
import org.jboss.tools.cdi.internal.core.scanner.FileSet;
import org.jboss.tools.cdi.seam.core.international.impl.BundleModel;
import org.jboss.tools.cdi.seam.core.international.scanner.BundleFileSet;
@@ -32,7 +33,6 @@
*
*/
public class CDISeamInternationalExtension implements ICDIExtension, IBuildParticipant2Feature {
- CDICoreNature project;
CDISeamInternationalDefinitionContext context = new CDISeamInternationalDefinitionContext();
BundleFileSet fileSet = new BundleFileSet();
@@ -46,10 +46,6 @@
return null;
}
- public void setProject(CDICoreNature n) {
- project = n;
- }
-
public BundleModel getBundleModel() {
return model;
}
@@ -100,7 +96,7 @@
}
@Override
- public void buildBeans() {
+ public void buildBeans(CDIProject target) {
model.rebuild(context.getAllBundles());
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/persistence/CDISeamPersistenceExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/persistence/CDISeamPersistenceExtension.java 2011-08-09 00:33:04 UTC (rev 33707)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/persistence/CDISeamPersistenceExtension.java 2011-08-09 00:33:22 UTC (rev 33708)
@@ -44,15 +44,9 @@
*
*/
public class CDISeamPersistenceExtension implements ICDIExtension, IBuildParticipantFeature {
- CDICoreNature project;
CDISeamPersistenceDefinitionContext context = new CDISeamPersistenceDefinitionContext();
@Override
- public void setProject(CDICoreNature n) {
- project = n;
- }
-
- @Override
public IDefinitionContextExtension getContext() {
return context;
}
@@ -79,21 +73,21 @@
}
@Override
- public void buildBeans() {
- List<TypeDefinition> definitions = project.getAllTypeDefinitions();
+ public void buildBeans(CDIProject target) {
+ List<TypeDefinition> definitions = target.getNature().getAllTypeDefinitions();
if(definitions.isEmpty()) {
//no beans to build
return;
}
- ParametedType entityManager = getType(CDIPersistenceConstants.ENTITY_MANAGER_TYPE_NAME);
- ParametedType entityManagerFactory = getType(CDIPersistenceConstants.ENTITY_MANAGER_FACTORY_TYPE_NAME);
- ParametedType session = getType(CDIPersistenceConstants.SESSION_TYPE_NAME);
- ParametedType sessionFactory = getType(CDIPersistenceConstants.SESSION_FACTORY_TYPE_NAME);
+ ParametedType entityManager = getType(CDIPersistenceConstants.ENTITY_MANAGER_TYPE_NAME, target);
+ ParametedType entityManagerFactory = getType(CDIPersistenceConstants.ENTITY_MANAGER_FACTORY_TYPE_NAME, target);
+ ParametedType session = getType(CDIPersistenceConstants.SESSION_TYPE_NAME, target);
+ ParametedType sessionFactory = getType(CDIPersistenceConstants.SESSION_FACTORY_TYPE_NAME, target);
if(entityManager == null && session == null) {
return;
}
- CDIProject cdi = (CDIProject)project.getDelegate();
+ CDIProject cdi = target;
for (TypeDefinition def: definitions) {
if(def.isVetoed() || !isArtifact(def)) {
@@ -147,13 +141,13 @@
&& m.isAnnotationPresent(CDIPersistenceConstants.EXTENSION_MANAGED_ANNOTATION_TYPE_NAME);
}
- private ParametedType getType(String name) {
- IType t = project.getType(name);
+ private ParametedType getType(String name, CDIProject project) {
+ IType t = project.getNature().getType(name);
if(t == null) {
return null;
}
try {
- return project.getTypeFactory().getParametedType(t, "L" + name + ";");
+ return project.getNature().getTypeFactory().getParametedType(t, "L" + name + ";");
} catch (JavaModelException e) {
CDISeamCorePlugin.getDefault().logError(e);
return null;
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r33707 - trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-08-08 20:33:04 -0400 (Mon, 08 Aug 2011)
New Revision: 33707
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigValidationTest.java
Log:
JBIDE-9484
https://issues.jboss.org/browse/JBIDE-9484
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigValidationTest.java 2011-08-09 00:32:52 UTC (rev 33706)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigValidationTest.java 2011-08-09 00:33:04 UTC (rev 33707)
@@ -48,7 +48,7 @@
public SeamConfigValidationTest() {
project = getTestProject();
- cdiProject = CDICorePlugin.getCDIProject(project, false);
+ cdiProject = CDICorePlugin.getCDIProject(project, true);
f = project.getFile("src/META-INF/beans.xml");
assertTrue(f.exists());
}
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r33706 - trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-08-08 20:32:52 -0400 (Mon, 08 Aug 2011)
New Revision: 33706
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/CDISeamConfigExtension.java
Log:
JBIDE-9484
https://issues.jboss.org/browse/JBIDE-9484
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/CDISeamConfigExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/CDISeamConfigExtension.java 2011-08-09 00:32:39 UTC (rev 33705)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/CDISeamConfigExtension.java 2011-08-09 00:32:52 UTC (rev 33706)
@@ -10,7 +10,6 @@
******************************************************************************/
package org.jboss.tools.cdi.seam.config.core;
-
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -28,6 +27,7 @@
import org.jboss.tools.cdi.core.extension.ICDIExtension;
import org.jboss.tools.cdi.core.extension.feature.IBuildParticipantFeature;
import org.jboss.tools.cdi.core.extension.feature.IValidatorFeature;
+import org.jboss.tools.cdi.internal.core.impl.CDIProject;
import org.jboss.tools.cdi.internal.core.scanner.FileSet;
import org.jboss.tools.cdi.internal.core.validation.CDICoreValidator;
import org.jboss.tools.cdi.seam.config.core.definition.SeamBeansDefinition;
@@ -50,7 +50,6 @@
*
*/
public class CDISeamConfigExtension implements ICDIExtension, IBuildParticipantFeature, IValidatorFeature {
- CDICoreNature project;
ConfigDefinitionContext context = new ConfigDefinitionContext();
ConfigFileSet fileSet = new ConfigFileSet();
@@ -63,10 +62,6 @@
return null;
}
- public void setProject(CDICoreNature n) {
- project = n;
- }
-
public ConfigDefinitionContext getContext() {
return context;
}
@@ -115,7 +110,7 @@
IDocument document = new Document();
SeamDefinitionBuilder builder = new SeamDefinitionBuilder();
document.set(text);
- SeamBeansDefinition def = builder.createDefinition(resource, document, project, context.getWorkingCopy());
+ SeamBeansDefinition def = builder.createDefinition(resource, document, context.getRootContext().getProject(), context.getWorkingCopy());
newDefinitions.add(def);
if(isSeamBeans) {
context.getWorkingCopy().addSeamBeanXML(p, def);
@@ -136,7 +131,7 @@
//nothing to do since we visited all resources.
}
- public void buildBeans() {
+ public void buildBeans(CDIProject target) {
//TODO
}
14 years, 8 months
- 1
- 0