Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-31 11:24:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updates test to use the new injectable factory

Browse Source
This commit is contained in:
Lukasz Lenart
2017-03-17 08:03:48 +01:00
parent 132829cc24
commit e8a598c7bc
4 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/test/java/com/opensymphony/xwork2/CompositeTextProviderTest.java
+1 -2
View File
@@ -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);
core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java
+1 -2
View File
@@ -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 {
core/src/test/java/com/opensymphony/xwork2/validator/RepopulateConversionErrorFieldValidatorSupportTest.java
+1 -1
View File
@@ -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 =
core/src/test/java/com/opensymphony/xwork2/validator/validators/AppendingValidatorContextTest.java
+1 -2
View File
@@ -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, "");