Author: scabanovich
Date: 2011-08-05 16:09:47 -0400 (Fri, 05 Aug 2011)
New Revision: 33639
Added:
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/.classpath
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/.project
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/.settings/
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/.settings/org.eclipse.jdt.core.prefs
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/bin/
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/bin/test/
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/bin/test/A.class
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/bin/test/EntityManagerTest.class
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/bin/test/MyQualifier.class
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/lib/
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/lib/cdi-api.jar
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/lib/hibernate3.jar
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/lib/javax.inject.jar
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/lib/seam-persistence.jar
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/lib/seam-solder.jar
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/src/
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/src/test/
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/src/test/EntityManagerTest.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/src/test/MyQualifier.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/
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/SeamPersistenceTestSetup.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/CDISeamCoreAllTests.java
Log:
JBIDE-9400
https://issues.jboss.org/browse/JBIDE-9400
Added:
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/.classpath
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/.classpath
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/.classpath 2011-08-05
20:09:47 UTC (rev 33639)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="lib/cdi-api.jar"/>
+ <classpathentry kind="lib"
path="lib/hibernate-jpa-2.0-api-1.0.1.Final.jar"/>
+ <classpathentry kind="lib" path="lib/hibernate3.jar"/>
+ <classpathentry kind="lib" path="lib/javax.inject.jar"/>
+ <classpathentry kind="lib" path="lib/seam-persistence.jar"/>
+ <classpathentry kind="lib" path="lib/seam-solder.jar"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Property changes on:
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/.classpath
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added:
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/.project
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/.project
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/.project 2011-08-05
20:09:47 UTC (rev 33639)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>Seam3PersistenceTest</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.jst.web.kb.kbbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.cdi.core.cdibuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.jboss.tools.jst.web.kb.kbnature</nature>
+ <nature>org.jboss.tools.cdi.core.cdinature</nature>
+ </natures>
+</projectDescription>
Property changes on:
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added:
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/.settings/org.eclipse.jdt.core.prefs
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/.settings/org.eclipse.jdt.core.prefs
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/.settings/org.eclipse.jdt.core.prefs 2011-08-05
20:09:47 UTC (rev 33639)
@@ -0,0 +1,12 @@
+#Fri Aug 05 12:26:35 PDT 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Property changes on:
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added:
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/bin/test/A.class
===================================================================
(Binary files differ)
Property changes on:
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/bin/test/A.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/bin/test/EntityManagerTest.class
===================================================================
(Binary files differ)
Property changes on:
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/bin/test/EntityManagerTest.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/bin/test/MyQualifier.class
===================================================================
(Binary files differ)
Property changes on:
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/bin/test/MyQualifier.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/lib/cdi-api.jar
===================================================================
(Binary files differ)
Property changes on:
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/lib/cdi-api.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar
===================================================================
(Binary files differ)
Property changes on:
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/lib/hibernate3.jar
===================================================================
(Binary files differ)
Property changes on:
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/lib/hibernate3.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/lib/javax.inject.jar
===================================================================
(Binary files differ)
Property changes on:
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/lib/javax.inject.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/lib/seam-persistence.jar
===================================================================
(Binary files differ)
Property changes on:
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/lib/seam-persistence.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/lib/seam-solder.jar
===================================================================
(Binary files differ)
Property changes on:
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/lib/seam-solder.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/src/test/EntityManagerTest.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/src/test/EntityManagerTest.java
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/src/test/EntityManagerTest.java 2011-08-05
20:09:47 UTC (rev 33639)
@@ -0,0 +1,31 @@
+package test;
+
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.jboss.seam.solder.core.ExtensionManaged;
+
+public class EntityManagerTest {
+
+ @ExtensionManaged
+ @Produces
+ @MyQualifier
+ EntityManagerFactory managerFactory;
+
+
+ @Inject
+ @MyQualifier
+ EntityManager manager;
+
+ @ExtensionManaged
+ @Produces
+ SessionFactory sessionFactory;
+
+ @Inject
+ Session session;
+
+}
Property changes on:
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/src/test/EntityManagerTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added:
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/src/test/MyQualifier.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/src/test/MyQualifier.java
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/src/test/MyQualifier.java 2011-08-05
20:09:47 UTC (rev 33639)
@@ -0,0 +1,21 @@
+package test;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Qualifier
+@Target({ TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+public @interface MyQualifier {
+
+}
Property changes on:
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/src/test/MyQualifier.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/CDISeamCoreAllTests.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/CDISeamCoreAllTests.java 2011-08-05
19:21:31 UTC (rev 33638)
+++
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/CDISeamCoreAllTests.java 2011-08-05
20:09:47 UTC (rev 33639)
@@ -16,6 +16,8 @@
import org.eclipse.jdt.internal.core.JavaModelManager;
import org.jboss.tools.cdi.seam.core.test.international.BundleModelTest;
import org.jboss.tools.cdi.seam.core.test.international.SeamResourceBundlesTest;
+import org.jboss.tools.cdi.seam.core.test.persistence.SeamPersistenceTest;
+import org.jboss.tools.cdi.seam.core.test.persistence.SeamPersistenceTestSetup;
import org.jboss.tools.cdi.seam.core.test.servlet.SeamServletValidationTest;
/**
@@ -35,6 +37,10 @@
TestSuite suite = new TestSuite("Seam Core Project Tests");
suiteAll.addTest(new SeamCoreTestSetup(suite));
suiteAll.addTestSuite(SeamServletValidationTest.class);
+
+ suite = new TestSuite("Seam Persistence Project Tests");
+ suiteAll.addTest(new SeamPersistenceTestSetup(suite));
+ suiteAll.addTestSuite(SeamPersistenceTest.class);
return suiteAll;
}
}
\ No newline at end of file
Added:
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
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTest.java 2011-08-05
20:09:47 UTC (rev 33639)
@@ -0,0 +1,58 @@
+package org.jboss.tools.cdi.seam.core.test.persistence;
+
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Set;
+
+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;
+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.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 {
+
+ protected IProject project;
+
+ public IProject getTestProject() throws IOException, CoreException,
InvocationTargetException, InterruptedException {
+ if(project==null) {
+ ValidatorManager.setStatus("INIT");
+ project =
ResourcesPlugin.getWorkspace().getRoot().getProject(SeamPersistenceTestSetup.PROJECT_NAME);
+ if(!project.exists()) {
+ project = ResourcesUtils.importProject(SeamPersistenceTestSetup.PLUGIN_ID,
SeamPersistenceTestSetup.PROJECT_PATH);
+ }
+ TestUtil.waitForValidation();
+ }
+ return project;
+ }
+
+ public void testEntityManagerInjection() throws Exception {
+ ICDIProject cdi = CDICorePlugin.getCDIProject(getTestProject(), true);
+ IInjectionPoint p = DependentProjectTest.getInjectionPointField(cdi,
"/src/test/EntityManagerTest.java", "manager");
+ assertNotNull(p);
+
+ Set<IBean> bs = cdi.getBeans(false, p);
+ assertEquals(1, bs.size());
+ }
+
+ public void testSessionInjection() throws Exception {
+ ICDIProject cdi = CDICorePlugin.getCDIProject(getTestProject(), true);
+ IInjectionPoint p = DependentProjectTest.getInjectionPointField(cdi,
"/src/test/EntityManagerTest.java", "session");
+ assertNotNull(p);
+
+ Set<IBean> bs = cdi.getBeans(false, p);
+ assertFalse(bs.isEmpty());
+ }
+
+}
Property changes on:
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added:
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTestSetup.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTestSetup.java
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTestSetup.java 2011-08-05
20:09:47 UTC (rev 33639)
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * 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.core.test.persistence;
+
+import junit.extensions.TestSetup;
+import junit.framework.Test;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.jboss.tools.test.util.JobUtils;
+import org.jboss.tools.test.util.ResourcesUtils;
+
+/**
+ * @author Alexey Kazakov
+ */
+public class SeamPersistenceTestSetup extends TestSetup {
+
+ public static final String PLUGIN_ID = "org.jboss.tools.cdi.seam.core.test";
+ public static final String PROJECT_NAME = "Seam3PersistenceTest";
+ public static final String PROJECT_PATH = "/projects/Seam3PersistenceTest";
+
+ protected IProject project;
+
+ public SeamPersistenceTestSetup(Test test) {
+ super(test);
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ project = ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME);
+ if(!project.exists()) {
+ project = ResourcesUtils.importProject(PLUGIN_ID, PROJECT_PATH);
+ }
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
+ JobUtils.waitForIdle();
+ project.delete(true, true, null);
+ JobUtils.waitForIdle();
+ ResourcesUtils.setBuildAutomatically(saveAutoBuild);
+ }
+}
\ No newline at end of file
Property changes on:
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTestSetup.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain