You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2017/03/14 18:36:09 UTC
[16/24] struts git commit: Adjusts tests
Adjusts tests
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/f784a16c
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/f784a16c
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/f784a16c
Branch: refs/heads/master
Commit: f784a16cb7f6515bf15f93173453326286e33ff0
Parents: ca0f629
Author: Lukasz Lenart <lu...@apache.org>
Authored: Mon Mar 13 09:10:26 2017 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Mon Mar 13 09:10:26 2017 +0100
----------------------------------------------------------------------
.../xwork2/CompositeTextProviderTest.java | 41 ++++----------------
.../xwork2/DefaultTextProviderTest.java | 7 ++--
.../xwork2/TextProviderSupportTest.java | 7 +++-
3 files changed, 18 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/f784a16c/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 2dcfa8b..7290902 100644
--- a/core/src/test/java/com/opensymphony/xwork2/CompositeTextProviderTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/CompositeTextProviderTest.java
@@ -76,40 +76,15 @@ public class CompositeTextProviderTest extends XWorkTestCase {
@Override
protected void setUp() throws Exception {
super.setUp();
- textProvider = new CompositeTextProvider(new TextProvider[] {
- new TextProviderSupport(ResourceBundle.getBundle("com.opensymphony.xwork2.validator.CompositeTextProviderTestResourceBundle1"),
- new LocaleProvider() {
- public Locale getLocale() {
- return Locale.ENGLISH;
- }
-
- @Override
- public boolean isValidLocaleString(String localeStr) {
- return true;
- }
-
- @Override
- public boolean isValidLocale(Locale locale) {
- return true;
- }
- }),
- new TextProviderSupport(ResourceBundle.getBundle("com.opensymphony.xwork2.validator.CompositeTextProviderTestResourceBundle2"),
- new LocaleProvider() {
- public Locale getLocale() {
- return Locale.ENGLISH;
- }
-
- @Override
- public boolean isValidLocaleString(String localeStr) {
- return true;
- }
-
- @Override
- public boolean isValidLocale(Locale locale) {
- return true;
- }
- })
+ TextProviderFactory tpf = container.getInstance(TextProviderFactory.class);
+ tpf.setTextProvider(null);
+
+ ActionContext.getContext().setLocale(Locale.ENGLISH);
+
+ textProvider = new CompositeTextProvider(new TextProvider[]{
+ tpf.createInstance(ResourceBundle.getBundle("com.opensymphony.xwork2.validator.CompositeTextProviderTestResourceBundle1")),
+ tpf.createInstance(ResourceBundle.getBundle("com.opensymphony.xwork2.validator.CompositeTextProviderTestResourceBundle2"))
});
}
http://git-wip-us.apache.org/repos/asf/struts/blob/f784a16c/core/src/test/java/com/opensymphony/xwork2/DefaultTextProviderTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/DefaultTextProviderTest.java b/core/src/test/java/com/opensymphony/xwork2/DefaultTextProviderTest.java
index 37d6dce..7b6b212 100644
--- a/core/src/test/java/com/opensymphony/xwork2/DefaultTextProviderTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/DefaultTextProviderTest.java
@@ -16,7 +16,6 @@
package com.opensymphony.xwork2;
import com.opensymphony.xwork2.util.LocalizedTextUtil;
-import junit.framework.TestCase;
import java.util.*;
@@ -25,7 +24,7 @@ import java.util.*;
*
* @author Claus Ibsen
*/
-public class DefaultTextProviderTest extends TestCase {
+public class DefaultTextProviderTest extends XWorkTestCase {
private DefaultTextProvider tp;
@@ -127,6 +126,8 @@ public class DefaultTextProviderTest extends TestCase {
@Override
protected void setUp() throws Exception {
+ super.setUp();
+
ActionContext ctx = new ActionContext(new HashMap<String, Object>());
ActionContext.setContext(ctx);
ctx.setLocale(Locale.CANADA);
@@ -134,7 +135,7 @@ public class DefaultTextProviderTest extends TestCase {
LocalizedTextUtil.clearDefaultResourceBundles();
LocalizedTextUtil.addDefaultResourceBundle(DefaultTextProviderTest.class.getName());
- tp = new DefaultTextProvider();
+ tp = container.inject(DefaultTextProvider.class);
}
@Override
http://git-wip-us.apache.org/repos/asf/struts/blob/f784a16c/core/src/test/java/com/opensymphony/xwork2/TextProviderSupportTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/TextProviderSupportTest.java b/core/src/test/java/com/opensymphony/xwork2/TextProviderSupportTest.java
index 6769d0e..a36b437 100644
--- a/core/src/test/java/com/opensymphony/xwork2/TextProviderSupportTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/TextProviderSupportTest.java
@@ -16,6 +16,8 @@
package com.opensymphony.xwork2;
+import com.opensymphony.xwork2.util.LocalizedTextUtil;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
@@ -108,6 +110,9 @@ public class TextProviderSupportTest extends XWorkTestCase {
protected void setUp() throws Exception {
super.setUp();
rb = ResourceBundle.getBundle(TextProviderSupportTest.class.getName(), Locale.ENGLISH);
+
+ LocalizedTextUtil ltu = container.getInstance(LocalizedTextUtil.class);
+
tp = new TextProviderSupport(rb, new LocaleProvider() {
public Locale getLocale() {
return Locale.ENGLISH;
@@ -122,7 +127,7 @@ public class TextProviderSupportTest extends XWorkTestCase {
public boolean isValidLocale(Locale locale) {
return true;
}
- });
+ }, ltu);
}
@Override