Author: alexsmirnov Date: 2010-10-27 17:28:56 -0400 (Wed, 27 Oct 2010) New Revision: 19716 Added: branches/RF-8742/ui/validator/api/src/main/java/org/richfaces/validator/FacesObjectDescriptor.java branches/RF-8742/ui/validator/impl/src/test/java/org/richfaces/validator/FacesConverterServiceTest.java Removed: branches/RF-8742/ui/validator/api/src/main/java/org/richfaces/validator/ValidatorDescriptor.java Modified: branches/RF-8742/ui/validator/api/src/main/java/org/richfaces/validator/BeanValidatorService.java branches/RF-8742/ui/validator/api/src/main/java/org/richfaces/validator/ConverterDescriptor.java branches/RF-8742/ui/validator/api/src/main/java/org/richfaces/validator/FacesConverterService.java branches/RF-8742/ui/validator/api/src/main/java/org/richfaces/validator/FacesValidatorService.java branches/RF-8742/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ClientValidatorBehavior.java branches/RF-8742/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ClientValidatorImpl.java branches/RF-8742/ui/validator/ui/src/main/java/org/richfaces/renderkit/html/ClientValidatorRenderer.java branches/RF-8742/ui/validator/ui/src/test/java/org/richfaces/component/behavior/BehaviorGetValidatorTest.java branches/RF-8742/ui/validator/ui/src/test/java/org/richfaces/renderkit/html/RendererGetClientSideScriptTest.java branches/RF-8742/ui/validator/ui/src/test/java/org/richfaces/renderkit/html/RendererGetComponentScriptTest.java branches/RF-8742/ui/validator/ui/src/test/java/org/richfaces/renderkit/html/RendererTestBase.java Log: CODING IN PROGRESS - issue RF-9520: ConverterService unit tests and implementation https://jira.jboss.org/browse/RF-9520 Modified: branches/RF-8742/ui/validator/api/src/main/java/org/richfaces/validator/BeanValidatorService.java =================================================================== --- branches/RF-8742/ui/validator/api/src/main/java/org/richfaces/validator/BeanValidatorService.java 2010-10-27 20:58:16 UTC (rev 19715) +++ branches/RF-8742/ui/validator/api/src/main/java/org/richfaces/validator/BeanValidatorService.java 2010-10-27 21:28:56 UTC (rev 19716) @@ -19,7 +19,7 @@ * @param expression * @return */ - Collection<ValidatorDescriptor> getConstrains(FacesContext context, ValueExpression expression,Class<?> ...groups); + Collection<FacesObjectDescriptor> getConstrains(FacesContext context, ValueExpression expression,Class<?> ...groups); Collection<String> validateExpression(FacesContext context,ValueExpression expression, Object newValue,Class<?> ...groups); Modified: branches/RF-8742/ui/validator/api/src/main/java/org/richfaces/validator/ConverterDescriptor.java =================================================================== --- branches/RF-8742/ui/validator/api/src/main/java/org/richfaces/validator/ConverterDescriptor.java 2010-10-27 20:58:16 UTC (rev 19715) +++ branches/RF-8742/ui/validator/api/src/main/java/org/richfaces/validator/ConverterDescriptor.java 2010-10-27 21:28:56 UTC (rev 19716) @@ -1,5 +1,5 @@ package org.richfaces.validator; -public interface ConverterDescriptor extends ValidatorDescriptor { +public interface ConverterDescriptor extends FacesObjectDescriptor { } Modified: branches/RF-8742/ui/validator/api/src/main/java/org/richfaces/validator/FacesConverterService.java =================================================================== --- branches/RF-8742/ui/validator/api/src/main/java/org/richfaces/validator/FacesConverterService.java 2010-10-27 20:58:16 UTC (rev 19715) +++ branches/RF-8742/ui/validator/api/src/main/java/org/richfaces/validator/FacesConverterService.java 2010-10-27 21:28:56 UTC (rev 19716) @@ -11,6 +11,6 @@ */ public interface FacesConverterService { - ConverterDescriptor getConverterDescription(FacesContext context,Converter validator); + ConverterDescriptor getConverterDescription(FacesContext context,Converter converter); } Copied: branches/RF-8742/ui/validator/api/src/main/java/org/richfaces/validator/FacesObjectDescriptor.java (from rev 19713, branches/RF-8742/ui/validator/api/src/main/java/org/richfaces/validator/ValidatorDescriptor.java) =================================================================== --- branches/RF-8742/ui/validator/api/src/main/java/org/richfaces/validator/FacesObjectDescriptor.java (rev 0) +++ branches/RF-8742/ui/validator/api/src/main/java/org/richfaces/validator/FacesObjectDescriptor.java 2010-10-27 21:28:56 UTC (rev 19716) @@ -0,0 +1,44 @@ +package org.richfaces.validator; + +import java.util.Map; + +import javax.faces.application.FacesMessage; + +/** + * <p class="changed_added_4_0"> + * Inmlementations of this interface describe JSF or JSR-303 validators. Because JSF supports 2 types of validators, + * this interface unifies access to them. + * </p> + * + * @author asmirnov(a)exadel.com + * + */ +public interface FacesObjectDescriptor { + + /** + * <p class="changed_added_4_0"> + * Returns JSF {@link javax.faces.validator.Validator} implementation class or JSR-303 annotation class. + * </p> + * + * @return + */ + Class<?> getImplementationClass(); + + /** + * <p class="changed_added_4_0"> + * Concrete validator parameters + * </p> + * + * @return non null map with validator instance parameters. + */ + Map<String, ? extends Object> getAdditionalParameters(); + + /** + * <p class="changed_added_4_0"> + * Localized validator message + * </p> + * + * @return + */ + FacesMessage getMessage(); +} Property changes on: branches/RF-8742/ui/validator/api/src/main/java/org/richfaces/validator/FacesObjectDescriptor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: branches/RF-8742/ui/validator/api/src/main/java/org/richfaces/validator/FacesValidatorService.java =================================================================== --- branches/RF-8742/ui/validator/api/src/main/java/org/richfaces/validator/FacesValidatorService.java 2010-10-27 20:58:16 UTC (rev 19715) +++ branches/RF-8742/ui/validator/api/src/main/java/org/richfaces/validator/FacesValidatorService.java 2010-10-27 21:28:56 UTC (rev 19716) @@ -6,5 +6,5 @@ public interface FacesValidatorService { - ValidatorDescriptor getValidatorDescription(FacesContext context,Validator validator); + FacesObjectDescriptor getValidatorDescription(FacesContext context,Validator validator); } Deleted: branches/RF-8742/ui/validator/api/src/main/java/org/richfaces/validator/ValidatorDescriptor.java =================================================================== --- branches/RF-8742/ui/validator/api/src/main/java/org/richfaces/validator/ValidatorDescriptor.java 2010-10-27 20:58:16 UTC (rev 19715) +++ branches/RF-8742/ui/validator/api/src/main/java/org/richfaces/validator/ValidatorDescriptor.java 2010-10-27 21:28:56 UTC (rev 19716) @@ -1,42 +0,0 @@ -package org.richfaces.validator; - -import java.util.Map; - -/** - * <p class="changed_added_4_0"> - * Inmlementations of this interface describe JSF or JSR-303 validators. Because JSF supports 2 types of validators, - * this interface unifies access to them. - * </p> - * - * @author asmirnov(a)exadel.com - * - */ -public interface ValidatorDescriptor { - - /** - * <p class="changed_added_4_0"> - * Returns JSF {@link javax.faces.validator.Validator} implementation class or JSR-303 annotation class. - * </p> - * - * @return - */ - Class<?> getValidatorClass(); - - /** - * <p class="changed_added_4_0"> - * Concrete validator parameters - * </p> - * - * @return non null map with validator instance parameters. - */ - Map<String, ? extends Object> getValidatorParameters(); - - /** - * <p class="changed_added_4_0"> - * Localized validator message - * </p> - * - * @return - */ - String getMessage(); -} Added: branches/RF-8742/ui/validator/impl/src/test/java/org/richfaces/validator/FacesConverterServiceTest.java =================================================================== --- branches/RF-8742/ui/validator/impl/src/test/java/org/richfaces/validator/FacesConverterServiceTest.java (rev 0) +++ branches/RF-8742/ui/validator/impl/src/test/java/org/richfaces/validator/FacesConverterServiceTest.java 2010-10-27 21:28:56 UTC (rev 19716) @@ -0,0 +1,37 @@ +package org.richfaces.validator; + +import static org.junit.Assert.*; + +import javax.faces.context.FacesContext; +import javax.faces.convert.Converter; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + + +public class FacesConverterServiceTest { + + FacesConverterService serviceImpl; + + Converter converter; + + private FacesContext context; + + @Before + public void setUp() { + // create service impl. + } + + @After + public void tearDown() { + serviceImpl = null; + } + + @Test + public void getConverterDescription() throws Exception { + ConverterDescriptor converterDescription = serviceImpl.getConverterDescription(context, converter); + assertEquals(converter.getClass(), converterDescription.getImplementationClass()); + } + +} Property changes on: branches/RF-8742/ui/validator/impl/src/test/java/org/richfaces/validator/FacesConverterServiceTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Modified: branches/RF-8742/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ClientValidatorBehavior.java =================================================================== --- branches/RF-8742/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ClientValidatorBehavior.java 2010-10-27 20:58:16 UTC (rev 19715) +++ branches/RF-8742/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ClientValidatorBehavior.java 2010-10-27 21:28:56 UTC (rev 19716) @@ -6,7 +6,7 @@ import javax.faces.component.behavior.ClientBehaviorContext; import org.richfaces.validator.ConverterDescriptor; -import org.richfaces.validator.ValidatorDescriptor; +import org.richfaces.validator.FacesObjectDescriptor; /** * <p class="changed_added_4_0">Interface for JSF Behavior that creates scripts for client-side validation</p> @@ -39,7 +39,7 @@ * @param context * @return */ - Collection<ValidatorDescriptor> getValidators(ClientBehaviorContext context); + Collection<FacesObjectDescriptor> getValidators(ClientBehaviorContext context); /** * <p class="changed_added_4_0">Returns array of classes that represents JSR-303 validation groups.</p> Modified: branches/RF-8742/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ClientValidatorImpl.java =================================================================== --- branches/RF-8742/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ClientValidatorImpl.java 2010-10-27 20:58:16 UTC (rev 19715) +++ branches/RF-8742/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ClientValidatorImpl.java 2010-10-27 21:28:56 UTC (rev 19716) @@ -48,7 +48,7 @@ import org.richfaces.validator.ConverterDescriptor; import org.richfaces.validator.FacesConverterService; import org.richfaces.validator.FacesValidatorService; -import org.richfaces.validator.ValidatorDescriptor; +import org.richfaces.validator.FacesObjectDescriptor; import com.google.common.collect.Lists; @@ -177,10 +177,10 @@ * @see org.richfaces.component.behavior.ClientValidatorBehavior#getValidators(javax.faces.component.behavior. * ClientBehaviorContext) */ - public Collection<ValidatorDescriptor> getValidators(ClientBehaviorContext context) { + public Collection<FacesObjectDescriptor> getValidators(ClientBehaviorContext context) { UIComponent component = context.getComponent(); if (component instanceof EditableValueHolder) { - ArrayList<ValidatorDescriptor> validators = Lists.newArrayList(); + ArrayList<FacesObjectDescriptor> validators = Lists.newArrayList(); EditableValueHolder input = (EditableValueHolder) component; Validator[] facesValidators = input.getValidators(); FacesContext facesContext = context.getFacesContext(); Modified: branches/RF-8742/ui/validator/ui/src/main/java/org/richfaces/renderkit/html/ClientValidatorRenderer.java =================================================================== --- branches/RF-8742/ui/validator/ui/src/main/java/org/richfaces/renderkit/html/ClientValidatorRenderer.java 2010-10-27 20:58:16 UTC (rev 19715) +++ branches/RF-8742/ui/validator/ui/src/main/java/org/richfaces/renderkit/html/ClientValidatorRenderer.java 2010-10-27 21:28:56 UTC (rev 19716) @@ -25,7 +25,7 @@ import org.richfaces.validator.LibraryFunction; import org.richfaces.validator.LibraryScriptString; import org.richfaces.validator.ScriptNotFoundException; -import org.richfaces.validator.ValidatorDescriptor; +import org.richfaces.validator.FacesObjectDescriptor; import com.google.common.collect.Lists; @@ -130,7 +130,7 @@ ComponentValidatorScript createValidatorScript(ClientBehaviorContext behaviorContext, ClientValidatorBehavior behavior) { ValidatorScriptBase validatorScript; - Collection<ValidatorDescriptor> validators = behavior.getValidators(behaviorContext); + Collection<FacesObjectDescriptor> validators = behavior.getValidators(behaviorContext); if (!validators.isEmpty()) { try { ConverterDescriptor converter = behavior.getConverter(behaviorContext); @@ -160,7 +160,7 @@ } private ValidatorScriptBase createValidatorScript(ClientBehaviorContext behaviorContext, - ClientValidatorBehavior behavior, Collection<ValidatorDescriptor> validators, + ClientValidatorBehavior behavior, Collection<FacesObjectDescriptor> validators, LibraryScriptString clientSideConverterScript) { Collection<? extends LibraryScriptString> validatorScripts = getClientSideValidatorScript(behaviorContext.getFacesContext(), validators); if (validatorScripts.isEmpty()) { @@ -199,10 +199,10 @@ return createClientFunction(converter, VALUE_LITERAL, clientScriptService); } - private LibraryScriptString createClientFunction(ValidatorDescriptor descriptor, JSLiteral variable, + private LibraryScriptString createClientFunction(FacesObjectDescriptor descriptor, JSLiteral variable, ClientScriptService clientScriptService) throws ScriptNotFoundException { - LibraryFunction script = clientScriptService.getScript(descriptor.getValidatorClass()); - return new LibraryScriptFunction(script, variable, descriptor.getMessage(), descriptor.getValidatorParameters()); + LibraryFunction script = clientScriptService.getScript(descriptor.getImplementationClass()); + return new LibraryScriptFunction(script, variable, descriptor.getMessage(), descriptor.getAdditionalParameters()); } /** @@ -216,11 +216,11 @@ * @throws ScriptNotFoundException */ Collection<? extends LibraryScriptString> getClientSideValidatorScript(FacesContext facesContext, - Collection<ValidatorDescriptor> validators) { + Collection<FacesObjectDescriptor> validators) { ClientScriptService clientScriptService = ServiceTracker.getService(facesContext, ClientScriptService.class); List<LibraryScriptString> scripts = Lists.newArrayList(); - for (ValidatorDescriptor validator : validators) { + for (FacesObjectDescriptor validator : validators) { try { scripts.add(createClientFunction(validator, CONVERTED_VALUE_LITERAL, clientScriptService)); } catch (ScriptNotFoundException e) { Modified: branches/RF-8742/ui/validator/ui/src/test/java/org/richfaces/component/behavior/BehaviorGetValidatorTest.java =================================================================== --- branches/RF-8742/ui/validator/ui/src/test/java/org/richfaces/component/behavior/BehaviorGetValidatorTest.java 2010-10-27 20:58:16 UTC (rev 19715) +++ branches/RF-8742/ui/validator/ui/src/test/java/org/richfaces/component/behavior/BehaviorGetValidatorTest.java 2010-10-27 21:28:56 UTC (rev 19716) @@ -8,6 +8,7 @@ import java.util.Collection; import javax.el.ValueExpression; +import javax.faces.application.FacesMessage; import javax.faces.validator.Validator; import javax.validation.groups.Default; @@ -21,7 +22,7 @@ import org.richfaces.application.ServiceTracker; import org.richfaces.validator.BeanValidatorService; import org.richfaces.validator.FacesValidatorService; -import org.richfaces.validator.ValidatorDescriptor; +import org.richfaces.validator.FacesObjectDescriptor; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; @@ -38,7 +39,7 @@ @RunWith(MockTestRunner.class) public class BehaviorGetValidatorTest extends BehaviorTestBase { - private static final String VALIDATION_ERROR = "Validation Error"; + private static final FacesMessage VALIDATION_ERROR = new FacesMessage("Validation Error"); private static final Class<?>[] DEFAULT_GROUP = { Default.class }; @@ -46,7 +47,7 @@ private Validator validator; @Mock - private ValidatorDescriptor beanValidatorDescriptor; + private FacesObjectDescriptor beanValidatorDescriptor; @Mock private BeanValidatorService validatorService; @@ -87,14 +88,14 @@ controller.verify(); } - private Collection<ValidatorDescriptor> checkValidator() { + private Collection<FacesObjectDescriptor> checkValidator() { controller.replay(); - Collection<ValidatorDescriptor> validators = behavior.getValidators(behaviorContext); + Collection<FacesObjectDescriptor> validators = behavior.getValidators(behaviorContext); // controller.verify(); return validators; } - private void setupBeanValidator(ValidatorDescriptor... validators) { + private void setupBeanValidator(FacesObjectDescriptor... validators) { expect(validatorService.getConstrains(environment.getFacesContext(), expression, DEFAULT_GROUP)).andStubReturn( Lists.newArrayList(validators)); @@ -103,8 +104,8 @@ private void setupComponentValidator(Validator... validators) { expect(input.getValidators()).andStubReturn(validators); for (Validator validator : validators) { - ValidatorDescriptor validatorDescriptor = environment.createMock(ValidatorDescriptor.class); - expect((Class) validatorDescriptor.getValidatorClass()).andStubReturn(validator.getClass()); + FacesObjectDescriptor validatorDescriptor = environment.createMock(FacesObjectDescriptor.class); + expect((Class) validatorDescriptor.getImplementationClass()).andStubReturn(validator.getClass()); expect(validatorDescriptor.getMessage()).andStubReturn(VALIDATION_ERROR); expect(facesValidatorService.getValidatorDescription(environment.getFacesContext(), validator)) .andStubReturn(validatorDescriptor); @@ -122,10 +123,10 @@ public void testComponentValidator() throws Exception { setupComponentValidator(validator); setupBeanValidator(); - Collection<ValidatorDescriptor> validators = checkValidator(); + Collection<FacesObjectDescriptor> validators = checkValidator(); assertEquals(1, validators.size()); - ValidatorDescriptor validatorDescriptor = Iterables.getOnlyElement(validators); - assertSame(validator.getClass(), validatorDescriptor.getValidatorClass()); + FacesObjectDescriptor validatorDescriptor = Iterables.getOnlyElement(validators); + assertSame(validator.getClass(), validatorDescriptor.getImplementationClass()); assertEquals(VALIDATION_ERROR, validatorDescriptor.getMessage()); controller.verify(); } @@ -134,9 +135,9 @@ public void testBeanValidators() throws Exception { setupComponentValidator(); setupBeanValidator(beanValidatorDescriptor); - Collection<ValidatorDescriptor> validators = checkValidator(); + Collection<FacesObjectDescriptor> validators = checkValidator(); assertEquals(1, validators.size()); - ValidatorDescriptor validatorDescriptor = Iterables.getOnlyElement(validators); + FacesObjectDescriptor validatorDescriptor = Iterables.getOnlyElement(validators); assertSame(beanValidatorDescriptor, validatorDescriptor); controller.verify(); } Modified: branches/RF-8742/ui/validator/ui/src/test/java/org/richfaces/renderkit/html/RendererGetClientSideScriptTest.java =================================================================== --- branches/RF-8742/ui/validator/ui/src/test/java/org/richfaces/renderkit/html/RendererGetClientSideScriptTest.java 2010-10-27 20:58:16 UTC (rev 19715) +++ branches/RF-8742/ui/validator/ui/src/test/java/org/richfaces/renderkit/html/RendererGetClientSideScriptTest.java 2010-10-27 21:28:56 UTC (rev 19716) @@ -23,7 +23,7 @@ import org.richfaces.validator.LibraryFunction; import org.richfaces.validator.LibraryScriptString; import org.richfaces.validator.ScriptNotFoundException; -import org.richfaces.validator.ValidatorDescriptor; +import org.richfaces.validator.FacesObjectDescriptor; import com.google.common.collect.Iterables; @@ -32,7 +32,7 @@ public class RendererGetClientSideScriptTest extends RendererTestBase { @Mock - private ValidatorDescriptor descriptor; + private FacesObjectDescriptor descriptor; @Mock private ConverterDescriptor converterDescriptor; @@ -43,7 +43,7 @@ @Mock private LibraryFunction script; - private Collection<ValidatorDescriptor> descriptors; + private Collection<FacesObjectDescriptor> descriptors; @Before public void setupService() { @@ -59,7 +59,7 @@ @Test() public void testGetClientSideScriptNotExists() throws Throwable { - expect((Class) descriptor.getValidatorClass()).andReturn(RegexValidator.class); + expect((Class) descriptor.getImplementationClass()).andReturn(RegexValidator.class); expect(scriptService.getScript(RegexValidator.class)).andThrow(new ScriptNotFoundException()); controller.replay(); @@ -71,7 +71,7 @@ @Test(expected = ScriptNotFoundException.class) public void testGetClientSideConverterScriptNotExists() throws Throwable { - expect((Class) converterDescriptor.getValidatorClass()).andReturn(NumberConverter.class); + expect((Class) converterDescriptor.getImplementationClass()).andReturn(NumberConverter.class); expect(scriptService.getScript(NumberConverter.class)).andThrow(new ScriptNotFoundException()); controller.replay(); renderer.getClientSideConverterScript(environment.getFacesContext(), converterDescriptor); @@ -80,9 +80,9 @@ @Test public void testGetClientSideValidatorScriptFromDescription() throws Exception { - expect((Class) descriptor.getValidatorClass()).andReturn(RegexValidator.class); + expect((Class) descriptor.getImplementationClass()).andReturn(RegexValidator.class); expect(descriptor.getMessage()).andReturn(VALIDATOR_MESSAGE); - expect((Map<String, Object>) descriptor.getValidatorParameters()).andReturn( + expect((Map<String, Object>) descriptor.getAdditionalParameters()).andReturn( (Map<String, Object>) VALIDATOR_PARAMS); expect(scriptService.getScript(RegexValidator.class)).andReturn(script); expect(script.getName()).andReturn(REGEX_VALIDATOR).atLeastOnce(); @@ -99,9 +99,9 @@ @Test public void testGetClientSideConverterScriptFromDescription() throws Exception { - expect((Class) converterDescriptor.getValidatorClass()).andReturn(NumberConverter.class); + expect((Class) converterDescriptor.getImplementationClass()).andReturn(NumberConverter.class); expect(converterDescriptor.getMessage()).andReturn(VALIDATOR_MESSAGE); - expect((Map<String, Object>) converterDescriptor.getValidatorParameters()).andReturn( + expect((Map<String, Object>) converterDescriptor.getAdditionalParameters()).andReturn( (Map<String, Object>) VALIDATOR_PARAMS); expect(scriptService.getScript(NumberConverter.class)).andReturn(script); expect(script.getName()).andReturn(REGEX_VALIDATOR).atLeastOnce(); Modified: branches/RF-8742/ui/validator/ui/src/test/java/org/richfaces/renderkit/html/RendererGetComponentScriptTest.java =================================================================== --- branches/RF-8742/ui/validator/ui/src/test/java/org/richfaces/renderkit/html/RendererGetComponentScriptTest.java 2010-10-27 20:58:16 UTC (rev 19715) +++ branches/RF-8742/ui/validator/ui/src/test/java/org/richfaces/renderkit/html/RendererGetComponentScriptTest.java 2010-10-27 21:28:56 UTC (rev 19716) @@ -12,6 +12,7 @@ import java.util.Collection; import java.util.Map; +import javax.faces.application.FacesMessage; import javax.faces.context.FacesContext; import javax.faces.convert.Converter; import javax.faces.convert.NumberConverter; @@ -31,7 +32,7 @@ import org.richfaces.validator.LibraryFunction; import org.richfaces.validator.LibraryScriptString; import org.richfaces.validator.ScriptNotFoundException; -import org.richfaces.validator.ValidatorDescriptor; +import org.richfaces.validator.FacesObjectDescriptor; import com.google.common.collect.Lists; @@ -207,7 +208,7 @@ return createFunction(NUMBER_CONVERTER, ClientValidatorRenderer.VALUE_VAR, VALIDATOR_MESSAGE); } - private LibraryScriptFunction createFunction(final String name, String var, String message) { + private LibraryScriptFunction createFunction(final String name, String var, FacesMessage validatorMessage) { LibraryFunction libraryScript = new LibraryFunction() { @@ -220,7 +221,7 @@ return CLIENT_VALIDATOR_LIBRARY; } }; - return new LibraryScriptFunction(libraryScript, new JSLiteral(var), message, VALIDATOR_PARAMS); + return new LibraryScriptFunction(libraryScript, new JSLiteral(var), validatorMessage, VALIDATOR_PARAMS); } private ClientValidatorRenderer createStubRenderer(final LibraryScriptFunction converterFunction, @@ -239,7 +240,7 @@ @Override Collection<? extends LibraryScriptString> getClientSideValidatorScript(FacesContext facesContext, - Collection<ValidatorDescriptor> validators) { + Collection<FacesObjectDescriptor> validators) { return Lists.newArrayList(validatorFunctions); } }; @@ -253,9 +254,9 @@ } else { expect(mockBehavior.getConverter(behaviorContext)).andStubReturn(null); } - ArrayList<ValidatorDescriptor> validatorDescriptors = new ArrayList<ValidatorDescriptor>(validators.length); + ArrayList<FacesObjectDescriptor> validatorDescriptors = new ArrayList<FacesObjectDescriptor>(validators.length); for (Class<?> validator : validators) { - ValidatorDescriptor validatorDescriptor = controller.createNiceMock(ValidatorDescriptor.class); + FacesObjectDescriptor validatorDescriptor = controller.createNiceMock(FacesObjectDescriptor.class); setupDescription(validator, validatorDescriptor); validatorDescriptors.add(validatorDescriptor); } @@ -263,9 +264,9 @@ expect(input.getClientId(environment.getFacesContext())).andStubReturn("foo:bar"); } - private void setupDescription(Class<?> converter, ValidatorDescriptor descriptor) { - expect((Class) descriptor.getValidatorClass()).andStubReturn(converter); + private void setupDescription(Class<?> converter, FacesObjectDescriptor descriptor) { + expect((Class) descriptor.getImplementationClass()).andStubReturn(converter); expect(converterDescription.getMessage()).andStubReturn(VALIDATOR_MESSAGE); - expect((Map) converterDescription.getValidatorParameters()).andStubReturn(VALIDATOR_PARAMS); + expect((Map) converterDescription.getAdditionalParameters()).andStubReturn(VALIDATOR_PARAMS); } } Modified: branches/RF-8742/ui/validator/ui/src/test/java/org/richfaces/renderkit/html/RendererTestBase.java =================================================================== --- branches/RF-8742/ui/validator/ui/src/test/java/org/richfaces/renderkit/html/RendererTestBase.java 2010-10-27 20:58:16 UTC (rev 19715) +++ branches/RF-8742/ui/validator/ui/src/test/java/org/richfaces/renderkit/html/RendererTestBase.java 2010-10-27 21:28:56 UTC (rev 19716) @@ -2,6 +2,8 @@ import java.util.Map; +import javax.faces.application.FacesMessage; + import org.jboss.test.faces.mock.Mock; import org.richfaces.component.behavior.BehaviorTestBase; import org.richfaces.component.behavior.ClientValidatorBehavior; @@ -14,7 +16,7 @@ protected static final String CLIENT_VALIDATORS_JS = "clientValidators.js"; protected static final String ORG_RICHFACES = "org.richfaces"; protected static final String REGEX_VALIDATOR = "regexValidator"; - protected static final String VALIDATOR_MESSAGE = "Validator Message"; + protected static final FacesMessage VALIDATOR_MESSAGE = new FacesMessage("Validator Message"); protected static final Map<String, ? extends Object> VALIDATOR_PARAMS = ImmutableMap.of("foo", "value", "bar", 10); protected static final LibraryResource CLIENT_VALIDATOR_LIBRARY = new LibraryResource(ORG_RICHFACES, CLIENT_VALIDATORS_JS);