[jbosstools-commits] JBoss Tools SVN: r42657 - in trunk: cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker and 1 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Thu Jul 19 17:41:31 EDT 2012
Author: dazarov
Date: 2012-07-19 17:41:31 -0400 (Thu, 19 Jul 2012)
New Revision: 42657
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AddAnnotation.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AddAnnotation.qfxresult
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AddLocalBean.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AddLocalBean.qfxresult
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AddRetention.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AddRetention.qfxresult
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AddSerializable.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AddSerializable.qfxresult
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AddTarget.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AddTarget.qfxresult
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/ChangeAnnotation.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/ChangeAnnotation.qfxresult
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/DeleteAnnotation.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/DeleteAnnotation.qfxresult
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/MakeFieldStatic.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/MakeFieldStatic.qfxresult
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/MakeMethodPublic.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/MakeMethodPublic.qfxresult
Removed:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/NonStaticProducerBroken.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/NonStaticProducerBroken.qfxresult
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIQuickFixTest.java
trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/QuickFixTestUtil.java
Log:
Make CDI Quick Fixes work for As-You-Type validator annotations https://issues.jboss.org/browse/JBIDE-12328
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AddAnnotation.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AddAnnotation.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AddAnnotation.java 2012-07-19 21:41:31 UTC (rev 42657)
@@ -0,0 +1,23 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import javax.enterprise.util.Nonbinding;
+
+ at Retention(RUNTIME)
+ at Target({TYPE, METHOD, FIELD, PARAMETER})
+ at Documented
+ at Qualifier
+public @interface AddAnnotation {
+ @Nonbinding
+ AAnnotation abc();
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AddAnnotation.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AddAnnotation.qfxresult
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AddAnnotation.qfxresult (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AddAnnotation.qfxresult 2012-07-19 21:41:31 UTC (rev 42657)
@@ -0,0 +1,21 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.PARAMETER;
+
+ at Retention(RUNTIME)
+ at Target({TYPE, METHOD, FIELD, PARAMETER})
+ at Documented
+ at Qualifier
+public @interface AddAnnotation {
+ AAnnotation abc();
+}
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AddLocalBean.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AddLocalBean.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AddLocalBean.java 2012-07-19 21:41:31 UTC (rev 42657)
@@ -0,0 +1,12 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import javax.ejb.Stateful;
+import javax.enterprise.inject.Produces;
+import javax.ejb.LocalBean;
+
+ at LocalBean
+ at Stateful
+public class AddLocalBean implements FooProducerLocal, FooProducerLocal2, FooProducerLocal3
+{
+ @Produces public Foo createFoo() { return new Foo(); }
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AddLocalBean.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AddLocalBean.qfxresult
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AddLocalBean.qfxresult (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AddLocalBean.qfxresult 2012-07-19 21:41:31 UTC (rev 42657)
@@ -0,0 +1,11 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import javax.ejb.Stateful;
+import javax.enterprise.inject.Produces;
+import javax.ejb.LocalBean;
+
+ at Stateful
+public class AddLocalBean implements FooProducerLocal, FooProducerLocal2, FooProducerLocal3
+{
+ @Produces public Foo createFoo() { return new Foo(); }
+}
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AddRetention.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AddRetention.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AddRetention.java 2012-07-19 21:41:31 UTC (rev 42657)
@@ -0,0 +1,21 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+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 java.lang.annotation.Documented;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.Retention;
+
+ at Retention(RUNTIME)
+ at Target( { TYPE, METHOD, PARAMETER, FIELD })
+ at Documented
+ at Qualifier
+public @interface AddRetention {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AddRetention.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AddRetention.qfxresult
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AddRetention.qfxresult (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AddRetention.qfxresult 2012-07-19 21:41:31 UTC (rev 42657)
@@ -0,0 +1,18 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+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 java.lang.annotation.Documented;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+ at Target( { TYPE, METHOD, PARAMETER, FIELD })
+ at Documented
+ at Qualifier
+public @interface AddRetention {
+
+}
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AddSerializable.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AddSerializable.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AddSerializable.java 2012-07-19 21:41:31 UTC (rev 42657)
@@ -0,0 +1,11 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import javax.enterprise.context.SessionScoped;
+import java.io.Serializable;
+
+
+ at SessionScoped
+class AddSerializable implements Serializable
+{
+ private static final long serialVersionUID = 1L;
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AddSerializable.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AddSerializable.qfxresult
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AddSerializable.qfxresult (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AddSerializable.qfxresult 2012-07-19 21:41:31 UTC (rev 42657)
@@ -0,0 +1,10 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import javax.enterprise.context.SessionScoped;
+
+
+ at SessionScoped
+class AddSerializable
+{
+ private static final long serialVersionUID = 1L;
+}
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AddTarget.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AddTarget.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AddTarget.java 2012-07-19 21:41:31 UTC (rev 42657)
@@ -0,0 +1,22 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Inherited;
+
+import javax.inject.Scope;
+
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.FIELD;
+import java.lang.annotation.Target;
+
+ at Target({TYPE, METHOD, FIELD})
+ at Retention(RUNTIME)
+ at Scope
+ at Inherited
+ at Documented
+public @interface AddTarget {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AddTarget.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AddTarget.qfxresult
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AddTarget.qfxresult (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AddTarget.qfxresult 2012-07-19 21:41:31 UTC (rev 42657)
@@ -0,0 +1,17 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Inherited;
+
+import javax.inject.Scope;
+
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+ at Retention(RUNTIME)
+ at Scope
+ at Inherited
+ at Documented
+public @interface AddTarget {
+
+}
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/ChangeAnnotation.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/ChangeAnnotation.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/ChangeAnnotation.java 2012-07-19 21:41:31 UTC (rev 42657)
@@ -0,0 +1,21 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+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 java.lang.annotation.Documented;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+ at Retention(RUNTIME)
+ at Target( { TYPE, METHOD, PARAMETER, FIELD })
+ at Documented
+ at Qualifier
+public @interface ChangeAnnotation {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/ChangeAnnotation.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/ChangeAnnotation.qfxresult
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/ChangeAnnotation.qfxresult (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/ChangeAnnotation.qfxresult 2012-07-19 21:41:31 UTC (rev 42657)
@@ -0,0 +1,20 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+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 java.lang.annotation.Documented;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+import java.lang.annotation.Retention;
+
+ at Retention(value = null)
+ at Target( { TYPE, METHOD, PARAMETER, FIELD })
+ at Documented
+ at Qualifier
+public @interface ChangeAnnotation {
+
+}
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/DeleteAnnotation.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/DeleteAnnotation.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/DeleteAnnotation.java 2012-07-19 21:41:31 UTC (rev 42657)
@@ -0,0 +1,19 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+import javax.inject.Named;
+
+ at Named("sss")
+public class DeleteAnnotation {
+ @Produces
+ public String produce(){
+ return "test";
+ }
+
+
+ @Inject
+ public DeleteAnnotation(String aaa){
+
+ }
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/DeleteAnnotation.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/DeleteAnnotation.qfxresult
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/DeleteAnnotation.qfxresult (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/DeleteAnnotation.qfxresult 2012-07-19 21:41:31 UTC (rev 42657)
@@ -0,0 +1,20 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import javax.enterprise.inject.Disposes;
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+import javax.inject.Named;
+
+ at Named("sss")
+public class DeleteAnnotation {
+ @Produces
+ public String produce(){
+ return "test";
+ }
+
+
+ @Inject
+ public DeleteAnnotation(@Disposes String aaa){
+
+ }
+}
Copied: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/MakeFieldStatic.java (from rev 42653, trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/NonStaticProducerBroken.java)
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/MakeFieldStatic.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/MakeFieldStatic.java 2012-07-19 21:41:31 UTC (rev 42657)
@@ -0,0 +1,10 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import javax.ejb.Stateless;
+import javax.enterprise.inject.Produces;
+
+ at Stateless
+public class MakeFieldStatic {
+
+ @Produces public static FunnelWeaver<String> anotherFunnelWeaver;
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/MakeFieldStatic.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Copied: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/MakeFieldStatic.qfxresult (from rev 42653, trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/NonStaticProducerBroken.qfxresult)
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/MakeFieldStatic.qfxresult (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/MakeFieldStatic.qfxresult 2012-07-19 21:41:31 UTC (rev 42657)
@@ -0,0 +1,10 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import javax.ejb.Stateless;
+import javax.enterprise.inject.Produces;
+
+ at Stateless
+public class MakeFieldStatic {
+
+ @Produces public FunnelWeaver<String> anotherFunnelWeaver;
+}
\ No newline at end of file
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/MakeMethodPublic.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/MakeMethodPublic.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/MakeMethodPublic.java 2012-07-19 21:41:31 UTC (rev 42657)
@@ -0,0 +1,10 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import javax.ejb.Stateful;
+import javax.enterprise.inject.Produces;
+
+ at Stateful
+public class MakeMethodPublic
+{
+ @Produces public Foo createFoo() { return new Foo(); }
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/MakeMethodPublic.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/MakeMethodPublic.qfxresult
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/MakeMethodPublic.qfxresult (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/MakeMethodPublic.qfxresult 2012-07-19 21:41:31 UTC (rev 42657)
@@ -0,0 +1,10 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import javax.ejb.Stateful;
+import javax.enterprise.inject.Produces;
+
+ at Stateful
+public class MakeMethodPublic
+{
+ @Produces Foo createFoo() { return new Foo(); }
+}
Deleted: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/NonStaticProducerBroken.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/NonStaticProducerBroken.java 2012-07-19 21:15:14 UTC (rev 42656)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/NonStaticProducerBroken.java 2012-07-19 21:41:31 UTC (rev 42657)
@@ -1,10 +0,0 @@
-package org.jboss.jsr299.tck.tests.jbt.quickfixes;
-
-import javax.ejb.Stateless;
-import javax.enterprise.inject.Produces;
-
- at Stateless
-public class NonStaticProducerBroken {
-
- public FunnelWeaver<String> anotherFunnelWeaver;
-}
\ No newline at end of file
Deleted: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/NonStaticProducerBroken.qfxresult
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/NonStaticProducerBroken.qfxresult 2012-07-19 21:15:14 UTC (rev 42656)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/NonStaticProducerBroken.qfxresult 2012-07-19 21:41:31 UTC (rev 42657)
@@ -1,10 +0,0 @@
-package org.jboss.jsr299.tck.tests.jbt.quickfixes;
-
-import javax.ejb.Stateless;
-import javax.enterprise.inject.Produces;
-
- at Stateless
-public class NonStaticProducerBroken {
-
- @Produces public FunnelWeaver<String> anotherFunnelWeaver;
-}
\ No newline at end of file
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIQuickFixTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIQuickFixTest.java 2012-07-19 21:15:14 UTC (rev 42656)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIQuickFixTest.java 2012-07-19 21:41:31 UTC (rev 42657)
@@ -2,23 +2,92 @@
import org.eclipse.core.runtime.CoreException;
import org.jboss.tools.cdi.core.test.tck.TCKTest;
-import org.jboss.tools.cdi.internal.core.validation.CDICoreValidator;
import org.jboss.tools.cdi.internal.core.validation.CDIValidationErrorManager;
+import org.jboss.tools.cdi.ui.marker.AddAnnotationMarkerResolution;
+import org.jboss.tools.cdi.ui.marker.AddLocalBeanMarkerResolution;
+import org.jboss.tools.cdi.ui.marker.AddRetentionAnnotationMarkerResolution;
+import org.jboss.tools.cdi.ui.marker.AddSerializableInterfaceMarkerResolution;
+import org.jboss.tools.cdi.ui.marker.AddTargetAnnotationMarkerResolution;
+import org.jboss.tools.cdi.ui.marker.ChangeAnnotationMarkerResolution;
+import org.jboss.tools.cdi.ui.marker.DeleteAnnotationMarkerResolution;
import org.jboss.tools.cdi.ui.marker.MakeFieldStaticMarkerResolution;
-import org.jboss.tools.common.base.test.MarkerResolutionTestUtil;
+import org.jboss.tools.cdi.ui.marker.MakeMethodPublicMarkerResolution;
import org.jboss.tools.common.base.test.QuickFixTestUtil;
-import org.jboss.tools.common.ui.marker.ConfigureProblemSeverityMarkerResolution;
public class CDIQuickFixTest extends TCKTest {
- QuickFixTestUtil util = new QuickFixTestUtil();
+ private QuickFixTestUtil util = new QuickFixTestUtil();
- public void testConfigureProblemSeverity() throws CoreException {
+ public void testMakeFieldStatic() throws CoreException {
util.checkPrpposal(tckProject,
- "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/NonStaticProducerBroken.java",
- "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/NonStaticProducerBroken.qfxresult",
- CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME,
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/MakeFieldStatic.java",
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/MakeFieldStatic.qfxresult",
CDIValidationErrorManager.ILLEGAL_PRODUCER_FIELD_IN_SESSION_BEAN_ID,
MakeFieldStaticMarkerResolution.class);
}
+
+ public void testAddLocalBeanResolution() throws CoreException {
+ util.checkPrpposal(tckProject,
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/AddLocalBean.java",
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/AddLocalBean.qfxresult",
+ CDIValidationErrorManager.ILLEGAL_PRODUCER_METHOD_IN_SESSION_BEAN_ID,
+ AddLocalBeanMarkerResolution.class);
+ }
+ public void testMakeProducerMethodPublicResolution() throws CoreException {
+ util.checkPrpposal(tckProject,
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/MakeMethodPublic.java",
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/MakeMethodPublic.qfxresult",
+ CDIValidationErrorManager.ILLEGAL_PRODUCER_METHOD_IN_SESSION_BEAN_ID,
+ MakeMethodPublicMarkerResolution.class);
+ }
+
+
+ public void testAddSerializableInterfaceResolution() throws CoreException{
+ util.checkPrpposal(tckProject,
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/AddSerializable.java",
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/AddSerializable.qfxresult",
+ CDIValidationErrorManager.NOT_PASSIVATION_CAPABLE_BEAN_ID,
+ AddSerializableInterfaceMarkerResolution.class);
+ }
+
+ public void testAddRetentionToQualifierResolution() throws CoreException{
+ util.checkPrpposal(tckProject,
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/AddRetention.java",
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/AddRetention.qfxresult",
+ CDIValidationErrorManager.MISSING_RETENTION_ANNOTATION_IN_QUALIFIER_TYPE_ID,
+ AddRetentionAnnotationMarkerResolution.class);
+ }
+
+ public void testChangeRetentionToQualifierResolution() throws CoreException{
+ util.checkPrpposal(tckProject,
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/ChangeAnnotation.java",
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/ChangeAnnotation.qfxresult",
+ CDIValidationErrorManager.MISSING_RETENTION_ANNOTATION_IN_QUALIFIER_TYPE_ID,
+ ChangeAnnotationMarkerResolution.class);
+ }
+
+ public void testAddTargetToScopeResolution() throws CoreException{
+ util.checkPrpposal(tckProject,
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/AddTarget.java",
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/AddTarget.qfxresult",
+ CDIValidationErrorManager.MISSING_TARGET_ANNOTATION_IN_SCOPE_TYPE_ID,
+ AddTargetAnnotationMarkerResolution.class);
+ }
+
+ public void testAddNonbindingToAnnotationMemberOfQualifierResolution() throws CoreException{
+ util.checkPrpposal(tckProject,
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/AddAnnotation.java",
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/AddAnnotation.qfxresult",
+ CDIValidationErrorManager.MISSING_NONBINDING_FOR_ANNOTATION_VALUE_IN_QUALIFIER_TYPE_MEMBER_ID,
+ AddAnnotationMarkerResolution.class);
+ }
+
+ public void testDeleteDisposesAnnotationFromParameterResolution() throws CoreException{
+ util.checkPrpposal(tckProject,
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/DeleteAnnotation.java",
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/DeleteAnnotation.qfxresult",
+ CDIValidationErrorManager.CONSTRUCTOR_PARAMETER_ANNOTATED_DISPOSES_ID,
+ DeleteAnnotationMarkerResolution.class);
+ }
+
}
Modified: trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/QuickFixTestUtil.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/QuickFixTestUtil.java 2012-07-19 21:15:14 UTC (rev 42656)
+++ trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/QuickFixTestUtil.java 2012-07-19 21:41:31 UTC (rev 42657)
@@ -30,15 +30,18 @@
import org.jboss.tools.common.ui.marker.AddSuppressWarningsMarkerResolution;
import org.jboss.tools.common.ui.marker.ConfigureProblemSeverityMarkerResolution;
import org.jboss.tools.common.util.FileUtil;
+import org.jboss.tools.common.validation.java.TempJavaProblem;
import org.jboss.tools.common.validation.java.TempJavaProblemAnnotation;
import org.jboss.tools.test.util.JobUtils;
public class QuickFixTestUtil{
- private static final int MAX_SECONDS_TO_WAIT = 10;
+ private static final int MAX_SECONDS_TO_WAIT = 3;
protected ISourceViewer getViewer(IEditorPart editor){
if(editor instanceof JavaEditor){
return ((JavaEditor)editor).getViewer();
+ }else{
+ Assert.fail("editor must be instanceof JavaEditor");
}
return null;
}
@@ -66,7 +69,7 @@
}
}
- public void checkPrpposal(IProject project, String fileName, String newFile, String idName, int id, Class<? extends IJavaCompletionProposal> proposalClass) throws CoreException {
+ public void checkPrpposal(IProject project, String fileName, String newFile, int id, Class<? extends IJavaCompletionProposal> proposalClass) throws CoreException {
IFile file = project.getFile(fileName);
IFile nFile = project.getFile(newFile);
@@ -87,11 +90,11 @@
document.set(text);
// Find annotation
- TempJavaProblemAnnotation[] annotations = waitForProblemAnnotationAppearance(viewer);
- System.out.println("ANNOTATIONS Before...");
- for(TempJavaProblemAnnotation a : annotations){
- System.out.println(a.getText());
- }
+ TempJavaProblemAnnotation[] annotations = waitForProblemAnnotationAppearance(viewer, id);
+ //System.out.println("ANNOTATIONS Before...");
+ //for(TempJavaProblemAnnotation a : annotations){
+ // System.out.println(a.getText());
+ //}
Assert.assertTrue("No annotations found", annotations.length > 0);
@@ -124,11 +127,11 @@
//TestUtil.validate(file);
- TempJavaProblemAnnotation[] newAnnotations = waitForProblemAnnotationAppearance(viewer);
- System.out.println("ANNOTATIONS After...");
- for(TempJavaProblemAnnotation a : newAnnotations){
- System.out.println(a.getText());
- }
+ TempJavaProblemAnnotation[] newAnnotations = waitForProblemAnnotationAppearance(viewer, id);
+ //System.out.println("ANNOTATIONS After...");
+ //for(TempJavaProblemAnnotation a : newAnnotations){
+ // System.out.println(a.getText());
+ //}
Assert.assertTrue("Quick fix did not decrease number of problems. was: "+annotations.length+" now: "+newAnnotations.length, newAnnotations.length <= annotations.length);
@@ -165,7 +168,7 @@
Assert.assertEquals("Wrong result of resolution", fileContent, text);
}
- protected TempJavaProblemAnnotation[] waitForProblemAnnotationAppearance(final ISourceViewer viewer) {
+ protected TempJavaProblemAnnotation[] waitForProblemAnnotationAppearance(final ISourceViewer viewer, final int problemId) {
final ArrayList<TempJavaProblemAnnotation> annotations = new ArrayList<TempJavaProblemAnnotation>();
Display.getDefault().syncExec(new Runnable() {
@@ -191,8 +194,11 @@
Object o = it.next();
if (o instanceof TempJavaProblemAnnotation){
- annotations.add((TempJavaProblemAnnotation) o);
- found = true;
+ int id = ((TempJavaProblemAnnotation) o).getId() - TempJavaProblem.TEMP_PROBLEM_ID;
+ if(id == problemId){
+ annotations.add((TempJavaProblemAnnotation) o);
+ found = true;
+ }
}
}
More information about the jbosstools-commits
mailing list