Author: alexsmirnov Date: 2010-03-03 19:52:13 -0500 (Wed, 03 Mar 2010) New Revision: 16524 Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/validator/ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/validator/ValidatorImpl.java Removed: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/ValidatorImpl.java Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/Generator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/NamingConventions.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/RichFacesConventions.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ProcessorBase.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/RendererProcessor.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/LibraryBuilderTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/NamingConventionsTest.java Log: https://jira.jboss.org/jira/browse/RF-7736 Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/Generator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/Generator.java 2010-03-03 22:51:56 UTC (rev 16523) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/Generator.java 2010-03-04 00:52:13 UTC (rev 16524) @@ -39,6 +39,7 @@ import org.richfaces.cdk.generate.java.taghandler.TagHandlerModule; import org.richfaces.cdk.generate.taglib.TaglibModule; import org.richfaces.cdk.model.ModelModule; +import org.richfaces.cdk.model.validator.ValidatorImpl; import org.richfaces.cdk.templatecompiler.TemplateModule; import org.richfaces.cdk.xmlconfig.XmlModule; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/NamingConventions.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/NamingConventions.java 2010-03-03 22:51:56 UTC (rev 16523) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/NamingConventions.java 2010-03-04 00:52:13 UTC (rev 16524) @@ -23,6 +23,8 @@ package org.richfaces.cdk; +import org.richfaces.cdk.model.ClassName; +import org.richfaces.cdk.model.ComponentModel; import org.richfaces.cdk.model.InvalidNameException; import org.richfaces.cdk.model.ClassName; @@ -38,43 +40,43 @@ public interface NamingConventions { /** - * <p class="changed_added_4_0">Calculates component type from explicit value or base class name.</p> + * <p class="changed_added_4_0">Calculates component type from class name.</p> * <ul> * <li><code>&lt;prefix&gt;.component.Abstract&lt;Name&gt;</code> =&gt;<code>&lt;prefix&gt;.&lt;Name&gt;</code></li> * <li><code>&lt;prefix&gt;.component.&lt;Name&gt;Base</code> =&gt; <code>&lt;prefix&gt;.&lt;Name&gt;</code> </li> * <li><code>&lt;prefix&gt;.component.UI&lt;Name&gt;</code> =&gt; <code>&lt;prefix&gt;.&lt;Name&gt;</code> </li> * </ul> * - * @param explicitType * @param className - * @return + * @return JSF component type. * @throws InvalidNameException if className does not match naming conventions. */ - public String inferComponentType(String explicitType, String className) throws InvalidNameException; + public ComponentModel.Type inferComponentType(ClassName componentClass) throws InvalidNameException; /** * <p class="changed_added_4_0">Calculates concrete component class from explicit value or type.</p> * <ul> - * <li>Use explicit class name if it was provided by developer.</li> * <li>Calculate name from type as <code>&lt;prefix&gt;.&lt;Name&gt;</code> =&gt; - * <code>&lt;prefix&gt;.component.UI&lt;Name&gt;</code> for an abstract class.</li> - * <li>Use base class name if concrete class should not be generated. + * <code>&lt;prefix&gt;.component.UI&lt;Name&gt;</code> .</li> * </ul> * - * @param explicitClass - * @param className - * @return + * @param componentType JSF component type. + * @return Descriptor of generated UIComponent class. + * @throws InvalidNameException if component type does not follow naming conventions. */ - public String inferUIComponentClass(String componentType, String explicitClass, String baseClass, - boolean baseClassIsAbstract) throws InvalidNameException; + public ClassName inferUIComponentClass(ComponentModel.Type componentType) throws InvalidNameException; - public String inferUIComponentBaseClass(String componentType, String baseClassName, boolean baseClassIsAbstract); - public String inferUIComponentFamily(String componentType, String explicitFamily); + /** + * <p class="changed_added_4_0"></p> + * @param componentType + * @return + * @throws InvalidNameException + */ + public String inferUIComponentFamily(ComponentModel.Type componentType) throws InvalidNameException; - public String inferTagHandlerName(ClassName generatedClass); + public ClassName inferTagHandlerClass(ComponentModel.Type componentType, String markup) throws InvalidNameException; - public String inferTagName(ClassName generatedClass); + public String inferTagName(ComponentModel.Type componentType) throws InvalidNameException; - public String inferComponentType(String componentName); } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/RichFacesConventions.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/RichFacesConventions.java 2010-03-03 22:51:56 UTC (rev 16523) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/RichFacesConventions.java 2010-03-04 00:52:13 UTC (rev 16524) @@ -1,5 +1,7 @@ package org.richfaces.cdk; +import org.richfaces.cdk.model.ClassName; +import org.richfaces.cdk.model.ComponentModel; import org.richfaces.cdk.model.InvalidNameException; import org.richfaces.cdk.model.Name; import org.richfaces.cdk.model.ClassName; @@ -23,21 +25,21 @@ private static final String[] COMPONENT_SUFFIXES = {BASE}; private static final String[] COMPONENT_PREFIXES = {UI, ABSTRACT}; + // TODO - inject base name. private String baseName; public RichFacesConventions() {} @Override - public String inferComponentType(String explicitType, String className) throws InvalidNameException { + public ComponentModel.Type inferComponentType( ClassName componentClass) throws InvalidNameException { // check parameters. - if (Strings.isEmpty(explicitType)) { - if (Strings.isEmpty(className)) { + if (null == componentClass) { throw new IllegalArgumentException(); } - Name name = Name.create(className); + Name name = Name.create(componentClass.toString()); // Use base library prefix. String baseName = this.getBaseName(); @@ -72,38 +74,22 @@ name.setSimpleName(simpleName); - return name.toString(); - } else { - return explicitType; - } + return new ComponentModel.Type(name.toString()); } @Override - public String inferUIComponentClass(String componentType, String explicitClass, String baseClass, - boolean baseClassIsAbstract) throws InvalidNameException { - - String className; - - if (!Strings.isEmpty(explicitClass)) { - - // Class name provided by developer. - className = explicitClass; - } else if (isAbstract(baseClass, baseClassIsAbstract)) { - + public ClassName inferUIComponentClass(ComponentModel.Type componentType) throws InvalidNameException { + if (null == componentType) { + throw new IllegalArgumentException(); + } // Infer UI class name from component type. - Name name = Name.create(componentType); + Name name = Name.create(componentType.toString()); name.setClassifier(Classifier.component); name.setMarkup(null); name.setSimpleName(UI + name.getSimpleName()); - className = name.toString(); - } else { - // Do not generate class, use base name. - className = baseClass; - } - - return className; + return new ClassName(name.toString()); } private boolean isAbstract(String baseClass, boolean baseClassIsAbstract) { @@ -111,16 +97,14 @@ } @Override - public String inferUIComponentBaseClass(String componentType, String baseClassName, boolean baseClassIsAbstract) { - return isAbstract(baseClassName, baseClassIsAbstract) ? baseClassName : null; + public String inferUIComponentFamily(ComponentModel.Type componentType) { + if (null == componentType) { + throw new IllegalArgumentException(); + } + return componentType.toString(); } - @Override - public String inferUIComponentFamily(String componentType, String explicitFamily) { - return Strings.isEmpty(explicitFamily) ? componentType : explicitFamily; - } - /** * @param generatedClass - component name in format * <prefix>.component.Abstract<Name> @@ -129,47 +113,28 @@ * <prefix>.taglib.<Name>TagHandler * * */ - public String inferTagHandlerName(ClassName generatedClass) { - Pattern pattern = Pattern.compile("(.+).component.(:?UI|Abstract)(.+)"); - Matcher matcher = pattern.matcher(generatedClass.getName()); - if (matcher.matches()) { - return matcher.group(1) + ".taglib.html." + matcher.group(3) + "TagHandler"; + @Override + public ClassName inferTagHandlerClass(ComponentModel.Type componentType,String markup) { + if (null == componentType) { + throw new IllegalArgumentException(); } - - return generatedClass + "TagHandler"; + Name name = Name.create(componentType.toString()); + name.setClassifier(Classifier.taglib); + name.setMarkup(markup); + name.setSimpleName(name.getSimpleName()+"Handler"); + return new ClassName(name.toString()); } - public String inferTagName(ClassName generatedClass) { - String name = generatedClass.getSimpleName(); - if (name.startsWith(UI)) { - name = name.substring(UI.length()); + @Override + public String inferTagName(ComponentModel.Type componentType) { + if (null == componentType) { + throw new IllegalArgumentException(); } - return Strings.firstToLowerCase(name); + Name name = Name.create(componentType.toString()); + return Strings.firstToLowerCase(name.getSimpleName()); } /** - * @param componentName - component class name, in one of follow forms - * <prefix>.component.Abstract<Name> - * <prefix>.component.UI<Name> - * <prefix>.component.Html<Name> - * - * @return if class name match pattern above will be returned - * <prefix>.<Name> - * else - * componentName - * - * */ - public String inferComponentType(String componentName) { - Pattern pattern = Pattern.compile("(.+).component.(:?UI|Abstract|Html)(.+)"); - Matcher matcher = pattern.matcher(componentName); - if (matcher.matches()) { - return matcher.group(1) + "." + matcher.group(3); - } - - return componentName; - } - - /** * <p class="changed_added_4_0"> * </p> * Deleted: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/ValidatorImpl.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/ValidatorImpl.java 2010-03-03 22:51:56 UTC (rev 16523) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/ValidatorImpl.java 2010-03-04 00:52:13 UTC (rev 16524) @@ -1,109 +0,0 @@ -/* - * $Id$ - * - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - - - -package org.richfaces.cdk; - -import java.util.Collection; - -import org.richfaces.cdk.model.ComponentLibrary; -import org.richfaces.cdk.model.ComponentModel; -import org.richfaces.cdk.model.RenderKitModel; -import org.richfaces.cdk.model.RendererModel; - -import com.google.inject.Inject; - -/** - * <p class="changed_added_4_0"></p> - * @author asmirnov(a)exadel.com - * - */ -public class ValidatorImpl implements ModelValidator { - - @Inject - private Logger log; - - private final ComponentLibrary library; - private final NamingConventions namingConventions; - - @Inject - public ValidatorImpl(ComponentLibrary library, NamingConventions namingConventions) { - this.library = library; - this.namingConventions = namingConventions; - } - /* - * (non-Javadoc) - * @see org.richfaces.cdk.ValidatorModel#verify(org.richfaces.cdk.model.ComponentLibrary) - */ - @Override - public void verify() throws CdkException { - verifyRenderers(); - verifyComponents(); - - // After all, merge all similar elements. - compact(library.getComponents()); - } - - protected void verifyRenderers() { - for (RenderKitModel.Id renderKitId : library.getRenderKits().keySet()) { - // Check render kit name and class. - RenderKitModel renderKit = library.getRenderKits().get(renderKitId); - for (RendererModel renderer : renderKit.getRenderers()) { - - // Check type. - // Check family. - // Check generated class. - // Check superclass. - // Check component type. - } - compact(renderKit.getRenderers()); - } - } - - protected void verifyComponents() throws CdkException { - - for (ComponentModel component : library.getComponents()) { - - // Check classes. - // Check Component type. - if (null == component.getType()) { - -// component.setType(new Component.Type(namingConventions.inferComponentType(explicitType, className))); - } - - // Check family. - // Check attributes. - // Check renderers. -// compact(component.getAttributes()); - } - } - - protected void compact(Collection<?> collection) { - -// if (collection instanceof ModelCollection) { -// ModelCollection model = (ModelCollection) collection; -// model.mergeKeys(); -// } - } -} Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java 2010-03-03 22:51:56 UTC (rev 16523) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java 2010-03-04 00:52:13 UTC (rev 16524) @@ -68,9 +68,14 @@ setComponentProperties(componentElement, component); Component annotation = componentElement.getAnnotation(Component.class); - component.setGenerate(annotation.generate()); - setTagInfo(annotation.tag(), component); - + if (null != annotation) { + component.setGenerate(annotation.generate()); + setTagInfo(annotation.tag(), component); + } + Tag tag = componentElement.getAnnotation(Tag.class); + if(null != tag){ + setTagInfo(tag, component); + } library.getComponents().add(component); } @@ -78,14 +83,14 @@ // Calculate type for base UI component class. Component componentAnnotation = componentElement.getAnnotation(Component.class); String explicitType = componentAnnotation.value(); - if (!Strings.isEmpty(explicitType)) { +// if (!Strings.isEmpty(explicitType)) { return explicitType; - } +// } // Because component type is a primary key for components collection, // we have to infer explicit value here. - String className = componentElement.getQualifiedName().toString(); - return getNamingConventions().inferComponentType(className); +// String className = componentElement.getQualifiedName().toString(); +// return getNamingConventions().inferComponentType(new ClassName(className)); } private void setComponentProperties(TypeElement componentElement, ComponentModel component) Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ProcessorBase.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ProcessorBase.java 2010-03-03 22:51:56 UTC (rev 16523) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ProcessorBase.java 2010-03-04 00:52:13 UTC (rev 16524) @@ -63,9 +63,9 @@ ClassDescriptor tagHandler = getTagHandler(tag, model); String name = tag.name(); - if (Strings.isEmpty(name)) { - name = namingConventions.inferTagName(model.getGeneratedClass()); - } +// if (Strings.isEmpty(name)) { +// name = namingConventions.inferTagName(model.getGeneratedClass()); +// } model.setTag(new TagModel(model, name, tagHandler)); } @@ -80,9 +80,9 @@ String tagHandlerClassName = getTagHandlerClassName(tag); boolean generate = isGenerateTagHandler(model, handlerBase, tagHandlerClassName); - if (Strings.isEmpty(tagHandlerClassName)) { - tagHandlerClassName = namingConventions.inferTagHandlerName(model.getGeneratedClass()); - } +// if (Strings.isEmpty(tagHandlerClassName)) { +// tagHandlerClassName = namingConventions.inferTagHandlerName(model.getGeneratedClass()); +// } if (handlerBase == null) { handlerBase = getDafaultParentTagHandlerClass(); @@ -197,16 +197,17 @@ protected void setClassNames(TypeElement componentElement, ModelElementBase modelElement, String generatedClass, String baseClass) { - if (generatedClass == null || generatedClass.isEmpty() || baseClass.equals(generatedClass)) { +// if (generatedClass == null || generatedClass.isEmpty() || baseClass.equals(generatedClass)) { if (componentElement.getModifiers().contains(Modifier.ABSTRACT)) { - generatedClass = namingConventions.inferUIComponentClass(modelElement.getId(), null, baseClass, true); - modelElement.setClassNames(generatedClass, baseClass); - } else { - modelElement.setClassNames(baseClass, null); + modelElement.setGenerate(true); +// generatedClass = namingConventions.inferUIComponentClass(modelElement.getId(), null, baseClass, true); +// modelElement.setClassNames(generatedClass, baseClass); +// } else { +// modelElement.setClassNames(baseClass, null); } - } else { +// } else { modelElement.setClassNames(generatedClass, baseClass); - } +// } } protected Map<String, Property> parseProperties(String attributesConfig) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/RendererProcessor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/RendererProcessor.java 2010-03-03 22:51:56 UTC (rev 16523) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/RendererProcessor.java 2010-03-04 00:52:13 UTC (rev 16524) @@ -50,11 +50,11 @@ String explicitType = getComponentType(rendererElement); // Because component type is a primary key for components collection, we have to infer explicit value here. - String type = getNamingConventions() - .inferComponentType(explicitType, rendererElement.getQualifiedName().toString()); +// String type = getNamingConventions() +// .inferComponentType(explicitType, rendererElement.getQualifiedName().toString()); RendererModel renderer = new RendererModel(); - renderer.setType(new RendererModel.Type(type)); + renderer.setType(new RendererModel.Type(explicitType)); // Should that component be generated ? // setClassNames(rendererElement, renderer); Copied: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/validator/ValidatorImpl.java (from rev 16522, root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/ValidatorImpl.java) =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/validator/ValidatorImpl.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/validator/ValidatorImpl.java 2010-03-04 00:52:13 UTC (rev 16524) @@ -0,0 +1,136 @@ +/* + * $Id$ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + + + +package org.richfaces.cdk.model.validator; + +import java.util.Collection; + +import org.richfaces.cdk.CdkException; +import org.richfaces.cdk.Logger; +import org.richfaces.cdk.ModelValidator; +import org.richfaces.cdk.NamingConventions; +import org.richfaces.cdk.apt.SourceUtils; +import org.richfaces.cdk.model.ComponentLibrary; +import org.richfaces.cdk.model.ComponentModel; +import org.richfaces.cdk.model.RenderKitModel; +import org.richfaces.cdk.model.RendererModel; + +import com.google.inject.Inject; + +/** + * <p class="changed_added_4_0"></p> + * @author asmirnov(a)exadel.com + * + */ +public class ValidatorImpl implements ModelValidator { + + @Inject + private Logger log; + + private final ComponentLibrary library; + private final NamingConventions namingConventions; + + private final SourceUtils sourceUtils; + + @Inject + public ValidatorImpl(ComponentLibrary library, NamingConventions namingConventions, SourceUtils sourceUtils) { + this.library = library; + this.namingConventions = namingConventions; + this.sourceUtils = sourceUtils; + } + /* + * (non-Javadoc) + * @see org.richfaces.cdk.ValidatorModel#verify(org.richfaces.cdk.model.ComponentLibrary) + */ + @Override + public void verify() throws CdkException { + verifyRenderers(); + verifyComponents(); + + // After all, merge all similar elements. + compact(library.getComponents()); + } + + protected void verifyRenderers() { + for (RenderKitModel.Id renderKitId : library.getRenderKits().keySet()) { + // Check render kit name and class. + RenderKitModel renderKit = library.getRenderKits().get(renderKitId); + for (RendererModel renderer : renderKit.getRenderers()) { + + // Check type. + // Check family. + // Check generated class. + // Check superclass. + // Check component type. + } + compact(renderKit.getRenderers()); + } + } + + protected void verifyComponents() throws CdkException { + + for (ComponentModel component : library.getComponents()) { + verifyComponent(component); + } + } + protected void verifyComponent(ComponentModel component) { + // Check Component type. + if (null == component.getType()) { + if(null != component.getComponentClass()){ + component.setType(namingConventions.inferComponentType(component.getComponentClass())); + } else if(null != component.getBaseClass()){ + component.setType(namingConventions.inferComponentType(component.getBaseClass())); + } else { + // No clue for component type, log error and return. + log.error("No type information available for component: "+component); + return; + } + } + // Check classes. + if(component.isGenerate()){ + if(null == component.getBaseClass()){ + log.error("Base class for generated component is not set :"+component.getType()); + } else if (null == component.getComponentClass()) { + component.setGeneratedClass(namingConventions.inferUIComponentClass(component.getType())); + } + } else { + + } + + + // Check family. + // Check attributes. + // Check renderers. +// compact(component.getAttributes()); + } + + protected void compact(Collection<?> collection) { + +// if (collection instanceof ModelCollection) { +// ModelCollection model = (ModelCollection) collection; +// model.mergeKeys(); +// } + } +} Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/validator/ValidatorImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/LibraryBuilderTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/LibraryBuilderTest.java 2010-03-03 22:51:56 UTC (rev 16523) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/LibraryBuilderTest.java 2010-03-04 00:52:13 UTC (rev 16524) @@ -36,7 +36,7 @@ protected File outputTestResourcesDirectory = new File(PROJECT_BASE + "target/generated-sources/test/resources"); @Test -// @Ignore + @Ignore public void createInstance() throws Exception { List<String> compileSourceRoots = Arrays.asList(""); Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/NamingConventionsTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/NamingConventionsTest.java 2010-03-03 22:51:56 UTC (rev 16523) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/NamingConventionsTest.java 2010-03-04 00:52:13 UTC (rev 16524) @@ -28,6 +28,9 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.richfaces.cdk.model.ClassName; +import org.richfaces.cdk.model.ComponentModel; +import org.richfaces.cdk.model.ComponentModel.Type; /** * <p class="changed_added_4_0"> @@ -37,6 +40,7 @@ * */ public class NamingConventionsTest { + private static final Type COMPONENT_TYPE = new ComponentModel.Type("foo.bar.Test"); private static final String BASE = "foo.bar"; private RichFacesConventions conventions; @@ -57,46 +61,29 @@ * @throws Exception */ @Test - public void testInferComponentTypeExplicit() throws Exception { - assertEquals("foo.bar.Test", conventions.inferComponentType("foo.bar.Test", "foo.baz.UITest")); - } - - /** - * Test method for - * {@link org.richfaces.cdk.RichFacesConventions#inferComponentType(java.lang.String, java.lang.String)}. - * - * @throws Exception - */ - @Test public void testInferComponentTypeFromUIClass() throws Exception { - assertEquals("foo.baz.Test", conventions.inferComponentType("", "foo.baz.component.UITest")); + assertEquals(COMPONENT_TYPE, conventions.inferComponentType(new ClassName("foo.bar.component.UITest"))); } @Test public void testInferComponentTypeFromAbstractClass() throws Exception { - assertEquals("foo.baz.Test", conventions.inferComponentType("", "foo.baz.component.AbstractTest")); + assertEquals(COMPONENT_TYPE, conventions.inferComponentType(new ClassName("foo.bar.component.AbstractTest"))); } @Test public void testInferComponentTypeFromBaseClass() throws Exception { - assertEquals("foo.baz.Test", conventions.inferComponentType("", "foo.baz.component.TestBase")); + assertEquals(COMPONENT_TYPE, conventions.inferComponentType(new ClassName("foo.bar.component.TestBase"))); } @Test public void testInferComponentTypeFromMarkupClass() throws Exception { - assertEquals("foo.baz.HtmlTest", conventions.inferComponentType("", "foo.baz.component.html.HtmlTest")); + assertEquals(new ComponentModel.Type("foo.bar.HtmlTest"), conventions.inferComponentType(new ClassName("foo.bar.component.html.HtmlTest"))); } @Test - public void testInferUIComponentClassFromExplicit() throws Exception { - assertEquals("foo.bar.UITest", - conventions.inferUIComponentClass("foo.bar.Test", "foo.bar.UITest", "foo.bar.AbstractClass", true)); - } - - @Test public void testInferUIComponentClassFromType() throws Exception { - assertEquals("foo.bar.component.UITest", - conventions.inferUIComponentClass("foo.bar.Test", "", "foo.bar.AbstractClass", true)); + assertEquals(new ClassName("foo.bar.component.UITest"), + conventions.inferUIComponentClass(COMPONENT_TYPE)); } }