Updates test to use the new injectable factory
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/e8a598c7 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/e8a598c7 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/e8a598c7 Branch: refs/heads/master Commit: e8a598c7bc83752f488ad4ccccd0d11a64df3f03 Parents: 132829c Author: Lukasz Lenart <[email protected]> Authored: Fri Mar 17 08:03:48 2017 +0100 Committer: Lukasz Lenart <[email protected]> Committed: Fri Mar 17 08:03:48 2017 +0100 ---------------------------------------------------------------------- .../java/com/opensymphony/xwork2/CompositeTextProviderTest.java | 3 +-- .../xwork2/validator/AnnotationActionValidatorManagerTest.java | 3 +-- .../RepopulateConversionErrorFieldValidatorSupportTest.java | 2 +- .../validator/validators/AppendingValidatorContextTest.java | 3 +-- 4 files changed, 4 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/e8a598c7/core/src/test/java/com/opensymphony/xwork2/CompositeTextProviderTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/CompositeTextProviderTest.java b/core/src/test/java/com/opensymphony/xwork2/CompositeTextProviderTest.java index ab5c170..3b5f30c 100644 --- a/core/src/test/java/com/opensymphony/xwork2/CompositeTextProviderTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/CompositeTextProviderTest.java @@ -77,8 +77,7 @@ public class CompositeTextProviderTest extends XWorkTestCase { protected void setUp() throws Exception { super.setUp(); - StrutsTextProviderFactory tpf = container.getInstance(StrutsTextProviderFactory.class); - tpf.setTextProvider(null); + TextProviderFactory tpf = container.getInstance(TextProviderFactory.class); ActionContext.getContext().setLocale(Locale.ENGLISH); http://git-wip-us.apache.org/repos/asf/struts/blob/e8a598c7/core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java index 8a9a4cd..89c21e3 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java @@ -24,7 +24,6 @@ import com.opensymphony.xwork2.FileManager; import com.opensymphony.xwork2.FileManagerFactory; import com.opensymphony.xwork2.SimpleAction; import com.opensymphony.xwork2.SimpleAnnotationAction; -import com.opensymphony.xwork2.StrutsTextProviderFactory; import com.opensymphony.xwork2.TextProviderFactory; import com.opensymphony.xwork2.XWorkTestCase; import com.opensymphony.xwork2.config.entities.ActionConfig; @@ -82,7 +81,7 @@ public class AnnotationActionValidatorManagerTest extends XWorkTestCase { ActionContext.getContext().setActionInvocation(invocation); - tpf = container.getInstance(StrutsTextProviderFactory.class); + tpf = container.getInstance(TextProviderFactory.class); } @Override protected void tearDown() throws Exception { http://git-wip-us.apache.org/repos/asf/struts/blob/e8a598c7/core/src/test/java/com/opensymphony/xwork2/validator/RepopulateConversionErrorFieldValidatorSupportTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/RepopulateConversionErrorFieldValidatorSupportTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/RepopulateConversionErrorFieldValidatorSupportTest.java index c4aa178..51d8236 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/RepopulateConversionErrorFieldValidatorSupportTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/RepopulateConversionErrorFieldValidatorSupportTest.java @@ -92,7 +92,7 @@ public class RepopulateConversionErrorFieldValidatorSupportTest extends XWorkTes conversionErrors.put("someFieldName", conversionErrorValue); conversionErrors.put("xxxsomeFieldName", conversionErrorValue); - TextProviderFactory tpf = container.inject(TextProviderFactory.class); + TextProviderFactory tpf = container.getInstance(TextProviderFactory.class); action = container.inject(ActionSupport.class); validator1 = http://git-wip-us.apache.org/repos/asf/struts/blob/e8a598c7/core/src/test/java/com/opensymphony/xwork2/validator/validators/AppendingValidatorContextTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/validators/AppendingValidatorContextTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/validators/AppendingValidatorContextTest.java index 52b331a..0446e97 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/validators/AppendingValidatorContextTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/validators/AppendingValidatorContextTest.java @@ -6,7 +6,6 @@ import java.util.Map; import com.opensymphony.xwork2.CompositeTextProvider; import com.opensymphony.xwork2.TextProvider; -import com.opensymphony.xwork2.StrutsTextProviderFactory; import com.opensymphony.xwork2.TextProviderFactory; import com.opensymphony.xwork2.XWorkTestCase; import com.opensymphony.xwork2.validator.DelegatingValidatorContext; @@ -29,7 +28,7 @@ public class AppendingValidatorContextTest extends XWorkTestCase { super.setUp(); action = container.inject(VisitorValidatorTestAction.class); - TextProviderFactory tpf = container.getInstance(StrutsTextProviderFactory.class); + TextProviderFactory tpf = container.getInstance(TextProviderFactory.class); ValidatorContext vc1 = new DelegatingValidatorContext(action, tpf); VisitorFieldValidator.AppendingValidatorContext vc2 = new AppendingValidatorContext(vc1, createTextProvider(action, vc1), FIRST_NAME, "");
