Author: dazarov Date: 2012-02-09 14:52:58 -0500 (Thu, 09 Feb 2012) New Revision: 38576 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/ValuedQualifier.java trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/AnnotationType.java trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIProject.java trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIQualifierDeclaration.java trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/AddQualifiersToBeanWizardTest.java Log: Wizard 'Specify CDI Bean for the Injection Point' does not compute correctly condition 'can finish' https://issues.jboss.org/browse/JBIDE-10637 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/ValuedQualifier.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/ValuedQualifier.java 2012-02-09 17:03:21 UTC (rev 38575) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/ValuedQualifier.java 2012-02-09 19:52:58 UTC (rev 38576) @@ -35,6 +35,8 @@ pair.value = mvp.getValue(); if(mvp.getValueKind() == IMemberValuePair.K_STRING){ pair.type = "String"; + }else if(mvp.getValueKind() == IMemberValuePair.K_CHAR){ + pair.type = "char"; } pairs.add(pair); } Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/AnnotationType.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/AnnotationType.java 2012-02-09 17:03:21 UTC (rev 38575) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/AnnotationType.java 2012-02-09 19:52:58 UTC (rev 38576) @@ -31,10 +31,18 @@ public class AnnotationType extends Type { private static IMethod[] methods = new IMethod[]{ + new Method("type", "LString;", null), + new Method("name", "LString;", new MemberValuePair("name", "User", IMemberValuePair.K_STRING)), new Method("realChanky", "Z", null), new Method("unrealChanky", "Z", new MemberValuePair("unrealChanky", true, IMemberValuePair.K_BOOLEAN)), new Method("number", "I", null), - new Method("size", "I", new MemberValuePair("size", 125, IMemberValuePair.K_INT)) + new Method("size", "I", new MemberValuePair("size", 125, IMemberValuePair.K_INT)), + new Method("bTs", "B", null), + new Method("bTs2", "B", new MemberValuePair("bTs2", (byte)4, IMemberValuePair.K_BYTE)), + new Method("posibility", "D", null), + new Method("posibility2", "D", new MemberValuePair("posibility2", 0.9999, IMemberValuePair.K_DOUBLE)), + new Method("ch", "C", null), + new Method("ch2", "C", new MemberValuePair("ch2", 'T', IMemberValuePair.K_CHAR)) }; public AnnotationType(String qualifiedName) { Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIProject.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIProject.java 2012-02-09 17:03:21 UTC (rev 38575) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIProject.java 2012-02-09 19:52:58 UTC (rev 38576) @@ -44,6 +44,9 @@ public static final String QUALIFIER4 = "org.test.Qualifier4"; public static final String QUALIFIER5 = "org.test.Qualifier5"; + public static final String COMPLICATED_QUALIFIER1 = "org.test.CompicatedQualifier"; + public static final String COMPLICATED_QUALIFIER2 = "org.test.OtherComplicatedQualifier"; + private IQualifier defaultQualifier, namedQualifier, anyQualifier, newQualifier; private ArrayList<IQualifier> qualifiers = new ArrayList<IQualifier>(); @@ -61,6 +64,9 @@ qualifiers.add(new CDIQualifier(this, QUALIFIER3)); qualifiers.add(new CDIQualifier(this, QUALIFIER4)); qualifiers.add(new CDIQualifier(this, QUALIFIER5)); + + qualifiers.add(new CDIQualifier(this, COMPLICATED_QUALIFIER1)); + qualifiers.add(new CDIQualifier(this, COMPLICATED_QUALIFIER2)); } @Override Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIQualifierDeclaration.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIQualifierDeclaration.java 2012-02-09 17:03:21 UTC (rev 38575) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIQualifierDeclaration.java 2012-02-09 19:52:58 UTC (rev 38576) @@ -25,7 +25,8 @@ new MemberValuePair("name", "John", IMemberValuePair.K_STRING), new MemberValuePair("size", 5, IMemberValuePair.K_INT), new MemberValuePair("p", 0.5, IMemberValuePair.K_DOUBLE), - new MemberValuePair("char", 'Q', IMemberValuePair.K_CHAR), + new MemberValuePair("ch", 'Q', IMemberValuePair.K_CHAR), + new MemberValuePair("b", (byte)6, IMemberValuePair.K_BYTE) }; public CDIQualifierDeclaration(){ Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/AddQualifiersToBeanWizardTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/AddQualifiersToBeanWizardTest.java 2012-02-09 17:03:21 UTC (rev 38575) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/AddQualifiersToBeanWizardTest.java 2012-02-09 19:52:58 UTC (rev 38576) @@ -34,6 +34,7 @@ import org.jboss.tools.cdi.ui.test.testmodel.CDIBean; import org.jboss.tools.cdi.ui.test.testmodel.CDIInjectionPoint; import org.jboss.tools.cdi.ui.test.testmodel.CDIProject; +import org.jboss.tools.cdi.ui.test.testmodel.CDIQualifierDeclaration; import org.jboss.tools.cdi.ui.wizard.AddQualifiersToBeanWizard; @@ -67,6 +68,8 @@ availableCheck.add(new ValuedQualifier(project.getQualifier(CDIProject.QUALIFIER3))); availableCheck.add(new ValuedQualifier(project.getQualifier(CDIProject.QUALIFIER4))); availableCheck.add(new ValuedQualifier(project.getQualifier(CDIProject.QUALIFIER5))); + availableCheck.add(new ValuedQualifier(project.getQualifier(CDIProject.COMPLICATED_QUALIFIER1))); + availableCheck.add(new ValuedQualifier(project.getQualifier(CDIProject.COMPLICATED_QUALIFIER2))); deployedCheck = new ArrayList<ValuedQualifier>(); @@ -217,5 +220,16 @@ checkValuedQualifierLists(deployedCheck, deployed); } - + + public void testValuedQualifier(){ + ValuedQualifier oneQualifier = new ValuedQualifier(project.getQualifier(CDIProject.COMPLICATED_QUALIFIER1)); + String value = oneQualifier.getValue(); + assertEquals("type = \"default\", name = \"User\", realChanky = false, unrealChanky = true, number = 0, size = 125, bTs = 0, bTs2 = 4, posibility = 0.0, posibility2 = 0.9999, ch = ' ', ch2 = 'T'", value); + } + + public void testValuedQualifierWithDeclaration(){ + ValuedQualifier anotherQualifier = new ValuedQualifier(project.getQualifier(CDIProject.COMPLICATED_QUALIFIER2), new CDIQualifierDeclaration()); + String value = anotherQualifier.getValue(); + assertEquals("name = \"John\", size = 5, p = 0.5, ch = 'Q', b = 6", value); + } }