Author: scabanovich Date: 2010-09-03 10:39:24 -0400 (Fri, 03 Sep 2010) New Revision: 24697 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/BeansXMLTest.java Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.java Log: https://jira.jboss.org/browse/JBIDE-6983 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/BeansXMLTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/BeansXMLTest.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/BeansXMLTest.java 2010-09-03 14:39:24 UTC (rev 24697) @@ -0,0 +1,72 @@ +package org.jboss.tools.cdi.core.test; + +import java.io.IOException; + +import junit.framework.TestCase; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Path; +import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.util.EclipseResourceUtil; +import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; +import org.jboss.tools.test.util.JobUtils; +import org.jboss.tools.test.util.ResourcesUtils; + +/** + * + * @author V.Kabanovich + * + */ +public class BeansXMLTest extends TestCase { + protected static String PLUGIN_ID = "org.jboss.tools.cdi.core.test"; + IProject project = null; + + public BeansXMLTest() {} + + public void setUp() throws Exception { + project = ResourcesUtils.importProject(PLUGIN_ID, "/projects/CDITest1"); + project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); + JobUtils.waitForIdle(); + } + + public void testBeansXML() throws CoreException, IOException { + IFile file = project.getFile(new Path("META-INF/beans.xml")); + assertNotNull(file); + XModelObject beansXML = EclipseResourceUtil.createObjectForResource(file); + assertNotNull(beansXML); + + assertEquals("FileCDIBeans", beansXML.getModelEntity().getName()); + + XModelObject o = findTag(beansXML, "drools:RuleResources"); + assertNotNull(o); + + o = findTag(beansXML, "drools:DroolsConfig/drools:ruleResources/s:Inject"); + assertNotNull(o); + } + + public void tearDown() throws Exception { + boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); + JobUtils.waitForIdle(); + project.delete(true, true, null); + JobUtils.waitForIdle(); + ResourcesUtils.setBuildAutomatically(saveAutoBuild); + } + + XModelObject findTag(XModelObject parent, String path) { + XModelObject[] cs = parent.getChildren(XModelObjectLoaderUtil.ENT_ANY_ELEMENT); + for (XModelObject o: cs) { + String name = o.getAttributeValue("tag"); + if(name == null) continue; + if(path.equals(name)) return o; + if(path.startsWith(name + "/")) { + return findTag(o, path.substring(name.length() + 1)); + } + } + return null; + } + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/BeansXMLTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2010-09-03 14:19:04 UTC (rev 24696) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2010-09-03 14:39:24 UTC (rev 24697) @@ -82,6 +82,7 @@ suite.addTestSuite(AnnotationsValidationTest.class); suite.addTestSuite(CoreValidationTest.class); + suiteAll.addTestSuite(BeansXMLTest.class); suiteAll.addTestSuite(DependentProjectTest.class); suiteAll.addTest(new CDICoreTestSetup(suite)); Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.java 2010-09-03 14:19:04 UTC (rev 24696) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.java 2010-09-03 14:39:24 UTC (rev 24697) @@ -43,10 +43,13 @@ IClassBean cb = null; for (IBean b: beans) { if(b instanceof IClassBean) { - cb = (IClassBean)b; - System.out.println(cb.getBeanClass().getFullyQualifiedName()); + IClassBean cb1 = (IClassBean)b; + if("cdi.test.MyBean".equals(cb1.getBeanClass().getFullyQualifiedName())) { + cb = cb1; + } } } + assertNotNull(cb); } public void tearDown() throws Exception {