You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by rd...@apache.org on 2010/12/01 15:45:17 UTC
svn commit: r1041026 [5/6] - in /myfaces/extensions/validator/trunk: ./
test-modules/
test-modules/base-test-infrastructure/src/test/java/org/apache/myfaces/extensions/validator/test/base/
test-modules/base-test-infrastructure/src/test/java/org/apache/...
Modified: myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/constraintsource/ConstraintSourceAwareValidation2TestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/constraintsource/ConstraintSourceAwareValidation2TestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/constraintsource/ConstraintSourceAwareValidation2TestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/constraintsource/ConstraintSourceAwareValidation2TestCase.java Wed Dec 1 14:45:13 2010
@@ -2,29 +2,19 @@ package org.apache.myfaces.extensions.va
import javax.faces.application.FacesMessage;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.myfaces.extensions.validator.test.propval.constraintsource.model.ConstraintSourceAware2Bean;
+import org.junit.Test;
public class ConstraintSourceAwareValidation2TestCase extends
AbstractConstraintSourceTestCase<ConstraintSourceAware2Bean>
{
- public ConstraintSourceAwareValidation2TestCase(String name)
- {
- super(name);
- }
-
- public static Test suite()
- {
- return new TestSuite(ConstraintSourceAwareValidation2TestCase.class);
- }
protected ConstraintSourceAware2Bean getBeanToTest()
{
return new ConstraintSourceAware2Bean();
}
+ @Test
public void testIgnoreConstraintSource()
{
createValueBindingForComponent(this.inputComponent1, "#{testBean.property1}");
@@ -38,6 +28,7 @@ AbstractConstraintSourceTestCase<Constra
checkMessageCount(0);
}
+ @Test
public void testStringBasedTargetProperty()
{
createValueBindingForComponent(this.inputComponent2, "#{testBean.property2}");
Modified: myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/constraintsource/ConstraintSourceAwareValidation3TestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/constraintsource/ConstraintSourceAwareValidation3TestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/constraintsource/ConstraintSourceAwareValidation3TestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/constraintsource/ConstraintSourceAwareValidation3TestCase.java Wed Dec 1 14:45:13 2010
@@ -2,28 +2,19 @@ package org.apache.myfaces.extensions.va
import javax.faces.application.FacesMessage;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.myfaces.extensions.validator.test.propval.constraintsource.model.ConstraintSourceAware3Bean;
+import org.junit.Test;
public class ConstraintSourceAwareValidation3TestCase extends
AbstractConstraintSourceTestCase<ConstraintSourceAware3Bean>
{
- public ConstraintSourceAwareValidation3TestCase(String name)
- {
- super(name);
- }
- public static Test suite()
- {
- return new TestSuite(ConstraintSourceAwareValidation3TestCase.class);
- }
protected ConstraintSourceAware3Bean getBeanToTest()
{
return new ConstraintSourceAware3Bean();
}
+ @Test
public void testMissingBasedConstraintSource()
{
createValueBindingForComponent(this.inputComponent1, "#{testBean.property1}");
@@ -37,6 +28,7 @@ AbstractConstraintSourceTestCase<Constra
checkMessageCount(0);
}
+ @Test
public void testFieldBasedConstraintSource()
{
createValueBindingForComponent(this.inputComponent2, "#{testBean.property2}");
Modified: myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/constraintsource/ConstraintSourceAwareValidation4TestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/constraintsource/ConstraintSourceAwareValidation4TestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/constraintsource/ConstraintSourceAwareValidation4TestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/constraintsource/ConstraintSourceAwareValidation4TestCase.java Wed Dec 1 14:45:13 2010
@@ -2,29 +2,19 @@ package org.apache.myfaces.extensions.va
import javax.faces.application.FacesMessage;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.myfaces.extensions.validator.test.propval.constraintsource.model.ConstraintSourceAware4Bean;
+import org.junit.Test;
public class ConstraintSourceAwareValidation4TestCase extends
AbstractConstraintSourceTestCase<ConstraintSourceAware4Bean>
{
- public ConstraintSourceAwareValidation4TestCase(String name)
- {
- super(name);
- }
-
- public static Test suite()
- {
- return new TestSuite(ConstraintSourceAwareValidation4TestCase.class);
- }
protected ConstraintSourceAware4Bean getBeanToTest()
{
return new ConstraintSourceAware4Bean();
}
+ @Test
public void testMethodBasedConstraintSourceAndTargetPropertyAnnotation()
{
createValueBindingForComponent(this.inputComponent1, "#{testBean.property1}");
@@ -39,6 +29,7 @@ AbstractConstraintSourceTestCase<Constra
checkMessageSeverities(FacesMessage.SEVERITY_ERROR);
}
+ @Test
public void testMissingBasedConstraintSource()
{
createValueBindingForComponent(this.inputComponent2, "#{testBean.property2}");
Modified: myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/constraintsource/ConstraintSourceAwareValidation5TestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/constraintsource/ConstraintSourceAwareValidation5TestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/constraintsource/ConstraintSourceAwareValidation5TestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/constraintsource/ConstraintSourceAwareValidation5TestCase.java Wed Dec 1 14:45:13 2010
@@ -20,10 +20,8 @@ package org.apache.myfaces.extensions.va
import javax.faces.application.FacesMessage;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.myfaces.extensions.validator.test.propval.constraintsource.model.ConstraintSourceAware5Bean;
+import org.junit.Test;
/**
* EXTVAL-83
@@ -32,23 +30,15 @@ import org.apache.myfaces.extensions.val
* @author Rudy De busscher
*/
public class ConstraintSourceAwareValidation5TestCase extends
-AbstractConstraintSourceTestCase<ConstraintSourceAware5Bean>
+ AbstractConstraintSourceTestCase<ConstraintSourceAware5Bean>
{
- public ConstraintSourceAwareValidation5TestCase(String name)
- {
- super(name);
- }
-
- public static Test suite()
- {
- return new TestSuite(ConstraintSourceAwareValidation5TestCase.class);
- }
protected ConstraintSourceAware5Bean getBeanToTest()
{
return new ConstraintSourceAware5Bean();
}
+ @Test
public void testMethodBasedTargetPropertyIdAnnotation()
{
createValueBindingForComponent(this.inputComponent1, "#{testBean.property1}");
@@ -63,6 +53,7 @@ AbstractConstraintSourceTestCase<Constra
checkMessageSeverities(FacesMessage.SEVERITY_ERROR);
}
+ @Test
public void testFieldBasedTargetPropertyIdAnnotation()
{
createValueBindingForComponent(this.inputComponent2, "#{testBean.property2}");
Modified: myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/constraintsource/ConstraintSourceAwareValidation6TestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/constraintsource/ConstraintSourceAwareValidation6TestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/constraintsource/ConstraintSourceAwareValidation6TestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/constraintsource/ConstraintSourceAwareValidation6TestCase.java Wed Dec 1 14:45:13 2010
@@ -1,7 +1,5 @@
package org.apache.myfaces.extensions.validator.test.propval.constraintsource;
-import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.myfaces.extensions.validator.core.DefaultExtValCoreConfiguration;
import org.apache.myfaces.extensions.validator.core.ExtValCoreConfiguration;
import org.apache.myfaces.extensions.validator.test.propval.constraintsource.custom.CustomConstraintSource;
@@ -9,6 +7,7 @@ import org.apache.myfaces.extensions.val
import org.apache.myfaces.extensions.validator.test.propval.constraintsource.custom.CustomTargetProperty;
import org.apache.myfaces.extensions.validator.test.propval.constraintsource.custom.CustomTargetPropertyId;
import org.apache.myfaces.extensions.validator.test.propval.constraintsource.model.ConstraintSourceAware6Bean;
+import org.junit.Test;
import javax.faces.application.FacesMessage;
import java.lang.annotation.Annotation;
@@ -16,15 +15,6 @@ import java.lang.annotation.Annotation;
public class ConstraintSourceAwareValidation6TestCase extends
AbstractConstraintSourceTestCase<ConstraintSourceAware6Bean>
{
- public ConstraintSourceAwareValidation6TestCase(String name)
- {
- super(name);
- }
-
- public static Test suite()
- {
- return new TestSuite(ConstraintSourceAwareValidation6TestCase.class);
- }
protected ConstraintSourceAware6Bean getBeanToTest()
{
@@ -62,6 +52,7 @@ public class ConstraintSourceAwareValida
};
}
+ @Test
public void testCustomAnnotations1()
{
createValueBindingForComponent(this.inputComponent1,
@@ -77,6 +68,7 @@ public class ConstraintSourceAwareValida
checkMessageSeverities(FacesMessage.SEVERITY_ERROR);
}
+ @Test
public void testCustomAnnotations2()
{
createValueBindingForComponent(this.inputComponent2,
@@ -92,6 +84,7 @@ public class ConstraintSourceAwareValida
checkMessageSeverities(FacesMessage.SEVERITY_ERROR);
}
+ @Test
public void testCustomAnnotations3()
{
createValueBindingForComponent(this.inputComponent3,
Modified: myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/CrossValTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/CrossValTestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/CrossValTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/CrossValTestCase.java Wed Dec 1 14:45:13 2010
@@ -22,10 +22,8 @@ import javax.faces.component.UIViewRoot;
import javax.faces.component.html.HtmlForm;
import javax.faces.component.html.HtmlInputText;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.myfaces.extensions.validator.test.propval.AbstractPropertyValidationTestCase;
+import org.junit.Test;
/**
* @author Leonardo Uribe
@@ -38,22 +36,17 @@ public class CrossValTestCase extends Ab
UIViewRoot rootComponent = null;
- public CrossValTestCase(String name)
+ public CrossValTestCase()
{
- super(name);
inputComponent1 = null;
inputComponent2 = null;
rootComponent = null;
}
- public static Test suite() {
- return new TestSuite(CrossValTestCase.class);
- }
-
@Override
- protected void setUp() throws Exception
+ protected void setUpTestCase()
{
- super.setUp();
+ super.setUpTestCase();
CrossValTestBean bean = new CrossValTestBean();
createValueBinding(null, "value", "#{testBean}");
facesContext.getExternalContext().getRequestMap().put("testBean",bean);
@@ -70,12 +63,7 @@ public class CrossValTestCase extends Ab
inputComponent2.setId("input2");
}
- @Override
- protected void tearDown() throws Exception
- {
- super.tearDown();
- }
-
+ @Test
public void testEqualsCorrect() throws Exception
{
createValueBinding(inputComponent1, "value", "#{testBean.property1}");
@@ -95,6 +83,7 @@ public class CrossValTestCase extends Ab
//no update model needed
}
+ @Test
public void testEqualsFail() throws Exception
{
createValueBinding(inputComponent1, "value", "#{testBean.property1}");
Modified: myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/ELCrossValReverseMessageTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/ELCrossValReverseMessageTestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/ELCrossValReverseMessageTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/ELCrossValReverseMessageTestCase.java Wed Dec 1 14:45:13 2010
@@ -18,35 +18,25 @@
*/
package org.apache.myfaces.extensions.validator.test.propval.crossval;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.myfaces.extensions.validator.crossval.annotation.Equals;
import org.apache.myfaces.extensions.validator.core.initializer.configuration.StaticConfigurationNames;
import org.apache.myfaces.extensions.validator.core.initializer.configuration.StaticInMemoryConfiguration;
import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.test.propval.crossval.mock.MockEqualsValidationStrategy;
import org.apache.myfaces.extensions.validator.test.base.util.MethodUtils;
+import org.junit.Assert;
+import org.junit.Test;
/**
* @author Gerhard Petracek
*/
public class ELCrossValReverseMessageTestCase extends ELCrossValTestCase
{
- public ELCrossValReverseMessageTestCase(String name)
- {
- super(name);
- }
-
- public static Test suite()
- {
- return new TestSuite(ELCrossValReverseMessageTestCase.class);
- }
@Override
- protected void setUp() throws Exception
+ protected void setUpTestCase()
{
- super.setUp();
+ super.setUpTestCase();
StaticInMemoryConfiguration config = new StaticInMemoryConfiguration();
@@ -66,17 +56,19 @@ public class ELCrossValReverseMessageTes
//don't retest this test-case
}
+ @Test
public void testModelAwareCrossEqualsValidationCorrect() throws Exception
{
super.testModelAwareCrossEqualsValidationCorrect();
- assertFalse(MethodUtils.isMethodCalled(MockEqualsValidationStrategy.class, "reverseMessage"));
+ Assert.assertFalse(MethodUtils.isMethodCalled(MockEqualsValidationStrategy.class, "reverseMessage"));
}
+ @Test
public void testModelAwareCrossEqualsValidationFailedValidation() throws Exception
{
super.testModelAwareCrossEqualsValidationFailedValidation();
- assertTrue(MethodUtils.isMethodCalled(MockEqualsValidationStrategy.class, "reverseMessage"));
+ Assert.assertTrue(MethodUtils.isMethodCalled(MockEqualsValidationStrategy.class, "reverseMessage"));
//1x getReverseErrorMessageSummary and 1x getReverseErrorMessageDetail
- assertTrue(MethodUtils.checkMethodCalled(MockEqualsValidationStrategy.class, "reverseMessage", 2));
+ Assert.assertTrue(MethodUtils.checkMethodCalled(MockEqualsValidationStrategy.class, "reverseMessage", 2));
}
}
\ No newline at end of file
Modified: myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/ELCrossValTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/ELCrossValTestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/ELCrossValTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/ELCrossValTestCase.java Wed Dec 1 14:45:13 2010
@@ -23,10 +23,8 @@ import javax.faces.component.html.HtmlFo
import javax.faces.component.html.HtmlInputText;
import javax.faces.convert.DateTimeConverter;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.myfaces.extensions.validator.test.propval.AbstractPropertyValidationTestCase;
+import org.junit.Test;
import java.util.Date;
@@ -40,23 +38,17 @@ public class ELCrossValTestCase extends
UIViewRoot rootComponent = null;
- public ELCrossValTestCase(String name)
+ public ELCrossValTestCase()
{
- super(name);
- inputComponent1 = null;
+ inputComponent1 = null;
inputComponent2 = null;
rootComponent = null;
}
- public static Test suite()
- {
- return new TestSuite(ELCrossValTestCase.class);
- }
-
@Override
- protected void setUp() throws Exception
+ protected void setUpTestCase()
{
- super.setUp();
+ super.setUpTestCase();
createRequestScopedBean("bean1", getEntityInstance());
createRequestScopedBean("bean2", getEntityInstance());
@@ -81,12 +73,8 @@ public class ELCrossValTestCase extends
form.getChildren().add(inputComponent2);
}
- @Override
- protected void tearDown() throws Exception
- {
- super.tearDown();
- }
+ @Test
public void testCrossComponentEqualsValidationCorrect() throws Exception
{
validateELCrossComponentValidationUseCase("14.05.1983", "14.05.1983", "14.05.1983", "14.05.1983");
@@ -94,6 +82,7 @@ public class ELCrossValTestCase extends
checkMessageCount(0);
}
+ @Test
public void testCrossComponentEqualsValidationFailedValidation() throws Exception
{
validateELCrossComponentValidationUseCase("14.05.1983", "14.05.1983", "14.05.1983", "12.12.2008");
@@ -124,6 +113,7 @@ public class ELCrossValTestCase extends
//no update model needed
}
+ @Test
public void testModelAwareCrossEqualsValidationCorrect() throws Exception
{
validateELModelAwareCrossValidationUseCase("14.05.1983", "14.05.1983", "14.05.1983", "14.05.1983");
@@ -131,6 +121,7 @@ public class ELCrossValTestCase extends
checkMessageCount(0);
}
+ @Test
public void testModelAwareCrossEqualsValidationFailedValidation() throws Exception
{
validateELModelAwareCrossValidationUseCase("14.05.1983", "14.05.1983", "14.05.1983", "12.12.2008");
@@ -138,6 +129,7 @@ public class ELCrossValTestCase extends
checkMessageCount(1);
}
+
private void validateELModelAwareCrossValidationUseCase(String valueBean1Property1, String valueBean1Property2, String valueBean2Property1, String valueBean2Property2)
{
createValueBinding(inputComponent1, "value", "#{bean1.date1}");
Modified: myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/EmptyIf1TestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/EmptyIf1TestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/EmptyIf1TestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/EmptyIf1TestCase.java Wed Dec 1 14:45:13 2010
@@ -18,9 +18,8 @@
*/
package org.apache.myfaces.extensions.validator.test.propval.crossval;
-import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.myfaces.extensions.validator.test.propval.AbstractPropertyValidationTestCase;
+import org.junit.Test;
import javax.faces.component.UIViewRoot;
import javax.faces.component.html.HtmlForm;
@@ -35,23 +34,18 @@ public class EmptyIf1TestCase extends Ab
UIViewRoot rootComponent = null;
- public EmptyIf1TestCase(String name)
+ public EmptyIf1TestCase()
{
- super(name);
inputComponent1 = null;
inputComponent2 = null;
rootComponent = null;
}
- public static Test suite()
- {
- return new TestSuite(EmptyIf1TestCase.class);
- }
@Override
- protected void setUp() throws Exception
+ protected void setUpTestCase()
{
- super.setUp();
+ super.setUpTestCase();
EmptyIf1TestBean bean = new EmptyIf1TestBean();
createValueBinding(null, "value", "#{testBean}");
facesContext.getExternalContext().getRequestMap().put("testBean", bean);
@@ -68,12 +62,7 @@ public class EmptyIf1TestCase extends Ab
inputComponent2.setId("input2");
}
- @Override
- protected void tearDown() throws Exception
- {
- super.tearDown();
- }
-
+ @Test
public void testEmptyIfTargetNotEmptyCorrect() throws Exception
{
createValueBinding(inputComponent1, "value", "#{testBean.property1}");
@@ -94,6 +83,7 @@ public class EmptyIf1TestCase extends Ab
//no update model needed
}
+ @Test
public void testEmptyIfTargetNotEmptyFailed() throws Exception
{
createValueBinding(inputComponent1, "value", "#{testBean.property1}");
@@ -117,6 +107,7 @@ public class EmptyIf1TestCase extends Ab
//no update model needed
}
+ @Test
public void testEmptyIfTargetEmptyCorrect1() throws Exception
{
createValueBinding(inputComponent1, "value", "#{testBean.property1}");
@@ -138,6 +129,7 @@ public class EmptyIf1TestCase extends Ab
//no update model needed
}
+ @Test
public void testEmptyIfTargetEmptyCorrect2() throws Exception
{
createValueBinding(inputComponent1, "value", "#{testBean.property1}");
Modified: myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/EmptyIf2TestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/EmptyIf2TestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/EmptyIf2TestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/EmptyIf2TestCase.java Wed Dec 1 14:45:13 2010
@@ -18,9 +18,8 @@
*/
package org.apache.myfaces.extensions.validator.test.propval.crossval;
-import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.myfaces.extensions.validator.test.propval.AbstractPropertyValidationTestCase;
+import org.junit.Test;
import javax.faces.component.UIViewRoot;
import javax.faces.component.html.HtmlForm;
@@ -35,23 +34,17 @@ public class EmptyIf2TestCase extends Ab
UIViewRoot rootComponent = null;
- public EmptyIf2TestCase(String name)
+ public EmptyIf2TestCase()
{
- super(name);
inputComponent1 = null;
inputComponent2 = null;
rootComponent = null;
}
- public static Test suite()
- {
- return new TestSuite(EmptyIf2TestCase.class);
- }
-
@Override
- protected void setUp() throws Exception
+ protected void setUpTestCase()
{
- super.setUp();
+ super.setUpTestCase();
EmptyIf2TestBean bean = new EmptyIf2TestBean();
createValueBinding(null, "value", "#{testBean}");
facesContext.getExternalContext().getRequestMap().put("testBean", bean);
@@ -68,12 +61,7 @@ public class EmptyIf2TestCase extends Ab
inputComponent2.setId("input2");
}
- @Override
- protected void tearDown() throws Exception
- {
- super.tearDown();
- }
-
+ @Test
public void testEmptyIfTargetEmptyCorrect() throws Exception
{
createValueBinding(inputComponent1, "value", "#{testBean.property1}");
@@ -95,6 +83,7 @@ public class EmptyIf2TestCase extends Ab
//no update model needed
}
+ @Test
public void testEmptyIfTargetEmptyFailed() throws Exception
{
createValueBinding(inputComponent1, "value", "#{testBean.property1}");
@@ -118,6 +107,7 @@ public class EmptyIf2TestCase extends Ab
//no update model needed
}
+ @Test
public void testEmptyIfTargetNotEmptyCorrect1() throws Exception
{
createValueBinding(inputComponent1, "value", "#{testBean.property1}");
@@ -139,6 +129,7 @@ public class EmptyIf2TestCase extends Ab
//no update model needed
}
+ @Test
public void testEmptyIfTargetNotEmptyCorrect2() throws Exception
{
createValueBinding(inputComponent1, "value", "#{testBean.property1}");
Modified: myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/EmptyIf3TestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/EmptyIf3TestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/EmptyIf3TestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/EmptyIf3TestCase.java Wed Dec 1 14:45:13 2010
@@ -18,9 +18,8 @@
*/
package org.apache.myfaces.extensions.validator.test.propval.crossval;
-import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.myfaces.extensions.validator.test.propval.AbstractPropertyValidationTestCase;
+import org.junit.Test;
import javax.faces.component.UIViewRoot;
import javax.faces.component.html.HtmlForm;
@@ -35,23 +34,17 @@ public class EmptyIf3TestCase extends Ab
UIViewRoot rootComponent = null;
- public EmptyIf3TestCase(String name)
+ public EmptyIf3TestCase()
{
- super(name);
inputComponent1 = null;
inputComponent2 = null;
rootComponent = null;
}
- public static Test suite()
- {
- return new TestSuite(EmptyIf3TestCase.class);
- }
-
@Override
- protected void setUp() throws Exception
+ protected void setUpTestCase()
{
- super.setUp();
+ super.setUpTestCase();
EmptyIf3TestBean bean = new EmptyIf3TestBean();
createValueBinding(null, "value", "#{testBean}");
facesContext.getExternalContext().getRequestMap().put("testBean", bean);
@@ -68,12 +61,7 @@ public class EmptyIf3TestCase extends Ab
inputComponent2.setId("input2");
}
- @Override
- protected void tearDown() throws Exception
- {
- super.tearDown();
- }
-
+ @Test
public void testEmptyIfBooleanTargetNotEmptyCorrect() throws Exception
{
createValueBinding(inputComponent1, "value", "#{testBean.property1}");
@@ -95,6 +83,7 @@ public class EmptyIf3TestCase extends Ab
//no update model needed
}
+ @Test
public void testEmptyIfBooleanTargetNotEmptyFailed() throws Exception
{
createValueBinding(inputComponent1, "value", "#{testBean.property1}");
@@ -118,6 +107,7 @@ public class EmptyIf3TestCase extends Ab
//no update model needed
}
+ @Test
public void testEmptyIfBooleanTargetEmptyCorrect1() throws Exception
{
createValueBinding(inputComponent1, "value", "#{testBean.property1}");
@@ -139,6 +129,7 @@ public class EmptyIf3TestCase extends Ab
//no update model needed
}
+ @Test
public void testEmptyIfBooleanTargetEmptyCorrect2() throws Exception
{
createValueBinding(inputComponent1, "value", "#{testBean.property1}");
Modified: myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/EmptyIf4TestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/EmptyIf4TestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/EmptyIf4TestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/EmptyIf4TestCase.java Wed Dec 1 14:45:13 2010
@@ -18,9 +18,8 @@
*/
package org.apache.myfaces.extensions.validator.test.propval.crossval;
-import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.myfaces.extensions.validator.test.propval.AbstractPropertyValidationTestCase;
+import org.junit.Test;
import javax.faces.component.UIViewRoot;
import javax.faces.component.html.HtmlForm;
@@ -35,23 +34,17 @@ public class EmptyIf4TestCase extends Ab
UIViewRoot rootComponent = null;
- public EmptyIf4TestCase(String name)
+ public EmptyIf4TestCase()
{
- super(name);
inputComponent1 = null;
inputComponent2 = null;
rootComponent = null;
}
- public static Test suite()
- {
- return new TestSuite(EmptyIf4TestCase.class);
- }
-
@Override
- protected void setUp() throws Exception
+ protected void setUpTestCase()
{
- super.setUp();
+ super.setUpTestCase();
EmptyIf4TestBean bean = new EmptyIf4TestBean();
createValueBinding(null, "value", "#{testBean}");
facesContext.getExternalContext().getRequestMap().put("testBean", bean);
@@ -68,12 +61,7 @@ public class EmptyIf4TestCase extends Ab
inputComponent2.setId("input2");
}
- @Override
- protected void tearDown() throws Exception
- {
- super.tearDown();
- }
-
+ @Test
public void testEmptyIfBooleanTargetEmptyCorrect() throws Exception
{
createValueBinding(inputComponent1, "value", "#{testBean.property1}");
@@ -95,6 +83,7 @@ public class EmptyIf4TestCase extends Ab
//no update model needed
}
+ @Test
public void testEmptyIfBooleanTargetEmptyFailed() throws Exception
{
createValueBinding(inputComponent1, "value", "#{testBean.property1}");
@@ -118,6 +107,7 @@ public class EmptyIf4TestCase extends Ab
//no update model needed
}
+ @Test
public void testEmptyIfBooleanTargetNotEmptyCorrect1() throws Exception
{
createValueBinding(inputComponent1, "value", "#{testBean.property1}");
@@ -139,6 +129,7 @@ public class EmptyIf4TestCase extends Ab
//no update model needed
}
+ @Test
public void testEmptyIfBooleanTargetNotEmptyCorrect2() throws Exception
{
createValueBinding(inputComponent1, "value", "#{testBean.property1}");
Modified: myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/EqualsStringTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/EqualsStringTestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/EqualsStringTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/EqualsStringTestCase.java Wed Dec 1 14:45:13 2010
@@ -18,16 +18,13 @@
*/
package org.apache.myfaces.extensions.validator.test.propval.crossval;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.apache.myfaces.extensions.validator.crossval.CrossValidationPhaseListener;
+
import org.apache.myfaces.extensions.validator.test.propval.AbstractPropertyValidationTestCase;
+import org.junit.Test;
import javax.faces.component.UIViewRoot;
import javax.faces.component.html.HtmlForm;
import javax.faces.component.html.HtmlInputText;
-import javax.faces.event.PhaseEvent;
-import javax.faces.event.PhaseId;
public class EqualsStringTestCase extends AbstractPropertyValidationTestCase
{
@@ -37,24 +34,18 @@ public class EqualsStringTestCase extend
UIViewRoot rootComponent = null;
- public EqualsStringTestCase(String name)
+ public EqualsStringTestCase()
{
- super(name);
inputComponent1 = null;
inputComponent2 = null;
rootComponent = null;
}
- public static Test suite()
- {
- return new TestSuite(EqualsStringTestCase.class);
- }
-
@Override
- protected void setUp() throws Exception
+ protected void setUpTestCase()
{
- super.setUp();
+ super.setUpTestCase();
EqualsStringTestBean bean = new EqualsStringTestBean();
createValueBinding(null, "value", "#{testBean}");
facesContext.getExternalContext().getRequestMap().put("testBean", bean);
@@ -71,12 +62,7 @@ public class EqualsStringTestCase extend
inputComponent2.setId("input2");
}
- @Override
- protected void tearDown() throws Exception
- {
- super.tearDown();
- }
-
+ @Test
public void testEqualsCaseSensitiveSame() throws Exception
{
createValueBinding(inputComponent1, "value", "#{testBean.property1}");
@@ -94,6 +80,7 @@ public class EqualsStringTestCase extend
checkMessageCount(0);
}
+ @Test
public void testEqualsCaseSensitiveDifferent() throws Exception
{
createValueBinding(inputComponent1, "value", "#{testBean.property1}");
@@ -111,6 +98,7 @@ public class EqualsStringTestCase extend
checkMessageCount(2); // For each field a message
}
+ @Test
public void testEqualsCaseInsensitiveSame() throws Exception
{
createValueBinding(inputComponent1, "value", "#{testBean.property1}");
@@ -128,6 +116,7 @@ public class EqualsStringTestCase extend
checkMessageCount(0);
}
+ @Test
public void testEqualsCaseInsensitiveDifferent() throws Exception
{
createValueBinding(inputComponent1, "value", "#{testBean.property1}");
Modified: myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/LocalPropertyCrossValReverseMessageTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/LocalPropertyCrossValReverseMessageTestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/LocalPropertyCrossValReverseMessageTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/LocalPropertyCrossValReverseMessageTestCase.java Wed Dec 1 14:45:13 2010
@@ -18,29 +18,25 @@
*/
package org.apache.myfaces.extensions.validator.test.propval.crossval;
-import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.myfaces.extensions.validator.core.initializer.configuration.StaticInMemoryConfiguration;
import org.apache.myfaces.extensions.validator.core.initializer.configuration.StaticConfigurationNames;
import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.crossval.annotation.Equals;
import org.apache.myfaces.extensions.validator.test.propval.crossval.mock.MockEqualsValidationStrategy;
import org.apache.myfaces.extensions.validator.test.base.util.MethodUtils;
+import org.junit.Assert;
+import org.junit.Test;
/**
* @author Gerhard Petracek
*/
public class LocalPropertyCrossValReverseMessageTestCase extends LocalPropertyCrossValTestCase
{
- public static Test suite()
- {
- return new TestSuite(LocalPropertyCrossValReverseMessageTestCase.class);
- }
@Override
- protected void setUp() throws Exception
+ protected void setUpTestCase()
{
- super.setUp();
+ super.setUpTestCase();
StaticInMemoryConfiguration config = new StaticInMemoryConfiguration();
@@ -48,11 +44,6 @@ public class LocalPropertyCrossValRevers
ExtValContext.getContext().addStaticConfiguration(StaticConfigurationNames.META_DATA_TO_VALIDATION_STRATEGY_CONFIG, config);
}
- public LocalPropertyCrossValReverseMessageTestCase(String name)
- {
- super(name);
- }
-
@Override
public void testCrossComponentEqualsValidationCorrect() throws Exception
{
@@ -66,18 +57,20 @@ public class LocalPropertyCrossValRevers
}
@Override
+ @Test
public void testModelAwareCrossEqualsValidationCorrect() throws Exception
{
super.testModelAwareCrossEqualsValidationCorrect();
- assertFalse(MethodUtils.isMethodCalled(MockEqualsValidationStrategy.class, "reverseMessage"));
+ Assert.assertFalse(MethodUtils.isMethodCalled(MockEqualsValidationStrategy.class, "reverseMessage"));
}
@Override
+ @Test
public void testModelAwareCrossEqualsValidationFailedValidation() throws Exception
{
super.testModelAwareCrossEqualsValidationFailedValidation();
- assertTrue(MethodUtils.isMethodCalled(MockEqualsValidationStrategy.class, "reverseMessage"));
+ Assert.assertTrue(MethodUtils.isMethodCalled(MockEqualsValidationStrategy.class, "reverseMessage"));
//1x getReverseErrorMessageSummary and 1x getReverseErrorMessageDetail
- assertTrue(MethodUtils.checkMethodCalled(MockEqualsValidationStrategy.class, "reverseMessage", 2));
+ Assert.assertTrue(MethodUtils.checkMethodCalled(MockEqualsValidationStrategy.class, "reverseMessage", 2));
}
}
\ No newline at end of file
Modified: myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/LocalPropertyCrossValTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/LocalPropertyCrossValTestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/LocalPropertyCrossValTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/LocalPropertyCrossValTestCase.java Wed Dec 1 14:45:13 2010
@@ -18,23 +18,12 @@
*/
package org.apache.myfaces.extensions.validator.test.propval.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()
Modified: myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/NotEqualsStringTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/NotEqualsStringTestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/NotEqualsStringTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/NotEqualsStringTestCase.java Wed Dec 1 14:45:13 2010
@@ -18,10 +18,9 @@
*/
package org.apache.myfaces.extensions.validator.test.propval.crossval;
-import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.myfaces.extensions.validator.crossval.CrossValidationPhaseListener;
import org.apache.myfaces.extensions.validator.test.propval.AbstractPropertyValidationTestCase;
+import org.junit.Test;
import javax.faces.component.UIViewRoot;
import javax.faces.component.html.HtmlForm;
@@ -37,23 +36,17 @@ public class NotEqualsStringTestCase ext
UIViewRoot rootComponent = null;
- public NotEqualsStringTestCase(String name)
+ public NotEqualsStringTestCase()
{
- super(name);
inputComponent1 = null;
inputComponent2 = null;
rootComponent = null;
}
- public static Test suite()
- {
- return new TestSuite(NotEqualsStringTestCase.class);
- }
-
@Override
- protected void setUp() throws Exception
+ protected void setUpTestCase()
{
- super.setUp();
+ super.setUpTestCase();
NotEqualsStringTestBean bean = new NotEqualsStringTestBean();
createValueBinding(null, "value", "#{testBean}");
facesContext.getExternalContext().getRequestMap().put("testBean", bean);
@@ -70,12 +63,7 @@ public class NotEqualsStringTestCase ext
inputComponent2.setId("input2");
}
- @Override
- protected void tearDown() throws Exception
- {
- super.tearDown();
- }
-
+ @Test
public void testEqualsCaseSensitiveSame() throws Exception
{
createValueBinding(inputComponent1, "value", "#{testBean.property1}");
@@ -94,6 +82,7 @@ public class NotEqualsStringTestCase ext
}
+ @Test
public void testEqualsCaseSensitiveDifferent() throws Exception
{
createValueBinding(inputComponent1, "value", "#{testBean.property1}");
@@ -112,6 +101,7 @@ public class NotEqualsStringTestCase ext
}
+ @Test
public void testEqualsCaseInsensitiveSame() throws Exception
{
createValueBinding(inputComponent1, "value", "#{testBean.property1}");
@@ -130,6 +120,7 @@ public class NotEqualsStringTestCase ext
}
+ @Test
public void testEqualsCaseInsensitiveDifferent() throws Exception
{
createValueBinding(inputComponent1, "value", "#{testBean.property1}");
Modified: myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/PropertyChainCrossValReverseMessageTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/PropertyChainCrossValReverseMessageTestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/PropertyChainCrossValReverseMessageTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/PropertyChainCrossValReverseMessageTestCase.java Wed Dec 1 14:45:13 2010
@@ -18,34 +18,26 @@
*/
package org.apache.myfaces.extensions.validator.test.propval.crossval;
-import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.myfaces.extensions.validator.crossval.annotation.Equals;
import org.apache.myfaces.extensions.validator.core.initializer.configuration.StaticInMemoryConfiguration;
import org.apache.myfaces.extensions.validator.core.initializer.configuration.StaticConfigurationNames;
import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.test.propval.crossval.mock.MockEqualsValidationStrategy;
import org.apache.myfaces.extensions.validator.test.base.util.MethodUtils;
+import org.junit.Assert;
+import org.junit.Test;
/**
* @author Gerhard Petracek
*/
public class PropertyChainCrossValReverseMessageTestCase extends PropertyChainCrossValTestCase
{
- public static Test suite()
- {
- return new TestSuite(PropertyChainCrossValReverseMessageTestCase.class);
- }
- public PropertyChainCrossValReverseMessageTestCase(String name)
- {
- super(name);
- }
@Override
- protected void setUp() throws Exception
+ protected void setUpTestCase()
{
- super.setUp();
+ super.setUpTestCase();
StaticInMemoryConfiguration config = new StaticInMemoryConfiguration();
@@ -65,17 +57,19 @@ public class PropertyChainCrossValRevers
//don't retest this test-case
}
+ @Test
public void testModelAwareCrossEqualsValidationCorrect() throws Exception
{
super.testModelAwareCrossEqualsValidationCorrect();
- assertFalse(MethodUtils.isMethodCalled(MockEqualsValidationStrategy.class, "reverseMessage"));
+ Assert.assertFalse(MethodUtils.isMethodCalled(MockEqualsValidationStrategy.class, "reverseMessage"));
}
+ @Test
public void testModelAwareCrossEqualsValidationFailedValidation() throws Exception
{
super.testModelAwareCrossEqualsValidationFailedValidation();
- assertTrue(MethodUtils.isMethodCalled(MockEqualsValidationStrategy.class, "reverseMessage"));
+ Assert.assertTrue(MethodUtils.isMethodCalled(MockEqualsValidationStrategy.class, "reverseMessage"));
//1x getReverseErrorMessageSummary and 1x getReverseErrorMessageDetail
- assertTrue(MethodUtils.checkMethodCalled(MockEqualsValidationStrategy.class, "reverseMessage", 2));
+ Assert.assertTrue(MethodUtils.checkMethodCalled(MockEqualsValidationStrategy.class, "reverseMessage", 2));
}
}
\ No newline at end of file
Modified: myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/PropertyChainCrossValTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/PropertyChainCrossValTestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/PropertyChainCrossValTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/PropertyChainCrossValTestCase.java Wed Dec 1 14:45:13 2010
@@ -18,9 +18,8 @@
*/
package org.apache.myfaces.extensions.validator.test.propval.crossval;
-import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.myfaces.extensions.validator.test.propval.AbstractPropertyValidationTestCase;
+import org.junit.Test;
import javax.faces.component.html.HtmlInputText;
import javax.faces.component.html.HtmlForm;
@@ -38,23 +37,17 @@ public class PropertyChainCrossValTestCa
UIViewRoot rootComponent = null;
- public static Test suite()
- {
- return new TestSuite(PropertyChainCrossValTestCase.class);
- }
- public PropertyChainCrossValTestCase(String name)
+ public PropertyChainCrossValTestCase()
{
- super(name);
inputComponent1 = null;
inputComponent2 = null;
rootComponent = null;
}
@Override
- protected void setUp() throws Exception
+ protected void setUpTestCase()
{
- super.setUp();
createRequestScopedBean("bean1", getEntityInstance());
rootComponent = new UIViewRoot();
@@ -77,12 +70,7 @@ public class PropertyChainCrossValTestCa
form.getChildren().add(inputComponent2);
}
- @Override
- protected void tearDown() throws Exception
- {
- super.tearDown();
- }
-
+ @Test
public void testCrossComponentEqualsValidationCorrect() throws Exception
{
validatePropertyChainCrossComponentValidationUseCase("14.05.1983", "14.05.1983");
@@ -90,6 +78,7 @@ public class PropertyChainCrossValTestCa
checkMessageCount(0);
}
+ @Test
public void testCrossComponentEqualsValidationFailedValidation() throws Exception
{
validatePropertyChainCrossComponentValidationUseCase("14.05.1983", "12.12.2008");
Modified: myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/RequiredIf1TestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/RequiredIf1TestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/RequiredIf1TestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/RequiredIf1TestCase.java Wed Dec 1 14:45:13 2010
@@ -18,9 +18,8 @@
*/
package org.apache.myfaces.extensions.validator.test.propval.crossval;
-import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.myfaces.extensions.validator.test.propval.AbstractPropertyValidationTestCase;
+import org.junit.Test;
import javax.faces.component.UIViewRoot;
import javax.faces.component.html.HtmlForm;
@@ -35,23 +34,18 @@ public class RequiredIf1TestCase extends
UIViewRoot rootComponent = null;
- public RequiredIf1TestCase(String name)
+ public RequiredIf1TestCase()
{
- super(name);
inputComponent1 = null;
inputComponent2 = null;
rootComponent = null;
}
- public static Test suite()
- {
- return new TestSuite(RequiredIf1TestCase.class);
- }
@Override
- protected void setUp() throws Exception
+ protected void setUpTestCase()
{
- super.setUp();
+ super.setUpTestCase();
RequiredIf1TestBean bean = new RequiredIf1TestBean();
createValueBinding(null, "value", "#{testBean}");
facesContext.getExternalContext().getRequestMap().put("testBean", bean);
@@ -68,12 +62,7 @@ public class RequiredIf1TestCase extends
inputComponent2.setId("input2");
}
- @Override
- protected void tearDown() throws Exception
- {
- super.tearDown();
- }
-
+ @Test
public void testRequiredIfTargetNotEmptyFailed() throws Exception
{
createValueBinding(inputComponent1, "value", "#{testBean.property1}");
@@ -96,6 +85,7 @@ public class RequiredIf1TestCase extends
//no update model needed
}
+ @Test
public void testRequiredIfTargetNotEmptyCorrect1() throws Exception
{
createValueBinding(inputComponent1, "value", "#{testBean.property1}");
@@ -117,6 +107,7 @@ public class RequiredIf1TestCase extends
//no update model needed
}
+ @Test
public void testRequiredIfTargetNotEmptyCorrect2() throws Exception
{
createValueBinding(inputComponent1, "value", "#{testBean.property1}");
@@ -138,6 +129,7 @@ public class RequiredIf1TestCase extends
//no update model needed
}
+ @Test
public void testRequiredIfTargetNotEmptyCorrect3() throws Exception
{
createValueBinding(inputComponent1, "value", "#{testBean.property1}");
Modified: myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/RequiredIf2TestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/RequiredIf2TestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/RequiredIf2TestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/RequiredIf2TestCase.java Wed Dec 1 14:45:13 2010
@@ -18,9 +18,8 @@
*/
package org.apache.myfaces.extensions.validator.test.propval.crossval;
-import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.myfaces.extensions.validator.test.propval.AbstractPropertyValidationTestCase;
+import org.junit.Test;
import javax.faces.component.UIViewRoot;
import javax.faces.component.html.HtmlForm;
@@ -35,23 +34,18 @@ public class RequiredIf2TestCase extends
UIViewRoot rootComponent = null;
- public RequiredIf2TestCase(String name)
+ public RequiredIf2TestCase()
{
- super(name);
inputComponent1 = null;
inputComponent2 = null;
rootComponent = null;
}
- public static Test suite()
- {
- return new TestSuite(RequiredIf2TestCase.class);
- }
@Override
- protected void setUp() throws Exception
+ protected void setUpTestCase()
{
- super.setUp();
+ super.setUpTestCase();
RequiredIf2TestBean bean = new RequiredIf2TestBean();
createValueBinding(null, "value", "#{testBean}");
facesContext.getExternalContext().getRequestMap().put("testBean", bean);
@@ -68,12 +62,7 @@ public class RequiredIf2TestCase extends
inputComponent2.setId("input2");
}
- @Override
- protected void tearDown() throws Exception
- {
- super.tearDown();
- }
-
+ @Test
public void testRequiredIfTargetEmptyFailed() throws Exception
{
createValueBinding(inputComponent1, "value", "#{testBean.property1}");
@@ -96,6 +85,7 @@ public class RequiredIf2TestCase extends
//no update model needed
}
+ @Test
public void testRequiredIfTargetEmptyCorrect1() throws Exception
{
createValueBinding(inputComponent1, "value", "#{testBean.property1}");
@@ -117,6 +107,7 @@ public class RequiredIf2TestCase extends
//no update model needed
}
+ @Test
public void testRequiredIfTargetEmptyCorrect2() throws Exception
{
createValueBinding(inputComponent1, "value", "#{testBean.property1}");
@@ -138,6 +129,7 @@ public class RequiredIf2TestCase extends
//no update model needed
}
+ @Test
public void testRequiredIfTargetEmptyCorrect3() throws Exception
{
createValueBinding(inputComponent1, "value", "#{testBean.property1}");
Modified: myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/RequiredIf3TestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/RequiredIf3TestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/RequiredIf3TestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/RequiredIf3TestCase.java Wed Dec 1 14:45:13 2010
@@ -18,9 +18,8 @@
*/
package org.apache.myfaces.extensions.validator.test.propval.crossval;
-import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.myfaces.extensions.validator.test.propval.AbstractPropertyValidationTestCase;
+import org.junit.Test;
import javax.faces.component.UIViewRoot;
import javax.faces.component.html.HtmlForm;
@@ -35,23 +34,18 @@ public class RequiredIf3TestCase extends
UIViewRoot rootComponent = null;
- public RequiredIf3TestCase(String name)
+ public RequiredIf3TestCase()
{
- super(name);
inputComponent1 = null;
inputComponent2 = null;
rootComponent = null;
}
- public static Test suite()
- {
- return new TestSuite(RequiredIf3TestCase.class);
- }
@Override
- protected void setUp() throws Exception
+ protected void setUpTestCase()
{
- super.setUp();
+ super.setUpTestCase();
RequiredIf3TestBean bean = new RequiredIf3TestBean();
createValueBinding(null, "value", "#{testBean}");
facesContext.getExternalContext().getRequestMap().put("testBean", bean);
@@ -68,12 +62,7 @@ public class RequiredIf3TestCase extends
inputComponent2.setId("input2");
}
- @Override
- protected void tearDown() throws Exception
- {
- super.tearDown();
- }
-
+ @Test
public void testRequiredIfBooleanTargetNotEmptyFailed() throws Exception
{
createValueBinding(inputComponent1, "value", "#{testBean.property1}");
@@ -96,6 +85,7 @@ public class RequiredIf3TestCase extends
//no update model needed
}
+ @Test
public void testRequiredIfBooleanTargetNotEmptyCorrect1() throws Exception
{
createValueBinding(inputComponent1, "value", "#{testBean.property1}");
@@ -117,6 +107,7 @@ public class RequiredIf3TestCase extends
//no update model needed
}
+ @Test
public void testRequiredIfBooleanTargetNotEmptyCorrect2() throws Exception
{
createValueBinding(inputComponent1, "value", "#{testBean.property1}");
@@ -138,6 +129,7 @@ public class RequiredIf3TestCase extends
//no update model needed
}
+ @Test
public void testRequiredIfBooleanTargetNotEmptyCorrect3() throws Exception
{
createValueBinding(inputComponent1, "value", "#{testBean.property1}");
Modified: myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/RequiredIf4TestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/RequiredIf4TestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/RequiredIf4TestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/crossval/RequiredIf4TestCase.java Wed Dec 1 14:45:13 2010
@@ -18,9 +18,8 @@
*/
package org.apache.myfaces.extensions.validator.test.propval.crossval;
-import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.myfaces.extensions.validator.test.propval.AbstractPropertyValidationTestCase;
+import org.junit.Test;
import javax.faces.component.UIViewRoot;
import javax.faces.component.html.HtmlForm;
@@ -38,23 +37,17 @@ public class RequiredIf4TestCase extends
UIViewRoot rootComponent = null;
- public RequiredIf4TestCase(String name)
+ public RequiredIf4TestCase()
{
- super(name);
inputComponent1 = null;
inputComponent2 = null;
rootComponent = null;
}
- public static Test suite()
- {
- return new TestSuite(RequiredIf4TestCase.class);
- }
-
@Override
- protected void setUp() throws Exception
+ protected void setUpTestCase()
{
- super.setUp();
+ super.setUpTestCase();
RequiredIf4TestBean bean = new RequiredIf4TestBean();
createValueBinding(null, "value", "#{testBean}");
facesContext.getExternalContext().getRequestMap().put("testBean", bean);
@@ -71,12 +64,7 @@ public class RequiredIf4TestCase extends
inputComponent2.setId("input2");
}
- @Override
- protected void tearDown() throws Exception
- {
- super.tearDown();
- }
-
+ @Test
public void testRequiredIfBooleanTargetEmptyFailed() throws Exception
{
createValueBinding(inputComponent1, "value", "#{testBean.property1}");
@@ -99,6 +87,7 @@ public class RequiredIf4TestCase extends
//no update model needed
}
+ @Test
public void testRequiredIfBooleanTargetEmptyCorrect1() throws Exception
{
createValueBinding(inputComponent1, "value", "#{testBean.property1}");
@@ -120,6 +109,7 @@ public class RequiredIf4TestCase extends
//no update model needed
}
+ @Test
public void testRequiredIfBooleanTargetEmptyCorrect2() throws Exception
{
createValueBinding(inputComponent1, "value", "#{testBean.property1}");
@@ -141,6 +131,7 @@ public class RequiredIf4TestCase extends
//no update model needed
}
+ @Test
public void testRequiredIfBooleanTargetEmptyCorrect3() throws Exception
{
createValueBinding(inputComponent1, "value", "#{testBean.property1}");
Modified: myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/interceptor/RegistrationModuleMetaDataExtractionInterceptorTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/interceptor/RegistrationModuleMetaDataExtractionInterceptorTestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/interceptor/RegistrationModuleMetaDataExtractionInterceptorTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/interceptor/RegistrationModuleMetaDataExtractionInterceptorTestCase.java Wed Dec 1 14:45:13 2010
@@ -25,29 +25,16 @@ import org.apache.myfaces.extensions.val
import org.apache.myfaces.extensions.validator.core.interceptor.MetaDataExtractionInterceptor;
import org.apache.myfaces.extensions.validator.PropertyValidationModuleKey;
import org.apache.myfaces.extensions.validator.test.core.AbstractExValCoreTestCase;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.framework.Assert;
+import org.junit.Assert;
+import org.junit.Test;
import java.util.List;
public class RegistrationModuleMetaDataExtractionInterceptorTestCase extends AbstractExValCoreTestCase
{
- /**
- * Construct a new instance of the test.
- *
- * @param name Name of the test.
- */
- public RegistrationModuleMetaDataExtractionInterceptorTestCase(String name)
- {
- super(name);
- }
- public static Test suite()
- {
- return new TestSuite(RegistrationModuleMetaDataExtractionInterceptorTestCase.class);
- }
+ @Test
public void testModulePropertyValidationInterceptorInitialization()
{
resetExtValContext();
@@ -63,6 +50,7 @@ public class RegistrationModuleMetaDataE
checkModuleAwarePropertyValidationInterceptorsWithPropertyValidationModule();
}
+
private void checkGlobalOnlyPropertyValidationInterceptors()
{
List<MetaDataExtractionInterceptor> result = ExtValContext.getContext().getMetaDataExtractionInterceptors();
Modified: myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/interceptor/RegistrationModulePropertyValidationInterceptorTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/interceptor/RegistrationModulePropertyValidationInterceptorTestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/interceptor/RegistrationModulePropertyValidationInterceptorTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/interceptor/RegistrationModulePropertyValidationInterceptorTestCase.java Wed Dec 1 14:45:13 2010
@@ -24,9 +24,8 @@ import org.apache.myfaces.extensions.val
import org.apache.myfaces.extensions.validator.core.interceptor.PropertyValidationInterceptor;
import org.apache.myfaces.extensions.validator.PropertyValidationModuleKey;
import org.apache.myfaces.extensions.validator.test.core.AbstractExValCoreTestCase;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.framework.Assert;
+import org.junit.Assert;
+import org.junit.Test;
import javax.faces.context.FacesContext;
import javax.faces.component.UIComponent;
@@ -35,21 +34,8 @@ import java.util.Map;
public class RegistrationModulePropertyValidationInterceptorTestCase extends AbstractExValCoreTestCase
{
- /**
- * Construct a new instance of the test.
- *
- * @param name Name of the test.
- */
- public RegistrationModulePropertyValidationInterceptorTestCase(String name)
- {
- super(name);
- }
-
- public static Test suite()
- {
- return new TestSuite(RegistrationModulePropertyValidationInterceptorTestCase.class);
- }
+ @Test
public void testModulePropertyValidationInterceptorInitialization()
{
resetExtValContext();
Modified: myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/interceptor/RegistrationRendererInterceptorTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/interceptor/RegistrationRendererInterceptorTestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/interceptor/RegistrationRendererInterceptorTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/interceptor/RegistrationRendererInterceptorTestCase.java Wed Dec 1 14:45:13 2010
@@ -24,30 +24,17 @@ import org.apache.myfaces.extensions.val
import org.apache.myfaces.extensions.validator.core.interceptor.ValidationInterceptor;
import org.apache.myfaces.extensions.validator.PropertyValidationModuleValidationInterceptor;
import org.apache.myfaces.extensions.validator.test.core.AbstractExValCoreTestCase;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.framework.Assert;
+import org.junit.Assert;
+import org.junit.Test;
import java.util.List;
public class RegistrationRendererInterceptorTestCase extends AbstractExValCoreTestCase
{
- /**
- * Construct a new instance of the test.
- *
- * @param name Name of the test.
- */
- public RegistrationRendererInterceptorTestCase(String name)
- {
- super(name);
- }
- public static Test suite()
- {
- return new TestSuite(RegistrationRendererInterceptorTestCase.class);
- }
@SuppressWarnings({"ConstantConditions"})
+ @Test
public void testRendererInterceptorInitialization()
{
ExtValContext.getContext().registerRendererInterceptor(new TestComponentInitializer());
@@ -63,7 +50,7 @@ public class RegistrationRendererInterce
for(int i = 0; i < resultLength; i++)
{
tmp = result.get(i);
- assertTrue(tmp instanceof TestComponentInitializer ||
+ Assert.assertTrue(tmp instanceof TestComponentInitializer ||
tmp instanceof ValidationInterceptor || /*due to a junit issue*/
tmp instanceof PropertyValidationModuleValidationInterceptor);
}
Modified: myfaces/extensions/validator/trunk/test-modules/trinidad-component-support-tests/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/trinidad-component-support-tests/pom.xml?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/trinidad-component-support-tests/pom.xml (original)
+++ myfaces/extensions/validator/trunk/test-modules/trinidad-component-support-tests/pom.xml Wed Dec 1 14:45:13 2010
@@ -42,6 +42,13 @@
<dependencies>
<dependency>
+ <groupId>org.apache.myfaces.extensions.validator.validation-modules</groupId>
+ <artifactId>myfaces-extval-property-validation</artifactId>
+ <version>1.2.5-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.myfaces.extensions.validator.test-modules</groupId>
<artifactId>myfaces-extval-base-test-infrastructure</artifactId>
<version>1.2.5-SNAPSHOT</version>
Modified: myfaces/extensions/validator/trunk/test-modules/trinidad-component-support-tests/src/test/java/org/apache/myfaces/extensions/validator/test/trinidad/AbstractTrinidadSupportTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/trinidad-component-support-tests/src/test/java/org/apache/myfaces/extensions/validator/test/trinidad/AbstractTrinidadSupportTestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/trinidad-component-support-tests/src/test/java/org/apache/myfaces/extensions/validator/test/trinidad/AbstractTrinidadSupportTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/trinidad-component-support-tests/src/test/java/org/apache/myfaces/extensions/validator/test/trinidad/AbstractTrinidadSupportTestCase.java Wed Dec 1 14:45:13 2010
@@ -18,27 +18,86 @@
*/
package org.apache.myfaces.extensions.validator.test.trinidad;
+import org.apache.myfaces.extensions.validator.core.renderkit.ExtValRenderKit;
import org.apache.myfaces.extensions.validator.test.base.AbstractExValTestCase;
import org.apache.myfaces.extensions.validator.trinidad.startup.TrinidadModuleStartupListener;
+import org.apache.myfaces.test.config.ConfigParser;
+import org.apache.myfaces.test.mock.MockRenderKit;
+import org.apache.myfaces.trinidad.component.UIXInput;
+import org.apache.myfaces.trinidad.context.RenderingContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
+import org.apache.myfaces.trinidad.skin.SkinFactory;
+import org.apache.myfaces.trinidadinternal.context.RequestContextBean;
+import org.apache.myfaces.trinidadinternal.context.RequestContextImpl;
+import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRenderKit;
+import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRenderingContext;
+import org.apache.myfaces.trinidadinternal.skin.SkinFactoryImpl;
+
+import javax.el.ValueExpression;
+import javax.faces.FactoryFinder;
+import javax.faces.el.ValueBinding;
+import javax.faces.render.RenderKitFactory;
+import java.net.URL;
+import java.util.Enumeration;
/**
- *
* @author Rudy De Busscher
- * since v4
- *
+ * since v4
*/
public abstract class AbstractTrinidadSupportTestCase extends AbstractExValTestCase
{
- public AbstractTrinidadSupportTestCase(String name)
+ private RequestContext requestContext;
+
+ private RenderingContext renderingContext;
+
+ @Override
+ protected void setFactories() throws Exception
{
- super(name);
+ super.setFactories();
+ FactoryFinder.setFactory(FactoryFinder.RENDER_KIT_FACTORY,
+ "org.apache.myfaces.trinidadinternal.renderkit.CoreRenderKitFactory");
+
+ }
+
+ @Override
+ protected void setUpRenderKit() throws Exception
+ {
+
+ RenderKitFactory renderKitFactory = (RenderKitFactory) FactoryFinder
+ .getFactory(FactoryFinder.RENDER_KIT_FACTORY);
+ renderKit = new ExtValRenderKit(new CoreRenderKit());
+ renderKitFactory.addRenderKit(RenderKitFactory.HTML_BASIC_RENDER_KIT,
+ renderKit);
+
+ renderKitFactory.addRenderKit("org.apache.myfaces.trinidad.core",
+ renderKit);
+ renderKitFactory.addRenderKit("org.apache.myfaces.trinidadinternal.core",
+ renderKit);
+ renderKitFactory.addRenderKit("org.apache.myfaces.trinidad.core.desktop",
+ renderKit);
+ renderKitFactory.addRenderKit("org.apache.myfaces.trinidad.core.pda",
+ renderKit);
+
+ ConfigParser parser = new ConfigParser();
+
+ Enumeration<URL> facesConfigEnum =getClass().getClassLoader().getResources("META-INF/faces-config.xml");
+
+ while (facesConfigEnum.hasMoreElements() ) {
+ URL url = facesConfigEnum.nextElement();
+ if (url.toExternalForm().contains("trinidad")) {
+ parser.parse(url);
+ }
+ }
+
+
}
@Override
protected void invokeStartupListeners()
{
- new TrinidadModuleStartupListener(){
+ new TrinidadModuleStartupListener()
+ {
private static final long serialVersionUID = 423076920926752646L;
@Override
@@ -47,7 +106,39 @@ public abstract class AbstractTrinidadSu
super.init();
}
}.init();
-
+
}
+ @Override
+ protected void resetTestCase()
+ {
+ renderingContext.release();
+ requestContext.release();
+ super.resetTestCase();
+ }
+
+ @Override
+ protected void setUpTestCase()
+ {
+ super.setUpTestCase();
+ SkinFactory.setFactory(new SkinFactoryImpl());
+ requestContext = new RequestContextImpl(new RequestContextBean());
+ ((RequestContextImpl)requestContext).init(externalContext);
+ renderingContext = new CoreRenderingContext();
+
+
+ }
+
+ protected void createValueBinding(UIXInput uiInput, String name, String expression)
+ {
+ ValueBinding valueBinding = application.createValueBinding(expression);
+ ValueExpression valueExpression = application.getExpressionFactory().createValueExpression(
+ facesContext.getELContext(), expression, Object.class);
+
+ if (uiInput != null)
+ {
+ uiInput.setValueBinding(name, valueBinding);
+ uiInput.setValueExpression(name, valueExpression);
+ }
+ }
}
Modified: myfaces/extensions/validator/trunk/test-modules/trinidad-component-support-tests/src/test/java/org/apache/myfaces/extensions/validator/test/trinidad/config/ExtValTrinidadSupportModuleConfigurationCustomTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/trinidad-component-support-tests/src/test/java/org/apache/myfaces/extensions/validator/test/trinidad/config/ExtValTrinidadSupportModuleConfigurationCustomTestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/trinidad-component-support-tests/src/test/java/org/apache/myfaces/extensions/validator/test/trinidad/config/ExtValTrinidadSupportModuleConfigurationCustomTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/trinidad-component-support-tests/src/test/java/org/apache/myfaces/extensions/validator/test/trinidad/config/ExtValTrinidadSupportModuleConfigurationCustomTestCase.java Wed Dec 1 14:45:13 2010
@@ -18,11 +18,10 @@
*/
package org.apache.myfaces.extensions.validator.test.trinidad.config;
-import junit.framework.Test;
-
-import org.apache.myfaces.extensions.validator.test.base.util.ClassLoaderTestSuite;
import org.apache.myfaces.extensions.validator.trinidad.DefaultExtValTrinidadSupportModuleConfiguration;
import org.apache.myfaces.extensions.validator.trinidad.ExtValTrinidadSupportModuleConfiguration;
+import org.junit.Assert;
+import org.junit.Test;
/**
*
@@ -34,11 +33,6 @@ public class ExtValTrinidadSupportModule
ExtValTrinidadSupportModuleConfigurationTestCase
{
- public ExtValTrinidadSupportModuleConfigurationCustomTestCase(String name)
- {
- super(name);
- }
-
public static class CustomExtValTrinidadSupportModuleConfiguration extends
DefaultExtValTrinidadSupportModuleConfiguration
{
@@ -70,20 +64,17 @@ public class ExtValTrinidadSupportModule
return null;
}
+ @Test
public void testExtValTrinidadSupportModuleConfigurationCustomDefault()
{
- assertFalse(ExtValTrinidadSupportModuleConfiguration.get().deactivateClientSideValidation());
+ Assert.assertFalse(ExtValTrinidadSupportModuleConfiguration.get().deactivateClientSideValidation());
}
+ @Test
public void testExtValTrinidadSupportModuleConfigurationCustomCustomConfig()
{
- assertTrue(ExtValTrinidadSupportModuleConfiguration.get().deactivateClientSideValidation());
+ Assert.assertTrue(ExtValTrinidadSupportModuleConfiguration.get().deactivateClientSideValidation());
}
- public static Test suite()
- {
- return new ClassLoaderTestSuite(ExtValTrinidadSupportModuleConfigurationCustomTestCase.class);
- }
-
}
Modified: myfaces/extensions/validator/trunk/test-modules/trinidad-component-support-tests/src/test/java/org/apache/myfaces/extensions/validator/test/trinidad/config/ExtValTrinidadSupportModuleConfigurationDeactivateClientSideValidationTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/trinidad-component-support-tests/src/test/java/org/apache/myfaces/extensions/validator/test/trinidad/config/ExtValTrinidadSupportModuleConfigurationDeactivateClientSideValidationTestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/trinidad-component-support-tests/src/test/java/org/apache/myfaces/extensions/validator/test/trinidad/config/ExtValTrinidadSupportModuleConfigurationDeactivateClientSideValidationTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/trinidad-component-support-tests/src/test/java/org/apache/myfaces/extensions/validator/test/trinidad/config/ExtValTrinidadSupportModuleConfigurationDeactivateClientSideValidationTestCase.java Wed Dec 1 14:45:13 2010
@@ -20,14 +20,13 @@ package org.apache.myfaces.extensions.va
import java.util.List;
-import junit.framework.Test;
-
import org.apache.myfaces.extensions.validator.ExtValInformation;
import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.core.initializer.component.ComponentInitializer;
-import org.apache.myfaces.extensions.validator.test.base.util.ClassLoaderTestSuite;
import org.apache.myfaces.extensions.validator.trinidad.DefaultExtValTrinidadSupportModuleConfiguration;
import org.apache.myfaces.extensions.validator.trinidad.ExtValTrinidadSupportModuleConfiguration;
+import org.junit.Assert;
+import org.junit.Test;
/**
*
@@ -39,11 +38,6 @@ public class ExtValTrinidadSupportModule
ExtValTrinidadSupportModuleConfigurationTestCase
{
- public ExtValTrinidadSupportModuleConfigurationDeactivateClientSideValidationTestCase(String name)
- {
- super(name);
- }
-
public static class CustomExtValTrinidadSupportModuleConfiguration extends
DefaultExtValTrinidadSupportModuleConfiguration
{
@@ -73,30 +67,26 @@ public class ExtValTrinidadSupportModule
return new CustomExtValTrinidadSupportModuleConfiguration();
}
+ @Test
public void testDeactivateClientSideValidationDefault()
{
List<ComponentInitializer> compInitializer = ExtValContext.getContext().getComponentInitializers();
- assertEquals(1, compInitializer.size());
+ Assert.assertEquals(1, compInitializer.size());
}
+ @Test
public void testDeactivateClientSideValidationWebXml()
{
List<ComponentInitializer> compInitializer = ExtValContext.getContext().getComponentInitializers();
- assertEquals(0, compInitializer.size());
+ Assert.assertEquals(0, compInitializer.size());
}
+ @Test
public void testDeactivateClientSideValidationCustomConfig()
{
List<ComponentInitializer> compInitializer = ExtValContext.getContext().getComponentInitializers();
- assertEquals(0, compInitializer.size());
- }
-
- public static Test suite()
- {
- return new ClassLoaderTestSuite(
- ExtValTrinidadSupportModuleConfigurationDeactivateClientSideValidationTestCase.class);
-
+ Assert.assertEquals(0, compInitializer.size());
}
}