[jbosstools-commits] JBoss Tools SVN: r30303 - in trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test: src/org/jboss/tools/cdi and 6 other directories.

Author: scabanovich Date: 2011-04-04 18:12:14 -0400 (Mon, 04 Apr 2011) New Revision: 30303 Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/BeanNamingTest.java trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/CDISolderCoreAllTests.java trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/VetoTest.java Removed: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/solder/core/test/BeanNamingTest.java trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/solder/core/test/CDISolderCoreAllTests.java trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/solder/core/test/VetoTest.java trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/seam/solder/core/test/BeanNamingTest.java trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/seam/solder/core/test/CDISolderCoreAllTests.java trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/seam/solder/core/test/VetoTest.java Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/META-INF/MANIFEST.MF Log: JBIDE-8198 https://issues.jboss.org/browse/JBIDE-8198 Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/META-INF/MANIFEST.MF =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/META-INF/MANIFEST.MF 2011-04-04 22:06:19 UTC (rev 30302) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/META-INF/MANIFEST.MF 2011-04-04 22:12:14 UTC (rev 30303) @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Contexts and Dependency Injection Test -Bundle-SymbolicName: org.jboss.tools.cdi.solder.core.test;singleton:=true +Bundle-SymbolicName: org.jboss.tools.cdi.seam.solder.core.test;singleton:=true Bundle-Version: 1.2.0.qualifier Bundle-Vendor: JBoss by Red Hat Bundle-RequiredExecutionEnvironment: JavaSE-1.6 @@ -10,7 +10,7 @@ org.eclipse.core.resources, org.junit, org.jboss.tools.cdi.core, - org.jboss.tools.cdi.solder.core, + org.jboss.tools.cdi.seam.solder.core, org.jboss.tools.common, org.eclipse.ui, org.eclipse.jdt.core, @@ -20,5 +20,5 @@ org.jboss.tools.jst.web.kb, org.jboss.tools.cdi.xml, org.eclipse.jst.standard.schemas -Export-Package: org.jboss.tools.seam.solder.core.test +Export-Package: org.jboss.tools.cdi.seam.solder.core.test Copied: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/BeanNamingTest.java (from rev 30302, trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/solder/core/test/BeanNamingTest.java) =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/BeanNamingTest.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/BeanNamingTest.java 2011-04-04 22:12:14 UTC (rev 30303) @@ -0,0 +1,84 @@ +package org.jboss.tools.cdi.seam.solder.core.test; + +import java.io.IOException; +import java.util.Set; + +import junit.framework.TestCase; + +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.cdi.core.CDICorePlugin; +import org.jboss.tools.cdi.core.IBean; +import org.jboss.tools.cdi.core.ICDIProject; +import org.jboss.tools.test.util.JobUtils; +import org.jboss.tools.test.util.ResourcesUtils; + +/** + * + * @author Viacheslav Kabanovich + * + */ +public class BeanNamingTest extends TestCase { + protected static String PLUGIN_ID = "org.jboss.tools.cdi.solder.core.test"; + IProject project = null; + + public BeanNamingTest() {} + + public void setUp() throws Exception { + project = ResourcesUtils.importProject(PLUGIN_ID, "/projects/CDISolderTest"); + JobUtils.waitForIdle(); + project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); + JobUtils.waitForIdle(); + } + + public void testNamedPackage() throws CoreException, IOException { + ICDIProject cdi = CDICorePlugin.getCDIProject(project, true); + + //1. package @Named; class not annotated + Set<IBean> bs = cdi.getBeans(new Path("/CDISolderTest/src/org/jboss/named/Dog.java")); + assertFalse(bs.isEmpty()); + IBean b = bs.iterator().next(); + assertEquals("dog", b.getName()); + + //2. package@Named; class @Named("little") + bs = cdi.getBeans(new Path("/CDISolderTest/src/org/jboss/named/Racoon.java")); + assertFalse(bs.isEmpty()); + b = bs.iterator().next(); + assertEquals("little", b.getName()); + } + + public void testFullyQualifiedPackage() throws CoreException, IOException { + ICDIProject cdi = CDICorePlugin.getCDIProject(project, true); + + //1. package @FullyQualified and @Named; class not annotated + Set<IBean> bs = cdi.getBeans(new Path("/CDISolderTest/src/org/jboss/fullyqualified/Cat.java")); + assertFalse(bs.isEmpty()); + IBean b = bs.iterator().next(); + assertEquals("org.jboss.fullyqualified.cat", b.getName()); + + //2. package @FullyQualified and @Named; class @Named("rodent") + bs = cdi.getBeans(new Path("/CDISolderTest/src/org/jboss/fullyqualified/Mouse.java")); + assertFalse(bs.isEmpty()); + b = bs.iterator().next(); + assertEquals("org.jboss.fullyqualified.rodent", b.getName()); + + //3. package @FullyQualified and @Named; class @FullyQualified(Dog.class) + bs = cdi.getBeans(new Path("/CDISolderTest/src/org/jboss/fullyqualified/Elephant.java")); + assertFalse(bs.isEmpty()); + b = bs.iterator().next(); + assertEquals("org.jboss.named.elephant", b.getName()); + + } + + public void tearDown() throws Exception { + boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); + JobUtils.waitForIdle(); + project.delete(true, true, null); + JobUtils.waitForIdle(); + ResourcesUtils.setBuildAutomatically(saveAutoBuild); + JobUtils.waitForIdle(); + } +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/BeanNamingTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/CDISolderCoreAllTests.java (from rev 30302, trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/solder/core/test/CDISolderCoreAllTests.java) =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/CDISolderCoreAllTests.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/CDISolderCoreAllTests.java 2011-04-04 22:12:14 UTC (rev 30303) @@ -0,0 +1,33 @@ +/******************************************************************************* + * Copyright (c) 2011 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.seam.solder.core.test; + +import junit.framework.Test; +import junit.framework.TestSuite; + +import org.eclipse.jdt.internal.core.JavaModelManager; +/** + * @author Viacheslav Kabanovich + */ +public class CDISolderCoreAllTests { + + public static Test suite() { + // it could be done here because it is not needed to be enabled back + JavaModelManager.getIndexManager().disable(); + + TestSuite suiteAll = new TestSuite("CDI Solder Core Tests"); + + suiteAll.addTestSuite(BeanNamingTest.class); + suiteAll.addTestSuite(VetoTest.class); + + return suiteAll; + } +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/CDISolderCoreAllTests.java ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/VetoTest.java (from rev 30302, trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/solder/core/test/VetoTest.java) =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/VetoTest.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/VetoTest.java 2011-04-04 22:12:14 UTC (rev 30303) @@ -0,0 +1,114 @@ +package org.jboss.tools.cdi.seam.solder.core.test; + + +import java.io.IOException; +import java.util.Set; + +import junit.framework.TestCase; + +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.cdi.core.CDIConstants; +import org.jboss.tools.cdi.core.CDICorePlugin; +import org.jboss.tools.cdi.core.IAnnotationDeclaration; +import org.jboss.tools.cdi.core.IBean; +import org.jboss.tools.cdi.core.ICDIProject; +import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition; +import org.jboss.tools.test.util.JobUtils; +import org.jboss.tools.test.util.ResourcesUtils; + +/** + * + * @author Viacheslav Kabanovich + * + */ +public class VetoTest extends TestCase { + protected static String PLUGIN_ID = "org.jboss.tools.cdi.solder.core.test"; + IProject project = null; + + public VetoTest() {} + + public void setUp() throws Exception { + project = ResourcesUtils.importProject(PLUGIN_ID, "/projects/CDISolderTest"); + JobUtils.waitForIdle(); + project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); + JobUtils.waitForIdle(); + } + + public void testVeto() throws CoreException, IOException { + ICDIProject cdi = CDICorePlugin.getCDIProject(project, true); + + //1. package annotated @Veto; class is not annotated with it + TypeDefinition d = cdi.getNature().getDefinitions().getTypeDefinition("org.jboss.vetoed.Tiger"); + assertNotNull(d); //Though there exists Java type Tiger + IAnnotationDeclaration a = d.getAnnotation(CDIConstants.NAMED_QUALIFIER_TYPE_NAME); + assertNotNull(a); + Object name = a.getMemberValue(null); + assertEquals("tiger", name); //...and it is annotated with @Named("tiger") + Set<IBean> bs = cdi.getBeans("tiger", false); + assertTrue(bs.isEmpty()); //...CDI model does not have a bean named "tiger" + bs = cdi.getBeans(d.getResource().getFullPath()); + assertTrue(bs.isEmpty()); //...and does not loaded any beans form its resource + + //2. class annotated @Veto + d = cdi.getNature().getDefinitions().getTypeDefinition("org.jboss.somevetoed.Lion"); + assertNotNull(d); //Though there exists Java type Lion + a = d.getAnnotation(CDIConstants.NAMED_QUALIFIER_TYPE_NAME); + assertNotNull(a); + name = a.getMemberValue(null); + assertEquals("lion", name); //...and it is annotated with @Named("lion") + bs = cdi.getBeans("lion", false); + assertTrue(bs.isEmpty()); //...CDI model does not have a bean named "lion" + bs = cdi.getBeans(d.getResource().getFullPath()); + assertTrue(bs.isEmpty()); //...and does not loaded any beans form its resource + } + + public void testRequires() throws CoreException, IOException { + ICDIProject cdi = CDICorePlugin.getCDIProject(project, true); + + //1. class annotated @Requires that references single non-available class + TypeDefinition d = cdi.getNature().getDefinitions().getTypeDefinition("org.jboss.requires.Bear"); + assertNotNull(d); //Though there exists Java type Bear + IAnnotationDeclaration a = d.getAnnotation(CDIConstants.NAMED_QUALIFIER_TYPE_NAME); + assertNotNull(a); + Object name = a.getMemberValue(null); + assertEquals("bear", name); //...and it is annotated with @Named("bear") + Set<IBean> bs = cdi.getBeans("bear", false); + assertTrue(bs.isEmpty()); //...CDI model does not have a bean named "bear" + bs = cdi.getBeans(d.getResource().getFullPath()); + assertTrue(bs.isEmpty()); //...and does not loaded any beans form its resource + + //2. class annotated @Requires that references array of classes some of which are not available + d = cdi.getNature().getDefinitions().getTypeDefinition("org.jboss.requires.Bee"); + assertNotNull(d); //Though there exists Java type Bee + a = d.getAnnotation(CDIConstants.NAMED_QUALIFIER_TYPE_NAME); + assertNotNull(a); + name = a.getMemberValue(null); + assertEquals("bee", name); //...and it is annotated with @Named("bee") + bs = cdi.getBeans("bee", false); + assertTrue(bs.isEmpty()); //...CDI model does not have a bean named "bee" + bs = cdi.getBeans(d.getResource().getFullPath()); + assertTrue(bs.isEmpty()); //...and does not loaded any beans form its resource + + //3. class annotated @Requires that references single available class + bs = cdi.getBeans("fly", false); + assertEquals(1, bs.size()); //...CDI model has a bean named "fly" + + //4. class annotated @Requires that references array of available classes + bs = cdi.getBeans("dragonfly", false); + assertEquals(1, bs.size()); //...CDI model has a bean named "dragonfly" + + } + + public void tearDown() throws Exception { + boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); + JobUtils.waitForIdle(); + project.delete(true, true, null); + JobUtils.waitForIdle(); + ResourcesUtils.setBuildAutomatically(saveAutoBuild); + JobUtils.waitForIdle(); + } +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/VetoTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain Deleted: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/solder/core/test/BeanNamingTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/solder/core/test/BeanNamingTest.java 2011-04-04 22:06:19 UTC (rev 30302) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/solder/core/test/BeanNamingTest.java 2011-04-04 22:12:14 UTC (rev 30303) @@ -1,84 +0,0 @@ -package org.jboss.tools.cdi.solder.core.test; - -import java.io.IOException; -import java.util.Set; - -import junit.framework.TestCase; - -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.cdi.core.CDICorePlugin; -import org.jboss.tools.cdi.core.IBean; -import org.jboss.tools.cdi.core.ICDIProject; -import org.jboss.tools.test.util.JobUtils; -import org.jboss.tools.test.util.ResourcesUtils; - -/** - * - * @author Viacheslav Kabanovich - * - */ -public class BeanNamingTest extends TestCase { - protected static String PLUGIN_ID = "org.jboss.tools.cdi.solder.core.test"; - IProject project = null; - - public BeanNamingTest() {} - - public void setUp() throws Exception { - project = ResourcesUtils.importProject(PLUGIN_ID, "/projects/CDISolderTest"); - JobUtils.waitForIdle(); - project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); - JobUtils.waitForIdle(); - } - - public void testNamedPackage() throws CoreException, IOException { - ICDIProject cdi = CDICorePlugin.getCDIProject(project, true); - - //1. package @Named; class not annotated - Set<IBean> bs = cdi.getBeans(new Path("/CDISolderTest/src/org/jboss/named/Dog.java")); - assertFalse(bs.isEmpty()); - IBean b = bs.iterator().next(); - assertEquals("dog", b.getName()); - - //2. package@Named; class @Named("little") - bs = cdi.getBeans(new Path("/CDISolderTest/src/org/jboss/named/Racoon.java")); - assertFalse(bs.isEmpty()); - b = bs.iterator().next(); - assertEquals("little", b.getName()); - } - - public void testFullyQualifiedPackage() throws CoreException, IOException { - ICDIProject cdi = CDICorePlugin.getCDIProject(project, true); - - //1. package @FullyQualified and @Named; class not annotated - Set<IBean> bs = cdi.getBeans(new Path("/CDISolderTest/src/org/jboss/fullyqualified/Cat.java")); - assertFalse(bs.isEmpty()); - IBean b = bs.iterator().next(); - assertEquals("org.jboss.fullyqualified.cat", b.getName()); - - //2. package @FullyQualified and @Named; class @Named("rodent") - bs = cdi.getBeans(new Path("/CDISolderTest/src/org/jboss/fullyqualified/Mouse.java")); - assertFalse(bs.isEmpty()); - b = bs.iterator().next(); - assertEquals("org.jboss.fullyqualified.rodent", b.getName()); - - //3. package @FullyQualified and @Named; class @FullyQualified(Dog.class) - bs = cdi.getBeans(new Path("/CDISolderTest/src/org/jboss/fullyqualified/Elephant.java")); - assertFalse(bs.isEmpty()); - b = bs.iterator().next(); - assertEquals("org.jboss.named.elephant", b.getName()); - - } - - public void tearDown() throws Exception { - boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); - JobUtils.waitForIdle(); - project.delete(true, true, null); - JobUtils.waitForIdle(); - ResourcesUtils.setBuildAutomatically(saveAutoBuild); - JobUtils.waitForIdle(); - } -} Deleted: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/solder/core/test/CDISolderCoreAllTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/solder/core/test/CDISolderCoreAllTests.java 2011-04-04 22:06:19 UTC (rev 30302) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/solder/core/test/CDISolderCoreAllTests.java 2011-04-04 22:12:14 UTC (rev 30303) @@ -1,33 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 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.solder.core.test; - -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.eclipse.jdt.internal.core.JavaModelManager; -/** - * @author Viacheslav Kabanovich - */ -public class CDISolderCoreAllTests { - - public static Test suite() { - // it could be done here because it is not needed to be enabled back - JavaModelManager.getIndexManager().disable(); - - TestSuite suiteAll = new TestSuite("CDI Solder Core Tests"); - - suiteAll.addTestSuite(BeanNamingTest.class); - suiteAll.addTestSuite(VetoTest.class); - - return suiteAll; - } -} Deleted: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/solder/core/test/VetoTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/solder/core/test/VetoTest.java 2011-04-04 22:06:19 UTC (rev 30302) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/solder/core/test/VetoTest.java 2011-04-04 22:12:14 UTC (rev 30303) @@ -1,114 +0,0 @@ -package org.jboss.tools.cdi.solder.core.test; - - -import java.io.IOException; -import java.util.Set; - -import junit.framework.TestCase; - -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.cdi.core.CDIConstants; -import org.jboss.tools.cdi.core.CDICorePlugin; -import org.jboss.tools.cdi.core.IAnnotationDeclaration; -import org.jboss.tools.cdi.core.IBean; -import org.jboss.tools.cdi.core.ICDIProject; -import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition; -import org.jboss.tools.test.util.JobUtils; -import org.jboss.tools.test.util.ResourcesUtils; - -/** - * - * @author Viacheslav Kabanovich - * - */ -public class VetoTest extends TestCase { - protected static String PLUGIN_ID = "org.jboss.tools.cdi.solder.core.test"; - IProject project = null; - - public VetoTest() {} - - public void setUp() throws Exception { - project = ResourcesUtils.importProject(PLUGIN_ID, "/projects/CDISolderTest"); - JobUtils.waitForIdle(); - project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); - JobUtils.waitForIdle(); - } - - public void testVeto() throws CoreException, IOException { - ICDIProject cdi = CDICorePlugin.getCDIProject(project, true); - - //1. package annotated @Veto; class is not annotated with it - TypeDefinition d = cdi.getNature().getDefinitions().getTypeDefinition("org.jboss.vetoed.Tiger"); - assertNotNull(d); //Though there exists Java type Tiger - IAnnotationDeclaration a = d.getAnnotation(CDIConstants.NAMED_QUALIFIER_TYPE_NAME); - assertNotNull(a); - Object name = a.getMemberValue(null); - assertEquals("tiger", name); //...and it is annotated with @Named("tiger") - Set<IBean> bs = cdi.getBeans("tiger", false); - assertTrue(bs.isEmpty()); //...CDI model does not have a bean named "tiger" - bs = cdi.getBeans(d.getResource().getFullPath()); - assertTrue(bs.isEmpty()); //...and does not loaded any beans form its resource - - //2. class annotated @Veto - d = cdi.getNature().getDefinitions().getTypeDefinition("org.jboss.somevetoed.Lion"); - assertNotNull(d); //Though there exists Java type Lion - a = d.getAnnotation(CDIConstants.NAMED_QUALIFIER_TYPE_NAME); - assertNotNull(a); - name = a.getMemberValue(null); - assertEquals("lion", name); //...and it is annotated with @Named("lion") - bs = cdi.getBeans("lion", false); - assertTrue(bs.isEmpty()); //...CDI model does not have a bean named "lion" - bs = cdi.getBeans(d.getResource().getFullPath()); - assertTrue(bs.isEmpty()); //...and does not loaded any beans form its resource - } - - public void testRequires() throws CoreException, IOException { - ICDIProject cdi = CDICorePlugin.getCDIProject(project, true); - - //1. class annotated @Requires that references single non-available class - TypeDefinition d = cdi.getNature().getDefinitions().getTypeDefinition("org.jboss.requires.Bear"); - assertNotNull(d); //Though there exists Java type Bear - IAnnotationDeclaration a = d.getAnnotation(CDIConstants.NAMED_QUALIFIER_TYPE_NAME); - assertNotNull(a); - Object name = a.getMemberValue(null); - assertEquals("bear", name); //...and it is annotated with @Named("bear") - Set<IBean> bs = cdi.getBeans("bear", false); - assertTrue(bs.isEmpty()); //...CDI model does not have a bean named "bear" - bs = cdi.getBeans(d.getResource().getFullPath()); - assertTrue(bs.isEmpty()); //...and does not loaded any beans form its resource - - //2. class annotated @Requires that references array of classes some of which are not available - d = cdi.getNature().getDefinitions().getTypeDefinition("org.jboss.requires.Bee"); - assertNotNull(d); //Though there exists Java type Bee - a = d.getAnnotation(CDIConstants.NAMED_QUALIFIER_TYPE_NAME); - assertNotNull(a); - name = a.getMemberValue(null); - assertEquals("bee", name); //...and it is annotated with @Named("bee") - bs = cdi.getBeans("bee", false); - assertTrue(bs.isEmpty()); //...CDI model does not have a bean named "bee" - bs = cdi.getBeans(d.getResource().getFullPath()); - assertTrue(bs.isEmpty()); //...and does not loaded any beans form its resource - - //3. class annotated @Requires that references single available class - bs = cdi.getBeans("fly", false); - assertEquals(1, bs.size()); //...CDI model has a bean named "fly" - - //4. class annotated @Requires that references array of available classes - bs = cdi.getBeans("dragonfly", false); - assertEquals(1, bs.size()); //...CDI model has a bean named "dragonfly" - - } - - public void tearDown() throws Exception { - boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); - JobUtils.waitForIdle(); - project.delete(true, true, null); - JobUtils.waitForIdle(); - ResourcesUtils.setBuildAutomatically(saveAutoBuild); - JobUtils.waitForIdle(); - } -} Deleted: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/seam/solder/core/test/BeanNamingTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/seam/solder/core/test/BeanNamingTest.java 2011-04-04 22:06:19 UTC (rev 30302) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/seam/solder/core/test/BeanNamingTest.java 2011-04-04 22:12:14 UTC (rev 30303) @@ -1,84 +0,0 @@ -package org.jboss.tools.seam.solder.core.test; - -import java.io.IOException; -import java.util.Set; - -import junit.framework.TestCase; - -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.cdi.core.CDICorePlugin; -import org.jboss.tools.cdi.core.IBean; -import org.jboss.tools.cdi.core.ICDIProject; -import org.jboss.tools.test.util.JobUtils; -import org.jboss.tools.test.util.ResourcesUtils; - -/** - * - * @author Viacheslav Kabanovich - * - */ -public class BeanNamingTest extends TestCase { - protected static String PLUGIN_ID = "org.jboss.tools.cdi.solder.core.test"; - IProject project = null; - - public BeanNamingTest() {} - - public void setUp() throws Exception { - project = ResourcesUtils.importProject(PLUGIN_ID, "/projects/CDISolderTest"); - JobUtils.waitForIdle(); - project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); - JobUtils.waitForIdle(); - } - - public void testNamedPackage() throws CoreException, IOException { - ICDIProject cdi = CDICorePlugin.getCDIProject(project, true); - - //1. package @Named; class not annotated - Set<IBean> bs = cdi.getBeans(new Path("/CDISolderTest/src/org/jboss/named/Dog.java")); - assertFalse(bs.isEmpty()); - IBean b = bs.iterator().next(); - assertEquals("dog", b.getName()); - - //2. package@Named; class @Named("little") - bs = cdi.getBeans(new Path("/CDISolderTest/src/org/jboss/named/Racoon.java")); - assertFalse(bs.isEmpty()); - b = bs.iterator().next(); - assertEquals("little", b.getName()); - } - - public void testFullyQualifiedPackage() throws CoreException, IOException { - ICDIProject cdi = CDICorePlugin.getCDIProject(project, true); - - //1. package @FullyQualified and @Named; class not annotated - Set<IBean> bs = cdi.getBeans(new Path("/CDISolderTest/src/org/jboss/fullyqualified/Cat.java")); - assertFalse(bs.isEmpty()); - IBean b = bs.iterator().next(); - assertEquals("org.jboss.fullyqualified.cat", b.getName()); - - //2. package @FullyQualified and @Named; class @Named("rodent") - bs = cdi.getBeans(new Path("/CDISolderTest/src/org/jboss/fullyqualified/Mouse.java")); - assertFalse(bs.isEmpty()); - b = bs.iterator().next(); - assertEquals("org.jboss.fullyqualified.rodent", b.getName()); - - //3. package @FullyQualified and @Named; class @FullyQualified(Dog.class) - bs = cdi.getBeans(new Path("/CDISolderTest/src/org/jboss/fullyqualified/Elephant.java")); - assertFalse(bs.isEmpty()); - b = bs.iterator().next(); - assertEquals("org.jboss.named.elephant", b.getName()); - - } - - public void tearDown() throws Exception { - boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); - JobUtils.waitForIdle(); - project.delete(true, true, null); - JobUtils.waitForIdle(); - ResourcesUtils.setBuildAutomatically(saveAutoBuild); - JobUtils.waitForIdle(); - } -} Deleted: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/seam/solder/core/test/CDISolderCoreAllTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/seam/solder/core/test/CDISolderCoreAllTests.java 2011-04-04 22:06:19 UTC (rev 30302) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/seam/solder/core/test/CDISolderCoreAllTests.java 2011-04-04 22:12:14 UTC (rev 30303) @@ -1,33 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 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.seam.solder.core.test; - -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.eclipse.jdt.internal.core.JavaModelManager; -/** - * @author Viacheslav Kabanovich - */ -public class CDISolderCoreAllTests { - - public static Test suite() { - // it could be done here because it is not needed to be enabled back - JavaModelManager.getIndexManager().disable(); - - TestSuite suiteAll = new TestSuite("CDI Solder Core Tests"); - - suiteAll.addTestSuite(BeanNamingTest.class); - suiteAll.addTestSuite(VetoTest.class); - - return suiteAll; - } -} Deleted: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/seam/solder/core/test/VetoTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/seam/solder/core/test/VetoTest.java 2011-04-04 22:06:19 UTC (rev 30302) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/seam/solder/core/test/VetoTest.java 2011-04-04 22:12:14 UTC (rev 30303) @@ -1,114 +0,0 @@ -package org.jboss.tools.seam.solder.core.test; - - -import java.io.IOException; -import java.util.Set; - -import junit.framework.TestCase; - -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.cdi.core.CDIConstants; -import org.jboss.tools.cdi.core.CDICorePlugin; -import org.jboss.tools.cdi.core.IAnnotationDeclaration; -import org.jboss.tools.cdi.core.IBean; -import org.jboss.tools.cdi.core.ICDIProject; -import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition; -import org.jboss.tools.test.util.JobUtils; -import org.jboss.tools.test.util.ResourcesUtils; - -/** - * - * @author Viacheslav Kabanovich - * - */ -public class VetoTest extends TestCase { - protected static String PLUGIN_ID = "org.jboss.tools.cdi.solder.core.test"; - IProject project = null; - - public VetoTest() {} - - public void setUp() throws Exception { - project = ResourcesUtils.importProject(PLUGIN_ID, "/projects/CDISolderTest"); - JobUtils.waitForIdle(); - project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); - JobUtils.waitForIdle(); - } - - public void testVeto() throws CoreException, IOException { - ICDIProject cdi = CDICorePlugin.getCDIProject(project, true); - - //1. package annotated @Veto; class is not annotated with it - TypeDefinition d = cdi.getNature().getDefinitions().getTypeDefinition("org.jboss.vetoed.Tiger"); - assertNotNull(d); //Though there exists Java type Tiger - IAnnotationDeclaration a = d.getAnnotation(CDIConstants.NAMED_QUALIFIER_TYPE_NAME); - assertNotNull(a); - Object name = a.getMemberValue(null); - assertEquals("tiger", name); //...and it is annotated with @Named("tiger") - Set<IBean> bs = cdi.getBeans("tiger", false); - assertTrue(bs.isEmpty()); //...CDI model does not have a bean named "tiger" - bs = cdi.getBeans(d.getResource().getFullPath()); - assertTrue(bs.isEmpty()); //...and does not loaded any beans form its resource - - //2. class annotated @Veto - d = cdi.getNature().getDefinitions().getTypeDefinition("org.jboss.somevetoed.Lion"); - assertNotNull(d); //Though there exists Java type Lion - a = d.getAnnotation(CDIConstants.NAMED_QUALIFIER_TYPE_NAME); - assertNotNull(a); - name = a.getMemberValue(null); - assertEquals("lion", name); //...and it is annotated with @Named("lion") - bs = cdi.getBeans("lion", false); - assertTrue(bs.isEmpty()); //...CDI model does not have a bean named "lion" - bs = cdi.getBeans(d.getResource().getFullPath()); - assertTrue(bs.isEmpty()); //...and does not loaded any beans form its resource - } - - public void testRequires() throws CoreException, IOException { - ICDIProject cdi = CDICorePlugin.getCDIProject(project, true); - - //1. class annotated @Requires that references single non-available class - TypeDefinition d = cdi.getNature().getDefinitions().getTypeDefinition("org.jboss.requires.Bear"); - assertNotNull(d); //Though there exists Java type Bear - IAnnotationDeclaration a = d.getAnnotation(CDIConstants.NAMED_QUALIFIER_TYPE_NAME); - assertNotNull(a); - Object name = a.getMemberValue(null); - assertEquals("bear", name); //...and it is annotated with @Named("bear") - Set<IBean> bs = cdi.getBeans("bear", false); - assertTrue(bs.isEmpty()); //...CDI model does not have a bean named "bear" - bs = cdi.getBeans(d.getResource().getFullPath()); - assertTrue(bs.isEmpty()); //...and does not loaded any beans form its resource - - //2. class annotated @Requires that references array of classes some of which are not available - d = cdi.getNature().getDefinitions().getTypeDefinition("org.jboss.requires.Bee"); - assertNotNull(d); //Though there exists Java type Bee - a = d.getAnnotation(CDIConstants.NAMED_QUALIFIER_TYPE_NAME); - assertNotNull(a); - name = a.getMemberValue(null); - assertEquals("bee", name); //...and it is annotated with @Named("bee") - bs = cdi.getBeans("bee", false); - assertTrue(bs.isEmpty()); //...CDI model does not have a bean named "bee" - bs = cdi.getBeans(d.getResource().getFullPath()); - assertTrue(bs.isEmpty()); //...and does not loaded any beans form its resource - - //3. class annotated @Requires that references single available class - bs = cdi.getBeans("fly", false); - assertEquals(1, bs.size()); //...CDI model has a bean named "fly" - - //4. class annotated @Requires that references array of available classes - bs = cdi.getBeans("dragonfly", false); - assertEquals(1, bs.size()); //...CDI model has a bean named "dragonfly" - - } - - public void tearDown() throws Exception { - boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); - JobUtils.waitForIdle(); - project.delete(true, true, null); - JobUtils.waitForIdle(); - ResourcesUtils.setBuildAutomatically(saveAutoBuild); - JobUtils.waitForIdle(); - } -}