Author: alexsmirnov Date: 2010-01-12 19:13:03 -0500 (Tue, 12 Jan 2010) New Revision: 16271 Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererTemplateParser.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigParser.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/ComponentProcessorTest.java Log: Fix component processor test. Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererTemplateParser.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererTemplateParser.java 2010-01-13 00:11:42 UTC (rev 16270) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererTemplateParser.java 2010-01-13 00:13:03 UTC (rev 16271) @@ -38,8 +38,9 @@ import org.richfaces.cdk.xmlconfig.JAXBBinding; /** - * <p class="changed_added_4_0"></p> - * + * <p class="changed_added_4_0"> + * </p> + * * @author asmirnov(a)exadel.com */ public class RendererTemplateParser implements ModelBuilder { @@ -47,34 +48,39 @@ private JAXBBinding jaxbBinding; /* - * (non-Javadoc) + * (non-Javadoc) + * * @see org.richfaces.cdk.ModelBuilder#build() */ @Override public void build() throws CdkException { ComponentLibrary library = context.getLibrary(); - for (File file : getContext().getSources(StandardSources.RENDERER_TEMPLATES)) { - Template template = parseTemplate(file); - CompositeInterface compositeInterface = template.getInterface(); - // TODO - infer values ? - RenderKitModel renderKit = library.addRenderKit(compositeInterface.getRenderKitId()); - RendererModel renderer = new RendererModel(new RendererModel.Type(compositeInterface.getRendererType())); - renderKit.getRenderers().add(renderer); - String componentType = compositeInterface.getComponentType(); + Iterable<File> sources = getContext().getSources(StandardSources.RENDERER_TEMPLATES); + if (null != sources) { + for (File file : sources) { + Template template = parseTemplate(file); + CompositeInterface compositeInterface = template.getInterface(); + // TODO - infer values ? + RenderKitModel renderKit = library.addRenderKit(compositeInterface.getRenderKitId()); + RendererModel renderer = + new RendererModel(new RendererModel.Type(compositeInterface.getRendererType())); + renderKit.getRenderers().add(renderer); + String componentType = compositeInterface.getComponentType(); - // component.getRenderers().add(renderer); + // component.getRenderers().add(renderer); - String family = compositeInterface.getComponentFamily(); + String family = compositeInterface.getComponentFamily(); - if (null != family) { - renderer.setFamily(family); + if (null != family) { + renderer.setFamily(family); + } + + renderer.setRendererClass(new ClassDescription(compositeInterface.getJavaClass())); + renderer.setTemplate(template); } - renderer.setRendererClass(new ClassDescription(compositeInterface.getJavaClass())); - renderer.setTemplate(template); } - } protected Template parseTemplate(File file) throws CdkException { @@ -82,7 +88,8 @@ } /* - * (non-Javadoc) + * (non-Javadoc) + * * @see org.richfaces.cdk.ModelBuilder#init(org.richfaces.cdk.CdkContext) */ @Override Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigParser.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigParser.java 2010-01-13 00:11:42 UTC (rev 16270) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigParser.java 2010-01-13 00:13:03 UTC (rev 16271) @@ -21,8 +21,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.xmlconfig; import org.richfaces.cdk.CdkContext; @@ -36,9 +34,11 @@ import java.io.File; /** - * <p class="changed_added_4_0"></p> + * <p class="changed_added_4_0"> + * </p> + * * @author asmirnov(a)exadel.com - * + * */ public class FacesConfigParser implements ModelBuilder { @@ -48,7 +48,9 @@ private JAXBBinding jaxbBinding; /** - * <p class="changed_added_4_0"></p> + * <p class="changed_added_4_0"> + * </p> + * * @return the context */ public CdkContext getContext() { @@ -56,29 +58,33 @@ } /* - * (non-Javadoc) + * (non-Javadoc) + * * @see org.richfaces.cdk.ModelBuilder#build() */ @Override public void build() throws CdkException { ComponentLibrary library = context.getLibrary(); - for (File file : context.getSources(StandardSources.FACES_CONFIGS)) { - FacesConfigBean unmarshal = unmarshalFacesConfig(file); - if(null != unmarshal){ - ComponentLibrary facesConfig = ADAPTER.unmarshal(unmarshal); - library.getComponents().addAll(facesConfig.getComponents()); - library.getRenderKits().putAll(facesConfig.getRenderKits()); - library.getConverters().addAll(facesConfig.getConverters()); - // TODO - merge changes into library. - // library.getRenderers().addAll(unmarshal.getRenderers()); - // library.getValidators().addAll(unmarshal.getValidators); - // library.getConverters().addAll(unmarshal.getConverters()); - // library.getBehaviors().addAll(unmarshal.getBehaviors()); - // library.setExtensions(unmarshal.getExtensions()); + Iterable<File> sources = context.getSources(StandardSources.FACES_CONFIGS); + if (null != sources) { + for (File file : sources) { + FacesConfigBean unmarshal = unmarshalFacesConfig(file); + if (null != unmarshal) { + ComponentLibrary facesConfig = ADAPTER.unmarshal(unmarshal); + library.getComponents().addAll(facesConfig.getComponents()); + library.getRenderKits().putAll(facesConfig.getRenderKits()); + library.getConverters().addAll(facesConfig.getConverters()); + // TODO - merge changes into library. + // library.getRenderers().addAll(unmarshal.getRenderers()); + // library.getValidators().addAll(unmarshal.getValidators); + // library.getConverters().addAll(unmarshal.getConverters()); + // library.getBehaviors().addAll(unmarshal.getBehaviors()); + // library.setExtensions(unmarshal.getExtensions()); + } } + } - } protected FacesConfigBean unmarshalFacesConfig(File file) throws CdkException { @@ -86,7 +92,8 @@ } /* - * (non-Javadoc) + * (non-Javadoc) + * * @see org.richfaces.cdk.ModelBuilder#init(org.richfaces.cdk.CdkContext) */ @Override Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/ComponentProcessorTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/ComponentProcessorTest.java 2010-01-13 00:11:42 UTC (rev 16270) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/ComponentProcessorTest.java 2010-01-13 00:13:03 UTC (rev 16271) @@ -29,6 +29,7 @@ import static org.junit.Assert.*; import java.util.Collection; +import java.util.Collections; import java.util.Map; import javax.el.ELContext; @@ -38,7 +39,11 @@ import org.junit.Test; import org.richfaces.cdk.CdkClassLoader; import org.richfaces.cdk.CdkContext; +import org.richfaces.cdk.CdkContextBase; +import org.richfaces.cdk.CdkException; +import org.richfaces.cdk.CdkProcessingException; import org.richfaces.cdk.CdkTestBase; +import org.richfaces.cdk.ModelValidator; import org.richfaces.cdk.NamingConventions; import org.richfaces.cdk.RichFacesConventions; import org.richfaces.cdk.StandardSources; @@ -71,7 +76,6 @@ * @throws Exception */ @Test - @Ignore public void testProcess() throws Exception { // Prepare Mock compilation context. @@ -82,7 +86,6 @@ compiler.init(cdkContext); processor.init(cdkContext); compiler.process(ImmutableList.of(getJavaFile(COMPONENT_CLASS_JAVA)), processor); - verify(cdkContext); ComponentLibrary library = cdkContext.getLibrary(); Collection<ComponentModel> components = library.getComponents(); @@ -92,7 +95,7 @@ ComponentModel component = Iterables.get(components, 0); Map<String, Property> attributes = component.getAttributes(); - assertEquals(17, attributes.size()); + assertEquals(3, attributes.size()); } /** @@ -103,7 +106,6 @@ * @throws Exception */ @Test - @Ignore public void testProcessFacesComponent() throws Exception { // Prepare Mock compilation context. @@ -114,7 +116,6 @@ compiler.init(cdkContext); processor.init(cdkContext); compiler.process(ImmutableList.of(getJavaFile(FACES_COMPONENT_CLASS_JAVA)), processor); - verify(cdkContext); ComponentLibrary library = cdkContext.getLibrary(); Collection<ComponentModel> components = library.getComponents(); @@ -124,35 +125,28 @@ ComponentModel component = Iterables.get(components, 0); Map<String, Property> attributes = component.getAttributes(); - assertEquals(15, attributes.size()); + assertEquals(0, attributes.size()); } private CdkContext createMockContext() throws Exception { - CdkContext cdkContext = createMock(CdkContext.class); - - expect(cdkContext.getSourceFolders(StandardSources.JAVA_SOURCES)).andStubReturn(testSourceDirectory); - expect(cdkContext.getOutputFolder((org.richfaces.cdk.CdkContext.OutputType) anyObject())).andStubReturn(null); - expect(cdkContext.getLoader()).andStubReturn(createClassLoader()); - expect(cdkContext.getLibrary()).andStubReturn(new ComponentLibrary()); - + CdkContextBase baseContext = new CdkContextBase(createClassLoader()); + baseContext.setSourceFolders(StandardSources.JAVA_SOURCES, testSourceDirectory); RichFacesConventions richFacesConventions = new RichFacesConventions(); + baseContext.setWorker(NamingConventions.class, richFacesConventions); + baseContext.setWorker(ModelValidator.class, new ModelValidator() { + + @Override + public void init(CdkContext context) { + + } + + @Override + public void verify(ComponentLibrary library) throws CdkException { + } + }); + baseContext.sendError(new CdkProcessingException()); - expect(cdkContext.getWorker(NamingConventions.class)).andStubReturn(richFacesConventions); - - FragmentParser fragmentParser = new FragmentParser(); - - expect(cdkContext.getWorker(FragmentParser.class)).andStubReturn(fragmentParser); - - JAXBBinding jaxbBinding = new JAXBBinding(); - - expect(cdkContext.getWorker(JAXBBinding.class)).andStubReturn(jaxbBinding); - expect(cdkContext.setWorker(eq(SourceUtils.class), (SourceUtils) anyObject())).andStubReturn(null); - replay(cdkContext); - richFacesConventions.init(cdkContext); - jaxbBinding.init(cdkContext); - fragmentParser.init(cdkContext); - - return cdkContext; + return baseContext; } protected CdkClassLoader createClassLoader() throws Exception {