You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2009/12/11 21:41:22 UTC
svn commit: r889809 - in
/myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules:
core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/el/
property-validation-tests/src/test/java/org/apache/myfaces/extensions/valida...
Author: gpetracek
Date: Fri Dec 11 20:41:21 2009
New Revision: 889809
URL: http://svn.apache.org/viewvc?rev=889809&view=rev
Log:
EXTVAL-30 cleanup
Modified:
myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/el/ValueBindingExpressionTestCase.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/baseval/parameter/ParameterTestCase.java
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/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/branches/branch_for_jsf_1_1/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/el/ValueBindingExpressionTestCase.java?rev=889809&r1=889808&r2=889809&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/el/ValueBindingExpressionTestCase.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/el/ValueBindingExpressionTestCase.java Fri Dec 11 20:41:21 2009
@@ -56,22 +56,22 @@
{
ValueBindingExpression valueBindingExpression = new ValueBindingExpression("#{bean1.property1}");
- Assert.assertEquals(valueBindingExpression.getExpressionString(), "#{bean1.property1}");
- Assert.assertEquals(valueBindingExpression.getBaseExpression().getExpressionString(), "#{bean1}");
- Assert.assertEquals(valueBindingExpression.getProperty(), "property1");
+ Assert.assertEquals("#{bean1.property1}", valueBindingExpression.getExpressionString());
+ Assert.assertEquals("#{bean1}", valueBindingExpression.getBaseExpression().getExpressionString());
+ Assert.assertEquals("property1", valueBindingExpression.getProperty());
valueBindingExpression = new ValueBindingExpression("#{bean1['property1']}");
- Assert.assertEquals(valueBindingExpression.getExpressionString(), "#{bean1['property1']}");
- Assert.assertEquals(valueBindingExpression.getBaseExpression().getExpressionString(), "#{bean1}");
- Assert.assertEquals(valueBindingExpression.getProperty(), "property1");
+ Assert.assertEquals("#{bean1['property1']}", valueBindingExpression.getExpressionString());
+ Assert.assertEquals("#{bean1}", valueBindingExpression.getBaseExpression().getExpressionString());
+ Assert.assertEquals("property1", valueBindingExpression.getProperty());
valueBindingExpression = new ValueBindingExpression("#{bean1['bean2'].property1}");
- Assert.assertEquals(valueBindingExpression.getExpressionString(), "#{bean1['bean2'].property1}");
- Assert.assertEquals(valueBindingExpression.getBaseExpression().getExpressionString(), "#{bean1['bean2']}");
- Assert.assertEquals(valueBindingExpression.getBaseExpression().getBaseExpression().getExpressionString(), "#{bean1}");
- Assert.assertEquals(valueBindingExpression.getProperty(), "property1");
+ Assert.assertEquals("#{bean1['bean2'].property1}", valueBindingExpression.getExpressionString());
+ Assert.assertEquals("#{bean1['bean2']}", valueBindingExpression.getBaseExpression().getExpressionString());
+ Assert.assertEquals("#{bean1}", valueBindingExpression.getBaseExpression().getBaseExpression().getExpressionString());
+ Assert.assertEquals("property1", valueBindingExpression.getProperty());
}
public void testStandardSyntaxReplaceProperty() throws Exception
@@ -80,27 +80,27 @@
valueBindingExpression = ValueBindingExpression.replaceProperty(valueBindingExpression, "property2");
- Assert.assertEquals(valueBindingExpression.getExpressionString(), "#{bean1.property2}");
- Assert.assertEquals(valueBindingExpression.getBaseExpression().getExpressionString(), "#{bean1}");
- Assert.assertEquals(valueBindingExpression.getProperty(), "property2");
+ Assert.assertEquals("#{bean1.property2}", valueBindingExpression.getExpressionString());
+ Assert.assertEquals("#{bean1}", valueBindingExpression.getBaseExpression().getExpressionString());
+ Assert.assertEquals("property2", valueBindingExpression.getProperty());
valueBindingExpression = new ValueBindingExpression("#{bean1['property1']}");
valueBindingExpression = ValueBindingExpression.replaceProperty(valueBindingExpression, "property2");
//TODO restore original syntax
- Assert.assertEquals(valueBindingExpression.getExpressionString(), "#{bean1.property2}");
- Assert.assertEquals(valueBindingExpression.getBaseExpression().getExpressionString(), "#{bean1}");
- Assert.assertEquals(valueBindingExpression.getProperty(), "property2");
+ Assert.assertEquals("#{bean1.property2}", valueBindingExpression.getExpressionString());
+ Assert.assertEquals("#{bean1}", valueBindingExpression.getBaseExpression().getExpressionString());
+ Assert.assertEquals("property2", valueBindingExpression.getProperty());
valueBindingExpression = new ValueBindingExpression("#{bean1['bean2'].property1}");
valueBindingExpression = ValueBindingExpression.replaceProperty(valueBindingExpression, "property2");
- Assert.assertEquals(valueBindingExpression.getExpressionString(), "#{bean1['bean2'].property2}");
- Assert.assertEquals(valueBindingExpression.getBaseExpression().getExpressionString(), "#{bean1['bean2']}");
- Assert.assertEquals(valueBindingExpression.getBaseExpression().getBaseExpression().getExpressionString(), "#{bean1}");
- Assert.assertEquals(valueBindingExpression.getProperty(), "property2");
+ Assert.assertEquals("#{bean1['bean2'].property2}", valueBindingExpression.getExpressionString());
+ Assert.assertEquals("#{bean1['bean2']}", valueBindingExpression.getBaseExpression().getExpressionString());
+ Assert.assertEquals("#{bean1}", valueBindingExpression.getBaseExpression().getBaseExpression().getExpressionString());
+ Assert.assertEquals("property2", valueBindingExpression.getProperty());
}
public void testStandardSyntaxAddProperty() throws Exception
@@ -109,36 +109,36 @@
valueBindingExpression = ValueBindingExpression.addProperty(valueBindingExpression, "property1");
- Assert.assertEquals(valueBindingExpression.getExpressionString(), "#{bean1.bean2.property1}");
- Assert.assertEquals(valueBindingExpression.getBaseExpression().getExpressionString(), "#{bean1.bean2}");
- Assert.assertEquals(valueBindingExpression.getProperty(), "property1");
+ Assert.assertEquals("#{bean1.bean2.property1}", valueBindingExpression.getExpressionString());
+ Assert.assertEquals("#{bean1.bean2}", valueBindingExpression.getBaseExpression().getExpressionString());
+ Assert.assertEquals("property1", valueBindingExpression.getProperty());
valueBindingExpression = new ValueBindingExpression("#{bean1['bean2']}");
valueBindingExpression = ValueBindingExpression.addProperty(valueBindingExpression, "property1");
- Assert.assertEquals(valueBindingExpression.getExpressionString(), "#{bean1['bean2'].property1}");
- Assert.assertEquals(valueBindingExpression.getBaseExpression().getExpressionString(), "#{bean1['bean2']}");
- Assert.assertEquals(valueBindingExpression.getProperty(), "property1");
+ Assert.assertEquals("#{bean1['bean2'].property1}", valueBindingExpression.getExpressionString());
+ Assert.assertEquals("#{bean1['bean2']}", valueBindingExpression.getBaseExpression().getExpressionString());
+ Assert.assertEquals("property1", valueBindingExpression.getProperty());
valueBindingExpression = new ValueBindingExpression("#{bean1['bean2'].bean3}");
valueBindingExpression = ValueBindingExpression.addProperty(valueBindingExpression, "property1");
- Assert.assertEquals(valueBindingExpression.getExpressionString(), "#{bean1['bean2'].bean3.property1}");
- Assert.assertEquals(valueBindingExpression.getBaseExpression().getExpressionString(), "#{bean1['bean2'].bean3}");
- Assert.assertEquals(valueBindingExpression
- .getBaseExpression().getBaseExpression().getExpressionString(), "#{bean1['bean2']}");
- Assert.assertEquals(valueBindingExpression.getProperty(), "property1");
+ Assert.assertEquals("#{bean1['bean2'].bean3.property1}", valueBindingExpression.getExpressionString());
+ Assert.assertEquals("#{bean1['bean2'].bean3}", valueBindingExpression.getBaseExpression().getExpressionString());
+ Assert.assertEquals("#{bean1['bean2']}",
+ valueBindingExpression.getBaseExpression().getBaseExpression().getExpressionString());
+ Assert.assertEquals("property1", valueBindingExpression.getProperty());
}
public void testFaceletsCustomComponentSyntax() throws Exception
{
ValueBindingExpression valueBindingExpression = new ValueBindingExpression("#{entity[fieldName]}");
- Assert.assertEquals(valueBindingExpression.getExpressionString(), "#{entity[fieldName]}");
- Assert.assertEquals(valueBindingExpression.getBaseExpression().getExpressionString(), "#{entity}");
- Assert.assertEquals(valueBindingExpression.getProperty(), "fieldName");
+ Assert.assertEquals("#{entity[fieldName]}", valueBindingExpression.getExpressionString());
+ Assert.assertEquals("#{entity}", valueBindingExpression.getBaseExpression().getExpressionString());
+ Assert.assertEquals("fieldName", valueBindingExpression.getProperty());
}
public void testFaceletsCustomComponentSyntaxReplaceProperty() throws Exception
@@ -148,9 +148,9 @@
valueBindingExpression = ValueBindingExpression.replaceProperty(valueBindingExpression, "newFieldName");
//TODO restore original syntax
- Assert.assertEquals(valueBindingExpression.getExpressionString(), "#{entity.newFieldName}");
- Assert.assertEquals(valueBindingExpression.getBaseExpression().getExpressionString(), "#{entity}");
- Assert.assertEquals(valueBindingExpression.getProperty(), "newFieldName");
+ Assert.assertEquals("#{entity.newFieldName}", valueBindingExpression.getExpressionString());
+ Assert.assertEquals("#{entity}", valueBindingExpression.getBaseExpression().getExpressionString());
+ Assert.assertEquals("newFieldName", valueBindingExpression.getProperty());
}
public void testComplexMapSyntax() throws Exception
@@ -159,8 +159,7 @@
= new ValueBindingExpression("#{bean1[bean2[bean3['key1']]].property1}");
//TODO
- //assertEquals(valueBindingExpression.getExpressionString(), "#{bean1[bean2[bean3['key1']]].property1}");
- Assert.assertEquals(valueBindingExpression.getProperty(), "property1");
+ //assertEquals("#{bean1[bean2[bean3['key1']]].property1}", valueBindingExpression.getExpressionString());
+ Assert.assertEquals("property1", valueBindingExpression.getProperty());
}
-
}
\ No newline at end of file
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/baseval/parameter/ParameterTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/baseval/parameter/ParameterTestCase.java?rev=889809&r1=889808&r2=889809&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/baseval/parameter/ParameterTestCase.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/property-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/propval/baseval/parameter/ParameterTestCase.java Fri Dec 11 20:41:21 2009
@@ -46,7 +46,7 @@
assertNotNull(extractor.extract(required).containsKey(ViolationSeverity.class));
assertNotNull(extractor.extract(required, ViolationSeverity.class).iterator().next());
- assertEquals(extractor.extract(required, ViolationSeverity.class).iterator().next(), FacesMessage.SEVERITY_WARN);
+ assertEquals(FacesMessage.SEVERITY_WARN, extractor.extract(required, ViolationSeverity.class).iterator().next());
}
public void testParameterStyleTwo() throws Exception
@@ -58,7 +58,7 @@
assertNotNull(extractor.extract(required).containsKey("client_side_validation_support"));
assertNotNull(extractor.extract(required, "client_side_validation_support").iterator().next());
- assertEquals(extractor.extract(required, "client_side_validation_support").iterator().next(), false);
+ assertEquals(false, extractor.extract(required, "client_side_validation_support").iterator().next());
}
public void testParameterStyleThree() throws Exception
@@ -70,10 +70,10 @@
assertNotNull(extractor.extract(required).containsKey(TestPriority.class));
assertNotNull(extractor.extract(required, TestPriority.class).iterator().next());
- assertEquals(extractor.extract(required, TestPriority.class, Integer.class).iterator().next(), new Integer(1));
- assertEquals(extractor.extract(required, TestPriority.class, String.class).size(), 2);
- assertEquals(extractor.extract(required, TestPriority.class, String.class, TestPriority.ShortDescription.class), "do it asap");
- assertEquals(extractor.extract(required, TestPriority.class, String.class, TestPriority.LongDescription.class), "do it immediately");
+ assertEquals(new Integer(1), extractor.extract(required, TestPriority.class, Integer.class).iterator().next());
+ assertEquals(2, extractor.extract(required, TestPriority.class, String.class).size());
+ assertEquals("do it asap", extractor.extract(required, TestPriority.class, String.class, TestPriority.ShortDescription.class));
+ assertEquals("do it immediately", extractor.extract(required, TestPriority.class, String.class, TestPriority.LongDescription.class));
}
public void testParameterStyleFour() throws Exception
@@ -85,8 +85,8 @@
assertNotNull(extractor.extract(required).containsKey(PropertyValidationInterceptor.class));
assertNotNull(extractor.extract(required, PropertyValidationInterceptor.class).iterator().next());
- assertEquals(extractor.extract(required, PropertyValidationInterceptor.class).size(), 1);
- assertEquals(extractor.extract(required, PropertyValidationInterceptor.class, PropertyValidationInterceptor.class).iterator().next().getClass().getName(), TestValidationInterceptor.class.getName());
+ assertEquals(1, extractor.extract(required, PropertyValidationInterceptor.class).size());
+ assertEquals(TestValidationInterceptor.class.getName(), extractor.extract(required, PropertyValidationInterceptor.class, PropertyValidationInterceptor.class).iterator().next().getClass().getName());
}
public void testParameterStyleFive() throws Exception
@@ -98,9 +98,9 @@
assertNotNull(extractor.extract(required).containsKey(DisableClientSideValidation.class));
assertNotNull(extractor.extract(required, DisableClientSideValidation.class).iterator().next());
- assertEquals(extractor.extract(required, DisableClientSideValidation.class).size(), 1);
- assertEquals(extractor.extract(required, DisableClientSideValidation.class, Class.class).size(), 1);
- assertEquals(extractor.extract(required, DisableClientSideValidation.class, Class.class).iterator().next().getName(), DisableClientSideValidation.class.getName());
+ assertEquals(1, extractor.extract(required, DisableClientSideValidation.class).size());
+ assertEquals(1, extractor.extract(required, DisableClientSideValidation.class, Class.class).size());
+ assertEquals(DisableClientSideValidation.class.getName(), extractor.extract(required, DisableClientSideValidation.class, Class.class).iterator().next().getName());
}
/*
@@ -116,7 +116,7 @@
assertNotNull(extractor.extract(required).containsKey(TestValidatorProvider.class));
assertNotNull(extractor.extract(required, TestValidatorProvider.class).iterator().next());
- assertEquals(extractor.extract(required, TestValidatorProvider.class, Class.class).size(), 2);
+ assertEquals(2, extractor.extract(required, TestValidatorProvider.class, Class.class).size());
}
public void testParameterStyleSeven() throws Exception
@@ -133,4 +133,4 @@
}
}
*/
-}
\ No newline at end of file
+}