[jbosstools-commits] JBoss Tools SVN: r30499 - in trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test: projects/CDISolderTest/src/org/jboss/logger and 1 other directories.

jbosstools-commits at lists.jboss.org jbosstools-commits at lists.jboss.org
Mon Apr 11 18:39:46 EDT 2011


Author: scabanovich
Date: 2011-04-11 18:39:46 -0400 (Mon, 11 Apr 2011)
New Revision: 30499

Added:
   trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/logger/
   trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/logger/LogAccess.java
   trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/logger/MyBundle.java
   trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/logger/MyLogger.java
   trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/MessageLoggerTest.java
Modified:
   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/CDISeamSolderCoreAllTests.java
Log:
JBIDE-8712
https://issues.jboss.org/browse/JBIDE-8712

Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/logger/LogAccess.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/logger/LogAccess.java	                        (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/logger/LogAccess.java	2011-04-11 22:39:46 UTC (rev 30499)
@@ -0,0 +1,13 @@
+package org.jboss.logger;
+
+import javax.inject.Inject;
+
+import org.jboss.seam.solder.messages.MessageBundle;
+
+public class LogAccess {
+	@Inject MyLogger logger;
+
+	@Inject @MessageBundle MyBundle bundle;
+	
+	String s = "#{logger1.message}";
+}


Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/logger/LogAccess.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/logger/MyBundle.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/logger/MyBundle.java	                        (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/logger/MyBundle.java	2011-04-11 22:39:46 UTC (rev 30499)
@@ -0,0 +1,8 @@
+package org.jboss.logger;
+
+import org.jboss.seam.solder.messages.MessageBundle;
+
+ at MessageBundle
+public interface MyBundle {
+
+}


Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/logger/MyBundle.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/logger/MyLogger.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/logger/MyLogger.java	                        (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/logger/MyLogger.java	2011-04-11 22:39:46 UTC (rev 30499)
@@ -0,0 +1,11 @@
+package org.jboss.logger;
+
+import javax.inject.Named;
+
+import org.jboss.seam.solder.logging.MessageLogger;
+
+ at MessageLogger
+ at Named("logger1")
+public interface MyLogger {
+	public String getMessage();
+}


Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/logger/MyLogger.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Modified: 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/BeanNamingTest.java	2011-04-11 22:38:34 UTC (rev 30498)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/BeanNamingTest.java	2011-04-11 22:39:46 UTC (rev 30499)
@@ -1,3 +1,13 @@
+/******************************************************************************* 
+ * 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 java.io.IOException;

Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/CDISeamSolderCoreAllTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/CDISeamSolderCoreAllTests.java	2011-04-11 22:38:34 UTC (rev 30498)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/CDISeamSolderCoreAllTests.java	2011-04-11 22:39:46 UTC (rev 30499)
@@ -28,6 +28,7 @@
 		suiteAll.addTestSuite(BeanNamingTest.class);
 		suiteAll.addTestSuite(VetoTest.class);
 		suiteAll.addTestSuite(ExactTest.class);
+		suiteAll.addTestSuite(MessageLoggerTest.class);
 
 		return suiteAll;
 	}

Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/MessageLoggerTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/MessageLoggerTest.java	                        (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/MessageLoggerTest.java	2011-04-11 22:39:46 UTC (rev 30499)
@@ -0,0 +1,110 @@
+/******************************************************************************* 
+ * 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 java.io.IOException;
+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.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jdt.core.IType;
+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.IInjectionPointField;
+import org.jboss.tools.test.util.JobUtils;
+import org.jboss.tools.test.util.ResourcesUtils;
+
+/**
+ *   
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class MessageLoggerTest extends TestCase {
+	protected static String PLUGIN_ID = "org.jboss.tools.cdi.seam.solder.core.test";
+	IProject project = null;
+
+	public MessageLoggerTest() {}
+
+	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 testMessageLogger() throws CoreException, IOException {
+		ICDIProject cdi = CDICorePlugin.getCDIProject(project, true);
+	
+		IInjectionPointField logger = getInjectionPointField(cdi, "src/org/jboss/logger/LogAccess.java", "logger");
+		
+		Set<IBean> bs = cdi.getBeans(false, logger);
+		assertEquals(1, bs.size());
+		
+		IBean b = bs.iterator().next();
+		
+		IType t = b.getBeanClass();
+		assertNotNull(t);
+		assertTrue(t.isInterface());
+		assertEquals("org.jboss.logger.MyLogger", t.getFullyQualifiedName());
+
+	}
+
+	public void testMessageBundle() throws CoreException, IOException {
+		ICDIProject cdi = CDICorePlugin.getCDIProject(project, true);
+	
+		IInjectionPointField bundle = getInjectionPointField(cdi, "src/org/jboss/logger/LogAccess.java", "bundle");
+		
+		Set<IBean> bs = cdi.getBeans(false, bundle);
+		assertEquals(1, bs.size());
+		
+		IBean b = bs.iterator().next();
+		
+		IType t = b.getBeanClass();
+		assertNotNull(t);
+		assertTrue(t.isInterface());
+		assertEquals("org.jboss.logger.MyBundle", t.getFullyQualifiedName());
+
+	}
+
+	public void tearDown() throws Exception {
+		boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
+		JobUtils.waitForIdle();
+		project.delete(true, true, null);
+		JobUtils.waitForIdle();
+		ResourcesUtils.setBuildAutomatically(saveAutoBuild);
+		JobUtils.waitForIdle();
+	}
+
+	protected IInjectionPointField getInjectionPointField(ICDIProject cdi, String beanClassFilePath, String fieldName) {
+		IFile file = cdi.getNature().getProject().getFile(beanClassFilePath);
+		Set<IBean> beans = cdi.getBeans(file.getFullPath());
+		assertEquals("Wrong number of the beans", 1, beans.size());
+		Set<IInjectionPoint> injections = beans.iterator().next().getInjectionPoints();
+		for (IInjectionPoint injectionPoint : injections) {
+			if(injectionPoint instanceof IInjectionPointField) {
+				IInjectionPointField field = (IInjectionPointField)injectionPoint;
+				if(fieldName.equals(field.getField().getElementName())) {
+					return field;
+				}
+			}
+		}
+		fail("Can't find \"" + fieldName + "\" injection point filed in " + beanClassFilePath);
+		return null;
+	}
+
+}


Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/MessageLoggerTest.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain



More information about the jbosstools-commits mailing list