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 [2/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/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/ModelValidation3TestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/ModelValidation3TestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/ModelValidation3TestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/ModelValidation3TestCase.java Wed Dec 1 14:45:13 2010
@@ -19,8 +19,7 @@
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 org.junit.Test;
import javax.faces.application.FacesMessage;
import javax.faces.context.FacesContext;
@@ -28,21 +27,13 @@ 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();
}
+ @Test
public void testModelValidationNoViewIdMatch()
{
validate();
@@ -52,6 +43,7 @@ public class ModelValidation3TestCase ex
checkMessageCount(0);
}
+ @Test
public void testModelValidationViewIdMatch()
{
FacesContext.getCurrentInstance().getViewRoot().setViewId("/pages/modelValidationAwarePage.xhtml");
Modified: myfaces/extensions/validator/trunk/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/ModelValidation4TestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/ModelValidation4TestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/ModelValidation4TestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/ModelValidation4TestCase.java Wed Dec 1 14:45:13 2010
@@ -19,8 +19,7 @@
package org.apache.myfaces.extensions.validator.test.beanval;
import org.apache.myfaces.extensions.validator.test.beanval.view.ModelValidationTestCase4PageBean;
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.Test;
import javax.faces.application.FacesMessage;
import javax.faces.context.FacesContext;
@@ -28,21 +27,13 @@ import javax.faces.context.FacesContext;
public class ModelValidation4TestCase extends
BaseBeanValPropertyValidationTestCase<ModelValidationTestCase4PageBean>
{
- public ModelValidation4TestCase(String name)
- {
- super(name);
- }
-
- public static Test suite()
- {
- return new TestSuite(ModelValidation4TestCase.class);
- }
protected ModelValidationTestCase4PageBean getBeanToTest()
{
return new ModelValidationTestCase4PageBean();
}
+ @Test
public void testModelValidationNoViewIdMatch()
{
validate();
@@ -52,6 +43,7 @@ public class ModelValidation4TestCase ex
checkMessageCount(0);
}
+ @Test
public void testModelValidationViewIdMatch()
{
FacesContext.getCurrentInstance().getViewRoot().setViewId("/pages/modelValidationAwarePage.xhtml");
Modified: myfaces/extensions/validator/trunk/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/RestrictGroupsTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/RestrictGroupsTestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/RestrictGroupsTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/RestrictGroupsTestCase.java Wed Dec 1 14:45:13 2010
@@ -20,29 +20,20 @@ package org.apache.myfaces.extensions.va
import org.apache.myfaces.extensions.validator.test.beanval.view.RestrictGroupValidationTestCase1PageBean;
import org.apache.myfaces.extensions.validator.test.beanval.model.SimulatedUserInformation;
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.Test;
import javax.faces.application.FacesMessage;
import javax.faces.context.FacesContext;
public class RestrictGroupsTestCase extends BaseBeanValPropertyValidationTestCase<RestrictGroupValidationTestCase1PageBean>
{
- public RestrictGroupsTestCase(String name)
- {
- super(name);
- }
-
- public static Test suite()
- {
- return new TestSuite(RestrictGroupsTestCase.class);
- }
protected RestrictGroupValidationTestCase1PageBean getBeanToTest()
{
return new RestrictGroupValidationTestCase1PageBean();
}
+ @Test
public void testRestrictedGroup()
{
createValueBindingForComponent(this.inputComponent1, "#{testBean.model1.property1}");
@@ -56,6 +47,7 @@ public class RestrictGroupsTestCase exte
checkMessageCount(0);
}
+ @Test
public void testRestrictedGroupWithAdminRole()
{
createRequestScopedBean("currentUser", new SimulatedUserInformation("admin"));
@@ -74,6 +66,7 @@ public class RestrictGroupsTestCase exte
checkMessageCount(0);
}
+ @Test
public void testRestrictedGroupWithUserRole()
{
createRequestScopedBean("currentUser", new SimulatedUserInformation("user"));
@@ -93,6 +86,7 @@ public class RestrictGroupsTestCase exte
checkMessageSeverities(FacesMessage.SEVERITY_ERROR);
}
+ @Test
public void testRestrictedGroupWithCorrectViewId()
{
FacesContext.getCurrentInstance().getViewRoot().setViewId("/pages/groupValidationAwarePage.xhtml");
@@ -111,6 +105,7 @@ public class RestrictGroupsTestCase exte
checkMessageCount(0);
}
+ @Test
public void testRestrictedGroupWithWrongViewId()
{
createValueBindingForComponent(this.inputComponent1, "#{testBean.model3.property1}");
@@ -128,6 +123,7 @@ public class RestrictGroupsTestCase exte
checkMessageSeverities(FacesMessage.SEVERITY_ERROR);
}
+ @Test
public void testUsedAndRestrictedGroup()
{
createValueBindingForComponent(this.inputComponent1, "#{testBean.model4.property1}");
Modified: myfaces/extensions/validator/trunk/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/UseGroupValidation1TestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/UseGroupValidation1TestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/UseGroupValidation1TestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/UseGroupValidation1TestCase.java Wed Dec 1 14:45:13 2010
@@ -18,31 +18,22 @@
*/
package org.apache.myfaces.extensions.validator.test.beanval;
-import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.myfaces.extensions.validator.test.beanval.view.UseGroupValidationTestCase1PageBean;
import org.apache.myfaces.extensions.validator.test.beanval.model.SimulatedUserInformation;
+import org.junit.Test;
import javax.faces.application.FacesMessage;
import javax.faces.context.FacesContext;
public class UseGroupValidation1TestCase extends BaseBeanValPropertyValidationTestCase<UseGroupValidationTestCase1PageBean>
{
- public UseGroupValidation1TestCase(String name)
- {
- super(name);
- }
-
- public static Test suite()
- {
- return new TestSuite(UseGroupValidation1TestCase.class);
- }
protected UseGroupValidationTestCase1PageBean getBeanToTest()
{
return new UseGroupValidationTestCase1PageBean();
}
+ @Test
public void testGroup1AwareValidation()
{
createValueBindingForComponent(this.inputComponent1, "#{testBean.model1.property1}");
@@ -60,6 +51,7 @@ public class UseGroupValidation1TestCase
checkMessageSeverities(FacesMessage.SEVERITY_ERROR);
}
+ @Test
public void testGroup1AndGroup2AwareValidation()
{
createValueBindingForComponent(this.inputComponent1, "#{testBean.model2.property1}");
@@ -77,6 +69,7 @@ public class UseGroupValidation1TestCase
checkMessageSeverities(FacesMessage.SEVERITY_ERROR, FacesMessage.SEVERITY_ERROR);
}
+ @Test
public void testGroup2AndGroup3AwareValidationWithWrongViewId()
{
createValueBindingForComponent(this.inputComponent1, "#{testBean.model3.property1}");
@@ -93,6 +86,7 @@ public class UseGroupValidation1TestCase
checkMessageCount(0);
}
+ @Test
public void testGroup2AndGroup3AwareValidationWithCorrectViewId1()
{
FacesContext.getCurrentInstance().getViewRoot().setViewId("/pages/page1.xhtml");
@@ -111,6 +105,7 @@ public class UseGroupValidation1TestCase
checkMessageSeverities(FacesMessage.SEVERITY_ERROR, FacesMessage.SEVERITY_ERROR);
}
+ @Test
public void testGroup2AndGroup3AwareValidationWithCorrectViewId2()
{
FacesContext.getCurrentInstance().getViewRoot().setViewId("/pages/page2.xhtml");
@@ -129,6 +124,7 @@ public class UseGroupValidation1TestCase
checkMessageSeverities(FacesMessage.SEVERITY_ERROR, FacesMessage.SEVERITY_ERROR);
}
+ @Test
public void testGroup2AwareValidationWithRoleAdmin()
{
createRequestScopedBean("currentUser", new SimulatedUserInformation("admin"));
@@ -147,6 +143,7 @@ public class UseGroupValidation1TestCase
checkMessageSeverities(FacesMessage.SEVERITY_ERROR);
}
+ @Test
public void testGroup2AndGroup3AwareValidationWithRoleUser()
{
createRequestScopedBean("currentUser", new SimulatedUserInformation("user"));
Modified: myfaces/extensions/validator/trunk/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/UseGroupValidation2TestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/UseGroupValidation2TestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/UseGroupValidation2TestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/UseGroupValidation2TestCase.java Wed Dec 1 14:45:13 2010
@@ -18,29 +18,20 @@
*/
package org.apache.myfaces.extensions.validator.test.beanval;
-import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.myfaces.extensions.validator.test.beanval.view.UseGroupValidationTestCase2PageBean;
+import org.junit.Test;
import javax.faces.application.FacesMessage;
public class UseGroupValidation2TestCase extends BaseBeanValPropertyValidationTestCase<UseGroupValidationTestCase2PageBean>
{
- public UseGroupValidation2TestCase(String name)
- {
- super(name);
- }
-
- public static Test suite()
- {
- return new TestSuite(UseGroupValidation2TestCase.class);
- }
protected UseGroupValidationTestCase2PageBean getBeanToTest()
{
return new UseGroupValidationTestCase2PageBean();
}
+ @Test
public void testGroup1AwareValidation()
{
createValueBindingForComponent(this.inputComponent1, "#{testBean.model.property1}");
Modified: myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/SupportForMapPropertyTest.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/SupportForMapPropertyTest.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/SupportForMapPropertyTest.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/SupportForMapPropertyTest.java Wed Dec 1 14:45:13 2010
@@ -19,6 +19,7 @@
package org.apache.myfaces.extensions.validator.test;
import org.apache.myfaces.extensions.validator.test.base.AbstractExValTestCase;
+import org.junit.Test;
import java.util.HashMap;
import java.util.Map;
@@ -27,8 +28,6 @@ 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;
//just a test for the mock impl.
public class SupportForMapPropertyTest extends AbstractExValTestCase
@@ -37,16 +36,6 @@ public class SupportForMapPropertyTest e
UIViewRoot rootComponent = null;
- public SupportForMapPropertyTest(String name)
- {
- super(name);
- }
-
- public static Test suite()
- {
- return new TestSuite(SupportForMapPropertyTest.class);
- }
-
@Override
protected void invokeStartupListeners()
{
@@ -54,9 +43,9 @@ public class SupportForMapPropertyTest e
}
@Override
- protected void setUp() throws Exception
+ protected void setUpTestCase()
{
- super.setUp();
+ super.setUpTestCase();
TestBean bean = new TestBean();
createValueBinding(null, "value", "#{testBean}");
facesContext.getExternalContext().getRequestMap().put("testBean", bean);
@@ -71,12 +60,7 @@ public class SupportForMapPropertyTest e
}
- @Override
- protected void tearDown() throws Exception
- {
- super.tearDown();
- }
-
+ @Test
public void testMapPropertyFromScreen()
{
createValueBinding(inputComponent1, "value", "#{testBean.mapProperty['Key']}");
Modified: myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/AbstractExValCoreTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/AbstractExValCoreTestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/AbstractExValCoreTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/AbstractExValCoreTestCase.java Wed Dec 1 14:45:13 2010
@@ -22,10 +22,6 @@ import org.apache.myfaces.extensions.val
public abstract class AbstractExValCoreTestCase extends AbstractExValTestCase
{
- public AbstractExValCoreTestCase(String name)
- {
- super(name);
- }
protected void invokeStartupListeners()
{
Modified: myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationActivateRequiredInitializationTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationActivateRequiredInitializationTestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationActivateRequiredInitializationTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationActivateRequiredInitializationTestCase.java Wed Dec 1 14:45:13 2010
@@ -18,13 +18,12 @@
*/
package org.apache.myfaces.extensions.validator.test.core.config;
-import junit.framework.Test;
-
import org.apache.myfaces.extensions.validator.ExtValInformation;
import org.apache.myfaces.extensions.validator.core.DefaultExtValCoreConfiguration;
import org.apache.myfaces.extensions.validator.core.ExtValCoreConfiguration;
-import org.apache.myfaces.extensions.validator.test.base.util.ClassLoaderTestSuite;
import org.apache.myfaces.extensions.validator.util.ExtValUtils;
+import org.junit.Assert;
+import org.junit.Test;
/**
*
@@ -35,11 +34,6 @@ import org.apache.myfaces.extensions.val
public class ExtValCoreConfigurationActivateRequiredInitializationTestCase extends ExtValCoreConfigurationTestCase
{
- public ExtValCoreConfigurationActivateRequiredInitializationTestCase(String name)
- {
- super(name);
- }
-
@Override
protected void addInitializationParameters()
{
@@ -73,36 +67,37 @@ public class ExtValCoreConfigurationActi
}
}
+ @Test
public void testActivateRequiredInitializationDefault()
{
- assertFalse(ExtValUtils.isRequiredInitializationActive());
+ Assert.assertFalse(ExtValUtils.isRequiredInitializationActive());
}
+ @Test
public void testActivateRequiredInitializationDefaultWithOverrule()
{
DefaultExtValCoreConfiguration.overruleActivateRequiredInitialization(Boolean.TRUE, true);
- assertTrue(ExtValUtils.isRequiredInitializationActive());
+ Assert.assertTrue(ExtValUtils.isRequiredInitializationActive());
}
+ @Test
public void testActivateRequiredInitializationWebXml()
{
- assertTrue(ExtValUtils.isRequiredInitializationActive());
+ Assert.assertTrue(ExtValUtils.isRequiredInitializationActive());
}
+ @Test
public void testActivateRequiredInitializationWebXmlWithOverrule()
{
DefaultExtValCoreConfiguration.overruleActivateRequiredInitialization(Boolean.FALSE, true);
- assertFalse(ExtValUtils.isRequiredInitializationActive());
+ Assert.assertFalse(ExtValUtils.isRequiredInitializationActive());
}
+ @Test
public void testActivateRequiredInitializationCustomConfig()
{
- assertTrue(ExtValUtils.isRequiredInitializationActive());
+ Assert.assertTrue(ExtValUtils.isRequiredInitializationActive());
}
- public static Test suite()
- {
- return new ClassLoaderTestSuite(ExtValCoreConfigurationActivateRequiredInitializationTestCase.class);
- }
}
Modified: myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationConstraintSourceAnnotationTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationConstraintSourceAnnotationTestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationConstraintSourceAnnotationTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationConstraintSourceAnnotationTestCase.java Wed Dec 1 14:45:13 2010
@@ -21,18 +21,18 @@ package org.apache.myfaces.extensions.va
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
-import junit.framework.Test;
import org.apache.myfaces.extensions.validator.core.DefaultExtValCoreConfiguration;
import org.apache.myfaces.extensions.validator.core.ExtValCoreConfiguration;
import org.apache.myfaces.extensions.validator.core.storage.PropertyStorage;
-import org.apache.myfaces.extensions.validator.test.base.util.ClassLoaderTestSuite;
import org.apache.myfaces.extensions.validator.test.core.config.support.ConstraintSourceAware2MetaDataBean;
import org.apache.myfaces.extensions.validator.test.core.config.support.ConstraintSourceAwareBean;
import org.apache.myfaces.extensions.validator.test.core.config.support.ConstraintSourceAwareMetaDataBean;
import org.apache.myfaces.extensions.validator.test.core.config.support.CustomConstraintSource;
import org.apache.myfaces.extensions.validator.util.ConstraintSourceUtils;
import org.apache.myfaces.extensions.validator.util.ReflectionUtils;
+import org.junit.Assert;
+import org.junit.Test;
/**
*
@@ -42,10 +42,6 @@ import org.apache.myfaces.extensions.val
*/
public class ExtValCoreConfigurationConstraintSourceAnnotationTestCase extends ExtValCoreConfigurationTestCase
{
- public ExtValCoreConfigurationConstraintSourceAnnotationTestCase(String name)
- {
- super(name);
- }
@Override
protected ExtValCoreConfiguration getCustomExtValCoreConfiguration()
@@ -68,6 +64,7 @@ public class ExtValCoreConfigurationCons
}
}
+ @Test
public void testConstraintSourceAnnotationDefault()
{
// Using the ConstraintSourceUtils.resolveMappedConstraintSourceFor
@@ -75,37 +72,34 @@ public class ExtValCoreConfigurationCons
Method method = ReflectionUtils.tryToGetMethod(ConstraintSourceUtils.class, "findMappedClass",
PropertyStorage.class, Class.class, String.class);
- assertNotNull(method);
+ Assert.assertNotNull(method);
method.setAccessible(true);
Object[] args = new Object[3];
args[0] = ReflectionUtils.getPropertyStorage();
args[1] = ConstraintSourceAwareBean.class;
args[2] = "property2";
Object result = ReflectionUtils.tryToInvokeMethodOfClass(ConstraintSourceUtils.class, method, args);
- assertNotNull(result);
- assertEquals(ConstraintSourceAwareMetaDataBean.class, result);
+ Assert.assertNotNull(result);
+ Assert.assertEquals(ConstraintSourceAwareMetaDataBean.class, result);
}
+ @Test
public void testConstraintSourceAnnotationCustomConfig()
{
Method method = ReflectionUtils.tryToGetMethod(ConstraintSourceUtils.class, "findMappedClass",
PropertyStorage.class, Class.class, String.class);
- assertNotNull(method);
+ Assert.assertNotNull(method);
method.setAccessible(true);
Object[] args = new Object[3];
args[0] = ReflectionUtils.getPropertyStorage();
args[1] = ConstraintSourceAwareBean.class;
args[2] = "property2";
Object result = ReflectionUtils.tryToInvokeMethodOfClass(ConstraintSourceUtils.class, method, args);
- assertNotNull(result);
- assertEquals(ConstraintSourceAware2MetaDataBean.class, result);
+ Assert.assertNotNull(result);
+ Assert.assertEquals(ConstraintSourceAware2MetaDataBean.class, result);
}
- public static Test suite()
- {
- return new ClassLoaderTestSuite(ExtValCoreConfigurationConstraintSourceAnnotationTestCase.class);
- }
}
Modified: myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomBasePackageTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomBasePackageTestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomBasePackageTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomBasePackageTestCase.java Wed Dec 1 14:45:13 2010
@@ -18,14 +18,14 @@
*/
package org.apache.myfaces.extensions.validator.test.core.config;
-import junit.framework.Test;
import org.apache.myfaces.extensions.validator.ExtValInformation;
import org.apache.myfaces.extensions.validator.core.CustomInformation;
import org.apache.myfaces.extensions.validator.core.DefaultExtValCoreConfiguration;
import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.core.ExtValCoreConfiguration;
-import org.apache.myfaces.extensions.validator.test.base.util.ClassLoaderTestSuite;
+import org.junit.Assert;
+import org.junit.Test;
/**
*
@@ -39,12 +39,6 @@ public class ExtValCoreConfigurationCust
private static final String ORG_APACHE_MYFACES_EXTENSIONS_VALIDATOR_TEST = "org.apache.myfaces.extensions.validator.test.";
private static final String ORG_APACHE_MYFACES_EXTENSIONS_VALIDATOR_CONFIG = "org.apache.myfaces.extensions.validator.config.";
- public ExtValCoreConfigurationCustomBasePackageTestCase(String name)
- {
- super(name);
-
- }
-
protected void addInitializationParameters()
{
super.addInitializationParameters();
@@ -75,29 +69,27 @@ public class ExtValCoreConfigurationCust
}
}
+ @Test
public void testCustomBasePackageDefault() throws Exception
{
String value = ExtValContext.getContext().getInformationProviderBean().get(CustomInformation.BASE_PACKAGE);
- assertEquals("org.apache.myfaces.extensions.validator.custom.", value);
+ Assert.assertEquals("org.apache.myfaces.extensions.validator.custom.", value);
}
+ @Test
public void testCustomBasePackageWebXml()
{
String value = ExtValContext.getContext().getInformationProviderBean().get(CustomInformation.BASE_PACKAGE);
- assertEquals(ORG_APACHE_MYFACES_EXTENSIONS_VALIDATOR_TEST, value);
+ Assert.assertEquals(ORG_APACHE_MYFACES_EXTENSIONS_VALIDATOR_TEST, value);
}
+ @Test
public void testCustomBasePackageCustomConfig()
{
String value = ExtValContext.getContext().getInformationProviderBean().get(CustomInformation.BASE_PACKAGE);
- assertEquals(ORG_APACHE_MYFACES_EXTENSIONS_VALIDATOR_CONFIG, value);
- }
-
- public static Test suite()
- {
- return new ClassLoaderTestSuite(ExtValCoreConfigurationCustomBasePackageTestCase.class);
+ Assert.assertEquals(ORG_APACHE_MYFACES_EXTENSIONS_VALIDATOR_CONFIG, value);
}
}
Modified: myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomComponentInitializerClassNameTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomComponentInitializerClassNameTestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomComponentInitializerClassNameTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomComponentInitializerClassNameTestCase.java Wed Dec 1 14:45:13 2010
@@ -24,14 +24,13 @@ import java.util.Map;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
-import junit.framework.Test;
-
import org.apache.myfaces.extensions.validator.ExtValInformation;
import org.apache.myfaces.extensions.validator.core.DefaultExtValCoreConfiguration;
import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.core.ExtValCoreConfiguration;
import org.apache.myfaces.extensions.validator.core.initializer.component.ComponentInitializer;
-import org.apache.myfaces.extensions.validator.test.base.util.ClassLoaderTestSuite;
+import org.junit.Assert;
+import org.junit.Test;
/**
*
@@ -42,10 +41,6 @@ import org.apache.myfaces.extensions.val
public class ExtValCoreConfigurationCustomComponentInitializerClassNameTestCase extends ExtValCoreConfigurationTestCase
{
- public ExtValCoreConfigurationCustomComponentInitializerClassNameTestCase(String name)
- {
- super(name);
- }
public static class CustomComponentInitializer implements ComponentInitializer
{
@@ -97,29 +92,27 @@ public class ExtValCoreConfigurationCust
}
}
+ @Test
public void testCustomComponentInitializerClassNameDefault()
{
- assertEquals(0, ExtValContext.getContext().getComponentInitializers().size());
+ Assert.assertEquals(0, ExtValContext.getContext().getComponentInitializers().size());
}
+ @Test
public void testCustomComponentInitializerClassNameWebXml()
{
List<ComponentInitializer> initializers = ExtValContext.getContext().getComponentInitializers();
- assertEquals(1, initializers.size());
- assertEquals(CustomComponentInitializer.class.getName(), initializers.get(0).getClass().getName());
+ Assert.assertEquals(1, initializers.size());
+ Assert.assertEquals(CustomComponentInitializer.class.getName(), initializers.get(0).getClass().getName());
}
+ @Test
public void testCustomComponentInitializerClassNameCustomConfig()
{
List<ComponentInitializer> initializers = ExtValContext.getContext().getComponentInitializers();
- assertEquals(1, initializers.size());
- assertEquals(Custom2ComponentInitializer.class.getName(), initializers.get(0).getClass().getName());
+ Assert.assertEquals(1, initializers.size());
+ Assert.assertEquals(Custom2ComponentInitializer.class.getName(), initializers.get(0).getClass().getName());
}
- public static Test suite()
- {
-
- return new ClassLoaderTestSuite(ExtValCoreConfigurationCustomComponentInitializerClassNameTestCase.class);
- }
}
Modified: myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomComponentMetaDataExtractorClassNameTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomComponentMetaDataExtractorClassNameTestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomComponentMetaDataExtractorClassNameTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomComponentMetaDataExtractorClassNameTestCase.java Wed Dec 1 14:45:13 2010
@@ -20,7 +20,6 @@ package org.apache.myfaces.extensions.va
import javax.faces.context.FacesContext;
-import junit.framework.Test;
import org.apache.myfaces.extensions.validator.ExtValInformation;
import org.apache.myfaces.extensions.validator.core.DefaultExtValCoreConfiguration;
@@ -30,7 +29,8 @@ import org.apache.myfaces.extensions.val
import org.apache.myfaces.extensions.validator.core.property.DefaultPropertyInformation;
import org.apache.myfaces.extensions.validator.core.property.PropertyInformation;
import org.apache.myfaces.extensions.validator.core.property.PropertyInformationKeys;
-import org.apache.myfaces.extensions.validator.test.base.util.ClassLoaderTestSuite;
+import org.junit.Assert;
+import org.junit.Test;
/**
*
@@ -44,10 +44,6 @@ public class ExtValCoreConfigurationCust
private static final String WEB_XML = "Web.XML";
private static final String CUSTOM_CONFIG = "Custom config";
- public ExtValCoreConfigurationCustomComponentMetaDataExtractorClassNameTestCase(String name)
- {
- super(name);
- }
public static class CustomMetaDataExtractor implements MetaDataExtractor
{
@@ -104,6 +100,7 @@ public class ExtValCoreConfigurationCust
}
}
+ @Test
public void testCustomComponentMetaDataExtractorClassNameDefault()
{
DefaultComponentMetaDataExtractorFactory factory = new DefaultComponentMetaDataExtractorFactory();
@@ -113,29 +110,27 @@ public class ExtValCoreConfigurationCust
// back.
// The web.xml and custom config sets an extractor that enters something
// here.
- assertNull(propInformation.getInformation(PropertyInformationKeys.CUSTOM_PROPERTIES));
+ Assert.assertNull(propInformation.getInformation(PropertyInformationKeys.CUSTOM_PROPERTIES));
}
+ @Test
public void testCustomComponentMetaDataExtractorClassNameWebXml()
{
DefaultComponentMetaDataExtractorFactory factory = new DefaultComponentMetaDataExtractorFactory();
MetaDataExtractor extractor = factory.create();
PropertyInformation propInformation = extractor.extract(facesContext, new Object());
- assertEquals(WEB_XML, propInformation.getInformation(PropertyInformationKeys.CUSTOM_PROPERTIES));
+ Assert.assertEquals(WEB_XML, propInformation.getInformation(PropertyInformationKeys.CUSTOM_PROPERTIES));
}
+ @Test
public void testCustomComponentMetaDataExtractorClassNameCustomConfig()
{
DefaultComponentMetaDataExtractorFactory factory = new DefaultComponentMetaDataExtractorFactory();
MetaDataExtractor extractor = factory.create();
PropertyInformation propInformation = extractor.extract(facesContext, new Object());
- assertEquals(CUSTOM_CONFIG, propInformation.getInformation(PropertyInformationKeys.CUSTOM_PROPERTIES));
+ Assert.assertEquals(CUSTOM_CONFIG, propInformation.getInformation(PropertyInformationKeys.CUSTOM_PROPERTIES));
}
- public static Test suite()
- {
- return new ClassLoaderTestSuite(ExtValCoreConfigurationCustomComponentMetaDataExtractorClassNameTestCase.class);
- }
}
Modified: myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomComponentMetaDataExtractorFactoryClassNameTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomComponentMetaDataExtractorFactoryClassNameTestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomComponentMetaDataExtractorFactoryClassNameTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomComponentMetaDataExtractorFactoryClassNameTestCase.java Wed Dec 1 14:45:13 2010
@@ -20,8 +20,6 @@ package org.apache.myfaces.extensions.va
import java.util.Map;
-import junit.framework.Test;
-
import org.apache.myfaces.extensions.validator.ExtValInformation;
import org.apache.myfaces.extensions.validator.core.DefaultExtValCoreConfiguration;
import org.apache.myfaces.extensions.validator.core.ExtValCoreConfiguration;
@@ -31,7 +29,9 @@ import org.apache.myfaces.extensions.val
import org.apache.myfaces.extensions.validator.core.metadata.extractor.ComponentMetaDataExtractorFactory;
import org.apache.myfaces.extensions.validator.core.metadata.extractor.DefaultComponentMetaDataExtractorFactory;
import org.apache.myfaces.extensions.validator.core.metadata.extractor.MetaDataExtractor;
-import org.apache.myfaces.extensions.validator.test.base.util.ClassLoaderTestSuite;
+import org.junit.Assert;
+import org.junit.Test;
+
/**
*
@@ -42,10 +42,6 @@ import org.apache.myfaces.extensions.val
public class ExtValCoreConfigurationCustomComponentMetaDataExtractorFactoryClassNameTestCase extends
ExtValCoreConfigurationTestCase
{
- public ExtValCoreConfigurationCustomComponentMetaDataExtractorFactoryClassNameTestCase(String name)
- {
- super(name);
- }
public static class CustomComponentMetaDataExtractorFactory implements ComponentMetaDataExtractorFactory
{
@@ -115,35 +111,31 @@ public class ExtValCoreConfigurationCust
}
}
+ @Test
public void testCustomComponentMetaDataExtractorFactoryClassNameDefault()
{
FactoryFinder factoryFinder = DefaultFactoryFinder.getInstance();
Object factory = factoryFinder.getFactory(FactoryNames.COMPONENT_META_DATA_EXTRACTOR_FACTORY,
ComponentMetaDataExtractorFactory.class);
- assertEquals(DefaultComponentMetaDataExtractorFactory.class.getName(), factory.getClass().getName());
+ Assert.assertEquals(DefaultComponentMetaDataExtractorFactory.class.getName(), factory.getClass().getName());
}
+ @Test
public void testCustomComponentMetaDataExtractorFactoryClassNameWebXml()
{
FactoryFinder factoryFinder = DefaultFactoryFinder.getInstance();
Object factory = factoryFinder.getFactory(FactoryNames.COMPONENT_META_DATA_EXTRACTOR_FACTORY,
ComponentMetaDataExtractorFactory.class);
- assertEquals(CustomComponentMetaDataExtractorFactory.class.getName(), factory.getClass().getName());
+ Assert.assertEquals(CustomComponentMetaDataExtractorFactory.class.getName(), factory.getClass().getName());
}
+ @Test
public void testCustomComponentMetaDataExtractorFactoryClassNameCustomConfig()
{
FactoryFinder factoryFinder = DefaultFactoryFinder.getInstance();
Object factory = factoryFinder.getFactory(FactoryNames.COMPONENT_META_DATA_EXTRACTOR_FACTORY,
ComponentMetaDataExtractorFactory.class);
- assertEquals(Custom2ComponentMetaDataExtractorFactory.class.getName(), factory.getClass().getName());
- }
-
- public static Test suite()
- {
-
- return new ClassLoaderTestSuite(
- ExtValCoreConfigurationCustomComponentMetaDataExtractorFactoryClassNameTestCase.class);
+ Assert.assertEquals(Custom2ComponentMetaDataExtractorFactory.class.getName(), factory.getClass().getName());
}
}
Modified: myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomFacesMessageFactoryClassNameTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomFacesMessageFactoryClassNameTestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomFacesMessageFactoryClassNameTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomFacesMessageFactoryClassNameTestCase.java Wed Dec 1 14:45:13 2010
@@ -21,8 +21,6 @@ package org.apache.myfaces.extensions.va
import javax.faces.application.FacesMessage;
import javax.faces.application.FacesMessage.Severity;
-import junit.framework.Test;
-
import org.apache.myfaces.extensions.validator.ExtValInformation;
import org.apache.myfaces.extensions.validator.core.DefaultExtValCoreConfiguration;
import org.apache.myfaces.extensions.validator.core.ExtValCoreConfiguration;
@@ -31,7 +29,8 @@ import org.apache.myfaces.extensions.val
import org.apache.myfaces.extensions.validator.core.factory.FactoryFinder;
import org.apache.myfaces.extensions.validator.core.factory.FactoryNames;
import org.apache.myfaces.extensions.validator.core.validation.message.DefaultFacesMessageFactory;
-import org.apache.myfaces.extensions.validator.test.base.util.ClassLoaderTestSuite;
+import org.junit.Assert;
+import org.junit.Test;
/**
*
@@ -41,10 +40,6 @@ import org.apache.myfaces.extensions.val
*/
public class ExtValCoreConfigurationCustomFacesMessageFactoryClassNameTestCase extends ExtValCoreConfigurationTestCase
{
- public ExtValCoreConfigurationCustomFacesMessageFactoryClassNameTestCase(String name)
- {
- super(name);
- }
public static class CustomFacesMessageFactory implements FacesMessageFactory
{
@@ -108,32 +103,29 @@ public class ExtValCoreConfigurationCust
}
}
+ @Test
public void testCustomFacesMessageFactoryClassNameDefault()
{
FactoryFinder factoryFinder = DefaultFactoryFinder.getInstance();
Object factory = factoryFinder.getFactory(FactoryNames.FACES_MESSAGE_FACTORY, FacesMessageFactory.class);
- assertEquals(DefaultFacesMessageFactory.class.getName(), factory.getClass().getName());
+ Assert.assertEquals(DefaultFacesMessageFactory.class.getName(), factory.getClass().getName());
}
+ @Test
public void testCustomFacesMessageFactoryClassNameWebXml()
{
FactoryFinder factoryFinder = DefaultFactoryFinder.getInstance();
Object factory = factoryFinder.getFactory(FactoryNames.FACES_MESSAGE_FACTORY, FacesMessageFactory.class);
- assertEquals(CustomFacesMessageFactory.class.getName(), factory.getClass().getName());
+ Assert.assertEquals(CustomFacesMessageFactory.class.getName(), factory.getClass().getName());
}
+ @Test
public void testCustomFacesMessageFactoryClassNameCustomConfig()
{
FactoryFinder factoryFinder = DefaultFactoryFinder.getInstance();
Object factory = factoryFinder.getFactory(FactoryNames.FACES_MESSAGE_FACTORY, FacesMessageFactory.class);
- assertEquals(Custom2FacesMessageFactory.class.getName(), factory.getClass().getName());
- }
-
- public static Test suite()
- {
-
- return new ClassLoaderTestSuite(ExtValCoreConfigurationCustomFacesMessageFactoryClassNameTestCase.class);
+ Assert.assertEquals(Custom2FacesMessageFactory.class.getName(), factory.getClass().getName());
}
}
Modified: myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomInformationProviderBeanClassNameTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomInformationProviderBeanClassNameTestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomInformationProviderBeanClassNameTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomInformationProviderBeanClassNameTestCase.java Wed Dec 1 14:45:13 2010
@@ -20,15 +20,14 @@ package org.apache.myfaces.extensions.va
import java.util.Map;
-import junit.framework.Test;
-
import org.apache.myfaces.extensions.validator.ExtValInformation;
import org.apache.myfaces.extensions.validator.core.CustomInformation;
import org.apache.myfaces.extensions.validator.core.DefaultExtValCoreConfiguration;
import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.core.ExtValCoreConfiguration;
import org.apache.myfaces.extensions.validator.core.InformationProviderBean;
-import org.apache.myfaces.extensions.validator.test.base.util.ClassLoaderTestSuite;
+import org.junit.Assert;
+import org.junit.Test;
/**
*
@@ -40,12 +39,6 @@ public class ExtValCoreConfigurationCust
ExtValCoreConfigurationTestCase
{
- public ExtValCoreConfigurationCustomInformationProviderBeanClassNameTestCase(String name)
- {
- super(name);
-
- }
-
public static class CustomInformationProviderBean extends InformationProviderBean
{
@@ -100,35 +93,33 @@ public class ExtValCoreConfigurationCust
}
+ @Test
public void testCustomInformationProviderBeanClassNameDefault()
{
InformationProviderBean bean = ExtValContext.getContext().getInformationProviderBean();
- assertEquals(InformationProviderBean.class.getName(), bean.getClass().getName());
+ Assert.assertEquals(InformationProviderBean.class.getName(), bean.getClass().getName());
}
+ @Test
public void testCustomInformationProviderBeanClassNameWebXml()
{
InformationProviderBean bean = ExtValContext.getContext().getInformationProviderBean();
- assertEquals(CustomInformationProviderBean.class.getName(), bean.getClass().getName());
+ Assert.assertEquals(CustomInformationProviderBean.class.getName(), bean.getClass().getName());
// An additional test to make sure we have the custom
// informationProviderBean.
- assertEquals(ExtValInformation.EXTENSIONS_VALIDATOR_BASE_PACKAGE_NAME + ".custom.X", bean
+ Assert.assertEquals(ExtValInformation.EXTENSIONS_VALIDATOR_BASE_PACKAGE_NAME + ".custom.X", bean
.get(CustomInformation.MESSAGE_BUNDLE_NAME));
}
+ @Test
public void testCustomInformationProviderBeanClassNameCustomConfig()
{
InformationProviderBean bean = ExtValContext.getContext().getInformationProviderBean();
- assertEquals(CustomInformationProviderBean2.class.getName(), bean.getClass().getName());
+ Assert.assertEquals(CustomInformationProviderBean2.class.getName(), bean.getClass().getName());
// An additional test to make sure we have the custom
// informationProviderBean.
- assertEquals(ExtValInformation.EXTENSIONS_VALIDATOR_BASE_PACKAGE_NAME + ".custom.Y", bean
+ Assert.assertEquals(ExtValInformation.EXTENSIONS_VALIDATOR_BASE_PACKAGE_NAME + ".custom.Y", bean
.get(CustomInformation.MESSAGE_BUNDLE_NAME));
}
- public static Test suite()
- {
- return new ClassLoaderTestSuite(ExtValCoreConfigurationCustomInformationProviderBeanClassNameTestCase.class);
- }
-
}
Modified: myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomMessageBundleBaseNameTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomMessageBundleBaseNameTestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomMessageBundleBaseNameTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomMessageBundleBaseNameTestCase.java Wed Dec 1 14:45:13 2010
@@ -18,13 +18,12 @@
*/
package org.apache.myfaces.extensions.validator.test.core.config;
-import junit.framework.Test;
-
import org.apache.myfaces.extensions.validator.ExtValInformation;
import org.apache.myfaces.extensions.validator.core.DefaultExtValCoreConfiguration;
import org.apache.myfaces.extensions.validator.core.ExtValCoreConfiguration;
import org.apache.myfaces.extensions.validator.core.validation.message.resolver.DefaultValidationErrorMessageResolver;
-import org.apache.myfaces.extensions.validator.test.base.util.ClassLoaderTestSuite;
+import org.junit.Assert;
+import org.junit.Test;
/**
*
@@ -47,11 +46,6 @@ public class ExtValCoreConfigurationCust
}
};
- public ExtValCoreConfigurationCustomMessageBundleBaseNameTestCase(String name)
- {
- super(name);
- }
-
protected void addInitializationParameters()
{
super.addInitializationParameters();
@@ -85,33 +79,30 @@ public class ExtValCoreConfigurationCust
}
}
+ @Test
public void testCustomMessageBundleBaseNameDefault() throws Exception
{
VisibleDefaultValidationErrorMessageResolver messageResolver = new VisibleDefaultValidationErrorMessageResolver();
- assertNull(messageResolver.getCustomBaseName());
+ Assert.assertNull(messageResolver.getCustomBaseName());
}
+ @Test
public void testCustomMessageBundleBaseNameWebXml() throws Exception
{
VisibleDefaultValidationErrorMessageResolver messageResolver = new VisibleDefaultValidationErrorMessageResolver();
- assertEquals(ORG_APACHE_MYFACES_EXTENSIONS_VALIDATOR_TEST, messageResolver.getCustomBaseName());
+ Assert.assertEquals(ORG_APACHE_MYFACES_EXTENSIONS_VALIDATOR_TEST, messageResolver.getCustomBaseName());
}
+ @Test
public void testCustomMessageBundleBaseNameCustomConfig() throws Exception
{
VisibleDefaultValidationErrorMessageResolver messageResolver = new VisibleDefaultValidationErrorMessageResolver();
- assertEquals(ORG_APACHE_MYFACES_EXTENSIONS_VALIDATOR_CONFIG, messageResolver.getCustomBaseName());
-
- }
-
- public static Test suite()
- {
+ Assert.assertEquals(ORG_APACHE_MYFACES_EXTENSIONS_VALIDATOR_CONFIG, messageResolver.getCustomBaseName());
- return new ClassLoaderTestSuite(ExtValCoreConfigurationCustomMessageBundleBaseNameTestCase.class);
}
}
Modified: myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomMessageResolverFactoryClassNameTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomMessageResolverFactoryClassNameTestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomMessageResolverFactoryClassNameTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomMessageResolverFactoryClassNameTestCase.java Wed Dec 1 14:45:13 2010
@@ -18,8 +18,6 @@
*/
package org.apache.myfaces.extensions.validator.test.core.config;
-import junit.framework.Test;
-
import org.apache.myfaces.extensions.validator.ExtValInformation;
import org.apache.myfaces.extensions.validator.core.DefaultExtValCoreConfiguration;
import org.apache.myfaces.extensions.validator.core.ExtValCoreConfiguration;
@@ -28,7 +26,9 @@ import org.apache.myfaces.extensions.val
import org.apache.myfaces.extensions.validator.core.factory.FactoryNames;
import org.apache.myfaces.extensions.validator.core.validation.message.resolver.DefaultMessageResolverFactory;
import org.apache.myfaces.extensions.validator.test.base.mock.MockMessageResolverFactory;
-import org.apache.myfaces.extensions.validator.test.base.util.ClassLoaderTestSuite;
+import org.junit.Assert;
+import org.junit.Test;
+
/**
*
@@ -39,10 +39,7 @@ import org.apache.myfaces.extensions.val
public class ExtValCoreConfigurationCustomMessageResolverFactoryClassNameTestCase extends
ExtValCoreConfigurationTestCase
{
- public ExtValCoreConfigurationCustomMessageResolverFactoryClassNameTestCase(String name)
- {
- super(name);
- }
+
public static class CustomMessageResolverFactory extends DefaultMessageResolverFactory
{
@@ -86,6 +83,7 @@ public class ExtValCoreConfigurationCust
}
}
+ @Test
public void testCustomMessageResolverFactoryClassNameDefault()
{
FactoryFinder factoryFinder = DefaultFactoryFinder.getInstance();
@@ -94,28 +92,24 @@ public class ExtValCoreConfigurationCust
// is made visible.
// assertEquals(DefaultMessageResolverFactory.class.getName(), factory
// .getClass().getName());
- assertEquals(MockMessageResolverFactory.class.getName(), factory.getClass().getName());
+ Assert.assertEquals(MockMessageResolverFactory.class.getName(), factory.getClass().getName());
}
+ @Test
public void testCustomMessageResolverFactoryClassNameWebXml()
{
FactoryFinder factoryFinder = DefaultFactoryFinder.getInstance();
Object factory = factoryFinder.getFactory(FactoryNames.MESSAGE_RESOLVER_FACTORY, Object.class);
- assertEquals(CustomMessageResolverFactory.class.getName(), factory.getClass().getName());
+ Assert.assertEquals(CustomMessageResolverFactory.class.getName(), factory.getClass().getName());
}
+ @Test
public void testCustomMessageResolverFactoryClassNameCustomConfig()
{
FactoryFinder factoryFinder = DefaultFactoryFinder.getInstance();
Object factory = factoryFinder.getFactory(FactoryNames.MESSAGE_RESOLVER_FACTORY, Object.class);
- assertEquals(Custom2MessageResolverFactory.class.getName(), factory.getClass().getName());
- }
-
- public static Test suite()
- {
-
- return new ClassLoaderTestSuite(ExtValCoreConfigurationCustomMessageResolverFactoryClassNameTestCase.class);
+ Assert.assertEquals(Custom2MessageResolverFactory.class.getName(), factory.getClass().getName());
}
}
Modified: myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomMetaDataExtractionInterceptorClassNameTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomMetaDataExtractionInterceptorClassNameTestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomMetaDataExtractionInterceptorClassNameTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomMetaDataExtractionInterceptorClassNameTestCase.java Wed Dec 1 14:45:13 2010
@@ -20,15 +20,14 @@ 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.DefaultExtValCoreConfiguration;
import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.core.ExtValCoreConfiguration;
import org.apache.myfaces.extensions.validator.core.interceptor.MetaDataExtractionInterceptor;
import org.apache.myfaces.extensions.validator.core.property.PropertyInformation;
-import org.apache.myfaces.extensions.validator.test.base.util.ClassLoaderTestSuite;
+import org.junit.Assert;
+import org.junit.Test;
/**
*
@@ -40,11 +39,6 @@ public class ExtValCoreConfigurationCust
ExtValCoreConfigurationTestCase
{
- public ExtValCoreConfigurationCustomMetaDataExtractionInterceptorClassNameTestCase(String name)
- {
- super(name);
- }
-
public static class CustomMetaDataExtractionInterceptor implements MetaDataExtractionInterceptor
{
@@ -94,30 +88,28 @@ public class ExtValCoreConfigurationCust
}
}
+
+ @Test
public void testCustomMetaDataExtractionInterceptorClassNameDefault()
{
- assertEquals(0, ExtValContext.getContext().getMetaDataExtractionInterceptors().size());
+ Assert.assertEquals(0, ExtValContext.getContext().getMetaDataExtractionInterceptors().size());
}
+ @Test
public void testCustomMetaDataExtractionInterceptorClassNameWebXml()
{
List<MetaDataExtractionInterceptor> result = ExtValContext.getContext().getMetaDataExtractionInterceptors();
- assertEquals(1, result.size());
- assertEquals(CustomMetaDataExtractionInterceptor.class.getName(), result.get(0).getClass().getName());
+ Assert.assertEquals(1, result.size());
+ Assert.assertEquals(CustomMetaDataExtractionInterceptor.class.getName(), result.get(0).getClass().getName());
}
+ @Test
public void testCustomMetaDataExtractionInterceptorClassNameCustomConfig()
{
List<MetaDataExtractionInterceptor> result = ExtValContext.getContext().getMetaDataExtractionInterceptors();
- assertEquals(1, result.size());
- assertEquals(Custom2MetaDataExtractionInterceptor.class.getName(), result.get(0).getClass().getName());
+ Assert.assertEquals(1, result.size());
+ Assert.assertEquals(Custom2MetaDataExtractionInterceptor.class.getName(), result.get(0).getClass().getName());
}
- public static Test suite()
- {
-
- return new ClassLoaderTestSuite(
- ExtValCoreConfigurationCustomMetaDataExtractionInterceptorClassNameTestCase.class);
- }
}
Modified: myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomMetaDataStorageFilterClassNameTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomMetaDataStorageFilterClassNameTestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomMetaDataStorageFilterClassNameTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomMetaDataStorageFilterClassNameTestCase.java Wed Dec 1 14:45:13 2010
@@ -21,15 +21,14 @@ package org.apache.myfaces.extensions.va
import java.lang.reflect.Field;
import java.util.List;
-import junit.framework.Test;
-
import org.apache.myfaces.extensions.validator.ExtValInformation;
import org.apache.myfaces.extensions.validator.core.DefaultExtValCoreConfiguration;
import org.apache.myfaces.extensions.validator.core.ExtValCoreConfiguration;
import org.apache.myfaces.extensions.validator.core.property.PropertyInformation;
import org.apache.myfaces.extensions.validator.core.storage.DefaultMetaDataStorage;
import org.apache.myfaces.extensions.validator.core.storage.MetaDataStorageFilter;
-import org.apache.myfaces.extensions.validator.test.base.util.ClassLoaderTestSuite;
+import org.junit.Assert;
+import org.junit.Test;
/**
*
@@ -40,10 +39,7 @@ import org.apache.myfaces.extensions.val
public class ExtValCoreConfigurationCustomMetaDataStorageFilterClassNameTestCase extends
ExtValCoreConfigurationTestCase
{
- public ExtValCoreConfigurationCustomMetaDataStorageFilterClassNameTestCase(String name)
- {
- super(name);
- }
+
public static class CustomMetaDataStorageFilter implements MetaDataStorageFilter
{
@@ -96,6 +92,7 @@ public class ExtValCoreConfigurationCust
}
}
+ @Test
public void testCustomMetaDataStorageFilterClassNameDefault() throws Exception
{
DefaultMetaDataStorage metaDataStorage = new DefaultMetaDataStorage();
@@ -104,11 +101,12 @@ public class ExtValCoreConfigurationCust
Field field = DefaultMetaDataStorage.class.getDeclaredField("metaDataStorageFilters");
field.setAccessible(true);
Object data = field.get(metaDataStorage);
- assertNotNull(data);
+ Assert.assertNotNull(data);
List<MetaDataStorageFilter> metaDataStorageFilters = (List<MetaDataStorageFilter>) data;
- assertEquals(0, metaDataStorageFilters.size());
+ Assert.assertEquals(0, metaDataStorageFilters.size());
}
+ @Test
public void testCustomMetaDataStorageFilterClassNameWebXml() throws Exception
{
DefaultMetaDataStorage metaDataStorage = new DefaultMetaDataStorage();
@@ -117,12 +115,13 @@ public class ExtValCoreConfigurationCust
Field field = DefaultMetaDataStorage.class.getDeclaredField("metaDataStorageFilters");
field.setAccessible(true);
Object data = field.get(metaDataStorage);
- assertNotNull(data);
+ Assert.assertNotNull(data);
List<MetaDataStorageFilter> metaDataStorageFilters = (List<MetaDataStorageFilter>) data;
- assertEquals(1, metaDataStorageFilters.size());
- assertEquals(CustomMetaDataStorageFilter.class.getName(), metaDataStorageFilters.get(0).getClass().getName());
+ Assert.assertEquals(1, metaDataStorageFilters.size());
+ Assert.assertEquals(CustomMetaDataStorageFilter.class.getName(), metaDataStorageFilters.get(0).getClass().getName());
}
+ @Test
public void testCustomMetaDataStorageFilterClassNameCustomConfig() throws Exception
{
DefaultMetaDataStorage metaDataStorage = new DefaultMetaDataStorage();
@@ -131,16 +130,10 @@ public class ExtValCoreConfigurationCust
Field field = DefaultMetaDataStorage.class.getDeclaredField("metaDataStorageFilters");
field.setAccessible(true);
Object data = field.get(metaDataStorage);
- assertNotNull(data);
+ Assert.assertNotNull(data);
List<MetaDataStorageFilter> metaDataStorageFilters = (List<MetaDataStorageFilter>) data;
- assertEquals(1, metaDataStorageFilters.size());
- assertEquals(Custom2MetaDataStorageFilter.class.getName(), metaDataStorageFilters.get(0).getClass().getName());
- }
-
- public static Test suite()
- {
-
- return new ClassLoaderTestSuite(ExtValCoreConfigurationCustomMetaDataStorageFilterClassNameTestCase.class);
+ Assert.assertEquals(1, metaDataStorageFilters.size());
+ Assert.assertEquals(Custom2MetaDataStorageFilter.class.getName(), metaDataStorageFilters.get(0).getClass().getName());
}
}
Modified: myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomMetaDataToValidationStrategyNameMapperClassNameTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomMetaDataToValidationStrategyNameMapperClassNameTestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomMetaDataToValidationStrategyNameMapperClassNameTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomMetaDataToValidationStrategyNameMapperClassNameTestCase.java Wed Dec 1 14:45:13 2010
@@ -20,8 +20,6 @@ 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.DefaultExtValCoreConfiguration;
import org.apache.myfaces.extensions.validator.core.ExtValContext;
@@ -30,7 +28,8 @@ import org.apache.myfaces.extensions.val
import org.apache.myfaces.extensions.validator.core.factory.NameMapperAwareFactory;
import org.apache.myfaces.extensions.validator.core.mapper.NameMapper;
import org.apache.myfaces.extensions.validator.test.base.mock.MockValidationStrategyFactory;
-import org.apache.myfaces.extensions.validator.test.base.util.ClassLoaderTestSuite;
+import org.junit.Assert;
+import org.junit.Test;
/**
*
@@ -44,11 +43,6 @@ public class ExtValCoreConfigurationCust
private static final String WEB_XML = "Web.xml";
private static final String CUSTOM_CONFIG = "Custom Config";
- public ExtValCoreConfigurationCustomMetaDataToValidationStrategyNameMapperClassNameTestCase(String name)
- {
- super(name);
- }
-
public static class CustomNameMapper implements NameMapper<String>
{
@@ -100,39 +94,42 @@ public class ExtValCoreConfigurationCust
}
}
+ @Test
public void testCustomMetaDataToValidationStrategyNameMapperClassNameDefault()
{
List<NameMapper<String>> nameMappers = getNameMappers();
- assertEquals(8, nameMappers.size());
+ Assert.assertEquals(8, nameMappers.size());
// The first one (due to @InvocationOrder) is the
// CustomConfiguredAnnotationToValidationStrategyNameMapper which we can
// customize and testing here.
NameMapper<String> mapper = nameMappers.get(0);
// By default nothing is configures so should return null.
- assertNull(mapper.createName(null));
+ Assert.assertNull(mapper.createName(null));
}
+ @Test
public void testCustomMetaDataToValidationStrategyNameMapperClassNameWebXml()
{
List<NameMapper<String>> nameMappers = getNameMappers();
// No mapper additional, but the first mapper contain now our custom
// configured mapper.
- assertEquals(8, nameMappers.size());
+ Assert.assertEquals(8, nameMappers.size());
NameMapper<String> mapper = nameMappers.get(0);
// So now it should return some value.
- assertEquals(WEB_XML, mapper.createName(null));
+ Assert.assertEquals(WEB_XML, mapper.createName(null));
}
+ @Test
public void testCustomMetaDataToValidationStrategyNameMapperClassNameCustomConfig()
{
List<NameMapper<String>> nameMappers = getNameMappers();
// No mapper additional, but the first mapper contain now our custom
// configured mapper.
- assertEquals(8, nameMappers.size());
+ Assert.assertEquals(8, nameMappers.size());
NameMapper<String> mapper = nameMappers.get(0);
// So now it should return some value.
- assertEquals(CUSTOM_CONFIG, mapper.createName(null));
+ Assert.assertEquals(CUSTOM_CONFIG, mapper.createName(null));
}
private List<NameMapper<String>> getNameMappers()
@@ -143,11 +140,5 @@ public class ExtValCoreConfigurationCust
return ((MockValidationStrategyFactory) result).getRegisteredNameMapperList();
}
- public static Test suite()
- {
-
- return new ClassLoaderTestSuite(
- ExtValCoreConfigurationCustomMetaDataToValidationStrategyNameMapperClassNameTestCase.class);
- }
}
Modified: myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomMetaDataTransformerFactoryClassNameTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomMetaDataTransformerFactoryClassNameTestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomMetaDataTransformerFactoryClassNameTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomMetaDataTransformerFactoryClassNameTestCase.java Wed Dec 1 14:45:13 2010
@@ -18,8 +18,6 @@
*/
package org.apache.myfaces.extensions.validator.test.core.config;
-import junit.framework.Test;
-
import org.apache.myfaces.extensions.validator.ExtValInformation;
import org.apache.myfaces.extensions.validator.core.DefaultExtValCoreConfiguration;
import org.apache.myfaces.extensions.validator.core.ExtValCoreConfiguration;
@@ -28,7 +26,9 @@ import org.apache.myfaces.extensions.val
import org.apache.myfaces.extensions.validator.core.factory.FactoryNames;
import org.apache.myfaces.extensions.validator.core.metadata.transformer.DefaultMetaDataTransformerFactory;
import org.apache.myfaces.extensions.validator.test.base.mock.MockMetaDataTransformerFactory;
-import org.apache.myfaces.extensions.validator.test.base.util.ClassLoaderTestSuite;
+import org.junit.Assert;
+import org.junit.Test;
+
/**
*
@@ -39,10 +39,6 @@ import org.apache.myfaces.extensions.val
public class ExtValCoreConfigurationCustomMetaDataTransformerFactoryClassNameTestCase extends
ExtValCoreConfigurationTestCase
{
- public ExtValCoreConfigurationCustomMetaDataTransformerFactoryClassNameTestCase(String name)
- {
- super(name);
- }
public static class CustomMetaDataTransformerFactory extends DefaultMetaDataTransformerFactory
{
@@ -89,6 +85,7 @@ public class ExtValCoreConfigurationCust
}
}
+ @Test
public void testCustomMetaDataTransformerFactoryClassNameDefault()
{
FactoryFinder factoryFinder = DefaultFactoryFinder.getInstance();
@@ -99,29 +96,26 @@ public class ExtValCoreConfigurationCust
// assertEquals(DefaultMetaDataTransformerFactory.class.getName(),
// factory
// .getClass().getName());
- assertEquals(MockMetaDataTransformerFactory.class.getName(), factory.getClass().getName());
+ Assert.assertEquals(MockMetaDataTransformerFactory.class.getName(), factory.getClass().getName());
}
+ @Test
public void testCustomMetaDataTransformerFactoryClassNameWebXml()
{
FactoryFinder factoryFinder = DefaultFactoryFinder.getInstance();
Object factory = factoryFinder.getFactory(FactoryNames.META_DATA_TRANSFORMER_FACTORY, Object.class);
- assertEquals(CustomMetaDataTransformerFactory.class.getName(), factory.getClass().getName());
+ Assert.assertEquals(CustomMetaDataTransformerFactory.class.getName(), factory.getClass().getName());
}
+ @Test
public void testCustomMetaDataTransformerFactoryClassNameCustomConfig()
{
FactoryFinder factoryFinder = DefaultFactoryFinder.getInstance();
Object factory = factoryFinder.getFactory(FactoryNames.META_DATA_TRANSFORMER_FACTORY, Object.class);
- assertEquals(Custom2MetaDataTransformerFactory.class.getName(), factory.getClass().getName());
+ Assert.assertEquals(Custom2MetaDataTransformerFactory.class.getName(), factory.getClass().getName());
}
- public static Test suite()
- {
-
- return new ClassLoaderTestSuite(ExtValCoreConfigurationCustomMetaDataTransformerFactoryClassNameTestCase.class);
- }
}
Modified: myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomPropertyValidationInterceptorClassNameTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomPropertyValidationInterceptorClassNameTestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomPropertyValidationInterceptorClassNameTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomPropertyValidationInterceptorClassNameTestCase.java Wed Dec 1 14:45:13 2010
@@ -24,14 +24,13 @@ import java.util.Map;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
-import junit.framework.Test;
-
import org.apache.myfaces.extensions.validator.ExtValInformation;
import org.apache.myfaces.extensions.validator.core.DefaultExtValCoreConfiguration;
import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.core.ExtValCoreConfiguration;
import org.apache.myfaces.extensions.validator.core.interceptor.PropertyValidationInterceptor;
-import org.apache.myfaces.extensions.validator.test.base.util.ClassLoaderTestSuite;
+import org.junit.Assert;
+import org.junit.Test;
/**
*
@@ -42,10 +41,7 @@ import org.apache.myfaces.extensions.val
public class ExtValCoreConfigurationCustomPropertyValidationInterceptorClassNameTestCase extends
ExtValCoreConfigurationTestCase
{
- public ExtValCoreConfigurationCustomPropertyValidationInterceptorClassNameTestCase(String name)
- {
- super(name);
- }
+
public static class CustomPropertyValidationInterceptor implements PropertyValidationInterceptor
{
@@ -114,30 +110,27 @@ public class ExtValCoreConfigurationCust
}
}
+ @Test
public void testCustomPropertyValidationInterceptorClassNameDefault()
{
- assertEquals(1, ExtValContext.getContext().getPropertyValidationInterceptors().size());
+ Assert.assertEquals(1, ExtValContext.getContext().getPropertyValidationInterceptors().size());
}
+ @Test
public void testCustomPropertyValidationInterceptorClassNameWebXml()
{
List<PropertyValidationInterceptor> data = ExtValContext.getContext().getPropertyValidationInterceptors();
- assertEquals(2, data.size());
- assertEquals(CustomPropertyValidationInterceptor.class.getName(), data.get(1).getClass().getName());
+ Assert.assertEquals(2, data.size());
+ Assert.assertEquals(CustomPropertyValidationInterceptor.class.getName(), data.get(1).getClass().getName());
}
+ @Test
public void testCustomPropertyValidationInterceptorClassNameCustomConfig()
{
List<PropertyValidationInterceptor> data = ExtValContext.getContext().getPropertyValidationInterceptors();
- assertEquals(2, data.size());
- assertEquals(Custom2PropertyValidationInterceptor.class.getName(), data.get(1).getClass().getName());
+ Assert.assertEquals(2, data.size());
+ Assert.assertEquals(Custom2PropertyValidationInterceptor.class.getName(), data.get(1).getClass().getName());
}
- public static Test suite()
- {
-
- return new ClassLoaderTestSuite(
- ExtValCoreConfigurationCustomPropertyValidationInterceptorClassNameTestCase.class);
- }
}
Modified: myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomStaticValidationStrategyMappingSourceTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomStaticValidationStrategyMappingSourceTestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomStaticValidationStrategyMappingSourceTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomStaticValidationStrategyMappingSourceTestCase.java Wed Dec 1 14:45:13 2010
@@ -21,15 +21,14 @@ package org.apache.myfaces.extensions.va
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
-import junit.framework.Test;
-
import org.apache.myfaces.extensions.validator.ExtValInformation;
import org.apache.myfaces.extensions.validator.core.DefaultExtValCoreConfiguration;
import org.apache.myfaces.extensions.validator.core.ExtValCoreConfiguration;
import org.apache.myfaces.extensions.validator.core.metadata.MetaDataEntry;
import org.apache.myfaces.extensions.validator.core.validation.strategy.DefaultValidationStrategyFactory;
import org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy;
-import org.apache.myfaces.extensions.validator.test.base.util.ClassLoaderTestSuite;
+import org.junit.Assert;
+import org.junit.Test;
/**
*
@@ -41,11 +40,6 @@ public class ExtValCoreConfigurationCust
ExtValCoreConfigurationTestCase
{
- public ExtValCoreConfigurationCustomStaticValidationStrategyMappingSourceTestCase(String name)
- {
- super(name);
- }
-
public static class CustomValidationStrategy implements ValidationStrategy
{
@@ -102,32 +96,28 @@ public class ExtValCoreConfigurationCust
}
}
+ @Test
public void testCustomStaticValidationStrategyMappingSourceDefault()
{
DefaultValidationStrategyFactory validationStrategyFactory = new DefaultValidationStrategyFactory();
// Something that isn't available, so should return null.
- assertNull(validationStrategyFactory.create("UnitTest"));
+ Assert.assertNull(validationStrategyFactory.create("UnitTest"));
}
+ @Test
public void testCustomStaticValidationStrategyMappingSourceWebXml()
{
DefaultValidationStrategyFactory validationStrategyFactory = new DefaultValidationStrategyFactory();
- assertEquals(CustomValidationStrategy.class.getName(), validationStrategyFactory.create("UnitTest").getClass()
+ Assert.assertEquals(CustomValidationStrategy.class.getName(), validationStrategyFactory.create("UnitTest").getClass()
.getName());
}
+ @Test
public void testCustomStaticValidationStrategyMappingSourceCustomConfig()
{
DefaultValidationStrategyFactory validationStrategyFactory = new DefaultValidationStrategyFactory();
- assertEquals(Custom2ValidationStrategy.class.getName(), validationStrategyFactory.create("UnitTest").getClass()
+ Assert.assertEquals(Custom2ValidationStrategy.class.getName(), validationStrategyFactory.create("UnitTest").getClass()
.getName());
}
- public static Test suite()
- {
-
- return new ClassLoaderTestSuite(
- ExtValCoreConfigurationCustomStaticValidationStrategyMappingSourceTestCase.class);
- }
-
}
Modified: myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomStorageManagerFactoryClassNameTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomStorageManagerFactoryClassNameTestCase.java?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomStorageManagerFactoryClassNameTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationCustomStorageManagerFactoryClassNameTestCase.java Wed Dec 1 14:45:13 2010
@@ -18,8 +18,6 @@
*/
package org.apache.myfaces.extensions.validator.test.core.config;
-import junit.framework.Test;
-
import org.apache.myfaces.extensions.validator.ExtValInformation;
import org.apache.myfaces.extensions.validator.core.DefaultExtValCoreConfiguration;
import org.apache.myfaces.extensions.validator.core.ExtValCoreConfiguration;
@@ -27,7 +25,9 @@ import org.apache.myfaces.extensions.val
import org.apache.myfaces.extensions.validator.core.factory.FactoryFinder;
import org.apache.myfaces.extensions.validator.core.factory.FactoryNames;
import org.apache.myfaces.extensions.validator.core.storage.DefaultStorageManagerFactory;
-import org.apache.myfaces.extensions.validator.test.base.util.ClassLoaderTestSuite;
+import org.junit.Assert;
+import org.junit.Test;
+
/**
*
@@ -38,10 +38,7 @@ import org.apache.myfaces.extensions.val
public class ExtValCoreConfigurationCustomStorageManagerFactoryClassNameTestCase extends
ExtValCoreConfigurationTestCase
{
- public ExtValCoreConfigurationCustomStorageManagerFactoryClassNameTestCase(String name)
- {
- super(name);
- }
+
public static class CustomDefaultStorageManagerFactory extends DefaultStorageManagerFactory
{
@@ -87,31 +84,28 @@ public class ExtValCoreConfigurationCust
}
}
+ @Test
public void testCustomStorageManagerFactoryClassNameDefault()
{
FactoryFinder factoryFinder = DefaultFactoryFinder.getInstance();
Object factory = factoryFinder.getFactory(FactoryNames.STORAGE_MANAGER_FACTORY, Object.class);
- assertEquals(DefaultStorageManagerFactory.class.getName(), factory.getClass().getName());
+ Assert.assertEquals(DefaultStorageManagerFactory.class.getName(), factory.getClass().getName());
}
+ @Test
public void testCustomStorageManagerFactoryClassNameWebXml()
{
FactoryFinder factoryFinder = DefaultFactoryFinder.getInstance();
Object factory = factoryFinder.getFactory(FactoryNames.STORAGE_MANAGER_FACTORY, Object.class);
- assertEquals(CustomDefaultStorageManagerFactory.class.getName(), factory.getClass().getName());
+ Assert.assertEquals(CustomDefaultStorageManagerFactory.class.getName(), factory.getClass().getName());
}
+ @Test
public void testCustomStorageManagerFactoryClassNameCustomConfig()
{
FactoryFinder factoryFinder = DefaultFactoryFinder.getInstance();
Object factory = factoryFinder.getFactory(FactoryNames.STORAGE_MANAGER_FACTORY, Object.class);
- assertEquals(Custom2DefaultStorageManagerFactory.class.getName(), factory.getClass().getName());
- }
-
- public static Test suite()
- {
-
- return new ClassLoaderTestSuite(ExtValCoreConfigurationCustomStorageManagerFactoryClassNameTestCase.class);
+ Assert.assertEquals(Custom2DefaultStorageManagerFactory.class.getName(), factory.getClass().getName());
}
}