JBoss Tools SVN: r31832 - in trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test: projects/CDISolderTest/src/org/jboss/generic2 and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-03 20:01:15 -0400 (Fri, 03 Jun 2011)
New Revision: 31832
Added:
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/ACMEQueue.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/DispatcherPolicy.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/Durable.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/DurableMessageLogger.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/DurableQueueConfiguration.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/DurableQueueConfiguration.original
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/DurableQueueConfiguration.vetoed
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/MessageDispatcher.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/MessageLogger.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/MessageManager.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/MessageQueue.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/MessageSystemConfiguration.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/MyMessageQueues.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/Payload.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/QueueManager.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/GenericBeanTest.java
Log:
JBIDE-9065
https://issues.jboss.org/browse/JBIDE-9065
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/ACMEQueue.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/ACMEQueue.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/ACMEQueue.java 2011-06-04 00:01:15 UTC (rev 31832)
@@ -0,0 +1,13 @@
+package org.jboss.generic2;
+
+import java.lang.annotation.Retention;
+
+import org.jboss.seam.solder.bean.generic.GenericType;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Retention(RUNTIME)
+(a)GenericType(MessageSystemConfiguration.class)
+@interface ACMEQueue {
+
+ String value();
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/ACMEQueue.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/DispatcherPolicy.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/DispatcherPolicy.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/DispatcherPolicy.java 2011-06-04 00:01:15 UTC (rev 31832)
@@ -0,0 +1,7 @@
+package org.jboss.generic2;
+
+public interface DispatcherPolicy {
+
+ void removeDuplicates();
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/DispatcherPolicy.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/Durable.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/Durable.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/Durable.java 2011-06-04 00:01:15 UTC (rev 31832)
@@ -0,0 +1,21 @@
+package org.jboss.generic2;
+
+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 Durable {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/Durable.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/DurableMessageLogger.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/DurableMessageLogger.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/DurableMessageLogger.java 2011-06-04 00:01:15 UTC (rev 31832)
@@ -0,0 +1,23 @@
+package org.jboss.generic2;
+
+import javax.inject.Inject;
+
+public class DurableMessageLogger {
+
+ @Inject
+ @Durable
+ MessageDispatcher dispatcher;
+
+ @Inject
+ @Durable
+ DispatcherPolicy policy;
+
+ /* Tweak the dispatch policy to enable duplicate removal */
+ @Inject
+ void tweakPolicy(@Durable DispatcherPolicy policy) {
+ policy.removeDuplicates();
+ }
+
+ void logMessage(Payload payload) {
+ }
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/DurableMessageLogger.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/DurableQueueConfiguration.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/DurableQueueConfiguration.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/DurableQueueConfiguration.java 2011-06-04 00:01:15 UTC (rev 31832)
@@ -0,0 +1,17 @@
+package org.jboss.generic2;
+
+import javax.enterprise.context.ConversationScoped;
+
+import org.jboss.seam.solder.core.Veto;
+
+//@Veto
+@Durable
+@ConversationScoped
+@ACMEQueue("durableQueue")
+public class DurableQueueConfiguration extends MessageSystemConfiguration {
+
+ public DurableQueueConfiguration() {
+ super(null);
+ this.durable = true;
+ }
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/DurableQueueConfiguration.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/DurableQueueConfiguration.original
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/DurableQueueConfiguration.original (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/DurableQueueConfiguration.original 2011-06-04 00:01:15 UTC (rev 31832)
@@ -0,0 +1,17 @@
+package org.jboss.generic2;
+
+import javax.enterprise.context.ConversationScoped;
+
+import org.jboss.seam.solder.core.Veto;
+
+//@Veto
+@Durable
+@ConversationScoped
+@ACMEQueue("durableQueue")
+public class DurableQueueConfiguration extends MessageSystemConfiguration {
+
+ public DurableQueueConfiguration() {
+ super(null);
+ this.durable = true;
+ }
+}
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/DurableQueueConfiguration.vetoed
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/DurableQueueConfiguration.vetoed (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/DurableQueueConfiguration.vetoed 2011-06-04 00:01:15 UTC (rev 31832)
@@ -0,0 +1,17 @@
+package org.jboss.generic2;
+
+import javax.enterprise.context.ConversationScoped;
+
+import org.jboss.seam.solder.core.Veto;
+
+@Veto
+@Durable
+@ConversationScoped
+@ACMEQueue("durableQueue")
+public class DurableQueueConfiguration extends MessageSystemConfiguration {
+
+ public DurableQueueConfiguration() {
+ super(null);
+ this.durable = true;
+ }
+}
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/MessageDispatcher.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/MessageDispatcher.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/MessageDispatcher.java 2011-06-04 00:01:15 UTC (rev 31832)
@@ -0,0 +1,9 @@
+package org.jboss.generic2;
+
+import org.jboss.seam.solder.messages.Message;
+
+public interface MessageDispatcher {
+
+ void send(Message message);
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/MessageDispatcher.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/MessageLogger.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/MessageLogger.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/MessageLogger.java 2011-06-04 00:01:15 UTC (rev 31832)
@@ -0,0 +1,14 @@
+package org.jboss.generic2;
+
+import javax.inject.Inject;
+
+public class MessageLogger {
+
+ @Inject
+ MessageDispatcher dispatcher;
+
+ void logMessage(Payload payload) {
+ /* Add metaddata to the message */
+ dispatcher.send(null);
+ }
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/MessageLogger.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/MessageManager.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/MessageManager.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/MessageManager.java 2011-06-04 00:01:15 UTC (rev 31832)
@@ -0,0 +1,27 @@
+package org.jboss.generic2;
+
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+
+import org.jboss.seam.solder.bean.generic.ApplyScope;
+import org.jboss.seam.solder.bean.generic.Generic;
+import org.jboss.seam.solder.bean.generic.GenericConfiguration;
+
+(a)GenericConfiguration(ACMEQueue.class)
+class MessageManager {
+
+ @Inject
+ @Generic
+ MessageQueue queue;
+
+ @Produces
+ @ApplyScope
+ MessageDispatcher messageDispatcherProducer() {
+ return queue.createMessageDispatcher();
+ }
+
+ @Produces
+ DispatcherPolicy getPolicy() {
+ return queue.getDispatcherPolicy();
+ }
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/MessageManager.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/MessageQueue.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/MessageQueue.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/MessageQueue.java 2011-06-04 00:01:15 UTC (rev 31832)
@@ -0,0 +1,8 @@
+package org.jboss.generic2;
+
+public interface MessageQueue {
+
+ public MessageDispatcher createMessageDispatcher();
+
+ public DispatcherPolicy getDispatcherPolicy();
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/MessageQueue.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/MessageSystemConfiguration.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/MessageSystemConfiguration.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/MessageSystemConfiguration.java 2011-06-04 00:01:15 UTC (rev 31832)
@@ -0,0 +1,10 @@
+package org.jboss.generic2;
+
+public class MessageSystemConfiguration {
+
+ MessageSystemConfiguration(Object o) {
+
+ }
+
+ protected boolean durable;
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/MessageSystemConfiguration.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/MyMessageQueues.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/MyMessageQueues.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/MyMessageQueues.java 2011-06-04 00:01:15 UTC (rev 31832)
@@ -0,0 +1,20 @@
+package org.jboss.generic2;
+
+import javax.enterprise.context.ConversationScoped;
+import javax.enterprise.inject.Produces;
+
+public class MyMessageQueues {
+ @Produces
+ @ACMEQueue("defaultQueue")
+ MessageSystemConfiguration defaultQueue = new MessageSystemConfiguration(null);
+
+ @Produces
+ @Durable
+ @ConversationScoped
+ @ACMEQueue("durableQueue")
+ MessageSystemConfiguration producerDefaultQueue() {
+ MessageSystemConfiguration config = new MessageSystemConfiguration(null);
+// config.setDurable(true);
+ return config;
+ }
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/MyMessageQueues.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/Payload.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/Payload.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/Payload.java 2011-06-04 00:01:15 UTC (rev 31832)
@@ -0,0 +1,5 @@
+package org.jboss.generic2;
+
+public class Payload {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/Payload.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/QueueManager.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/QueueManager.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/QueueManager.java 2011-06-04 00:01:15 UTC (rev 31832)
@@ -0,0 +1,38 @@
+package org.jboss.generic2;
+
+import javax.annotation.PostConstruct;
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+
+import org.jboss.seam.solder.bean.generic.ApplyScope;
+import org.jboss.seam.solder.bean.generic.Generic;
+import org.jboss.seam.solder.bean.generic.GenericConfiguration;
+import java.io.Serializable;
+
+(a)GenericConfiguration(ACMEQueue.class)
+@ApplyScope
+public class QueueManager implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @Inject
+ @Generic
+ MessageSystemConfiguration systemConfig;
+
+ @Inject
+ ACMEQueue config;
+
+// MessageQueueFactory factory;
+
+ @PostConstruct
+ void init() {
+// factory = systemConfig.createMessageQueueFactory();
+ }
+
+ @Produces
+ @ApplyScope
+ public MessageQueue messageQueueProducer() {
+// return factory.createMessageQueue(config.name());
+ return null;
+ }
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/QueueManager.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/GenericBeanTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/GenericBeanTest.java 2011-06-03 23:52:58 UTC (rev 31831)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/GenericBeanTest.java 2011-06-04 00:01:15 UTC (rev 31832)
@@ -16,7 +16,11 @@
import java.util.Set;
import org.eclipse.core.resources.IFile;
+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.eclipse.jdt.core.IType;
import org.jboss.tools.cdi.core.CDICorePlugin;
import org.jboss.tools.cdi.core.IBean;
@@ -28,6 +32,9 @@
import org.jboss.tools.cdi.core.IProducerMethod;
import org.jboss.tools.cdi.seam.solder.core.generic.GenericBeanProducerMethod;
import org.jboss.tools.cdi.seam.solder.core.generic.GenericClassBean;
+import org.jboss.tools.common.util.FileUtil;
+import org.jboss.tools.test.util.JobUtils;
+import org.jboss.tools.test.util.ResourcesUtils;
/**
*
@@ -184,4 +191,101 @@
return result;
}
+ public void testVetoedGenericBeanInjectionIntoGenericPoint() throws CoreException {
+ ICDIProject cdi = CDICorePlugin.getCDIProject(project, true);
+
+ /*
+ * Injection point: in class MessageManager
+ * @Inject @Generic MessageQueue queue;
+ * There are 3 configurations, hence there are 3 beans MessageQueue,
+ * each has that injection point;
+ * in all cases bean is produced by MyGenericBean.createMyFirstBean()
+ */
+ IClassBean beanToBeVetoed = null;
+ Set<IInjectionPointField> injections = getGenericInjectionPointField(cdi, "src/org/jboss/generic2/MessageManager.java", "queue");
+ assertEquals(3, injections.size());
+ for (IInjectionPointField injection: injections) {
+ Set<IBean> bs = cdi.getBeans(false, injection);
+ assertTrue(bs.size() >= 1);
+ for (IBean b: bs) {
+ assertTrue(b instanceof GenericBeanProducerMethod);
+ GenericBeanProducerMethod m = (GenericBeanProducerMethod)b;
+ assertEquals("messageQueueProducer", m.getMethod().getElementName());
+ IBean g = ((GenericClassBean) m.getClassBean()).getGenericProducerBean();
+ if(g instanceof IClassBean) {
+ beanToBeVetoed = (IClassBean)g;
+ }
+ }
+ }
+ assertNotNull(beanToBeVetoed);
+
+
+ /*
+ * Replace DurableQueueConfiguration.java with vetoed version.
+ * After that there are only 2 configurations.
+ */
+ replaceFile("src/org/jboss/generic2/DurableQueueConfiguration.vetoed",
+ "src/org/jboss/generic2/DurableQueueConfiguration.java");
+
+ beanToBeVetoed = null;
+ injections = getGenericInjectionPointField(cdi, "src/org/jboss/generic2/MessageManager.java", "queue");
+ assertEquals(2, injections.size());
+ for (IInjectionPointField injection: injections) {
+ Set<IBean> bs = cdi.getBeans(false, injection);
+ assertEquals(1, bs.size());
+ IBean b = bs.iterator().next();
+ assertTrue(b instanceof GenericBeanProducerMethod);
+ GenericBeanProducerMethod m = (GenericBeanProducerMethod)b;
+ assertEquals("messageQueueProducer", m.getMethod().getElementName());
+ IBean g = ((GenericClassBean) m.getClassBean()).getGenericProducerBean();
+ if(g instanceof IClassBean) {
+ beanToBeVetoed = (IClassBean)g;
+ }
+ }
+ assertNull(beanToBeVetoed);
+
+ /*
+ * Set original DurableQueueConfiguration.java back.
+ * Make sure that there are again 3 configurations.
+ */
+ replaceFile("src/org/jboss/generic2/DurableQueueConfiguration.original",
+ "src/org/jboss/generic2/DurableQueueConfiguration.java");
+
+ beanToBeVetoed = null;
+ injections = getGenericInjectionPointField(cdi, "src/org/jboss/generic2/MessageManager.java", "queue");
+ assertEquals(3, injections.size());
+ for (IInjectionPointField injection: injections) {
+ Set<IBean> bs = cdi.getBeans(false, injection);
+ assertTrue(bs.size() >= 1);
+ for (IBean b: bs) {
+ assertTrue(b instanceof GenericBeanProducerMethod);
+ GenericBeanProducerMethod m = (GenericBeanProducerMethod)b;
+ assertEquals("messageQueueProducer", m.getMethod().getElementName());
+ IBean g = ((GenericClassBean) m.getClassBean()).getGenericProducerBean();
+ if(g instanceof IClassBean) {
+ beanToBeVetoed = (IClassBean)g;
+ }
+ }
+ }
+ assertNotNull(beanToBeVetoed);
+ }
+
+ void replaceFile(String sourcePath, String targetPath) throws CoreException {
+ boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
+ JobUtils.waitForIdle();
+ try {
+ IFile target = project.getFile(new Path(targetPath));
+ assertTrue(target.exists());
+ IFile source = project.getFile(new Path(sourcePath));
+ assertTrue(target.exists());
+ target.setContents(source.getContents(), true, false, new NullProgressMonitor());
+ JobUtils.waitForIdle();
+ project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
+ JobUtils.waitForIdle();
+ } finally {
+ ResourcesUtils.setBuildAutomatically(saveAutoBuild);
+ JobUtils.waitForIdle();
+ }
+ }
+
}
14 years, 10 months
JBoss Tools SVN: r31831 - in trunk/cdi: tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/inject/revalidation and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-06-03 19:52:58 -0400 (Fri, 03 Jun 2011)
New Revision: 31831
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/inject/revalidation/Fruit.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/inject/revalidation/MarketPlace.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/inject/revalidation/MarketPlace.validation
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/inject/revalidation/MarketPlaceOriginal.validation
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/inject/revalidation/TestBeanForProducerBroken.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DeploymentProblemsValidationTests.java
Log:
https://issues.jboss.org/browse/JBIDE-9071
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-06-03 23:01:36 UTC (rev 31830)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-06-03 23:52:58 UTC (rev 31831)
@@ -1329,16 +1329,14 @@
private void collectAllRelatedInjections(IFile validatingResource, Set<IPath> relatedResources) {
Set<IBean> beans = cdiProject.getBeans(validatingResource.getFullPath());
for (IBean bean : beans) {
- if(bean instanceof IClassBean) {
- Set<IParametedType> types = bean.getAllTypes();
- for (IParametedType type : types) {
- IType superType = type.getType();
- if(superType!=null) {
- Set<IInjectionPoint> injections = cdiProject.getInjections(superType.getFullyQualifiedName());
- for (IInjectionPoint injection : injections) {
- if(!injection.getClassBean().getBeanClass().isBinary() && injection.getClassBean()!=bean) {
- relatedResources.add(injection.getResource().getFullPath());
- }
+ Set<IParametedType> types = bean.getAllTypes();
+ for (IParametedType type : types) {
+ IType superType = type.getType();
+ if(superType!=null) {
+ Set<IInjectionPoint> injections = cdiProject.getInjections(superType.getFullyQualifiedName());
+ for (IInjectionPoint injection : injections) {
+ if(!injection.getClassBean().getBeanClass().isBinary() && injection.getClassBean()!=bean) {
+ relatedResources.add(injection.getResource().getFullPath());
}
}
}
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/inject/revalidation/Fruit.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/inject/revalidation/Fruit.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/inject/revalidation/Fruit.java 2011-06-03 23:52:58 UTC (rev 31831)
@@ -0,0 +1,5 @@
+package org.jboss.jsr299.tck.tests.jbt.validation.inject.revalidation;
+
+public class Fruit {
+
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/inject/revalidation/Fruit.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/inject/revalidation/MarketPlace.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/inject/revalidation/MarketPlace.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/inject/revalidation/MarketPlace.java 2011-06-03 23:52:58 UTC (rev 31831)
@@ -0,0 +1,8 @@
+package org.jboss.jsr299.tck.tests.jbt.validation.inject.revalidation;
+
+public class MarketPlace {
+
+ public Fruit createFruit() {
+ return new Fruit();
+ }
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/inject/revalidation/MarketPlace.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/inject/revalidation/MarketPlace.validation
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/inject/revalidation/MarketPlace.validation (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/inject/revalidation/MarketPlace.validation 2011-06-03 23:52:58 UTC (rev 31831)
@@ -0,0 +1,11 @@
+package org.jboss.jsr299.tck.tests.jbt.validation.inject.revalidation;
+
+import javax.enterprise.inject.Produces;
+
+public class MarketPlace {
+
+ @Produces
+ public Fruit createFruit() {
+ return new Fruit();
+ }
+}
\ No newline at end of file
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/inject/revalidation/MarketPlaceOriginal.validation
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/inject/revalidation/MarketPlaceOriginal.validation (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/inject/revalidation/MarketPlaceOriginal.validation 2011-06-03 23:52:58 UTC (rev 31831)
@@ -0,0 +1,8 @@
+package org.jboss.jsr299.tck.tests.jbt.validation.inject.revalidation;
+
+public class MarketPlace {
+
+ public Fruit createFruit() {
+ return new Fruit();
+ }
+}
\ No newline at end of file
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/inject/revalidation/TestBeanForProducerBroken.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/inject/revalidation/TestBeanForProducerBroken.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/inject/revalidation/TestBeanForProducerBroken.java 2011-06-03 23:52:58 UTC (rev 31831)
@@ -0,0 +1,8 @@
+package org.jboss.jsr299.tck.tests.jbt.validation.inject.revalidation;
+
+import javax.inject.Inject;
+
+public class TestBeanForProducerBroken {
+
+ @Inject Fruit fruit;
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/inject/revalidation/TestBeanForProducerBroken.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DeploymentProblemsValidationTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DeploymentProblemsValidationTests.java 2011-06-03 23:01:36 UTC (rev 31830)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DeploymentProblemsValidationTests.java 2011-06-03 23:52:58 UTC (rev 31831)
@@ -17,6 +17,8 @@
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;
@@ -284,6 +286,41 @@
}
/**
+ * See https://issues.jboss.org/browse/JBIDE-9071
+ * @throws Exception
+ */
+ 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);
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(testInjection, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 7);
+
+ 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(tckProject);
+
+ 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(tckProject);
+
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(testInjection, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS, 7);
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(testInjection, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 7);
+
+ ResourcesUtils.setBuildAutomatically(saveAutoBuild);
+ JobUtils.waitForIdle();
+ }
+
+ /**
* 6.6.4 Validation of passivation capable beans and dependencies
* - If a managed bean which declares a passivating scope is not passivation capable, then the container automatically detects the problem and treats it as a deployment problem.
*
14 years, 10 months
JBoss Tools SVN: r31830 - trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-03 19:01:36 -0400 (Fri, 03 Jun 2011)
New Revision: 31830
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/GenericBeanDefinitionContext.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericConfiguration.java
Log:
JBIDE-9065
https://issues.jboss.org/browse/JBIDE-9065
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-06-03 21:51:16 UTC (rev 31829)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolderGenericBeanExtension.java 2011-06-03 23:01:36 UTC (rev 31830)
@@ -98,6 +98,10 @@
Set<TypeDefinition> ts = c.getGenericConfigurationBeans();
for (AbstractMemberDefinition gp: ms.keySet()) {
+ //check veto
+ if(gp.getTypeDefinition().isVetoed()) {
+ continue;
+ }
List<IAnnotationDeclaration> list = ms.get(gp);
for (TypeDefinition t: ts) {
TypeDefinition ti = new TypeDefinition();
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanDefinitionContext.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanDefinitionContext.java 2011-06-03 21:51:16 UTC (rev 31829)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanDefinitionContext.java 2011-06-03 23:01:36 UTC (rev 31830)
@@ -13,6 +13,7 @@
import java.util.HashMap;
import java.util.Map;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.jdt.core.IType;
import org.jboss.tools.cdi.core.extension.AbstractDefinitionContextExtension;
import org.jboss.tools.cdi.internal.core.impl.definition.AnnotationDefinition;
@@ -49,6 +50,13 @@
}
@Override
+ public void clean(IPath path) {
+ for (GenericConfiguration c: genericConfiguartions.values()) {
+ c.clear(path);
+ }
+ }
+
+ @Override
public void clean(String typeName) {
genericConfiguartions.remove(typeName);
for (GenericConfiguration c: genericConfiguartions.values()) {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericConfiguration.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericConfiguration.java 2011-06-03 21:51:16 UTC (rev 31829)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericConfiguration.java 2011-06-03 23:01:36 UTC (rev 31830)
@@ -45,6 +45,10 @@
this.genericType = genericType;
}
+ public void clear(IPath path) {
+ involvedResources.remove(path);
+ }
+
public void clear(String typeName) {
Iterator<AbstractMemberDefinition> it = genericProducerBeans.keySet().iterator();
while(it.hasNext()) {
14 years, 10 months
JBoss Tools SVN: r31829 - trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-06-03 17:51:16 -0400 (Fri, 03 Jun 2011)
New Revision: 31829
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockJSTPublisherTest.java
Log:
[JBIDE-9054] removed unneeded imports
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockJSTPublisherTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockJSTPublisherTest.java 2011-06-03 21:47:16 UTC (rev 31828)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockJSTPublisherTest.java 2011-06-03 21:51:16 UTC (rev 31829)
@@ -6,8 +6,6 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.ServerUtil;
-import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7JSTPublisher;
-import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7Server;
import org.jboss.ide.eclipse.as.test.util.IOUtil;
import org.jboss.ide.eclipse.as.test.util.ServerRuntimeUtils;
14 years, 10 months
JBoss Tools SVN: r31828 - trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-06-03 17:47:16 -0400 (Fri, 03 Jun 2011)
New Revision: 31828
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeploymentTester.java
Log:
[JBIDE-9069] fixed SingleFileDeploymentTester: formerly only .deploy marker was removed, now also .failed marker is always removed. I corrected the asserts in the test
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeploymentTester.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeploymentTester.java 2011-06-03 20:36:04 UTC (rev 31827)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeploymentTester.java 2011-06-03 21:47:16 UTC (rev 31828)
@@ -174,25 +174,26 @@
ServerRuntimeUtils.publish(server);
JobUtils.waitForIdle();
assertEquals(changed2.size(), 2); // Creating blah.jar and blah.jar.dodeploy
- assertEquals(removed2.size(), 1); // TODO find out why its "removing" the empty string
+ assertEquals(removed2.size(), 2); // removed test.xml - we could be switching from exploded to war - and test.xml.failed
MockPublishMethod.reset();
IOUtil.setContents(project.getFile(filename), "2");
ServerRuntimeUtils.publish(server);
JobUtils.waitForIdle();
- assertEquals(changed2.size(), 2);
- assertEquals(removed2.size(), 0);
+ assertEquals(changed2.size(), 2); // Creating blah.jar and blah.jar.dodeploy
+ // Removed blah.jar.failed
+ assertEquals(removed2.size(), 1);
MockPublishMethod.reset();
server = ServerRuntimeUtils.removeModule(server, mods[0]);
- assertEquals(changed2.size(), 0);
+ assertEquals(changed2.size(), 0);
assertEquals(removed2.size(), 0);
MockPublishMethod.reset();
ServerRuntimeUtils.publish(server);
JobUtils.waitForIdle();
assertEquals(changed2.size(), 0);
- assertEquals(removed2.size(), 1);
+ assertEquals(removed2.size(), 2); // [test.xml.failed, test.xml.deployed]
MockPublishMethod.reset();
}
@@ -218,15 +219,16 @@
assertEquals(changed2.size(), 0);
assertEquals(removed2.size(), 0);
ServerRuntimeUtils.publish(server);
- assertEquals(changed2.size(), 5);
- assertEquals(removed2.size(), 1);
+ assertEquals(changed2.size(), 5); // [test, test/1.txt, test/2.txt, test/3.txt, test.dodeploy]
+ // [test.failed, test] -> always removing prior deployment (could be switching from war to exloded) & .failed marker
+ assertEquals(removed2.size(), 2);
MockPublishMethod.reset();
IFolder folder = project.getFolder(folderName);
IOUtil.setContents(folder.getFile("3.txt"), "3a");
ServerRuntimeUtils.publish(server);
assertEquals(changed2.size(), 3);
- assertEquals(removed2.size(), 0);
+ assertEquals(removed2.size(), 1); // [test.failed]
MockPublishMethod.reset();
server = ServerRuntimeUtils.removeModule(server, mods[0]);
@@ -237,7 +239,7 @@
ServerRuntimeUtils.publish(server);
JobUtils.waitForIdle();
assertEquals(changed2.size(), 0);
- assertEquals(removed2.size(), 1);
+ assertEquals(removed2.size(), 2); // [test.failed, test.deployed]
MockPublishMethod.reset();
}
14 years, 10 months
JBoss Tools SVN: r31827 - trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-06-03 16:36:04 -0400 (Fri, 03 Jun 2011)
New Revision: 31827
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentWarUpdateXML.java
Log:
[JBIDE-9069] fixed testWarUpdateMockPublishMethodJBoss7: formerly only .deploy marker was removed, now also .failed marker is always removed. I corrected the asserts in the test
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentWarUpdateXML.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentWarUpdateXML.java 2011-06-03 19:18:57 UTC (rev 31826)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentWarUpdateXML.java 2011-06-03 20:36:04 UTC (rev 31827)
@@ -60,16 +60,24 @@
public void testWarUpdateMockPublishMethod() throws CoreException, IOException {
server = ServerRuntimeUtils.useMockPublishMethod(server);
- testMockPublishMethod(7,1,"newModule.war");
+ testMockPublishMethod(7,"newModule.war");
}
public void testWarUpdateMockPublishMethodJBoss7() throws CoreException, IOException {
server = ServerRuntimeUtils.createMockJBoss7Server();
server = ServerRuntimeUtils.useMockPublishMethod(server);
- testMockPublishMethod(8,1,"newModule.war" + DeploymentMarkerUtils.DEPLOYED);
+ /*
+ * removing module newModule.war will remove 2 markers:
+ * <ul>
+ * <li>newModule.war.deployed</li>
+ * <li>newModule.war.failed</li>
+ * </ul>
+ */
+ testMockPublishMethod(8,"newModule.war" + DeploymentMarkerUtils.FAILED_DEPLOY,"newModule.war" + DeploymentMarkerUtils.DEPLOYED);
}
- private void testMockPublishMethod(int initial, int remove, String removedFile) throws CoreException, IOException {
+ private void testMockPublishMethod(int initial, String... filesToRemove) throws CoreException, IOException {
+ // add
MockPublishMethod.reset();
IModule mod = ServerUtil.getModule(project);
server = ServerRuntimeUtils.addModule(server,mod);
@@ -77,10 +85,14 @@
assertEquals(initial, MockPublishMethod.getChanged().length);
MockPublishMethod.reset();
+ // remove
server = ServerRuntimeUtils.removeModule(server, mod);
ServerRuntimeUtils.publish(server);
- assertEquals(remove, MockPublishMethod.getRemoved().length);
- assertEquals(removedFile, MockPublishMethod.getRemoved()[0].toString());
+ assertEquals(filesToRemove.length, MockPublishMethod.getRemoved().length);
+ IPath[] removedFiles = MockPublishMethod.getRemoved();
+ for(int i = 0; i < removedFiles.length; i++) {
+ assertEquals(filesToRemove[i], removedFiles[i].toString());
+ }
MockPublishMethod.reset();
}
}
14 years, 10 months
JBoss Tools SVN: r31826 - branches/jbosstools-3.2.x/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2011-06-03 15:18:57 -0400 (Fri, 03 Jun 2011)
New Revision: 31826
Added:
branches/jbosstools-3.2.x/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/Nullplugin_JBIDE8792.java
Modified:
branches/jbosstools-3.2.x/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/XulRunnerAllTests.java
Log:
https://issues.jboss.org/browse/JBIDE-8792 : Install flash plugin message appears in VPE if on page used flash references
- added JUnit to check that there is no nullplugin in the XULRunner
Added: branches/jbosstools-3.2.x/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/Nullplugin_JBIDE8792.java
===================================================================
--- branches/jbosstools-3.2.x/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/Nullplugin_JBIDE8792.java (rev 0)
+++ branches/jbosstools-3.2.x/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/Nullplugin_JBIDE8792.java 2011-06-03 19:18:57 UTC (rev 31826)
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2007-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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.vpe.xulrunner.test;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.runtime.Platform;
+import org.jboss.tools.vpe.xulrunner.browser.XulRunnerBrowser;
+import org.osgi.framework.Bundle;
+
+/**
+ * Check that there is no nullplugin in the XULRunner bundle.
+ * <p>
+ * The nullplugin is the default plug-in for Adobe Flash. The
+ * presence of it is undesirable for VPE, because it shows annoying
+ * message suggesting to download Adobe Flash plugin.
+ *
+ * @see <a href="https://issues.jboss.org/browse/JBIDE-8792">JBIDE-8792</a>
+ * @author Yahor Radtsevich
+ */
+public class Nullplugin_JBIDE8792 extends TestCase {
+ public void testNullplugin() {
+ Bundle xulRunnerBundle = Platform.getBundle(XulRunnerBrowser.getXulRunnerBundle());
+ assertTrue("Nullplugin is found, but it should not be there.",
+ xulRunnerBundle.getResource("xulrunner/plugins/libnullplugin.so") == null &&
+ xulRunnerBundle.getResource("xulrunner/plugins/npnul32.dll") == null);
+ }
+}
Modified: branches/jbosstools-3.2.x/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/XulRunnerAllTests.java
===================================================================
--- branches/jbosstools-3.2.x/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/XulRunnerAllTests.java 2011-06-03 19:07:02 UTC (rev 31825)
+++ branches/jbosstools-3.2.x/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/XulRunnerAllTests.java 2011-06-03 19:18:57 UTC (rev 31826)
@@ -19,6 +19,7 @@
suite.addTestSuite(XulRunnerBrowserTest.class);
suite.addTestSuite(DOMCreatingTest.class);
suite.addTestSuite(XPCOMTest.class);
+ suite.addTestSuite(Nullplugin_JBIDE8792.class);
return suite;
}
}
14 years, 10 months
JBoss Tools SVN: r31825 - trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2011-06-03 15:07:02 -0400 (Fri, 03 Jun 2011)
New Revision: 31825
Added:
trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/Nullplugin_JBIDE8792.java
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/XulRunnerAllTests.java
Log:
https://issues.jboss.org/browse/JBIDE-8792 : Install flash plugin message appears in VPE if on page used flash references
- added JUnit to check that there is no nullplugin in the XULRunner
Added: trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/Nullplugin_JBIDE8792.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/Nullplugin_JBIDE8792.java (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/Nullplugin_JBIDE8792.java 2011-06-03 19:07:02 UTC (rev 31825)
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2007-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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.vpe.xulrunner.test;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.runtime.Platform;
+import org.jboss.tools.vpe.xulrunner.browser.XulRunnerBrowser;
+import org.osgi.framework.Bundle;
+
+/**
+ * Check that there is no nullplugin in the XULRunner bundle.
+ * <p>
+ * The nullplugin is the default plug-in for Adobe Flash. The
+ * presence of it is undesirable for VPE, because it shows annoying
+ * message suggesting to download Adobe Flash plugin.
+ *
+ * @see <a href="https://issues.jboss.org/browse/JBIDE-8792">JBIDE-8792</a>
+ * @author Yahor Radtsevich
+ */
+public class Nullplugin_JBIDE8792 extends TestCase {
+ public void testNullplugin() {
+ Bundle xulRunnerBundle = Platform.getBundle(XulRunnerBrowser.getXulRunnerBundle());
+ assertTrue("Nullplugin is found, but it should not be there.",
+ xulRunnerBundle.getResource("xulrunner/plugins/libnullplugin.so") == null &&
+ xulRunnerBundle.getResource("xulrunner/plugins/npnul32.dll") == null);
+ }
+}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/XulRunnerAllTests.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/XulRunnerAllTests.java 2011-06-03 18:31:53 UTC (rev 31824)
+++ trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/XulRunnerAllTests.java 2011-06-03 19:07:02 UTC (rev 31825)
@@ -19,6 +19,7 @@
suite.addTestSuite(XulRunnerBrowserTest.class);
suite.addTestSuite(DOMCreatingTest.class);
suite.addTestSuite(XPCOMTest.class);
+ suite.addTestSuite(Nullplugin_JBIDE8792.class);
return suite;
}
}
14 years, 10 months
JBoss Tools SVN: r31824 - trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-03 14:31:53 -0400 (Fri, 03 Jun 2011)
New Revision: 31824
Removed:
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/JobUtils.java
Log:
JBIDE-9066
https://issues.jboss.org/browse/JBIDE-9066
Deleted: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/JobUtils.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/JobUtils.java 2011-06-03 18:19:57 UTC (rev 31823)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/JobUtils.java 2011-06-03 18:31:53 UTC (rev 31824)
@@ -1,58 +0,0 @@
-package org.jboss.tools.seam.ui.test.view;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.swt.widgets.Display;
-
-public class JobUtils {
- public static void waitUsersJobsAreFinished() {
- Job waitJob = new Job("Waiting while all users jobs are finished") {
- @Override
- protected IStatus run(IProgressMonitor monitor) {
- return Status.OK_STATUS;
- }
- };
- waitJob.setUser(true);
- waitJob.schedule(5000);
-
- try {
- waitJob.join();
- } catch (InterruptedException e) {
- }
- }
-
- public static void waitForJobs() {
- while (!Platform.getJobManager().isIdle())
- delay(1000);
- }
-
- /**
- * Process UI input but do not return for the
- * specified time interval.
- *
- * @param delayMillis the number of milliseconds
- */
- protected static void delay(long delayMillis) {
- Display currentDisplay = Display.getCurrent();
-
- // If this is the UI thread
- if (currentDisplay != null) {
- long endTimeMillis = System.currentTimeMillis() + delayMillis;
- while (System.currentTimeMillis() < endTimeMillis) {
- if (!currentDisplay.readAndDispatch()) currentDisplay.sleep();
- }
- currentDisplay.update();
- } else {
- // perform a simple sleep
- try {
- Thread.sleep(delayMillis);
- } catch (InterruptedException e) {
- // Just allow it running
- }
- }
- }
-
-}
14 years, 10 months
JBoss Tools SVN: r31823 - trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-03 14:19:57 -0400 (Fri, 03 Jun 2011)
New Revision: 31823
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/TestUtil.java
Log:
JBIDE-9066
https://issues.jboss.org/browse/JBIDE-9066
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/TestUtil.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/TestUtil.java 2011-06-03 18:18:13 UTC (rev 31822)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/TestUtil.java 2011-06-03 18:19:57 UTC (rev 31823)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007-2010 Red Hat, Inc.
+ * Copyright (c) 2007-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,
@@ -11,12 +11,11 @@
package org.jboss.tools.jsf.ui.test;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditorPart;
+import org.jboss.tools.test.util.JobUtils;
import static junit.framework.Assert.*;
@@ -35,32 +34,11 @@
public static final long MAX_IDLE = 15*1000L;
public static void delay(long waitTimeMillis) {
- Display display = Display.getCurrent();
- if (display != null) {
- long endTimeMillis = System.currentTimeMillis() + waitTimeMillis;
- while (System.currentTimeMillis() < endTimeMillis) {
- if (!display.readAndDispatch())
- display.sleep();
- }
- display.update();
- }
- // Otherwise, perform a simple sleep.
- else {
- try {
- Thread.sleep(waitTimeMillis);
- } catch (InterruptedException e) {
- // Ignored.
- }
- }
+ JobUtils.delay(waitTimeMillis);
}
public static void waitForIdle(long maxIdle) {
- long start = System.currentTimeMillis();
- while (!Job.getJobManager().isIdle()) {
- delay(500);
- if ( (System.currentTimeMillis()-start) > maxIdle )
- throw new RuntimeException("A long running task detected"); //$NON-NLS-1$
- }
+ JobUtils.waitForIdle(500, maxIdle);
}
public static void waitForIdle() {
@@ -68,14 +46,11 @@
}
public static JSPMultiPageEditorPart openEditor(IEditorInput input) throws PartInitException {
-
// get editor
JSPMultiPageEditorPart part = (JSPMultiPageEditorPart) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().openEditor(
input, EDITOR_ID, true);
-
assertNotNull(part);
return part;
-
}
}
14 years, 10 months