Author: jjankovi Date: 2011-11-30 08:46:47 -0500 (Wed, 30 Nov 2011) New Revision: 36780 Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/FindObserverForEventTest.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/OpenOnTest.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/BeanValidationQuickFixTest.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/DecoratorValidationQuickFixTest.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/IBindingValidationQuickFixTest.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/InterceptorValidationQuickFixTest.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/QualifierValidationQuickFixTest.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/StereotypeValidationQuickFixTest.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3Test.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/BeansXMLValidationHelper.java Log: Small refactoring of creating CDI components Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/FindObserverForEventTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/FindObserverForEventTest.java 2011-11-30 13:39:40 UTC (rev 36779) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/FindObserverForEventTest.java 2011-11-30 13:46:47 UTC (rev 36780) @@ -90,25 +90,18 @@ wizard.createCDIComponent(CDIWizardType.QUALIFIER, "Q2", getPackageName(), null); - wizard.createCDIComponent(CDIWizardType.BEAN, "MyBean1", getPackageName(), null); - editResourceUtil.replaceClassContentByResource(FindObserverForEventTest.class - .getResourceAsStream("/resources/events/MyBean1.java.cdi"), - false); + wizard.createCDIComponentWithContent(CDIWizardType.BEAN, "MyBean1", + getPackageName(), null, "/resources/events/MyBean1.java.cdi"); - wizard.createCDIComponent(CDIWizardType.BEAN, "MyBean2", getPackageName(), null); - editResourceUtil.replaceClassContentByResource(FindObserverForEventTest.class - .getResourceAsStream("/resources/events/MyBean2.java.cdi"), - false); + wizard.createCDIComponentWithContent(CDIWizardType.BEAN, "MyBean2", + getPackageName(), null, "/resources/events/MyBean2.java.cdi"); - wizard.createCDIComponent(CDIWizardType.BEAN, "EventsProducer", getPackageName(), null); - editResourceUtil.replaceClassContentByResource(FindObserverForEventTest.class - .getResourceAsStream("/resources/events/EventsProducer.java.cdi"), - false); - - wizard.createCDIComponent(CDIWizardType.BEAN, "ObserverBean", getPackageName(), null); - editResourceUtil.replaceClassContentByResource(FindObserverForEventTest.class - .getResourceAsStream("/resources/events/ObserverBean.java.cdi"), - false); + wizard.createCDIComponentWithContent(CDIWizardType.BEAN, "EventsProducer", + getPackageName(), null, "/resources/events/EventsProducer.java.cdi"); + + wizard.createCDIComponentWithContent(CDIWizardType.BEAN, "ObserverBean", + getPackageName(), null, "/resources/events/ObserverBean.java.cdi"); + util.waitForNonIgnoredJobs(); } Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/OpenOnTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/OpenOnTest.java 2011-11-30 13:39:40 UTC (rev 36779) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/OpenOnTest.java 2011-11-30 13:46:47 UTC (rev 36780) @@ -82,10 +82,9 @@ String className = "Bean1"; - wizard.createCDIComponent(CDIWizardType.BEAN, className, getPackageName(), null); - editResourceUtil.replaceClassContentByResource(OpenOnTest.class - .getResourceAsStream("/resources/openon/BeanWithDisposerAndProducer.java.cdi"), - false); + wizard.createCDIComponentWithContent(CDIWizardType.BEAN, className, + getPackageName(), null, "/resources/openon/BeanWithDisposerAndProducer.java.cdi"); + editResourceUtil.replaceInEditor("BeanComponent", className); openOnUtil.openOnByOption("disposeMethod", className + ".java", "Open Bound Producer"); assertTrue(getEd().toTextEditor().getSelection().equals("produceMethod")); @@ -96,14 +95,11 @@ @Test public void testObserverOpenOn() { - wizard.createCDIComponent(CDIWizardType.BEAN, "EventBean", getPackageName(), null); - editResourceUtil.replaceClassContentByResource(OpenOnTest.class - .getResourceAsStream("/resources/openon/EventBean.java.cdi"), - false); - wizard.createCDIComponent(CDIWizardType.BEAN, "ObserverBean", getPackageName(), null); - editResourceUtil.replaceClassContentByResource(OpenOnTest.class - .getResourceAsStream("/resources/openon/ObserverBean.java.cdi"), - false); + wizard.createCDIComponentWithContent(CDIWizardType.BEAN, "EventBean", + getPackageName(), null, "/resources/openon/EventBean.java.cdi"); + + wizard.createCDIComponentWithContent(CDIWizardType.BEAN, "ObserverBean", + getPackageName(), null, "/resources/openon/ObserverBean.java.cdi"); bot.editorByTitle("EventBean.java").show(); setEd(bot.activeEditor().toTextEditor()); @@ -123,30 +119,21 @@ wizard.createCDIComponent(CDIWizardType.BEAN, "MyBean1", getPackageName(), null); - wizard.createCDIComponent(CDIWizardType.BEAN, "MyBean2", getPackageName(), null); - editResourceUtil.replaceClassContentByResource(OpenOnTest.class - .getResourceAsStream("/resources/openon/InjectedPoints/MyBean2.java.cdi"), - false); + wizard.createCDIComponentWithContent(CDIWizardType.BEAN, "MyBean2", + getPackageName(), null, "/resources/openon/InjectedPoints/MyBean2.java.cdi"); - wizard.createCDIComponent(CDIWizardType.BEAN, "MyBean3", getPackageName(), null); - editResourceUtil.replaceClassContentByResource(OpenOnTest.class - .getResourceAsStream("/resources/openon/InjectedPoints/MyBean3.java.cdi"), - false); + wizard.createCDIComponentWithContent(CDIWizardType.BEAN, "MyBean3", + getPackageName(), null, "/resources/openon/InjectedPoints/MyBean3.java.cdi"); - wizard.createCDIComponent(CDIWizardType.BEAN, "MyBean4", getPackageName(), null); - editResourceUtil.replaceClassContentByResource(OpenOnTest.class - .getResourceAsStream("/resources/openon/InjectedPoints/MyBean4.java.cdi"), - false); + wizard.createCDIComponentWithContent(CDIWizardType.BEAN, "MyBean4", + getPackageName(), null, "/resources/openon/InjectedPoints/MyBean4.java.cdi"); - wizard.createCDIComponent(CDIWizardType.BEAN, "MyBean5", getPackageName(), null); - editResourceUtil.replaceClassContentByResource(OpenOnTest.class - .getResourceAsStream("/resources/openon/InjectedPoints/MyBean5.java.cdi"), - false); + wizard.createCDIComponentWithContent(CDIWizardType.BEAN, "MyBean5", + getPackageName(), null, "/resources/openon/InjectedPoints/MyBean5.java.cdi"); - wizard.createCDIComponent(CDIWizardType.BEAN, "MainBean", getPackageName(), null); - editResourceUtil.replaceClassContentByResource(OpenOnTest.class - .getResourceAsStream("/resources/openon/InjectedPoints/MainBean.java.cdi"), - false); + wizard.createCDIComponentWithContent(CDIWizardType.BEAN, "MainBean", + getPackageName(), null, "/resources/openon/InjectedPoints/MainBean.java.cdi"); + } private void checkInjectedPoint(String injectedPoint, String option) { Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/BeanValidationQuickFixTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/BeanValidationQuickFixTest.java 2011-11-30 13:39:40 UTC (rev 36779) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/BeanValidationQuickFixTest.java 2011-11-30 13:46:47 UTC (rev 36780) @@ -96,14 +96,12 @@ String className = "Bean1"; - wizard.createCDIComponent(CDIWizardType.BEAN, className, getPackageName(), null); - editResourceUtil.replaceClassContentByResource(QuickFixTestBase.class - .getResourceAsStream("/resources/quickfix/bean/ConstructorWithParam.java.cdi"), false); + wizard.createCDIComponentWithContent(CDIWizardType.BEAN, className, + getPackageName(), null, "/resources/quickfix/bean/ConstructorWithParam.java.cdi"); editResourceUtil.replaceInEditor("BeanComponent", className); checkQuickFix(CDIAnnotationsType.DISPOSES, CDIWizardType.BEAN); - editResourceUtil.replaceClassContentByResource(QuickFixTestBase.class .getResourceAsStream("/resources/quickfix/bean/ConstructorWithParam.java.cdi"), false); @@ -121,10 +119,9 @@ String className = "Bean2"; - wizard.createCDIComponent(CDIWizardType.BEAN, className, getPackageName(), null); + wizard.createCDIComponentWithContent(CDIWizardType.BEAN, className, + getPackageName(), null, "/resources/quickfix/bean/ProducerWithParam.java.cdi"); - editResourceUtil.replaceClassContentByResource(QuickFixTestBase.class - .getResourceAsStream("/resources/quickfix/bean/ProducerWithParam.java.cdi"), false); editResourceUtil.replaceInEditor("BeanComponent", className); checkQuickFix(CDIAnnotationsType.DISPOSES, CDIWizardType.BEAN); @@ -147,10 +144,9 @@ String className = "Bean3"; - wizard.createCDIComponent(CDIWizardType.BEAN, className, getPackageName(), null); + wizard.createCDIComponentWithContent(CDIWizardType.BEAN, className, + getPackageName(), null, "/resources/quickfix/bean/BeanInjectDisposes.java.cdi"); - editResourceUtil.replaceClassContentByResource(QuickFixTestBase.class - .getResourceAsStream("/resources/quickfix/bean/BeanInjectDisposes.java.cdi"), false); editResourceUtil.replaceInEditor("BeanComponent", className); checkQuickFix(CDIAnnotationsType.DISPOSES, CDIWizardType.BEAN); @@ -163,10 +159,9 @@ String className = "Bean4"; - wizard.createCDIComponent(CDIWizardType.BEAN, className, getPackageName(), null); + wizard.createCDIComponentWithContent(CDIWizardType.BEAN, className, + getPackageName(), null, "/resources/quickfix/bean/BeanInjectDisposes.java.cdi"); - editResourceUtil.replaceClassContentByResource(QuickFixTestBase.class - .getResourceAsStream("/resources/quickfix/bean/BeanInjectDisposes.java.cdi"), false); editResourceUtil.replaceInEditor("import javax.enterprise.inject.Disposes;", "import javax.enterprise.event.Observes;"); editResourceUtil.replaceInEditor("@Disposes", "@Observes"); @@ -182,11 +177,9 @@ String className = "Bean5"; - wizard.createCDIComponent(CDIWizardType.BEAN, className, getPackageName(), null); + wizard.createCDIComponentWithContent(CDIWizardType.BEAN, className, + getPackageName(), null, "/resources/quickfix/bean/BeanInjectProducer.java.cdi"); - editResourceUtil.replaceClassContentByResource(QuickFixTestBase.class - .getResourceAsStream("/resources/quickfix/bean/BeanInjectProducer.java.cdi"), false); - editResourceUtil.replaceInEditor("BeanComponent", className); checkQuickFix(CDIAnnotationsType.PRODUCES, CDIWizardType.BEAN); @@ -199,12 +192,9 @@ String className = "Bean6"; - wizard.createCDIComponent(CDIWizardType.BEAN, className, getPackageName(), null); + wizard.createCDIComponentWithContent(CDIWizardType.BEAN, className, + getPackageName(), null, "/resources/quickfix/bean/ObserverWithDisposer.java.cdi"); - editResourceUtil.replaceClassContentByResource(QuickFixTestBase.class - .getResourceAsStream("/resources/quickfix/bean/ObserverWithDisposer.java.cdi"), - false); - editResourceUtil.replaceInEditor("BeanComponent", className); checkQuickFix(CDIAnnotationsType.OBSERVES, CDIWizardType.BEAN); Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/DecoratorValidationQuickFixTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/DecoratorValidationQuickFixTest.java 2011-11-30 13:39:40 UTC (rev 36779) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/DecoratorValidationQuickFixTest.java 2011-11-30 13:46:47 UTC (rev 36780) @@ -48,15 +48,10 @@ String className = "Decorator1"; - wizard.createCDIComponent(CDIWizardType.DECORATOR, className, - getPackageName(), "java.util.set"); - bot.editorByTitle(className + ".java").show(); - setEd(bot.activeEditor().toTextEditor()); + wizard.createCDIComponentWithContent(CDIWizardType.DECORATOR, className, + getPackageName(), "java.util.set", "/resources/quickfix/decorator/" + + "DecoratorWithStateless.java.cdi"); - - editResourceUtil.replaceClassContentByResource(QuickFixTestBase.class - .getResourceAsStream("/resources/quickfix/decorator/" + - "DecoratorWithStateless.java.cdi"), false); editResourceUtil.replaceInEditor("DecoratorComponent", className); checkQuickFix(CDIAnnotationsType.STATELESS, CDIWizardType.DECORATOR); @@ -69,15 +64,10 @@ String className = "Decorator2"; - wizard.createCDIComponent(CDIWizardType.DECORATOR, className, - getPackageName(), "java.util.set"); - bot.editorByTitle(className + ".java").show(); - setEd(bot.activeEditor().toTextEditor()); - - - editResourceUtil.replaceClassContentByResource(QuickFixTestBase.class - .getResourceAsStream("/resources/quickfix/decorator/" + - "DecoratorWithNamed.java.cdi"), false); + wizard.createCDIComponentWithContent(CDIWizardType.DECORATOR, className, + getPackageName(), "java.util.set", "/resources/quickfix/decorator/" + + "DecoratorWithNamed.java.cdi"); + editResourceUtil.replaceInEditor("DecoratorComponent", className); checkQuickFix(CDIAnnotationsType.NAMED, CDIWizardType.DECORATOR); @@ -90,15 +80,10 @@ String className = "Decorator3"; - wizard.createCDIComponent(CDIWizardType.DECORATOR, className, - getPackageName(), "java.util.set"); - bot.editorByTitle(className + ".java").show(); - setEd(bot.activeEditor().toTextEditor()); + wizard.createCDIComponentWithContent(CDIWizardType.DECORATOR, className, + getPackageName(), "java.util.set", "/resources/quickfix/decorator/" + + "DecoratorWithProducer.java.cdi"); - - editResourceUtil.replaceClassContentByResource(QuickFixTestBase.class - .getResourceAsStream("/resources/quickfix/decorator/" + - "DecoratorWithProducer.java.cdi"), false); editResourceUtil.replaceInEditor("DecoratorComponent", className); checkQuickFix(CDIAnnotationsType.PRODUCES, CDIWizardType.DECORATOR); @@ -111,15 +96,10 @@ String className = "Decorator4"; - wizard.createCDIComponent(CDIWizardType.DECORATOR, className, - getPackageName(), "java.util.set"); - bot.editorByTitle(className + ".java").show(); - setEd(bot.activeEditor().toTextEditor()); + wizard.createCDIComponentWithContent(CDIWizardType.DECORATOR, className, + getPackageName(), "java.util.set", "/resources/quickfix/decorator/" + + "DecoratorWithDisposes.java.cdi"); - - editResourceUtil.replaceClassContentByResource(QuickFixTestBase.class - .getResourceAsStream("/resources/quickfix/decorator/" + - "DecoratorWithDisposes.java.cdi"), false); editResourceUtil.replaceInEditor("DecoratorComponent", className); checkQuickFix(CDIAnnotationsType.DISPOSES, CDIWizardType.DECORATOR); @@ -132,15 +112,10 @@ String className = "Decorator5"; - wizard.createCDIComponent(CDIWizardType.DECORATOR, className, - getPackageName(), "java.util.set"); - bot.editorByTitle(className + ".java").show(); - setEd(bot.activeEditor().toTextEditor()); + wizard.createCDIComponentWithContent(CDIWizardType.DECORATOR, className, + getPackageName(), "java.util.set", "/resources/quickfix/decorator/" + + "DecoratorWithDisposes.java.cdi"); - - editResourceUtil.replaceClassContentByResource(QuickFixTestBase.class - .getResourceAsStream("/resources/quickfix/decorator/" + - "DecoratorWithDisposes.java.cdi"), false); editResourceUtil.replaceInEditor("import javax.enterprise.inject.Disposes;", "import javax.enterprise.event.Observes;"); editResourceUtil.replaceInEditor("@Disposes", "@Observes"); @@ -156,15 +131,10 @@ String className = "Decorator6"; - wizard.createCDIComponent(CDIWizardType.DECORATOR, className, - getPackageName(), "java.util.set"); - bot.editorByTitle(className + ".java").show(); - setEd(bot.activeEditor().toTextEditor()); + wizard.createCDIComponentWithContent(CDIWizardType.DECORATOR, className, + getPackageName(), "java.util.set", "/resources/quickfix/decorator/" + + "DecoratorWithSpecializes.java.cdi"); - - editResourceUtil.replaceClassContentByResource(QuickFixTestBase.class - .getResourceAsStream("/resources/quickfix/decorator/" + - "DecoratorWithSpecializes.java.cdi"), false); editResourceUtil.replaceInEditor("DecoratorComponent", className); checkQuickFix(CDIAnnotationsType.SPECIALIZES, CDIWizardType.DECORATOR); Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/IBindingValidationQuickFixTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/IBindingValidationQuickFixTest.java 2011-11-30 13:39:40 UTC (rev 36779) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/IBindingValidationQuickFixTest.java 2011-11-30 13:46:47 UTC (rev 36780) @@ -49,12 +49,10 @@ String className = "IBinding1"; wizard.createAnnotation("AAnnotation", getPackageName()); - wizard.createCDIComponent(CDIWizardType.INTERCEPTOR_BINDING, - className, getPackageName(), null); - - editResourceUtil.replaceClassContentByResource(QuickFixTestBase.class - .getResourceAsStream("/resources/quickfix/interceptorBinding/" + - "IBindingWithAnnotation.java.cdi"), false); + wizard.createCDIComponentWithContent(CDIWizardType.INTERCEPTOR_BINDING, + className, getPackageName(), null, "/resources/quickfix/interceptorBinding/" + + "IBindingWithAnnotation.java.cdi"); + editResourceUtil.replaceInEditor("IBindingComponent", className); checkQuickFix(CDIAnnotationsType.NONBINDING, CDIWizardType.INTERCEPTOR_BINDING); Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/InterceptorValidationQuickFixTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/InterceptorValidationQuickFixTest.java 2011-11-30 13:39:40 UTC (rev 36779) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/InterceptorValidationQuickFixTest.java 2011-11-30 13:46:47 UTC (rev 36780) @@ -48,14 +48,10 @@ String className = "Interceptor1"; - wizard.createCDIComponent(CDIWizardType.INTERCEPTOR, className, getPackageName(), null); - bot.editorByTitle(className + ".java").show(); - setEd(bot.activeEditor().toTextEditor()); - - - editResourceUtil.replaceClassContentByResource(QuickFixTestBase.class - .getResourceAsStream("/resources/quickfix/interceptor/" + - "InterceptorWithStateless.java.cdi"), false); + wizard.createCDIComponentWithContent(CDIWizardType.INTERCEPTOR, className, + getPackageName(), null, "/resources/quickfix/interceptor/" + + "InterceptorWithStateless.java.cdi"); + editResourceUtil.replaceInEditor("InterceptorComponent", className); checkQuickFix(CDIAnnotationsType.STATELESS, CDIWizardType.INTERCEPTOR); @@ -68,14 +64,10 @@ String className = "Interceptor2"; - wizard.createCDIComponent(CDIWizardType.INTERCEPTOR, className, getPackageName(), null); - bot.editorByTitle(className + ".java").show(); - setEd(bot.activeEditor().toTextEditor()); - - - editResourceUtil.replaceClassContentByResource(QuickFixTestBase.class - .getResourceAsStream("/resources/quickfix/interceptor/" + - "InterceptorWithNamed.java.cdi"), false); + wizard.createCDIComponentWithContent(CDIWizardType.INTERCEPTOR, className, + getPackageName(), null, "/resources/quickfix/interceptor/" + + "InterceptorWithNamed.java.cdi"); + editResourceUtil.replaceInEditor("InterceptorComponent", className); checkQuickFix(CDIAnnotationsType.NAMED, CDIWizardType.INTERCEPTOR); @@ -88,14 +80,10 @@ String className = "Interceptor3"; - wizard.createCDIComponent(CDIWizardType.INTERCEPTOR, className, getPackageName(), null); - bot.editorByTitle(className + ".java").show(); - setEd(bot.activeEditor().toTextEditor()); - - - editResourceUtil.replaceClassContentByResource(QuickFixTestBase.class - .getResourceAsStream("/resources/quickfix/interceptor/" + - "InterceptorWithProducer.java.cdi"), false); + wizard.createCDIComponentWithContent(CDIWizardType.INTERCEPTOR, className, + getPackageName(), null, "/resources/quickfix/interceptor/" + + "InterceptorWithProducer.java.cdi"); + editResourceUtil.replaceInEditor("InterceptorComponent", className); checkQuickFix(CDIAnnotationsType.PRODUCES, CDIWizardType.INTERCEPTOR); @@ -108,14 +96,10 @@ String className = "Interceptor4"; - wizard.createCDIComponent(CDIWizardType.INTERCEPTOR, className, getPackageName(), null); - bot.editorByTitle(className + ".java").show(); - setEd(bot.activeEditor().toTextEditor()); - - - editResourceUtil.replaceClassContentByResource(QuickFixTestBase.class - .getResourceAsStream("/resources/quickfix/interceptor/" + - "InterceptorWithDisposes.java.cdi"), false); + wizard.createCDIComponentWithContent(CDIWizardType.INTERCEPTOR, className, + getPackageName(), null, "/resources/quickfix/interceptor/" + + "InterceptorWithDisposes.java.cdi"); + editResourceUtil.replaceInEditor("InterceptorComponent", className); checkQuickFix(CDIAnnotationsType.DISPOSES, CDIWizardType.INTERCEPTOR); @@ -128,14 +112,10 @@ String className = "Interceptor5"; - wizard.createCDIComponent(CDIWizardType.INTERCEPTOR, className, getPackageName(), null); - bot.editorByTitle(className + ".java").show(); - setEd(bot.activeEditor().toTextEditor()); + wizard.createCDIComponentWithContent(CDIWizardType.INTERCEPTOR, className, + getPackageName(), null, "/resources/quickfix/interceptor/" + + "InterceptorWithDisposes.java.cdi"); - - editResourceUtil.replaceClassContentByResource(QuickFixTestBase.class - .getResourceAsStream("/resources/quickfix/interceptor/" + - "InterceptorWithDisposes.java.cdi"), false); editResourceUtil.replaceInEditor("import javax.enterprise.inject.Disposes;", "import javax.enterprise.event.Observes;"); editResourceUtil.replaceInEditor("@Disposes", "@Observes"); @@ -151,14 +131,10 @@ String className = "Interceptor6"; - wizard.createCDIComponent(CDIWizardType.INTERCEPTOR, className, getPackageName(), null); - bot.editorByTitle(className + ".java").show(); - setEd(bot.activeEditor().toTextEditor()); - - - editResourceUtil.replaceClassContentByResource(QuickFixTestBase.class - .getResourceAsStream("/resources/quickfix/interceptor/" + - "InterceptorWithSpecializes.java.cdi"), false); + wizard.createCDIComponentWithContent(CDIWizardType.INTERCEPTOR, className, + getPackageName(), null, "/resources/quickfix/interceptor/" + + "InterceptorWithSpecializes.java.cdi"); + editResourceUtil.replaceInEditor("InterceptorComponent", className); checkQuickFix(CDIAnnotationsType.SPECIALIZES, CDIWizardType.INTERCEPTOR); Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/QualifierValidationQuickFixTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/QualifierValidationQuickFixTest.java 2011-11-30 13:39:40 UTC (rev 36779) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/QualifierValidationQuickFixTest.java 2011-11-30 13:46:47 UTC (rev 36780) @@ -84,10 +84,10 @@ String className = "Qualifier3"; wizard.createAnnotation("AAnnotation", getPackageName()); - wizard.createCDIComponent(CDIWizardType.QUALIFIER, className, getPackageName(), null); + wizard.createCDIComponentWithContent(CDIWizardType.QUALIFIER, className, + getPackageName(), null, "/resources/quickfix/" + + "qualifier/QualifierWithAnnotation.java.cdi"); - editResourceUtil.replaceClassContentByResource(QuickFixTestBase.class - .getResourceAsStream("/resources/quickfix/qualifier/QualifierWithAnnotation.java.cdi"), false); editResourceUtil.replaceInEditor("QualifierComponent", className); checkQuickFix(CDIAnnotationsType.NONBINDING, CDIWizardType.QUALIFIER); Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/StereotypeValidationQuickFixTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/StereotypeValidationQuickFixTest.java 2011-11-30 13:39:40 UTC (rev 36779) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/StereotypeValidationQuickFixTest.java 2011-11-30 13:46:47 UTC (rev 36780) @@ -83,9 +83,9 @@ String className = "Stereotype3"; - wizard.createCDIComponent(CDIWizardType.STEREOTYPE, className, getPackageName(), null); - editResourceUtil.replaceClassContentByResource(QuickFixTestBase.class - .getResourceAsStream("/resources/quickfix/stereotype/StereotypeWithNamed.java.cdi"), false); + wizard.createCDIComponentWithContent(CDIWizardType.STEREOTYPE, className, + getPackageName(), null, "/resources/quickfix/stereotype/StereotypeWithNamed.java.cdi"); + editResourceUtil.replaceInEditor("StereotypeComponent", className); checkQuickFix(CDIAnnotationsType.NAMED, CDIWizardType.STEREOTYPE); @@ -98,10 +98,9 @@ String className = "Stereotype4"; - wizard.createCDIComponent(CDIWizardType.STEREOTYPE, className, getPackageName(), null); + wizard.createCDIComponentWithContent(CDIWizardType.STEREOTYPE, className, + getPackageName(), null, "/resources/quickfix/stereotype/StereotypeWithTyped.java.cdi"); - editResourceUtil.replaceClassContentByResource(QuickFixTestBase.class - .getResourceAsStream("/resources/quickfix/stereotype/StereotypeWithTyped.java.cdi"), false); editResourceUtil.replaceInEditor("StereotypeComponent", className); checkQuickFix(CDIAnnotationsType.TYPED, CDIWizardType.STEREOTYPE); Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3Test.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3Test.java 2011-11-30 13:39:40 UTC (rev 36779) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3Test.java 2011-11-30 13:46:47 UTC (rev 36780) @@ -77,9 +77,8 @@ wizard.createCDIComponent(CDIWizardType.BEANS_XML, "beans.xml", getProjectName() + "/WebContent/WEB-INF", null); - wizard.createCDIComponent(CDIWizardType.BEAN, className, getPackageName(), null); - editResourceUtil.replaceClassContentByResource(Seam3Test.class - .getResourceAsStream("/resources/seam3/Bean.java.cdi"), false); + wizard.createCDIComponentWithContent(CDIWizardType.BEAN, className, + getPackageName(), null, "/resources/seam3/Bean.java.cdi"); editResourceUtil.replaceInEditor("BeanComponent", className); openOnUtil.openOnByOption("beansXml", className + ".java", "Open Resource"); @@ -140,57 +139,47 @@ /** * injectable beans + qualifiers + generic configuration components */ - wizard.createCDIComponent(CDIWizardType.BEAN, "MyBean", getGenericPackageName(), null); - editResourceUtil.replaceClassContentByResource(Seam3Test.class - .getResourceAsStream("/resources/generic/MyBean.java.cdi"), false); + wizard.createCDIComponentWithContent(CDIWizardType.BEAN, "MyBean", + getGenericPackageName(), null, "/resources/generic/MyBean.java.cdi"); editResourceUtil.replaceInEditor("MyBeanX", "MyBean"); - wizard.createCDIComponent(CDIWizardType.BEAN, "MyBean2", getGenericPackageName(), null); - editResourceUtil.replaceClassContentByResource(Seam3Test.class - .getResourceAsStream("/resources/generic/MyBean.java.cdi"), false); + wizard.createCDIComponentWithContent(CDIWizardType.BEAN, "MyBean2", + getGenericPackageName(), null, "/resources/generic/MyBean.java.cdi"); editResourceUtil.replaceInEditor("MyBeanX", "MyBean2"); - wizard.createCDIComponent(CDIWizardType.BEAN, "MyBean3", getGenericPackageName(), null); - editResourceUtil.replaceClassContentByResource(Seam3Test.class - .getResourceAsStream("/resources/generic/MyBean.java.cdi"), false); + wizard.createCDIComponentWithContent(CDIWizardType.BEAN, "MyBean3", + getGenericPackageName(), null, "/resources/generic/MyBean.java.cdi"); editResourceUtil.replaceInEditor("MyBeanX", "MyBean3"); - wizard.createCDIComponent(CDIWizardType.BEAN, "MyConfiguration", getGenericPackageName(), null); - editResourceUtil.replaceClassContentByResource(Seam3Test.class - .getResourceAsStream("/resources/generic/MyBean.java.cdi"), false); + wizard.createCDIComponentWithContent(CDIWizardType.BEAN, "MyConfiguration", + getGenericPackageName(), null, "/resources/generic/MyBean.java.cdi"); editResourceUtil.replaceInEditor("MyBeanX", "MyConfiguration"); - wizard.createCDIComponent(CDIWizardType.BEAN, "MyGenericType", getGenericPackageName(), null); - editResourceUtil.replaceClassContentByResource(Seam3Test.class - .getResourceAsStream("/resources/generic/MyGenericType.java.cdi"), false); + wizard.createCDIComponentWithContent(CDIWizardType.BEAN, "MyGenericType", + getGenericPackageName(), null, "/resources/generic/MyGenericType.java.cdi"); wizard.createCDIComponent(CDIWizardType.QUALIFIER, "Qualifier1", getGenericPackageName(), null); wizard.createCDIComponent(CDIWizardType.QUALIFIER, "Qualifier2", getGenericPackageName(), null); - wizard.createCDIComponent(CDIWizardType.BEAN, "MyExtendedConfiguration", getGenericPackageName(), null); - editResourceUtil.replaceClassContentByResource(Seam3Test.class - .getResourceAsStream("/resources/generic/MyExtendConfig.java.cdi"), false); + wizard.createCDIComponentWithContent(CDIWizardType.BEAN, "MyExtendedConfiguration", + getGenericPackageName(), null, "/resources/generic/MyExtendConfig.java.cdi"); - wizard.createCDIComponent(CDIWizardType.BEAN, "MyConfigurationProducer", getGenericPackageName(), null); - editResourceUtil.replaceClassContentByResource(Seam3Test.class - .getResourceAsStream("/resources/generic/MyConfigProd.java.cdi"), false); + wizard.createCDIComponentWithContent(CDIWizardType.BEAN, "MyConfigurationProducer", + getGenericPackageName(), null, "/resources/generic/MyConfigProd.java.cdi"); /** * beans which include atributes suggesting opening all the available * generic configurations */ - wizard.createCDIComponent(CDIWizardType.BEAN, "MyBeanInjections", getGenericPackageName(), null); - editResourceUtil.replaceClassContentByResource(Seam3Test.class - .getResourceAsStream("/resources/generic/MyBeanInjections.java.cdi"), false); + wizard.createCDIComponentWithContent(CDIWizardType.BEAN, "MyBeanInjections", + getGenericPackageName(), null, "/resources/generic/MyBeanInjections.java.cdi"); - wizard.createCDIComponent(CDIWizardType.BEAN, "MyGenericBean", getGenericPackageName(), null); - editResourceUtil.replaceClassContentByResource(Seam3Test.class - .getResourceAsStream("/resources/generic/MyGenericBean.java.cdi"), false); + wizard.createCDIComponentWithContent(CDIWizardType.BEAN, "MyGenericBean", + getGenericPackageName(), null, "/resources/generic/MyGenericBean.java.cdi"); - wizard.createCDIComponent(CDIWizardType.BEAN, "MyGenericBean2", getGenericPackageName(), null); - editResourceUtil.replaceClassContentByResource(Seam3Test.class - .getResourceAsStream("/resources/generic/MyGenericBean2.java.cdi"), false); + wizard.createCDIComponentWithContent(CDIWizardType.BEAN, "MyGenericBean2", + getGenericPackageName(), null, "/resources/generic/MyGenericBean2.java.cdi"); } private void checkMyBeanInjections() { Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/BeansXMLValidationHelper.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/BeansXMLValidationHelper.java 2011-11-30 13:39:40 UTC (rev 36779) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/BeansXMLValidationHelper.java 2011-11-30 13:46:47 UTC (rev 36780) @@ -28,6 +28,18 @@ public class BeansXMLValidationHelper extends CDITestBase { + private static final String CLEAR_BEANS_XML = "/resources/beansXML/beans.xml.cdi"; + private static final String CLEAR_BEANS_XML_WITH_TAG = "/resources/beansXML/" + + "beansXmlWithEmptyTag.xml.cdi"; + private static final String BEANS_XML_WITH_INTERCEPTOR = "/resources/beansXML/" + + "beansXmlWithInterceptor.xml.cdi"; + private static final String BEANS_XML_WITH_DECORATOR = "/resources/beansXML/" + + "beansXmlWithDecorator.xml.cdi"; + private static final String BEANS_XML_WITH_STEREOTYPE = "/resources/beansXML/" + + "beansXmlWithStereotype.xml.cdi"; + private static final String BEANS_XML_WITH_ALTERNATIVE = "/resources/beansXML/" + + "beansXmlWithAlternative.xml.cdi"; + /** * Method checks if there is validation problem with text * specified by parameter validationErrors for entered project @@ -59,7 +71,8 @@ /** * Method checks if there is no validation problem when * creating interceptor component with entered className - * packageName for project with name projectName + * packageName for project with name projectName and + * insert tag containing this interceptor * @param projectName * @param packageName * @param className @@ -74,7 +87,8 @@ /** * Method checks if there is no validation problem when * creating decorator component with entered className - * packageName for project with name projectName + * packageName for project with name projectName and + * insert tag containing this decorator * @param projectName * @param packageName * @param className @@ -89,7 +103,8 @@ /** * Method checks if there is no validation problem when * creating alternative bean component with entered className - * packageName for project with name projectName + * packageName for project with name projectName and + * insert tag containing this alternative * @param projectName * @param packageName * @param className @@ -117,7 +132,7 @@ */ public void createClearBeansXML(String projectName) { - createBeansXMLWithContent(projectName, "/resources/beansXML/beans.xml.cdi"); + createBeansXMLWithContent(projectName, CLEAR_BEANS_XML); } @@ -127,8 +142,7 @@ */ public void createClearBeansXMLWithEmptyTag(String projectName) { - createBeansXMLWithContent(projectName, "/resources/beansXML/" + - "beansXmlWithEmptyTag.xml.cdi"); + createBeansXMLWithContent(projectName, CLEAR_BEANS_XML_WITH_TAG); } /** @@ -143,8 +157,7 @@ public void createBeansXMLWithInterceptor(String projectName, String packageName, String className) { - createBeansXMLWithContent(projectName, "/resources/beansXML/" + - "beansXmlWithInterceptor.xml.cdi"); + createBeansXMLWithContent(projectName, BEANS_XML_WITH_INTERCEPTOR); if (className == null || className.length() == 0) { editResourceUtil.replaceInEditor("<class>Component</class>", "<class></class>"); @@ -166,8 +179,7 @@ public void createBeansXMLWithDecorator(String projectName, String packageName, String className) { - createBeansXMLWithContent(projectName, "/resources/beansXML/" + - "beansXmlWithDecorator.xml.cdi"); + createBeansXMLWithContent(projectName, BEANS_XML_WITH_DECORATOR); if (className == null || className.length() == 0) { editResourceUtil.replaceInEditor("<class>Component</class>", "<class></class>"); @@ -189,8 +201,7 @@ public void createBeansXMLWithStereotype(String projectName, String packageName, String className) { - createBeansXMLWithContent(projectName, "/resources/beansXML/" + - "beansXmlWithStereotype.xml.cdi"); + createBeansXMLWithContent(projectName, BEANS_XML_WITH_STEREOTYPE); if (className == null || className.length() == 0) { editResourceUtil.replaceInEditor("<stereotype>Component</stereotype>", "<stereotype></stereotype>"); @@ -212,8 +223,7 @@ public void createBeansXMLWithAlternative(String projectName, String packageName, String className) { - createBeansXMLWithContent(projectName, "/resources/beansXML/" + - "beansXmlWithAlternative.xml.cdi"); + createBeansXMLWithContent(projectName, BEANS_XML_WITH_ALTERNATIVE); if (className == null || className.length() == 0) { editResourceUtil.replaceInEditor("<class>Component</class>", "<class></class>"); @@ -235,7 +245,8 @@ "WebContent/META-INF/beans.xml".split("/")) && !projectExplorer.isFilePresent(projectName, "WebContent/WEB-INF/beans.xml".split("/"))) { - wizard.createCDIComponent(CDIWizardType.BEANS_XML, null, projectName + "/WebContent/WEB-INF", null); + wizard.createCDIComponent(CDIWizardType.BEANS_XML, null, + projectName + "/WebContent/WEB-INF", null); } if (!projectExplorer.isFilePresent(projectName, "WebContent/META-INF/beans.xml".split("/"))) {