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/11/08 19:01:17 UTC
svn commit: r833901 - in
/myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval:
./ view/
Author: gpetracek
Date: Sun Nov 8 18:01:17 2009
New Revision: 833901
URL: http://svn.apache.org/viewvc?rev=833901&view=rev
Log:
EXTVAL-30 bv model validation test cases
Added:
myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/ModelValidation1TestCase.java
- copied, changed from r833855, myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/ModelValidationTestCase.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/ModelValidation2TestCase.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/ModelValidation3TestCase.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/view/ModelValidationTestCase2PageBean.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/view/ModelValidationTestCase3PageBean.java
Removed:
myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/ModelValidationTestCase.java
Copied: myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/ModelValidation1TestCase.java (from r833855, myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/ModelValidationTestCase.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/ModelValidation1TestCase.java?p2=myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/ModelValidation1TestCase.java&p1=myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/ModelValidationTestCase.java&r1=833855&r2=833901&rev=833901&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/ModelValidationTestCase.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/ModelValidation1TestCase.java Sun Nov 8 18:01:17 2009
@@ -24,17 +24,17 @@
import javax.faces.application.FacesMessage;
-public class ModelValidationTestCase extends
+public class ModelValidation1TestCase extends
BaseBeanValPropertyValidationTestCase<ModelValidationTestCase1PageBean>
{
- public ModelValidationTestCase(String name)
+ public ModelValidation1TestCase(String name)
{
super(name);
}
public static Test suite()
{
- return new TestSuite(ModelValidationTestCase.class);
+ return new TestSuite(ModelValidation1TestCase.class);
}
protected ModelValidationTestCase1PageBean getBeanToTest()
@@ -42,7 +42,7 @@
return new ModelValidationTestCase1PageBean();
}
- public void testClassLevelValidation()
+ public void testModelValidation()
{
createValueBindingForComponent(this.inputComponent1, "#{testBean.model1.property1}");
setValueToValidate(this.inputComponent1, "123");
@@ -59,7 +59,7 @@
checkMessageCount(0);
}
- public void testClassLevelViolationWithGlobalViolationMessageViaProperty()
+ public void testModelViolationWithGlobalViolationMessageViaProperty()
{
createValueBindingForComponent(this.inputComponent1, "#{testBean.model1.property1}");
setValueToValidate(this.inputComponent1, "123");
@@ -77,7 +77,7 @@
checkMessageSeverities(FacesMessage.SEVERITY_ERROR);
}
- public void testClassLevelViolationWithInlineViolationMessageViaProperty()
+ public void testModelViolationWithInlineViolationMessageViaProperty()
{
createValueBindingForComponent(this.inputComponent1, "#{testBean.model2.property1}");
setValueToValidate(this.inputComponent1, "123");
@@ -98,7 +98,7 @@
checkMessageSeverities(FacesMessage.SEVERITY_ERROR, FacesMessage.SEVERITY_ERROR);
}
- public void testClassLevelViolationWithGlobalViolationMessageViaField()
+ public void testModelViolationWithGlobalViolationMessageViaField()
{
createValueBindingForComponent(this.inputComponent1, "#{testBean.model3.property1}");
setValueToValidate(this.inputComponent1, "123");
@@ -116,7 +116,7 @@
checkMessageSeverities(FacesMessage.SEVERITY_ERROR);
}
- public void testClassLevelViolationWithInlineViolationMessageViaField()
+ public void testModelViolationWithInlineViolationMessageViaField()
{
createValueBindingForComponent(this.inputComponent1, "#{testBean.model4.property1}");
setValueToValidate(this.inputComponent1, "123");
@@ -136,4 +136,4 @@
checkMessageCount(2);
checkMessageSeverities(FacesMessage.SEVERITY_ERROR, FacesMessage.SEVERITY_ERROR);
}
-}
\ No newline at end of file
+}
Added: myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/ModelValidation2TestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/ModelValidation2TestCase.java?rev=833901&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/ModelValidation2TestCase.java (added)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/ModelValidation2TestCase.java Sun Nov 8 18:01:17 2009
@@ -0,0 +1,79 @@
+/*
+ * 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.test.beanval;
+
+import org.apache.myfaces.extensions.validator.test.beanval.view.ModelValidationTestCase2PageBean;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import javax.faces.application.FacesMessage;
+
+public class ModelValidation2TestCase extends
+ BaseBeanValPropertyValidationTestCase<ModelValidationTestCase2PageBean>
+{
+ public ModelValidation2TestCase(String name)
+ {
+ super(name);
+ }
+
+ public static Test suite()
+ {
+ return new TestSuite(ModelValidation2TestCase.class);
+ }
+
+ protected ModelValidationTestCase2PageBean getBeanToTest()
+ {
+ return new ModelValidationTestCase2PageBean();
+ }
+
+ public void testModelValidation()
+ {
+ createValueBindingForComponent(this.inputComponent1, "#{testBean.model.property1}");
+ setValueToValidate(this.inputComponent1, "123");
+
+ createValueBindingForComponent(this.inputComponent2, "#{testBean.model.property2}");
+ setValueToValidate(this.inputComponent2, "123");
+
+ validateComponents();
+ updateComponents();
+ processModelValidation();
+
+ assertNavigationBlocked(false);
+
+ checkMessageCount(0);
+ }
+
+ public void testModelViolationWithGlobalViolationMessageClassLevel()
+ {
+ createValueBindingForComponent(this.inputComponent1, "#{testBean.model.property1}");
+ setValueToValidate(this.inputComponent1, "123");
+
+ createValueBindingForComponent(this.inputComponent2, "#{testBean.model.property2}");
+ setValueToValidate(this.inputComponent2, "456");
+
+ validateComponents();
+ updateComponents();
+ processModelValidation();
+
+ assertNavigationBlocked(true);
+
+ checkMessageCount(1);
+ checkMessageSeverities(FacesMessage.SEVERITY_ERROR);
+ }
+}
Added: myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/ModelValidation3TestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/ModelValidation3TestCase.java?rev=833901&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/ModelValidation3TestCase.java (added)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/ModelValidation3TestCase.java Sun Nov 8 18:01:17 2009
@@ -0,0 +1,79 @@
+/*
+ * 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.test.beanval;
+
+import org.apache.myfaces.extensions.validator.test.beanval.view.ModelValidationTestCase3PageBean;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import javax.faces.application.FacesMessage;
+import javax.faces.context.FacesContext;
+
+public class ModelValidation3TestCase extends
+ BaseBeanValPropertyValidationTestCase<ModelValidationTestCase3PageBean>
+{
+ public ModelValidation3TestCase(String name)
+ {
+ super(name);
+ }
+
+ public static Test suite()
+ {
+ return new TestSuite(ModelValidation3TestCase.class);
+ }
+
+ protected ModelValidationTestCase3PageBean getBeanToTest()
+ {
+ return new ModelValidationTestCase3PageBean();
+ }
+
+ public void testModelValidationNoViewIdMatch()
+ {
+ validate();
+
+ assertNavigationBlocked(false);
+
+ checkMessageCount(0);
+ }
+
+ public void testModelValidationViewIdMatch()
+ {
+ FacesContext.getCurrentInstance().getViewRoot().setViewId("/pages/modelValidationAwarePage.xhtml");
+
+ validate();
+
+ assertNavigationBlocked(true);
+
+ checkMessageCount(1);
+ checkMessageSeverities(FacesMessage.SEVERITY_ERROR);
+ }
+
+ private void validate()
+ {
+ createValueBindingForComponent(this.inputComponent1, "#{testBean.model.property1}");
+ setValueToValidate(this.inputComponent1, "123");
+
+ createValueBindingForComponent(this.inputComponent2, "#{testBean.model.property2}");
+ setValueToValidate(this.inputComponent2, "456");
+
+ validateComponents();
+ updateComponents();
+ processModelValidation();
+ }
+}
Added: myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/view/ModelValidationTestCase2PageBean.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/view/ModelValidationTestCase2PageBean.java?rev=833901&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/view/ModelValidationTestCase2PageBean.java (added)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/view/ModelValidationTestCase2PageBean.java Sun Nov 8 18:01:17 2009
@@ -0,0 +1,34 @@
+/*
+ * 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.test.beanval.view;
+
+import org.apache.myfaces.extensions.validator.beanval.annotation.BeanValidation;
+import org.apache.myfaces.extensions.validator.beanval.annotation.ModelValidation;
+import org.apache.myfaces.extensions.validator.test.beanval.model.ModelValidationTestCase1Bean;
+
+@BeanValidation(modelValidation = @ModelValidation(isActive = true, validationTargets = "#{testBean.model}"))
+public class ModelValidationTestCase2PageBean
+{
+ private ModelValidationTestCase1Bean model = new ModelValidationTestCase1Bean();
+
+ public ModelValidationTestCase1Bean getModel()
+ {
+ return model;
+ }
+}
Added: myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/view/ModelValidationTestCase3PageBean.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/view/ModelValidationTestCase3PageBean.java?rev=833901&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/view/ModelValidationTestCase3PageBean.java (added)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/view/ModelValidationTestCase3PageBean.java Sun Nov 8 18:01:17 2009
@@ -0,0 +1,35 @@
+/*
+ * 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.test.beanval.view;
+
+import org.apache.myfaces.extensions.validator.beanval.annotation.BeanValidation;
+import org.apache.myfaces.extensions.validator.beanval.annotation.ModelValidation;
+import org.apache.myfaces.extensions.validator.test.beanval.model.ModelValidationTestCase1Bean;
+
+@BeanValidation(viewIds = "/pages/modelValidationAwarePage.xhtml",
+ modelValidation = @ModelValidation(isActive = true, validationTargets = "#{testBean.model}"))
+public class ModelValidationTestCase3PageBean
+{
+ private ModelValidationTestCase1Bean model = new ModelValidationTestCase1Bean();
+
+ public ModelValidationTestCase1Bean getModel()
+ {
+ return model;
+ }
+}