You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2009/02/13 08:19:18 UTC
svn commit: r744015 - in
/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator:
./ crossval/
Author: gpetracek
Date: Fri Feb 13 07:19:17 2009
New Revision: 744015
URL: http://svn.apache.org/viewvc?rev=744015&view=rev
Log:
EXTVAL-35 tests for local property referencing syntax
Added:
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/crossval/ELCrossValTestCase.java
- copied, changed from r743937, myfaces/extensions/validator/trunk/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/crossval/ELCrossComponentValidationTest.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/crossval/LocalPropertyCrossValTestCase.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/crossval/LocalPropertyCrossValTestDateBean.java
Removed:
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/crossval/ELCrossComponentValidationTest.java
Modified:
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/AbstractExValViewControllerTestCase.java
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/AbstractExValViewControllerTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/AbstractExValViewControllerTestCase.java?rev=744015&r1=744014&r2=744015&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/AbstractExValViewControllerTestCase.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/AbstractExValViewControllerTestCase.java Fri Feb 13 07:19:17 2009
@@ -64,7 +64,7 @@
* overrides <code>setUp()</code> and/or <code>tearDown()</code>, then those
* methods but call the overwitten method to insure a valid test environment.
*/
-public class AbstractExValViewControllerTestCase extends TestCase
+public abstract class AbstractExValViewControllerTestCase extends TestCase
{
protected MockApplication application;
protected MockServletConfig config;
Copied: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/crossval/ELCrossValTestCase.java (from r743937, myfaces/extensions/validator/trunk/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/crossval/ELCrossComponentValidationTest.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/crossval/ELCrossValTestCase.java?p2=myfaces/extensions/validator/trunk/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/crossval/ELCrossValTestCase.java&p1=myfaces/extensions/validator/trunk/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/crossval/ELCrossComponentValidationTest.java&r1=743937&r2=744015&rev=744015&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/crossval/ELCrossComponentValidationTest.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/crossval/ELCrossValTestCase.java Fri Feb 13 07:19:17 2009
@@ -33,14 +33,14 @@
/**
* @author Gerhard Petracek
*/
-public class ELCrossComponentValidationTest extends AbstractExValViewControllerTestCase
+public class ELCrossValTestCase extends AbstractExValViewControllerTestCase
{
HtmlInputText inputComponent1 = null;
HtmlInputText inputComponent2 = null;
UIViewRoot rootComponent = null;
- public ELCrossComponentValidationTest(String name)
+ public ELCrossValTestCase(String name)
{
super(name);
inputComponent1 = null;
@@ -50,15 +50,15 @@
public static Test suite()
{
- return new TestSuite(ELCrossComponentValidationTest.class);
+ return new TestSuite(ELCrossValTestCase.class);
}
@Override
protected void setUp() throws Exception
{
super.setUp();
- createRequestScopedBean("bean1", new ELCrossValTestDateBean());
- createRequestScopedBean("bean2", new ELCrossValTestDateBean());
+ createRequestScopedBean("bean1", getEntityInstance());
+ createRequestScopedBean("bean2", getEntityInstance());
rootComponent = new UIViewRoot();
@@ -107,8 +107,8 @@
createValueBinding(inputComponent2, "value", "#{bean2.date2}");
//set model values
- resolveBean("bean1", ELCrossValTestDateBean.class).setDate2((Date)inputComponent1.getConverter().getAsObject(facesContext, inputComponent1, valueBean1Property2));
- resolveBean("bean2", ELCrossValTestDateBean.class).setDate1((Date)inputComponent2.getConverter().getAsObject(facesContext, inputComponent2, valueBean2Property1));
+ resolveBean("bean1", getEntityInstance().getClass()).setDate2((Date)inputComponent1.getConverter().getAsObject(facesContext, inputComponent1, valueBean1Property2));
+ resolveBean("bean2", getEntityInstance().getClass()).setDate1((Date)inputComponent2.getConverter().getAsObject(facesContext, inputComponent2, valueBean2Property1));
//decode
@@ -144,9 +144,9 @@
createValueBinding(inputComponent2, "value", "#{bean2.date2}");
//set model values
- resolveBean("bean1", ELCrossValTestDateBean.class).setDate2((Date)inputComponent1.getConverter().getAsObject(facesContext, inputComponent1, valueBean1Property2));
- resolveBean("bean2", ELCrossValTestDateBean.class).setDate1((Date)inputComponent2.getConverter().getAsObject(facesContext, inputComponent2, valueBean2Property1));
- resolveBean("bean2", ELCrossValTestDateBean.class).setDate2((Date)inputComponent2.getConverter().getAsObject(facesContext, inputComponent2, valueBean2Property2));
+ resolveBean("bean1", getEntityInstance().getClass()).setDate2((Date)inputComponent1.getConverter().getAsObject(facesContext, inputComponent1, valueBean1Property2));
+ resolveBean("bean2", getEntityInstance().getClass()).setDate1((Date)inputComponent2.getConverter().getAsObject(facesContext, inputComponent2, valueBean2Property1));
+ resolveBean("bean2", getEntityInstance().getClass()).setDate2((Date)inputComponent2.getConverter().getAsObject(facesContext, inputComponent2, valueBean2Property2));
//decode
@@ -159,4 +159,9 @@
//no update model needed
}
+
+ protected ELCrossValTestDateBean getEntityInstance()
+ {
+ return new ELCrossValTestDateBean();
+ }
}
\ No newline at end of file
Added: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/crossval/LocalPropertyCrossValTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/crossval/LocalPropertyCrossValTestCase.java?rev=744015&view=auto
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/crossval/LocalPropertyCrossValTestCase.java (added)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/crossval/LocalPropertyCrossValTestCase.java Fri Feb 13 07:19:17 2009
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.extensions.validator.crossval;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * @author Gerhard Petracek
+ */
+public class LocalPropertyCrossValTestCase extends ELCrossValTestCase
+{
+ public static Test suite()
+ {
+ return new TestSuite(LocalPropertyCrossValTestCase.class);
+ }
+
+ public LocalPropertyCrossValTestCase(String name)
+ {
+ super(name);
+ }
+
+ @Override
+ protected ELCrossValTestDateBean getEntityInstance()
+ {
+ return new LocalPropertyCrossValTestDateBean();
+ }
+}
\ No newline at end of file
Added: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/crossval/LocalPropertyCrossValTestDateBean.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/crossval/LocalPropertyCrossValTestDateBean.java?rev=744015&view=auto
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/crossval/LocalPropertyCrossValTestDateBean.java (added)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/crossval/LocalPropertyCrossValTestDateBean.java Fri Feb 13 07:19:17 2009
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.extensions.validator.crossval;
+
+import org.apache.myfaces.extensions.validator.crossval.annotation.Equals;
+
+import java.util.Date;
+
+/**
+ * @author Gerhard Petracek
+ */
+public class LocalPropertyCrossValTestDateBean extends ELCrossValTestDateBean
+{
+ private static final Date DEFAULT_DATE = new Date();
+
+ @Equals("date2")
+ private Date date1 = DEFAULT_DATE;
+
+ private Date date2 = DEFAULT_DATE;
+
+ public Date getDate1()
+ {
+ return date1;
+ }
+
+ public void setDate1(Date date1)
+ {
+ this.date1 = date1;
+ }
+
+ public Date getDate2()
+ {
+ return date2;
+ }
+
+ public void setDate2(Date date2)
+ {
+ this.date2 = date2;
+ }
+}
\ No newline at end of file