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 [4/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/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationTestCase.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/ExtValCoreConfigurationTestCase.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/ExtValCoreConfigurationTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationTestCase.java Wed Dec 1 14:45:13 2010
@@ -19,6 +19,9 @@
package org.apache.myfaces.extensions.validator.test.core.config;
import org.apache.myfaces.extensions.validator.test.core.AbstractExValCoreTestCase;
+import org.apache.myfaces.test.runners.NamedRunner;
+import org.apache.myfaces.test.runners.TestPerClassLoaderRunner;
+import org.junit.runner.RunWith;
/**
*
@@ -26,13 +29,12 @@ import org.apache.myfaces.extensions.val
* since v4
*
*/
+@RunWith(value = TestPerClassLoaderRunner.class)
public abstract class ExtValCoreConfigurationTestCase extends
AbstractExValCoreTestCase
{
-
- public ExtValCoreConfigurationTestCase(String name)
- {
- super(name);
+ protected String getName() {
+ return NamedRunner.getTestMethodName();
}
protected boolean needXmlParameters()
Modified: myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationValidateEmptyFieldsTestCase.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/ExtValCoreConfigurationValidateEmptyFieldsTestCase.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/ExtValCoreConfigurationValidateEmptyFieldsTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationValidateEmptyFieldsTestCase.java Wed Dec 1 14:45:13 2010
@@ -23,12 +23,11 @@ import java.util.Map;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
-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.initializer.component.AbstractHtmlCoreComponentsComponentInitializer;
-import org.apache.myfaces.extensions.validator.test.base.util.ClassLoaderTestSuite;
+import org.junit.Assert;
+import org.junit.Test;
/**
*
@@ -38,10 +37,6 @@ import org.apache.myfaces.extensions.val
*/
public class ExtValCoreConfigurationValidateEmptyFieldsTestCase extends ExtValCoreConfigurationTestCase
{
- public ExtValCoreConfigurationValidateEmptyFieldsTestCase(String name)
- {
- super(name);
- }
public static class CustomComponentInitializer extends AbstractHtmlCoreComponentsComponentInitializer
{
@@ -91,28 +86,25 @@ public class ExtValCoreConfigurationVali
}
}
+ @Test
public void testValidateEmptyFieldsDefault()
{
CustomComponentInitializer initializer = new CustomComponentInitializer();
- assertTrue(initializer.validateEmptyFields());
+ Assert.assertTrue(initializer.validateEmptyFields());
}
+ @Test
public void testValidateEmptyFieldsWebXml()
{
CustomComponentInitializer initializer = new CustomComponentInitializer();
- assertFalse(initializer.validateEmptyFields());
+ Assert.assertFalse(initializer.validateEmptyFields());
}
+ @Test
public void testValidateEmptyFieldsCustomConfig()
{
CustomComponentInitializer initializer = new CustomComponentInitializer();
- assertFalse(initializer.validateEmptyFields());
- }
-
- public static Test suite()
- {
-
- return new ClassLoaderTestSuite(ExtValCoreConfigurationValidateEmptyFieldsTestCase.class);
+ Assert.assertFalse(initializer.validateEmptyFields());
}
}
Modified: myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationViolationSeverityTestCase.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/ExtValCoreConfigurationViolationSeverityTestCase.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/ExtValCoreConfigurationViolationSeverityTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/config/ExtValCoreConfigurationViolationSeverityTestCase.java Wed Dec 1 14:45:13 2010
@@ -18,14 +18,13 @@
*/
package org.apache.myfaces.extensions.validator.test.core.config;
-import junit.framework.Test;
-
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.validation.parameter.ViolationSeverity;
-import org.apache.myfaces.extensions.validator.test.base.util.ClassLoaderTestSuite;
+import org.junit.Assert;
+import org.junit.Test;
/**
*
@@ -35,11 +34,6 @@ import org.apache.myfaces.extensions.val
*/
public class ExtValCoreConfigurationViolationSeverityTestCase extends ExtValCoreConfigurationTestCase
{
- public ExtValCoreConfigurationViolationSeverityTestCase(String name)
- {
- super(name);
- }
-
@Override
protected ExtValCoreConfiguration getCustomExtValCoreConfiguration()
{
@@ -68,22 +62,18 @@ public class ExtValCoreConfigurationViol
}
+ @Test
public void testViolationSeverityDefault()
{
- assertEquals(ViolationSeverity.class.getName(), ((Class) ExtValContext.getContext().getGlobalProperty(
+ Assert.assertEquals(ViolationSeverity.class.getName(), ((Class) ExtValContext.getContext().getGlobalProperty(
ViolationSeverity.class.getName())).getName());
}
+ @Test
public void testViolationSeverityCustomConfig()
{
- assertEquals(CustomViolationSeverity.class.getName(), ((Class) ExtValContext.getContext().getGlobalProperty(
+ Assert.assertEquals(CustomViolationSeverity.class.getName(), ((Class) ExtValContext.getContext().getGlobalProperty(
ViolationSeverity.class.getName())).getName());
}
- public static Test suite()
- {
-
- return new ClassLoaderTestSuite(ExtValCoreConfigurationViolationSeverityTestCase.class);
- }
-
}
Modified: myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/el/ValueBindingExpressionTestCase.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/el/ValueBindingExpressionTestCase.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/el/ValueBindingExpressionTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/el/ValueBindingExpressionTestCase.java Wed Dec 1 14:45:13 2010
@@ -20,9 +20,8 @@ package org.apache.myfaces.extensions.va
import org.apache.myfaces.extensions.validator.core.el.ValueBindingExpression;
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;
/**
* @author Gerhard Petracek
@@ -30,28 +29,8 @@ import junit.framework.Assert;
*/
public class ValueBindingExpressionTestCase extends AbstractExValCoreTestCase
{
- public ValueBindingExpressionTestCase(String name)
- {
- super(name);
- }
-
- public static Test suite()
- {
- return new TestSuite(ValueBindingExpressionTestCase.class);
- }
-
- @Override
- protected void setUp() throws Exception
- {
- super.setUp();
- }
-
- @Override
- protected void tearDown() throws Exception
- {
- super.tearDown();
- }
+ @Test
public void testStandardSyntax() throws Exception
{
ValueBindingExpression valueBindingExpression = new ValueBindingExpression("#{bean1.property1}");
@@ -74,6 +53,7 @@ public class ValueBindingExpressionTestC
Assert.assertEquals("property1", valueBindingExpression.getProperty());
}
+ @Test
public void testStandardSyntaxReplaceProperty() throws Exception
{
ValueBindingExpression valueBindingExpression = new ValueBindingExpression("#{bean1.property1}");
@@ -103,6 +83,7 @@ public class ValueBindingExpressionTestC
Assert.assertEquals("property2", valueBindingExpression.getProperty());
}
+ @Test
public void testStandardSyntaxAddProperty() throws Exception
{
ValueBindingExpression valueBindingExpression = new ValueBindingExpression("#{bean1.bean2}");
@@ -132,6 +113,7 @@ public class ValueBindingExpressionTestC
Assert.assertEquals("property1", valueBindingExpression.getProperty());
}
+ @Test
public void testFaceletsCustomComponentSyntax() throws Exception
{
ValueBindingExpression valueBindingExpression = new ValueBindingExpression("#{entity[fieldName]}");
@@ -141,6 +123,7 @@ public class ValueBindingExpressionTestC
Assert.assertEquals("fieldName", valueBindingExpression.getProperty());
}
+ @Test
public void testFaceletsCustomComponentSyntaxReplaceProperty() throws Exception
{
ValueBindingExpression valueBindingExpression = new ValueBindingExpression("#{entity[fieldName]}");
@@ -153,6 +136,7 @@ public class ValueBindingExpressionTestC
Assert.assertEquals("newFieldName", valueBindingExpression.getProperty());
}
+ @Test
public void testComplexMapSyntax() throws Exception
{
ValueBindingExpression valueBindingExpression
Modified: myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/initializer/RegistrationComponentInitializerTestCase.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/initializer/RegistrationComponentInitializerTestCase.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/initializer/RegistrationComponentInitializerTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/initializer/RegistrationComponentInitializerTestCase.java Wed Dec 1 14:45:13 2010
@@ -22,9 +22,8 @@ import org.apache.myfaces.extensions.val
import org.apache.myfaces.extensions.validator.core.InvocationOrder;
import org.apache.myfaces.extensions.validator.core.initializer.component.ComponentInitializer;
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;
@@ -33,21 +32,7 @@ import java.util.List;
public class RegistrationComponentInitializerTestCase extends AbstractExValCoreTestCase
{
- /**
- * Construct a new instance of the test.
- *
- * @param name Name of the test.
- */
- public RegistrationComponentInitializerTestCase(String name)
- {
- super(name);
- }
-
- public static Test suite()
- {
- return new TestSuite(RegistrationComponentInitializerTestCase.class);
- }
-
+ @Test
public void testComponentInitializerInitialization()
{
ExtValContext.getContext().addComponentInitializer(new TestComponentInitializer1000());
Modified: myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/interceptor/RegistrationMetaDataExtractionInterceptorTestCase.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/interceptor/RegistrationMetaDataExtractionInterceptorTestCase.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/interceptor/RegistrationMetaDataExtractionInterceptorTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/interceptor/RegistrationMetaDataExtractionInterceptorTestCase.java Wed Dec 1 14:45:13 2010
@@ -23,29 +23,14 @@ import org.apache.myfaces.extensions.val
import org.apache.myfaces.extensions.validator.core.property.PropertyInformation;
import org.apache.myfaces.extensions.validator.core.interceptor.MetaDataExtractionInterceptor;
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 RegistrationMetaDataExtractionInterceptorTestCase extends AbstractExValCoreTestCase
{
- /**
- * Construct a new instance of the test.
- *
- * @param name Name of the test.
- */
- public RegistrationMetaDataExtractionInterceptorTestCase(String name)
- {
- super(name);
- }
-
- public static Test suite()
- {
- return new TestSuite(RegistrationMetaDataExtractionInterceptorTestCase.class);
- }
-
+ @Test
public void testMetaDataExtractionInterceptorInitialization()
{
ExtValContext.getContext().addMetaDataExtractionInterceptor(new TestMetaDataExtractionInterceptor1000());
Modified: myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/interceptor/RegistrationPropertyValidationInterceptorTestCase.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/interceptor/RegistrationPropertyValidationInterceptorTestCase.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/interceptor/RegistrationPropertyValidationInterceptorTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/interceptor/RegistrationPropertyValidationInterceptorTestCase.java Wed Dec 1 14:45:13 2010
@@ -23,9 +23,8 @@ import org.apache.myfaces.extensions.val
import org.apache.myfaces.extensions.validator.core.interceptor.PropertyValidationInterceptor;
import org.apache.myfaces.extensions.validator.core.interceptor.FacesMessagePropertyValidationInterceptor;
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;
@@ -34,21 +33,7 @@ import java.util.Map;
public class RegistrationPropertyValidationInterceptorTestCase extends AbstractExValCoreTestCase
{
- /**
- * Construct a new instance of the test.
- *
- * @param name Name of the test.
- */
- public RegistrationPropertyValidationInterceptorTestCase(String name)
- {
- super(name);
- }
-
- public static Test suite()
- {
- return new TestSuite(RegistrationPropertyValidationInterceptorTestCase.class);
- }
-
+ @Test
public void testPropertyValidationInterceptorInitialization()
{
ExtValContext.getContext().addPropertyValidationInterceptor(new TestComponentInitializer());
Modified: myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/interceptor/RegistrationValidationExceptionInterceptorTestCase.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/interceptor/RegistrationValidationExceptionInterceptorTestCase.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/interceptor/RegistrationValidationExceptionInterceptorTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/interceptor/RegistrationValidationExceptionInterceptorTestCase.java Wed Dec 1 14:45:13 2010
@@ -27,9 +27,8 @@ import org.apache.myfaces.extensions.val
import org.apache.myfaces.extensions.validator.core.interceptor.ViolationSeverityValidationExceptionInterceptor;
import org.apache.myfaces.extensions.validator.core.interceptor.ViolationExceptionInterceptor;
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.component.UIComponent;
import javax.faces.validator.ValidatorException;
@@ -37,21 +36,7 @@ import java.util.List;
public class RegistrationValidationExceptionInterceptorTestCase extends AbstractExValCoreTestCase
{
- /**
- * Construct a new instance of the test.
- *
- * @param name Name of the test.
- */
- public RegistrationValidationExceptionInterceptorTestCase(String name)
- {
- super(name);
- }
-
- public static Test suite()
- {
- return new TestSuite(RegistrationValidationExceptionInterceptorTestCase.class);
- }
-
+ @Test
public void testValidationExceptionInterceptorInitialization()
{
ExtValContext.getContext().addValidationExceptionInterceptor(new TestValidationExceptionInterceptor1());
Modified: myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/mapper/RegistrationMetaDataToValidationStrategyNameMapperTestCase.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/mapper/RegistrationMetaDataToValidationStrategyNameMapperTestCase.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/mapper/RegistrationMetaDataToValidationStrategyNameMapperTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/mapper/RegistrationMetaDataToValidationStrategyNameMapperTestCase.java Wed Dec 1 14:45:13 2010
@@ -27,29 +27,15 @@ import org.apache.myfaces.extensions.val
import org.apache.myfaces.extensions.validator.util.ExtValUtils;
import org.apache.myfaces.extensions.validator.test.core.AbstractExValCoreTestCase;
import org.apache.myfaces.extensions.validator.test.base.mock.MockValidationStrategyFactory;
-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 RegistrationMetaDataToValidationStrategyNameMapperTestCase extends AbstractExValCoreTestCase
{
- /**
- * Construct a new instance of the test.
- *
- * @param name Name of the test.
- */
- public RegistrationMetaDataToValidationStrategyNameMapperTestCase(String name)
- {
- super(name);
- }
-
- public static Test suite()
- {
- return new TestSuite(RegistrationMetaDataToValidationStrategyNameMapperTestCase.class);
- }
+ @Test
public void testMetaDataToValidationStrategyNameMapperInitialization()
{
ExtValUtils.registerMetaDataToValidationStrategyNameMapper(
Modified: myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/mapper/RegistrationValidationStrategyToMessageResolverNameMapperTestCase.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/mapper/RegistrationValidationStrategyToMessageResolverNameMapperTestCase.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/mapper/RegistrationValidationStrategyToMessageResolverNameMapperTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/mapper/RegistrationValidationStrategyToMessageResolverNameMapperTestCase.java Wed Dec 1 14:45:13 2010
@@ -28,29 +28,15 @@ import org.apache.myfaces.extensions.val
import org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy;
import org.apache.myfaces.extensions.validator.test.core.AbstractExValCoreTestCase;
import org.apache.myfaces.extensions.validator.test.base.mock.MockMessageResolverFactory;
-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 RegistrationValidationStrategyToMessageResolverNameMapperTestCase extends AbstractExValCoreTestCase
{
- /**
- * Construct a new instance of the test.
- *
- * @param name Name of the test.
- */
- public RegistrationValidationStrategyToMessageResolverNameMapperTestCase(String name)
- {
- super(name);
- }
-
- public static Test suite()
- {
- return new TestSuite(RegistrationValidationStrategyToMessageResolverNameMapperTestCase.class);
- }
+ @Test
public void testValidationStrategyToMessageResolverNameMapperInitialization()
{
ExtValUtils.registerValidationStrategyToMessageResolverNameMapper(
Modified: myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/mapper/RegistrationValidationStrategyToMetaDataTransformerNameMapperTestCase.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/mapper/RegistrationValidationStrategyToMetaDataTransformerNameMapperTestCase.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/mapper/RegistrationValidationStrategyToMetaDataTransformerNameMapperTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/mapper/RegistrationValidationStrategyToMetaDataTransformerNameMapperTestCase.java Wed Dec 1 14:45:13 2010
@@ -28,28 +28,14 @@ import org.apache.myfaces.extensions.val
import org.apache.myfaces.extensions.validator.core.metadata.transformer.mapper.*;
import org.apache.myfaces.extensions.validator.test.core.AbstractExValCoreTestCase;
import org.apache.myfaces.extensions.validator.test.base.mock.MockMetaDataTransformerFactory;
-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 RegistrationValidationStrategyToMetaDataTransformerNameMapperTestCase extends AbstractExValCoreTestCase
{
- /**
- * Construct a new instance of the test.
- *
- * @param name Name of the test.
- */
- public RegistrationValidationStrategyToMetaDataTransformerNameMapperTestCase(String name)
- {
- super(name);
- }
-
- public static Test suite()
- {
- return new TestSuite(RegistrationValidationStrategyToMetaDataTransformerNameMapperTestCase.class);
- }
+ @Test
public void testValidationStrategyToMetaDataTransformerMapperInitialization()
{
ExtValUtils.registerValidationStrategyToMetaDataTransformerNameMapper(
Modified: myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/stage/CustomProjectStageTestCase.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/stage/CustomProjectStageTestCase.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/stage/CustomProjectStageTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/stage/CustomProjectStageTestCase.java Wed Dec 1 14:45:13 2010
@@ -21,53 +21,49 @@ package org.apache.myfaces.extensions.va
import org.apache.myfaces.extensions.validator.core.JsfProjectStage;
import org.apache.myfaces.extensions.validator.core.ProjectStage;
import org.apache.myfaces.extensions.validator.test.core.AbstractExValCoreTestCase;
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.Assert;
+import org.junit.Test;
public class CustomProjectStageTestCase extends AbstractExValCoreTestCase
{
private static final String PROJECT_STAGE = "javax.faces.PROJECT_STAGE";
- public CustomProjectStageTestCase(String name)
- {
- super(name);
- }
-
- public static Test suite()
- {
- return new TestSuite(CustomProjectStageTestCase.class);
- }
-
+ @Test
public void testDevelopmentStage()
{
servletContext.addInitParameter(PROJECT_STAGE, "Dev");
- assertTrue(CustomProjectStage.is(CustomProjectStage.Dev));
+ Assert.assertTrue(CustomProjectStage.is(CustomProjectStage.Dev));
}
+ @Test
public void testTestStage()
{
servletContext.addInitParameter(PROJECT_STAGE, "Test");
- assertTrue(CustomProjectStage.is(CustomProjectStage.Test));
+ Assert.assertTrue(CustomProjectStage.is(CustomProjectStage.Test));
}
+ @Test
public void testProductionStage()
{
servletContext.addInitParameter(PROJECT_STAGE, "Prod");
- assertTrue(CustomProjectStage.is(CustomProjectStage.Prod));
+ Assert.assertTrue(CustomProjectStage.is(CustomProjectStage.Prod));
}
+ @Test
public void testDefaultStage()
{
- assertTrue(ProjectStage.is(JsfProjectStage.Production.getValue()));
+ Assert.assertTrue(ProjectStage.is(JsfProjectStage.Production.getValue()));
}
+ @Test
public void testWrongDefaultStage1()
{
- assertFalse(CustomProjectStage.is(CustomProjectStage.Dev));
+ Assert.assertFalse(CustomProjectStage.is(CustomProjectStage.Dev));
}
+ @Test
public void testWrongDefaultStage2()
{
- assertFalse(CustomProjectStage.is(CustomProjectStage.Test));
+ Assert.assertFalse(CustomProjectStage.is(CustomProjectStage.Test));
}
}
\ No newline at end of file
Modified: myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/stage/IndependentProjectStageTestCase.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/stage/IndependentProjectStageTestCase.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/stage/IndependentProjectStageTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/stage/IndependentProjectStageTestCase.java Wed Dec 1 14:45:13 2010
@@ -18,10 +18,10 @@
*/
package org.apache.myfaces.extensions.validator.test.core.stage;
-import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.myfaces.extensions.validator.core.*;
import org.apache.myfaces.extensions.validator.test.core.AbstractExValCoreTestCase;
+import org.junit.Assert;
+import org.junit.Test;
import javax.faces.context.FacesContext;
@@ -34,18 +34,7 @@ public class IndependentProjectStageTest
private static final String CUSTOM_PROD = "custom_prod";
private static final String CUSTOM_TEST = "custom_test";
- public IndependentProjectStageTestCase(String name)
- {
- super(name);
- }
-
- public static Test suite()
- {
- return new TestSuite(IndependentProjectStageTestCase.class);
- }
-
-
- @Override
+ @Override
protected ExtValCoreConfiguration getCustomExtValCoreConfiguration()
{
return new DefaultExtValCoreConfiguration()
@@ -116,53 +105,61 @@ public class IndependentProjectStageTest
}
}
+ @Test
public void testDevelopmentStage()
{
servletContext.addInitParameter(INDEPENDENT_PROJECT_STAGE, CUSTOM_DEV);
- assertTrue(ProjectStage.is(ProjectStage.createStageName(CUSTOM_DEV)));
+ Assert.assertTrue(ProjectStage.is(ProjectStage.createStageName(CUSTOM_DEV)));
}
+ @Test
public void testTestStage()
{
servletContext.addInitParameter(INDEPENDENT_PROJECT_STAGE, CUSTOM_TEST);
- assertTrue(ProjectStage.is(ProjectStage.createStageName(CUSTOM_TEST)));
+ Assert.assertTrue(ProjectStage.is(ProjectStage.createStageName(CUSTOM_TEST)));
}
+ @Test
public void testFallbackStage()
{
servletContext.addInitParameter(INDEPENDENT_PROJECT_STAGE, "SystemTest");
- assertTrue(JsfProjectStage.is(JsfProjectStage.SystemTest));
- assertTrue(ProjectStage.is(ProjectStage.createStageName("SystemTest")));
- assertTrue(ProjectStage.is(JsfProjectStage.SystemTest.getValue()));
+ Assert.assertTrue(JsfProjectStage.is(JsfProjectStage.SystemTest));
+ Assert.assertTrue(ProjectStage.is(ProjectStage.createStageName("SystemTest")));
+ Assert.assertTrue(ProjectStage.is(JsfProjectStage.SystemTest.getValue()));
}
+ @Test
public void testOverrideJsfStage()
{
servletContext.addInitParameter(INDEPENDENT_PROJECT_STAGE, CUSTOM_DEV);
servletContext.addInitParameter(JSF_PROJECT_STAGE, "SystemTest");
- assertTrue(JsfProjectStage.is(JsfProjectStage.SystemTest));
- assertTrue(ProjectStage.is(JsfProjectStage.SystemTest.getValue()));
+ Assert.assertTrue(JsfProjectStage.is(JsfProjectStage.SystemTest));
+ Assert.assertTrue(ProjectStage.is(JsfProjectStage.SystemTest.getValue()));
}
+ @Test
public void testProductionStage()
{
servletContext.addInitParameter(INDEPENDENT_PROJECT_STAGE, CUSTOM_PROD);
- assertTrue(ProjectStage.is(ProjectStage.createStageName(CUSTOM_PROD)));
+ Assert.assertTrue(ProjectStage.is(ProjectStage.createStageName(CUSTOM_PROD)));
}
+ @Test
public void testDefaultStage()
{
- assertTrue(ProjectStage.is(ProjectStage.createStageName(CUSTOM_PROD)));
+ Assert.assertTrue(ProjectStage.is(ProjectStage.createStageName(CUSTOM_PROD)));
}
+ @Test
public void testWrongDefaultStage1()
{
- assertFalse(ProjectStage.is(ProjectStage.createStageName(CUSTOM_DEV)));
+ Assert.assertFalse(ProjectStage.is(ProjectStage.createStageName(CUSTOM_DEV)));
}
+ @Test
public void testWrongDefaultStage2()
{
- assertFalse(ProjectStage.is(ProjectStage.createStageName(CUSTOM_TEST)));
+ Assert.assertFalse(ProjectStage.is(ProjectStage.createStageName(CUSTOM_TEST)));
}
}
Modified: myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/stage/JsfProjectStageTestCase.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/stage/JsfProjectStageTestCase.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/stage/JsfProjectStageTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/stage/JsfProjectStageTestCase.java Wed Dec 1 14:45:13 2010
@@ -20,63 +20,62 @@ package org.apache.myfaces.extensions.va
import org.apache.myfaces.extensions.validator.core.JsfProjectStage;
import org.apache.myfaces.extensions.validator.test.core.AbstractExValCoreTestCase;
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.Assert;
+import org.junit.Test;
public class JsfProjectStageTestCase extends AbstractExValCoreTestCase
{
private static final String PROJECT_STAGE = "javax.faces.PROJECT_STAGE";
- public JsfProjectStageTestCase(String name)
- {
- super(name);
- }
-
- public static Test suite()
- {
- return new TestSuite(JsfProjectStageTestCase.class);
- }
+ @Test
public void testDevelopmentStage()
{
servletContext.addInitParameter(PROJECT_STAGE, "Development");
- assertTrue(JsfProjectStage.is(JsfProjectStage.Development));
+ Assert.assertTrue(JsfProjectStage.is(JsfProjectStage.Development));
}
+ @Test
public void testUnitTestStage()
{
servletContext.addInitParameter(PROJECT_STAGE, "UnitTest");
- assertTrue(JsfProjectStage.is(JsfProjectStage.UnitTest));
+ Assert.assertTrue(JsfProjectStage.is(JsfProjectStage.UnitTest));
}
+ @Test
public void testSystemTestStage()
{
servletContext.addInitParameter(PROJECT_STAGE, "SystemTest");
- assertTrue(JsfProjectStage.is(JsfProjectStage.SystemTest));
+ Assert.assertTrue(JsfProjectStage.is(JsfProjectStage.SystemTest));
}
+ @Test
public void testProductionStage()
{
servletContext.addInitParameter(PROJECT_STAGE, "Production");
- assertTrue(JsfProjectStage.is(JsfProjectStage.Production));
+ Assert.assertTrue(JsfProjectStage.is(JsfProjectStage.Production));
}
+ @Test
public void testDefaultStage()
{
- assertTrue(JsfProjectStage.is(JsfProjectStage.Production));
+ Assert.assertTrue(JsfProjectStage.is(JsfProjectStage.Production));
}
+ @Test
public void testWrongDefaultStage1()
{
- assertFalse(JsfProjectStage.is(JsfProjectStage.Development));
+ Assert.assertFalse(JsfProjectStage.is(JsfProjectStage.Development));
}
+ @Test
public void testWrongDefaultStage2()
{
- assertFalse(JsfProjectStage.is(JsfProjectStage.UnitTest));
+ Assert.assertFalse(JsfProjectStage.is(JsfProjectStage.UnitTest));
}
+ @Test
public void testWrongDefaultStage3()
{
- assertFalse(JsfProjectStage.is(JsfProjectStage.SystemTest));
+ Assert.assertFalse(JsfProjectStage.is(JsfProjectStage.SystemTest));
}
}
\ No newline at end of file
Modified: myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/util/model/TestMetaDataExtractionInterceptor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/util/model/TestMetaDataExtractionInterceptor.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/util/model/TestMetaDataExtractionInterceptor.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/util/model/TestMetaDataExtractionInterceptor.java Wed Dec 1 14:45:13 2010
@@ -3,7 +3,9 @@ package org.apache.myfaces.extensions.va
import org.apache.myfaces.extensions.validator.core.interceptor.MetaDataExtractionInterceptor;
import org.apache.myfaces.extensions.validator.core.metadata.MetaDataEntry;
import org.apache.myfaces.extensions.validator.core.property.PropertyInformation;
+import org.junit.Ignore;
+@Ignore
public class TestMetaDataExtractionInterceptor implements
MetaDataExtractionInterceptor
{
Modified: myfaces/extensions/validator/trunk/test-modules/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/pom.xml?rev=1041026&r1=1041025&r2=1041026&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/pom.xml (original)
+++ myfaces/extensions/validator/trunk/test-modules/pom.xml Wed Dec 1 14:45:13 2010
@@ -76,29 +76,12 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.shale</groupId>
- <artifactId>shale-test</artifactId>
- <version>1.0.4</version>
+ <groupId>org.apache.myfaces.test</groupId>
+ <artifactId>myfaces-test12</artifactId>
+ <version>1.0.0</version>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.myfaces</groupId>
- <artifactId>myfaces-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.myfaces</groupId>
- <artifactId>myfaces-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>myfaces</groupId>
- <artifactId>myfaces-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>myfaces</groupId>
- <artifactId>myfaces-impl</artifactId>
- </exclusion>
- </exclusions>
</dependency>
+
</dependencies>
<build>
Modified: myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/AbstractPropertyValidationTestCase.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/AbstractPropertyValidationTestCase.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/AbstractPropertyValidationTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/AbstractPropertyValidationTestCase.java Wed Dec 1 14:45:13 2010
@@ -27,10 +27,6 @@ import javax.faces.event.PhaseId;
public abstract class AbstractPropertyValidationTestCase extends AbstractExValTestCase
{
- public AbstractPropertyValidationTestCase(String name)
- {
- super(name);
- }
protected void invokeStartupListeners()
{
Modified: myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/baseval/BaseValTestCase.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/baseval/BaseValTestCase.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/baseval/BaseValTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/baseval/BaseValTestCase.java Wed Dec 1 14:45:13 2010
@@ -18,9 +18,6 @@
*/
package org.apache.myfaces.extensions.validator.test.propval.baseval;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import javax.faces.component.UIViewRoot;
import javax.faces.component.html.HtmlForm;
import javax.faces.component.html.HtmlInputText;
@@ -28,6 +25,8 @@ import javax.faces.el.ValueBinding;
import org.apache.myfaces.extensions.validator.test.propval.AbstractPropertyValidationTestCase;
import org.apache.myfaces.extensions.validator.test.propval.BaseValTestBean;
+import org.junit.Assert;
+import org.junit.Test;
/**
* @author Leonardo Uribe
@@ -40,24 +39,17 @@ public class BaseValTestCase extends Abs
BaseValTestBean bean = null;
- public BaseValTestCase(String name)
+ public BaseValTestCase()
{
- super(name);
inputComponent = null;
rootComponent = null;
bean = null;
}
- public static Test suite()
- {
- return new TestSuite(BaseValTestCase.class);
- }
-
@SuppressWarnings({"UnusedDeclaration"})
@Override
- protected void setUp() throws Exception
+ public void setUpTestCase()
{
- super.setUp();
bean = new BaseValTestBean();
ValueBinding vb = application.createValueBinding("#{testBean}");
facesContext.getExternalContext().getRequestMap().put("testBean", bean);
@@ -72,14 +64,15 @@ public class BaseValTestCase extends Abs
}
@Override
- protected void tearDown() throws Exception
+ protected void resetTestCase()
{
- super.tearDown();
+ super.resetTestCase();
inputComponent = null;
rootComponent = null;
bean = null;
}
+ @Test
public void testNameRequiredFail() throws Exception
{
createValueBinding(inputComponent, "value", "#{testBean.name}");
@@ -88,10 +81,11 @@ public class BaseValTestCase extends Abs
inputComponent.validate(facesContext);
- assertFalse(inputComponent.isValid());
+ Assert.assertFalse(inputComponent.isValid());
checkMessageCount(1);
}
+ @Test
public void testName1LenghtMaxFail() throws Exception
{
createValueBinding(inputComponent, "value", "#{testBean.name1}");
@@ -102,10 +96,11 @@ public class BaseValTestCase extends Abs
//validate
inputComponent.validate(facesContext);
- assertFalse(inputComponent.isValid());
+ Assert.assertFalse(inputComponent.isValid());
checkMessageCount(1);
}
+ @Test
public void testName1LenghtCorrect() throws Exception
{
createValueBinding(inputComponent, "value", "#{testBean.name1}");
@@ -116,10 +111,11 @@ public class BaseValTestCase extends Abs
//validate
inputComponent.validate(facesContext);
- assertTrue(inputComponent.isValid());
+ Assert.assertTrue(inputComponent.isValid());
checkMessageCount(0);
}
+ @Test
public void testName1LenghtMinFail() throws Exception
{
createValueBinding(inputComponent, "value", "#{testBean.name1}");
@@ -130,10 +126,11 @@ public class BaseValTestCase extends Abs
//validate
inputComponent.validate(facesContext);
- assertFalse(inputComponent.isValid());
+ Assert.assertFalse(inputComponent.isValid());
checkMessageCount(1);
}
+ @Test
public void testName1NoLenght() throws Exception
{
createValueBinding(inputComponent, "value", "#{testBean.name1}");
@@ -144,10 +141,11 @@ public class BaseValTestCase extends Abs
//validate
inputComponent.validate(facesContext);
- assertTrue(inputComponent.isValid());
+ Assert.assertTrue(inputComponent.isValid());
checkMessageCount(0);
}
+ @Test
public void testPatternNameFail() throws Exception
{
createValueBinding(inputComponent, "value", "#{testBean.patternName}");
@@ -158,10 +156,11 @@ public class BaseValTestCase extends Abs
//validate
inputComponent.validate(facesContext);
- assertFalse(inputComponent.isValid());
+ Assert.assertFalse(inputComponent.isValid());
checkMessageCount(1);
}
+ @Test
public void testPatternNoName() throws Exception
{
createValueBinding(inputComponent, "value", "#{testBean.patternName}");
@@ -172,10 +171,11 @@ public class BaseValTestCase extends Abs
//validate
inputComponent.validate(facesContext);
- assertTrue(inputComponent.isValid());
+ Assert.assertTrue(inputComponent.isValid());
checkMessageCount(0);
}
+ @Test
public void testPatternNameCorrect() throws Exception
{
createValueBinding(inputComponent, "value", "#{testBean.patternName}");
@@ -186,10 +186,11 @@ public class BaseValTestCase extends Abs
//validate
inputComponent.validate(facesContext);
- assertTrue(inputComponent.isValid());
+ Assert.assertTrue(inputComponent.isValid());
checkMessageCount(0);
}
+ @Test
public void testDoubleValueFail() throws Exception
{
createValueBinding(inputComponent, "value", "#{testBean.doubleValue1}");
@@ -200,10 +201,11 @@ public class BaseValTestCase extends Abs
//validate
inputComponent.validate(facesContext);
- assertFalse(inputComponent.isValid());
+ Assert.assertFalse(inputComponent.isValid());
checkMessageCount(1);
}
+ @Test
public void testDoubleValueCorrect() throws Exception
{
createValueBinding(inputComponent, "value", "#{testBean.doubleValue1}");
@@ -214,14 +216,15 @@ public class BaseValTestCase extends Abs
//validate
inputComponent.validate(facesContext);
- assertTrue(inputComponent.isValid());
+ Assert.assertTrue(inputComponent.isValid());
checkMessageCount(0);
- assertEquals(200d, inputComponent.getValue());
+ Assert.assertEquals(200d, inputComponent.getValue());
inputComponent.updateModel(facesContext);
- assertEquals(200d, bean.getDoubleValue1());
+ Assert.assertEquals(Double.valueOf(200), bean.getDoubleValue1());
}
+ @Test
public void testDoubleNoValue() throws Exception
{
createValueBinding(inputComponent, "value", "#{testBean.doubleValue1}");
@@ -232,7 +235,7 @@ public class BaseValTestCase extends Abs
//validate
inputComponent.validate(facesContext);
- assertTrue(inputComponent.isValid());
+ Assert.assertTrue(inputComponent.isValid());
checkMessageCount(0);
}
}
\ 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/baseval/CustomSeverity1TestCase.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/baseval/CustomSeverity1TestCase.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/baseval/CustomSeverity1TestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/baseval/CustomSeverity1TestCase.java Wed Dec 1 14:45:13 2010
@@ -18,8 +18,6 @@
*/
package org.apache.myfaces.extensions.validator.test.propval.baseval;
-import junit.framework.Test;
-import junit.framework.TestSuite;
import javax.faces.component.UIViewRoot;
import javax.faces.component.html.HtmlForm;
@@ -34,6 +32,8 @@ import org.apache.myfaces.extensions.val
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.validation.parameter.ViolationSeverity;
+import org.junit.Assert;
+import org.junit.Test;
public class CustomSeverity1TestCase extends AbstractPropertyValidationTestCase
{
@@ -43,25 +43,18 @@ public class CustomSeverity1TestCase ext
private CustomSeverityTestBean bean = null;
- public CustomSeverity1TestCase(String name)
+ public CustomSeverity1TestCase()
{
- super(name);
inputComponent = null;
rootComponent = null;
bean = null;
}
- public static Test suite()
- {
- return new TestSuite(CustomSeverity1TestCase.class);
- }
-
@SuppressWarnings({"UnusedDeclaration"})
@Override
- protected void setUp() throws Exception
+ public void setUpTestCase()
{
- super.setUp();
- bean = new CustomSeverityTestBean();
+ bean = new CustomSeverityTestBean();
ValueBinding vb = application.createValueBinding("#{testBean}");
facesContext.getExternalContext().getRequestMap().put("testBean", bean);
@@ -75,14 +68,15 @@ public class CustomSeverity1TestCase ext
}
@Override
- protected void tearDown() throws Exception
+ protected void resetTestCase()
{
- super.tearDown();
+ super.resetTestCase();
inputComponent = null;
rootComponent = null;
bean = null;
}
+ @Test
public void testCustomValidationParameterViaGlobalProperty() throws Exception
{
ExtValContext.getContext()
@@ -94,7 +88,7 @@ public class CustomSeverity1TestCase ext
inputComponent.validate(facesContext);
- assertTrue(inputComponent.isValid());
+ Assert.assertTrue(inputComponent.isValid());
assertNavigationBlocked(false);
@@ -102,6 +96,7 @@ public class CustomSeverity1TestCase ext
checkMessageSeverities(FacesMessage.SEVERITY_WARN);
}
+ @Test
public void testCustomValidationParameterViaStaticConfig() throws Exception
{
StaticInMemoryConfiguration config = new StaticInMemoryConfiguration();
@@ -116,7 +111,7 @@ public class CustomSeverity1TestCase ext
inputComponent.validate(facesContext);
- assertTrue(inputComponent.isValid());
+ Assert.assertTrue(inputComponent.isValid());
assertNavigationBlocked(false);
@@ -124,6 +119,7 @@ public class CustomSeverity1TestCase ext
checkMessageSeverities(FacesMessage.SEVERITY_WARN);
}
+ @Test
public void testUnknownValidationParameter() throws Exception
{
createValueBinding(inputComponent, "value", "#{testBean.name}");
@@ -132,7 +128,7 @@ public class CustomSeverity1TestCase ext
inputComponent.validate(facesContext);
- assertFalse(inputComponent.isValid());
+ Assert.assertFalse(inputComponent.isValid());
assertNavigationBlocked(true);
Modified: myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/baseval/parameter/TestPerson.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/baseval/parameter/TestPerson.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/baseval/parameter/TestPerson.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/baseval/parameter/TestPerson.java Wed Dec 1 14:45:13 2010
@@ -21,7 +21,9 @@ package org.apache.myfaces.extensions.va
import org.apache.myfaces.extensions.validator.baseval.annotation.Required;
import org.apache.myfaces.extensions.validator.core.validation.parameter.ViolationSeverity;
import org.apache.myfaces.extensions.validator.core.validation.parameter.DisableClientSideValidation;
+import org.junit.Ignore;
+@Ignore
public class TestPerson
{
@Required(parameters = {ViolationSeverity.Warn.class, TestAllowClientSideValidation.class})
Modified: myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/baseval/parameter/TestPriorityHigh.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/baseval/parameter/TestPriorityHigh.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/baseval/parameter/TestPriorityHigh.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/baseval/parameter/TestPriorityHigh.java Wed Dec 1 14:45:13 2010
@@ -18,6 +18,9 @@
*/
package org.apache.myfaces.extensions.validator.test.propval.baseval.parameter;
+import org.junit.Ignore;
+
+@Ignore
public class TestPriorityHigh implements TestPriority
{
public Integer getValue()
Modified: myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/baseval/parameter/TestPriorityLow.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/baseval/parameter/TestPriorityLow.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/baseval/parameter/TestPriorityLow.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/baseval/parameter/TestPriorityLow.java Wed Dec 1 14:45:13 2010
@@ -18,6 +18,9 @@
*/
package org.apache.myfaces.extensions.validator.test.propval.baseval.parameter;
+import org.junit.Ignore;
+
+@Ignore
public class TestPriorityLow implements TestPriority
{
public Integer getValue()
Modified: myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/baseval/parameter/TestValidationInterceptor.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/baseval/parameter/TestValidationInterceptor.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/baseval/parameter/TestValidationInterceptor.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/baseval/parameter/TestValidationInterceptor.java Wed Dec 1 14:45:13 2010
@@ -21,11 +21,13 @@ package org.apache.myfaces.extensions.va
import org.apache.myfaces.extensions.validator.core.interceptor.PropertyValidationInterceptor;
import org.apache.myfaces.extensions.validator.core.validation.parameter.ParameterValue;
import org.apache.myfaces.extensions.validator.core.InvocationOrder;
+import org.junit.Ignore;
import javax.faces.context.FacesContext;
import javax.faces.component.UIComponent;
import java.util.Map;
+@Ignore
@InvocationOrder(210)
public class TestValidationInterceptor implements PropertyValidationInterceptor
{
Modified: myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/baseval/parameter/TestValidatorProvider.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/baseval/parameter/TestValidatorProvider.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/baseval/parameter/TestValidatorProvider.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/baseval/parameter/TestValidatorProvider.java Wed Dec 1 14:45:13 2010
@@ -21,7 +21,9 @@ package org.apache.myfaces.extensions.va
import org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy;
import org.apache.myfaces.extensions.validator.core.validation.parameter.ValidationParameter;
import org.apache.myfaces.extensions.validator.core.validation.parameter.ParameterKey;
+import org.junit.Ignore;
+@Ignore
public class TestValidatorProvider implements ValidationParameter, TestValidationStrategyProvider
{
@ParameterKey
Modified: myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/config/ExtValBaseValidationConfigurationCustomTestCase.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/config/ExtValBaseValidationConfigurationCustomTestCase.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/config/ExtValBaseValidationConfigurationCustomTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/config/ExtValBaseValidationConfigurationCustomTestCase.java Wed Dec 1 14:45:13 2010
@@ -18,11 +18,10 @@
*/
package org.apache.myfaces.extensions.validator.test.propval.config;
-import junit.framework.Test;
-
import org.apache.myfaces.extensions.validator.baseval.DefaultExtValBaseValidationModuleConfiguration;
import org.apache.myfaces.extensions.validator.baseval.ExtValBaseValidationModuleConfiguration;
-import org.apache.myfaces.extensions.validator.test.base.util.ClassLoaderTestSuite;
+import org.junit.Assert;
+import org.junit.Test;
/**
*
@@ -33,10 +32,6 @@ import org.apache.myfaces.extensions.val
public class ExtValBaseValidationConfigurationCustomTestCase extends ExtValBaseValidationConfigurationTestCase
{
- public ExtValBaseValidationConfigurationCustomTestCase(String name)
- {
- super(name);
- }
public static class CustomExtValBaseValidationModuleConfiguration extends
DefaultExtValBaseValidationModuleConfiguration
@@ -70,19 +65,15 @@ public class ExtValBaseValidationConfigu
return null;
}
+ @Test
public void testExtValBaseValidationModuleConfigurationCustomDefault()
{
- assertFalse(ExtValBaseValidationModuleConfiguration.get().deactivateJpaBasedValidation());
+ Assert.assertFalse(ExtValBaseValidationModuleConfiguration.get().deactivateJpaBasedValidation());
}
public void testExtValBaseValidationModuleConfigurationCustomCustomConfig()
{
- assertTrue(ExtValBaseValidationModuleConfiguration.get().deactivateJpaBasedValidation());
+ Assert.assertTrue(ExtValBaseValidationModuleConfiguration.get().deactivateJpaBasedValidation());
}
- public static Test suite()
- {
-
- return new ClassLoaderTestSuite(ExtValBaseValidationConfigurationCustomTestCase.class);
- }
}
Modified: myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/config/ExtValBaseValidationConfigurationDeactivateJpaBasedValidationTestCase.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/config/ExtValBaseValidationConfigurationDeactivateJpaBasedValidationTestCase.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/config/ExtValBaseValidationConfigurationDeactivateJpaBasedValidationTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/config/ExtValBaseValidationConfigurationDeactivateJpaBasedValidationTestCase.java Wed Dec 1 14:45:13 2010
@@ -20,15 +20,15 @@ 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.baseval.DefaultExtValBaseValidationModuleConfiguration;
import org.apache.myfaces.extensions.validator.baseval.ExtValBaseValidationModuleConfiguration;
import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.core.initializer.configuration.StaticConfiguration;
import org.apache.myfaces.extensions.validator.core.initializer.configuration.StaticConfigurationNames;
-import org.apache.myfaces.extensions.validator.test.base.util.ClassLoaderTestSuite;
+import org.junit.Assert;
+import org.junit.Test;
+
/**
*
@@ -40,10 +40,6 @@ public class ExtValBaseValidationConfigu
ExtValBaseValidationConfigurationTestCase
{
- public ExtValBaseValidationConfigurationDeactivateJpaBasedValidationTestCase(String name)
- {
- super(name);
- }
@Override
protected void addInitializationParameters()
@@ -71,31 +67,28 @@ public class ExtValBaseValidationConfigu
};
}
+ @Test
public void testExtValBaseValidationConfigurationDeactivateJpaBasedValidationDefault()
{
List<StaticConfiguration<String, String>> configs = ExtValContext.getContext().getStaticConfiguration(
StaticConfigurationNames.META_DATA_TO_VALIDATION_STRATEGY_CONFIG);
- assertEquals(1, configs.size());
+ Assert.assertEquals(1, configs.size());
}
+ @Test
public void testExtValBaseValidationConfigurationDeactivateJpaBasedValidationWebXml()
{
List<StaticConfiguration<String, String>> configs = ExtValContext.getContext().getStaticConfiguration(
StaticConfigurationNames.META_DATA_TO_VALIDATION_STRATEGY_CONFIG);
- assertEquals(0, configs.size());
+ Assert.assertEquals(0, configs.size());
}
+ @Test
public void testExtValBaseValidationConfigurationDeactivateJpaBasedValidationCustomConfig()
{
List<StaticConfiguration<String, String>> configs = ExtValContext.getContext().getStaticConfiguration(
StaticConfigurationNames.META_DATA_TO_VALIDATION_STRATEGY_CONFIG);
- assertEquals(0, configs.size());
- }
-
- public static Test suite()
- {
-
- return new ClassLoaderTestSuite(ExtValBaseValidationConfigurationDeactivateJpaBasedValidationTestCase.class);
+ Assert.assertEquals(0, configs.size());
}
}
Modified: myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/config/ExtValBaseValidationConfigurationJpaValidationErrorMessagesTestCase.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/config/ExtValBaseValidationConfigurationJpaValidationErrorMessagesTestCase.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/config/ExtValBaseValidationConfigurationJpaValidationErrorMessagesTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/config/ExtValBaseValidationConfigurationJpaValidationErrorMessagesTestCase.java Wed Dec 1 14:45:13 2010
@@ -18,13 +18,12 @@
*/
package org.apache.myfaces.extensions.validator.test.propval.config;
-import junit.framework.Test;
-
import org.apache.myfaces.extensions.validator.ExtValInformation;
import org.apache.myfaces.extensions.validator.baseval.DefaultExtValBaseValidationModuleConfiguration;
import org.apache.myfaces.extensions.validator.baseval.ExtValBaseValidationModuleConfiguration;
import org.apache.myfaces.extensions.validator.baseval.message.resolver.JpaValidationErrorMessageResolver;
-import org.apache.myfaces.extensions.validator.test.base.util.ClassLoaderTestSuite;
+import org.junit.Assert;
+import org.junit.Test;
/**
*
@@ -39,11 +38,6 @@ public class ExtValBaseValidationConfigu
private static final String WEB_XML = "Web.XML";
private static final String CUSTOM_CONFIG = "Custom config";
- public ExtValBaseValidationConfigurationJpaValidationErrorMessagesTestCase(String name)
- {
- super(name);
- }
-
public static class VisibleJpaValidationErrorMessageResolver extends JpaValidationErrorMessageResolver
{
@@ -81,28 +75,25 @@ public class ExtValBaseValidationConfigu
};
}
+ @Test
public void testExtValBaseValidationConfigurationJpaValidationErrorMessagesDefault()
{
VisibleJpaValidationErrorMessageResolver messageResolver = new VisibleJpaValidationErrorMessageResolver();
- assertNull(messageResolver.getCustomBaseName());
+ Assert.assertNull(messageResolver.getCustomBaseName());
}
+ @Test
public void testExtValBaseValidationConfigurationJpaValidationErrorMessagesWebXml()
{
VisibleJpaValidationErrorMessageResolver messageResolver = new VisibleJpaValidationErrorMessageResolver();
- assertEquals(WEB_XML, messageResolver.getCustomBaseName());
+ Assert.assertEquals(WEB_XML, messageResolver.getCustomBaseName());
}
+ @Test
public void testExtValBaseValidationConfigurationJpaValidationErrorMessagesCustomConfig()
{
VisibleJpaValidationErrorMessageResolver messageResolver = new VisibleJpaValidationErrorMessageResolver();
- assertEquals(CUSTOM_CONFIG, messageResolver.getCustomBaseName());
- }
-
- public static Test suite()
- {
-
- return new ClassLoaderTestSuite(ExtValBaseValidationConfigurationJpaValidationErrorMessagesTestCase.class);
+ Assert.assertEquals(CUSTOM_CONFIG, messageResolver.getCustomBaseName());
}
}
Modified: myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/config/ExtValBaseValidationConfigurationTestCase.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/config/ExtValBaseValidationConfigurationTestCase.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/config/ExtValBaseValidationConfigurationTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/config/ExtValBaseValidationConfigurationTestCase.java Wed Dec 1 14:45:13 2010
@@ -25,19 +25,21 @@ import org.apache.myfaces.extensions.val
import org.apache.myfaces.extensions.validator.crossval.DefaultExtValCrossValidationModuleConfiguration;
import org.apache.myfaces.extensions.validator.crossval.ExtValCrossValidationModuleConfiguration;
import org.apache.myfaces.extensions.validator.test.core.AbstractExValCoreTestCase;
+import org.apache.myfaces.test.runners.NamedRunner;
+import org.apache.myfaces.test.runners.TestPerClassLoaderRunner;
+import org.junit.runner.RunWith;
/**
- *
* @author Rudy De Busscher
- * since v4
- *
+ * since v4
*/
+@RunWith(value = TestPerClassLoaderRunner.class)
public abstract class ExtValBaseValidationConfigurationTestCase extends AbstractExValCoreTestCase
{
- public ExtValBaseValidationConfigurationTestCase(String name)
+ protected String getName()
{
- super(name);
+ return NamedRunner.getTestMethodName();
}
protected boolean needXmlParameters()
@@ -85,16 +87,18 @@ public abstract class ExtValBaseValidati
if (needCustomConfig())
{
ExtValModuleConfiguration[] result = new ExtValModuleConfiguration[]
- { getCustomBaseValidationModuleConfiguration() };
+ {getCustomBaseValidationModuleConfiguration()};
if (result.length == 1 && result[0] == null)
{
// test don't want to specify a custom configuration.
return null;
- } else
+ }
+ else
{
return result;
}
- } else
+ }
+ else
{
return null;
}
Modified: myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/config/ExtValCrossValidationConfigurationCustomTestCase.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/config/ExtValCrossValidationConfigurationCustomTestCase.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/config/ExtValCrossValidationConfigurationCustomTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/config/ExtValCrossValidationConfigurationCustomTestCase.java Wed Dec 1 14:45:13 2010
@@ -18,11 +18,10 @@
*/
package org.apache.myfaces.extensions.validator.test.propval.config;
-import junit.framework.Test;
-
import org.apache.myfaces.extensions.validator.crossval.DefaultExtValCrossValidationModuleConfiguration;
import org.apache.myfaces.extensions.validator.crossval.ExtValCrossValidationModuleConfiguration;
-import org.apache.myfaces.extensions.validator.test.base.util.ClassLoaderTestSuite;
+import org.junit.Assert;
+import org.junit.Test;
/**
*
@@ -33,11 +32,6 @@ import org.apache.myfaces.extensions.val
public class ExtValCrossValidationConfigurationCustomTestCase extends ExtValCrossValidationConfigurationTestCase
{
- public ExtValCrossValidationConfigurationCustomTestCase(String name)
- {
- super(name);
- }
-
public static class CustomExtValCrossValidationModuleConfiguration extends
DefaultExtValCrossValidationModuleConfiguration
{
@@ -70,19 +64,16 @@ public class ExtValCrossValidationConfig
return null;
}
+ @Test
public void testExtValCrossValidationModuleConfigurationCustomDefault()
{
- assertFalse(ExtValCrossValidationModuleConfiguration.get().deactivateCrossvalidation());
+ Assert.assertFalse(ExtValCrossValidationModuleConfiguration.get().deactivateCrossvalidation());
}
+ @Test
public void testExtValCrossValidationModuleConfigurationCustomCustomConfig()
{
- assertTrue(ExtValCrossValidationModuleConfiguration.get().deactivateCrossvalidation());
+ Assert.assertTrue(ExtValCrossValidationModuleConfiguration.get().deactivateCrossvalidation());
}
- public static Test suite()
- {
-
- return new ClassLoaderTestSuite(ExtValCrossValidationConfigurationCustomTestCase.class);
- }
}
Modified: myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/config/ExtValCrossValidationConfigurationDeactivateCrossvalidationTestCase.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/config/ExtValCrossValidationConfigurationDeactivateCrossvalidationTestCase.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/config/ExtValCrossValidationConfigurationDeactivateCrossvalidationTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/config/ExtValCrossValidationConfigurationDeactivateCrossvalidationTestCase.java Wed Dec 1 14:45:13 2010
@@ -30,12 +30,11 @@ import javax.faces.lifecycle.Lifecycle;
import javax.faces.lifecycle.LifecycleFactory;
import javax.faces.webapp.FacesServlet;
-import junit.framework.Test;
-
import org.apache.myfaces.extensions.validator.ExtValInformation;
import org.apache.myfaces.extensions.validator.crossval.DefaultExtValCrossValidationModuleConfiguration;
import org.apache.myfaces.extensions.validator.crossval.ExtValCrossValidationModuleConfiguration;
-import org.apache.myfaces.extensions.validator.test.base.util.ClassLoaderTestSuite;
+import org.junit.Assert;
+import org.junit.Test;
/**
*
@@ -47,11 +46,6 @@ public class ExtValCrossValidationConfig
ExtValCrossValidationConfigurationTestCase
{
- public ExtValCrossValidationConfigurationDeactivateCrossvalidationTestCase(String name)
- {
- super(name);
- }
-
@Override
protected void addInitializationParameters()
{
@@ -78,27 +72,30 @@ public class ExtValCrossValidationConfig
};
}
+ @Test
public void testExtValBaseValidationConfigurationDeactivateCrossvalidationDefault()
{
executeBeforePhaseOfCrossValidationPhaseListener();
// PhaseIdPhaseListener from core and CrossValidationPhaseListener
- assertEquals(2, getPhaseListeners().size());
+ Assert.assertEquals(2, getPhaseListeners().size());
}
+ @Test
public void testExtValBaseValidationConfigurationDeactivateCrossvalidationWebXml()
{
executeBeforePhaseOfCrossValidationPhaseListener();
// PhaseIdPhaseListener from core
- assertEquals(1, getPhaseListeners().size());
+ Assert.assertEquals(1, getPhaseListeners().size());
}
+ @Test
public void testExtValBaseValidationConfigurationDeactivateCrossvalidationCustomConfig()
{
executeBeforePhaseOfCrossValidationPhaseListener();
// PhaseIdPhaseListener from core
- assertEquals(1, getPhaseListeners().size());
+ Assert.assertEquals(1, getPhaseListeners().size());
}
@@ -136,10 +133,4 @@ public class ExtValCrossValidationConfig
}
- public static Test suite()
- {
-
- return new ClassLoaderTestSuite(ExtValCrossValidationConfigurationDeactivateCrossvalidationTestCase.class);
- }
-
}
Modified: myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/config/ExtValCrossValidationConfigurationTestCase.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/config/ExtValCrossValidationConfigurationTestCase.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/config/ExtValCrossValidationConfigurationTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/config/ExtValCrossValidationConfigurationTestCase.java Wed Dec 1 14:45:13 2010
@@ -25,6 +25,9 @@ import org.apache.myfaces.extensions.val
import org.apache.myfaces.extensions.validator.crossval.DefaultExtValCrossValidationModuleConfiguration;
import org.apache.myfaces.extensions.validator.crossval.ExtValCrossValidationModuleConfiguration;
import org.apache.myfaces.extensions.validator.test.core.AbstractExValCoreTestCase;
+import org.apache.myfaces.test.runners.NamedRunner;
+import org.apache.myfaces.test.runners.TestPerClassLoaderRunner;
+import org.junit.runner.RunWith;
/**
*
@@ -32,14 +35,17 @@ import org.apache.myfaces.extensions.val
* since v4
*
*/
+@RunWith(value = TestPerClassLoaderRunner.class)
public abstract class ExtValCrossValidationConfigurationTestCase extends AbstractExValCoreTestCase
{
- public ExtValCrossValidationConfigurationTestCase(String name)
+
+ protected String getName()
{
- super(name);
+ return NamedRunner.getTestMethodName();
}
+
protected boolean needXmlParameters()
{
return getName().contains("Xml");
Modified: myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/constraintsource/AbstractConstraintSourceTestCase.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/AbstractConstraintSourceTestCase.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/AbstractConstraintSourceTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/constraintsource/AbstractConstraintSourceTestCase.java Wed Dec 1 14:45:13 2010
@@ -9,6 +9,7 @@ import javax.faces.el.ValueBinding;
import org.apache.myfaces.extensions.validator.internal.Priority;
import org.apache.myfaces.extensions.validator.internal.ToDo;
import org.apache.myfaces.extensions.validator.test.propval.AbstractPropertyValidationTestCase;
+import org.junit.Assert;
@ToDo(value=Priority.MEDIUM,description="This is more or less the same as BaseBeanValPropertyValidationTestCase but can it be unified ??")
public abstract class AbstractConstraintSourceTestCase<T> extends AbstractPropertyValidationTestCase
@@ -22,16 +23,12 @@ public abstract class AbstractConstraint
protected T bean;
- public AbstractConstraintSourceTestCase(String name)
- {
- super(name);
- }
-
+
@SuppressWarnings({"UnusedDeclaration"})
@Override
- protected void setUp() throws Exception
+ protected void setUpTestCase()
{
- super.setUp();
+ super.setUpTestCase();
bean = getBeanToTest();
bindBeanToExpression();
@@ -66,9 +63,9 @@ public abstract class AbstractConstraint
protected abstract T getBeanToTest();
@Override
- protected void tearDown() throws Exception
+ protected void resetTestCase()
{
- super.tearDown();
+ super.resetTestCase();
inputComponent1 = null;
inputComponent2 = null;
inputComponent3 = null;
@@ -102,12 +99,12 @@ public abstract class AbstractConstraint
protected void assertComponentValid(UIInput uiInput)
{
- assertTrue(isComponentValid(uiInput));
+ Assert.assertTrue(isComponentValid(uiInput));
}
protected void assertComponentInvalid(UIInput uiInput)
{
- assertFalse(isComponentValid(uiInput));
+ Assert.assertFalse(isComponentValid(uiInput));
}
private boolean isComponentValid(UIInput uiComponent)
Modified: myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/constraintsource/ConstraintSourceAwareValidation1TestCase.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/ConstraintSourceAwareValidation1TestCase.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/ConstraintSourceAwareValidation1TestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/constraintsource/ConstraintSourceAwareValidation1TestCase.java Wed Dec 1 14:45:13 2010
@@ -21,9 +21,7 @@ package org.apache.myfaces.extensions.va
import javax.faces.application.FacesMessage;
import org.apache.myfaces.extensions.validator.test.propval.constraintsource.model.ConstraintSourceAware1Bean;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.Test;
/**
* EXTVAL-83
@@ -34,21 +32,13 @@ import junit.framework.TestSuite;
public class ConstraintSourceAwareValidation1TestCase extends
AbstractConstraintSourceTestCase<ConstraintSourceAware1Bean>
{
- public ConstraintSourceAwareValidation1TestCase(String name)
- {
- super(name);
- }
-
- public static Test suite()
- {
- return new TestSuite(ConstraintSourceAwareValidation1TestCase.class);
- }
protected ConstraintSourceAware1Bean getBeanToTest()
{
return new ConstraintSourceAware1Bean();
}
+ @Test
public void testImplicitFieldMapping()
{
createValueBindingForComponent(this.inputComponent1,
@@ -64,6 +54,7 @@ public class ConstraintSourceAwareValida
checkMessageSeverities(FacesMessage.SEVERITY_ERROR);
}
+ @Test
public void testImplicitMethodMapping()
{
createValueBindingForComponent(this.inputComponent2,