Repository: struts Updated Branches: refs/heads/master 9e95d7929 -> 2e9df577a
http://git-wip-us.apache.org/repos/asf/struts/blob/2e9df577/xwork-core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java index 2a07e0b..e7045c2 100644 --- a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java +++ b/xwork-core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java @@ -9,7 +9,6 @@ import com.opensymphony.xwork2.validator.validators.DoubleRangeFieldValidator; import java.util.HashMap; import java.util.Iterator; import java.util.List; -import java.util.Locale; import java.util.Map; /** @@ -24,8 +23,8 @@ public class DoubleRangeValidatorTest extends XWorkTestCase { public void testRangeValidationWithError() throws Exception { //Explicitly set an out-of-range double for DoubleRangeValidatorTest - Map<String, Object> context = new HashMap<String, Object>(); - HashMap<String, Object> params = new HashMap<String, Object>(); + Map<String, Object> context = new HashMap<>(); + HashMap<String, Object> params = new HashMap<>(); params.put("percentage", 100.0123d); context.put(ActionContext.PARAMETERS, params); @@ -45,8 +44,8 @@ public class DoubleRangeValidatorTest extends XWorkTestCase { } public void testRangeValidationNoError() throws Exception { - Map<String, Object> context = new HashMap<String, Object>(); - HashMap<String, Object> params = new HashMap<String, Object>(); + Map<String, Object> context = new HashMap<>(); + HashMap<String, Object> params = new HashMap<>(); params.put("percentage", 1.234567d); context.put(ActionContext.PARAMETERS, params); @@ -182,8 +181,8 @@ public class DoubleRangeValidatorTest extends XWorkTestCase { public void testRangeValidationWithExpressionsFail() throws Exception { //Explicitly set an out-of-range double for DoubleRangeValidatorTest - Map<String, Object> context = new HashMap<String, Object>(); - HashMap<String, Object> params = new HashMap<String, Object>(); + Map<String, Object> context = new HashMap<>(); + HashMap<String, Object> params = new HashMap<>(); params.put("percentage", 100.0123d); context.put(ActionContext.PARAMETERS, params); http://git-wip-us.apache.org/repos/asf/struts/blob/2e9df577/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ExpressionValidatorTest.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ExpressionValidatorTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ExpressionValidatorTest.java index 991650e..572b316 100644 --- a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ExpressionValidatorTest.java +++ b/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ExpressionValidatorTest.java @@ -18,17 +18,16 @@ package com.opensymphony.xwork2.validator; import com.mockobjects.dynamic.C; import com.mockobjects.dynamic.Mock; import com.opensymphony.xwork2.*; -import com.opensymphony.xwork2.config.providers.MockConfigurationProvider; import com.opensymphony.xwork2.config.entities.ActionConfig; +import com.opensymphony.xwork2.config.providers.MockConfigurationProvider; import com.opensymphony.xwork2.validator.validators.ExpressionValidator; +import org.easymock.EasyMock; import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.easymock.EasyMock; - /** * Unit test for ExpressionValidator. * @@ -60,12 +59,12 @@ public class ExpressionValidatorTest extends XWorkTestCase { } public void testExpressionValidatorFailure() throws Exception { - HashMap<String, Object> params = new HashMap<String, Object>(); + HashMap<String, Object> params = new HashMap<>(); params.put("date", "12/23/2002"); params.put("foo", "5"); params.put("bar", "7"); - HashMap<String, Object> extraContext = new HashMap<String, Object>(); + HashMap<String, Object> extraContext = new HashMap<>(); extraContext.put(ActionContext.PARAMETERS, params); ActionProxy proxy = actionProxyFactory.createActionProxy("", MockConfigurationProvider.VALIDATION_ACTION_NAME, extraContext); @@ -88,7 +87,7 @@ public class ExpressionValidatorTest extends XWorkTestCase { params.put("foo", "10"); params.put("bar", "7"); - HashMap<String, Object> extraContext = new HashMap<String, Object>(); + HashMap<String, Object> extraContext = new HashMap<>(); extraContext.put(ActionContext.PARAMETERS, params); ActionProxy proxy = actionProxyFactory.createActionProxy("", MockConfigurationProvider.VALIDATION_ACTION_NAME, extraContext); http://git-wip-us.apache.org/repos/asf/struts/blob/2e9df577/xwork-core/src/test/java/com/opensymphony/xwork2/validator/GenericValidatorContext.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/GenericValidatorContext.java b/xwork-core/src/test/java/com/opensymphony/xwork2/validator/GenericValidatorContext.java index 9a98628..6273259 100644 --- a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/GenericValidatorContext.java +++ b/xwork-core/src/test/java/com/opensymphony/xwork2/validator/GenericValidatorContext.java @@ -43,7 +43,7 @@ public class GenericValidatorContext extends DelegatingValidatorContext { @Override public synchronized Collection<String> getActionErrors() { - return new ArrayList<String>(internalGetActionErrors()); + return new ArrayList<>(internalGetActionErrors()); } @Override @@ -90,7 +90,7 @@ public class GenericValidatorContext extends DelegatingValidatorContext { List<String> thisFieldErrors = errors.get(fieldName); if (thisFieldErrors == null) { - thisFieldErrors = new ArrayList<String>(); + thisFieldErrors = new ArrayList<>(); errors.put(fieldName, thisFieldErrors); } @@ -119,7 +119,7 @@ public class GenericValidatorContext extends DelegatingValidatorContext { private Collection<String> internalGetActionErrors() { if (actionErrors == null) { - actionErrors = new ArrayList<String>(); + actionErrors = new ArrayList<>(); } return actionErrors; @@ -127,7 +127,7 @@ public class GenericValidatorContext extends DelegatingValidatorContext { private Collection<String> internalGetActionMessages() { if (actionMessages == null) { - actionMessages = new ArrayList<String>(); + actionMessages = new ArrayList<>(); } return actionMessages; @@ -135,7 +135,7 @@ public class GenericValidatorContext extends DelegatingValidatorContext { private Map<String, List<String>> internalGetFieldErrors() { if (fieldErrors == null) { - fieldErrors = new HashMap<String, List<String>>(); + fieldErrors = new HashMap<>(); } return fieldErrors; http://git-wip-us.apache.org/repos/asf/struts/blob/2e9df577/xwork-core/src/test/java/com/opensymphony/xwork2/validator/IntRangeValidatorTest.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/IntRangeValidatorTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/validator/IntRangeValidatorTest.java index 7f4ee22..9c0281b 100644 --- a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/IntRangeValidatorTest.java +++ b/xwork-core/src/test/java/com/opensymphony/xwork2/validator/IntRangeValidatorTest.java @@ -37,10 +37,10 @@ import java.util.Map; public class IntRangeValidatorTest extends XWorkTestCase { public void testRangeValidation() { - HashMap<String, String> params = new HashMap<String, String>(); + HashMap<String, String> params = new HashMap<>(); params.put("bar", "5"); - HashMap<String, Object> extraContext = new HashMap<String, Object>(); + HashMap<String, Object> extraContext = new HashMap<>(); extraContext.put(ActionContext.PARAMETERS, params); try { http://git-wip-us.apache.org/repos/asf/struts/blob/2e9df577/xwork-core/src/test/java/com/opensymphony/xwork2/validator/LongRangeValidatorTest.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/LongRangeValidatorTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/validator/LongRangeValidatorTest.java index a56c421..dfed43e 100644 --- a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/LongRangeValidatorTest.java +++ b/xwork-core/src/test/java/com/opensymphony/xwork2/validator/LongRangeValidatorTest.java @@ -35,10 +35,10 @@ import java.util.Map; public class LongRangeValidatorTest extends XWorkTestCase { public void testRangeValidation() { - HashMap<String, String> params = new HashMap<String, String>(); + HashMap<String, String> params = new HashMap<>(); params.put("longFoo", "200"); - HashMap<String, Object> extraContext = new HashMap<String, Object>(); + HashMap<String, Object> extraContext = new HashMap<>(); extraContext.put(ActionContext.PARAMETERS, params); try { http://git-wip-us.apache.org/repos/asf/struts/blob/2e9df577/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ModelDrivenValidationTest.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ModelDrivenValidationTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ModelDrivenValidationTest.java index 5ae5180..1ced1f5 100644 --- a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ModelDrivenValidationTest.java +++ b/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ModelDrivenValidationTest.java @@ -32,10 +32,10 @@ import java.util.Map; public class ModelDrivenValidationTest extends XWorkTestCase { public void testModelDrivenValidation() throws Exception { - Map<String, Object> params = new HashMap<String, Object>(); + Map<String, Object> params = new HashMap<>(); params.put("count", new String[]{"11"}); - Map<String, Object> context = new HashMap<String, Object>(); + Map<String, Object> context = new HashMap<>(); context.put(ActionContext.PARAMETERS, params); XmlConfigurationProvider provider = new XmlConfigurationProvider("xwork-sample.xml"); http://git-wip-us.apache.org/repos/asf/struts/blob/2e9df577/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ShortRangeValidatorTest.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ShortRangeValidatorTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ShortRangeValidatorTest.java index 9456874..22909df 100644 --- a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ShortRangeValidatorTest.java +++ b/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ShortRangeValidatorTest.java @@ -35,10 +35,10 @@ import java.util.Map; public class ShortRangeValidatorTest extends XWorkTestCase { public void testRangeValidation() { - HashMap<String, Object> params = new HashMap<String, Object>(); + HashMap<String, Object> params = new HashMap<>(); params.put("shortFoo", "200"); - HashMap<String, Object> extraContext = new HashMap<String, Object>(); + HashMap<String, Object> extraContext = new HashMap<>(); extraContext.put(ActionContext.PARAMETERS, params); try { http://git-wip-us.apache.org/repos/asf/struts/blob/2e9df577/xwork-core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java index c511a64..dc1fad8 100644 --- a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java +++ b/xwork-core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java @@ -34,7 +34,7 @@ import java.util.*; public class SimpleActionValidationTest extends XWorkTestCase { public void testAliasValidation() { - HashMap<String, Object> params = new HashMap<String, Object>(); + HashMap<String, Object> params = new HashMap<>(); params.put("baz", "10"); //valid values @@ -81,7 +81,7 @@ public class SimpleActionValidationTest extends XWorkTestCase { } public void testLookingUpFieldNameAsTextKey() { - HashMap<String, Object> params = new HashMap<String, Object>(); + HashMap<String, Object> params = new HashMap<>(); // should cause a message params.put("baz", "-1"); @@ -89,7 +89,7 @@ public class SimpleActionValidationTest extends XWorkTestCase { //valid values params.put("bar", "7"); - HashMap<String, Object> extraContext = new HashMap<String, Object>(); + HashMap<String, Object> extraContext = new HashMap<>(); extraContext.put(ActionContext.PARAMETERS, params); try { @@ -111,10 +111,10 @@ public class SimpleActionValidationTest extends XWorkTestCase { } public void testMessageKey() { - HashMap<String, Object> params = new HashMap<String, Object>(); + HashMap<String, Object> params = new HashMap<>(); params.put("foo", "200"); - HashMap<String, Object> extraContext = new HashMap<String, Object>(); + HashMap<String, Object> extraContext = new HashMap<>(); extraContext.put(ActionContext.PARAMETERS, params); try { @@ -160,10 +160,10 @@ public class SimpleActionValidationTest extends XWorkTestCase { } public void testParamterizedMessage() { - HashMap<String, Object> params = new HashMap<String, Object>(); + HashMap<String, Object> params = new HashMap<>(); params.put("bar", "42"); - HashMap<String, Object> extraContext = new HashMap<String, Object>(); + HashMap<String, Object> extraContext = new HashMap<>(); extraContext.put(ActionContext.PARAMETERS, params); try { @@ -185,7 +185,7 @@ public class SimpleActionValidationTest extends XWorkTestCase { } public void testSubPropertiesAreValidated() { - HashMap<String, Object> params = new HashMap<String, Object>(); + HashMap<String, Object> params = new HashMap<>(); params.put("baz", "10"); //valid values @@ -198,7 +198,7 @@ public class SimpleActionValidationTest extends XWorkTestCase { // this should cause a message params.put("bean.count", "100"); - HashMap<String, Object> extraContext = new HashMap<String, Object>(); + HashMap<String, Object> extraContext = new HashMap<>(); extraContext.put(ActionContext.PARAMETERS, params); try { http://git-wip-us.apache.org/repos/asf/struts/blob/2e9df577/xwork-core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java index f495557..2895d80 100644 --- a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java +++ b/xwork-core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java @@ -17,7 +17,6 @@ package com.opensymphony.xwork2.validator; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.XWorkTestCase; -import com.opensymphony.xwork2.util.URLUtil; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.validator.validators.URLValidator; http://git-wip-us.apache.org/repos/asf/struts/blob/2e9df577/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ValidatorAnnotationTest.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ValidatorAnnotationTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ValidatorAnnotationTest.java index db0e8e6..3991288 100644 --- a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ValidatorAnnotationTest.java +++ b/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ValidatorAnnotationTest.java @@ -17,12 +17,12 @@ import java.util.HashMap; public class ValidatorAnnotationTest extends XWorkTestCase { public void testNotAnnotatedMethodSuccess() throws Exception { - HashMap<String, Object> params = new HashMap<String, Object>(); + HashMap<String, Object> params = new HashMap<>(); params.put("date", "12/23/2002"); params.put("foo", "5"); params.put("bar", "7"); - HashMap<String, Object> extraContext = new HashMap<String, Object>(); + HashMap<String, Object> extraContext = new HashMap<>(); extraContext.put(ActionContext.PARAMETERS, params); ActionProxy proxy = actionProxyFactory.createActionProxy("", "notAnnotatedMethod", extraContext); @@ -34,9 +34,9 @@ public class ValidatorAnnotationTest extends XWorkTestCase { } public void testNotAnnotatedMethodSuccess2() throws Exception { - HashMap<String, Object> params = new HashMap<String, Object>(); + HashMap<String, Object> params = new HashMap<>(); - HashMap<String, Object> extraContext = new HashMap<String, Object>(); + HashMap<String, Object> extraContext = new HashMap<>(); extraContext.put(ActionContext.PARAMETERS, params); ActionProxy proxy = actionProxyFactory.createActionProxy("", "notAnnotatedMethod", extraContext); @@ -48,9 +48,9 @@ public class ValidatorAnnotationTest extends XWorkTestCase { } public void testAnnotatedMethodFailure() throws Exception { - HashMap<String, Object> params = new HashMap<String, Object>(); + HashMap<String, Object> params = new HashMap<>(); - HashMap<String, Object> extraContext = new HashMap<String, Object>(); + HashMap<String, Object> extraContext = new HashMap<>(); extraContext.put(ActionContext.PARAMETERS, params); ActionProxy proxy = actionProxyFactory.createActionProxy("", "annotatedMethod", extraContext); @@ -64,13 +64,13 @@ public class ValidatorAnnotationTest extends XWorkTestCase { } public void testAnnotatedMethodSuccess() throws Exception { - HashMap<String, Object> params = new HashMap<String, Object>(); + HashMap<String, Object> params = new HashMap<>(); //make it not fail params.put("param1", "key1"); params.put("param2", "key2"); - HashMap<String, Object> extraContext = new HashMap<String, Object>(); + HashMap<String, Object> extraContext = new HashMap<>(); extraContext.put(ActionContext.PARAMETERS, params); ActionProxy proxy = actionProxyFactory.createActionProxy("", "annotatedMethod", extraContext); @@ -79,12 +79,12 @@ public class ValidatorAnnotationTest extends XWorkTestCase { } public void testAnnotatedMethodSuccess2() throws Exception { - HashMap<String, Object> params = new HashMap<String, Object>(); + HashMap<String, Object> params = new HashMap<>(); //make it not fail params.put("param2", "key2"); - HashMap<String, Object> extraContext = new HashMap<String, Object>(); + HashMap<String, Object> extraContext = new HashMap<>(); extraContext.put(ActionContext.PARAMETERS, params); ActionProxy proxy = actionProxyFactory.createActionProxy("", "annotatedMethod", extraContext); @@ -93,12 +93,12 @@ public class ValidatorAnnotationTest extends XWorkTestCase { } public void testAnnotatedMethodSuccess3() throws Exception { - HashMap<String, Object> params = new HashMap<String, Object>(); + HashMap<String, Object> params = new HashMap<>(); //make it not fail params.put("param1", "key1"); - HashMap<String, Object> extraContext = new HashMap<String, Object>(); + HashMap<String, Object> extraContext = new HashMap<>(); extraContext.put(ActionContext.PARAMETERS, params); ActionProxy proxy = actionProxyFactory.createActionProxy("", "annotatedMethod", extraContext); http://git-wip-us.apache.org/repos/asf/struts/blob/2e9df577/xwork-core/src/test/java/com/opensymphony/xwork2/validator/VisitorFieldValidatorTest.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/VisitorFieldValidatorTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/validator/VisitorFieldValidatorTest.java index 3073d6a..c36f761 100644 --- a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/VisitorFieldValidatorTest.java +++ b/xwork-core/src/test/java/com/opensymphony/xwork2/validator/VisitorFieldValidatorTest.java @@ -17,13 +17,9 @@ package com.opensymphony.xwork2.validator; import com.opensymphony.xwork2.*; import com.opensymphony.xwork2.config.entities.ActionConfig; -import com.opensymphony.xwork2.interceptor.DefaultWorkflowInterceptor; - -import java.util.*; - import org.easymock.EasyMock; -import org.easymock.IAnswer; +import java.util.*; /** * VisitorFieldValidatorTest @@ -178,7 +174,7 @@ public class VisitorFieldValidatorTest extends XWorkTestCase { public void testVisitorChildConversionValidation() throws Exception { //add conversion error - Map<String, Object> conversionErrors = new HashMap<String, Object>(); + Map<String, Object> conversionErrors = new HashMap<>(); conversionErrors.put("bean.child.count", "bar"); ActionContext.getContext().setConversionErrors(conversionErrors); http://git-wip-us.apache.org/repos/asf/struts/blob/2e9df577/xwork-core/src/test/java/com/opensymphony/xwork2/validator/VisitorValidatorTestAction.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/VisitorValidatorTestAction.java b/xwork-core/src/test/java/com/opensymphony/xwork2/validator/VisitorValidatorTestAction.java index 2bebe4b..fad95fb 100644 --- a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/VisitorValidatorTestAction.java +++ b/xwork-core/src/test/java/com/opensymphony/xwork2/validator/VisitorValidatorTestAction.java @@ -30,7 +30,7 @@ import java.util.List; */ public class VisitorValidatorTestAction extends ActionSupport { - private List<TestBean> testBeanList = new ArrayList<TestBean>(); + private List<TestBean> testBeanList = new ArrayList<>(); private String context; private TestBean bean = new TestBean(); private TestBean[] testBeanArray;
