diff options
| author | Mika Murtojarvi <mika@vaadin.com> | 2014-12-10 12:43:00 +0200 |
|---|---|---|
| committer | Mika Murtojarvi <mika@vaadin.com> | 2014-12-10 12:43:00 +0200 |
| commit | 1be6a54741355224482eb4ef164d4c79e41e0785 (patch) | |
| tree | 3330dde8e7db554c4457c2a11e56f894df6202a3 /server | |
| parent | de839dca9100e991304dd347f595e2f8f423acb9 (diff) | |
| download | vaadin-framework-1be6a54741355224482eb4ef164d4c79e41e0785.tar.gz vaadin-framework-1be6a54741355224482eb4ef164d4c79e41e0785.zip | |
Change a test not to use LocaleUtils.
Change-Id: I447960c4621c8bf0acbc1cce5bcc4fe5dc341256
Diffstat (limited to 'server')
| -rw-r--r-- | server/tests/src/com/vaadin/tests/layoutparser/TestLocale.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/server/tests/src/com/vaadin/tests/layoutparser/TestLocale.java b/server/tests/src/com/vaadin/tests/layoutparser/TestLocale.java index 3df72554ad..eea533243c 100644 --- a/server/tests/src/com/vaadin/tests/layoutparser/TestLocale.java +++ b/server/tests/src/com/vaadin/tests/layoutparser/TestLocale.java @@ -19,7 +19,6 @@ import java.util.Locale; import junit.framework.TestCase; -import org.apache.commons.lang3.LocaleUtils; import org.jsoup.nodes.Document; import org.jsoup.nodes.DocumentType; import org.jsoup.nodes.Element; @@ -134,17 +133,15 @@ public class TestLocale extends TestCase { // hierarchy VerticalLayout vLayout = (VerticalLayout) LayoutHandler.parse( doc.toString()).getComponentRoot(); - assertEquals("Wrong locale.", LocaleUtils.toLocale("en_US"), + assertEquals("Wrong locale.", new Locale("en", "US"), vLayout.getLocale()); HorizontalLayout hLayout = (HorizontalLayout) vLayout.getComponent(0); assertEquals("The element should have the same locale as its parent.", vLayout.getLocale(), hLayout.getLocale()); Button b1 = (Button) hLayout.getComponent(0); - assertEquals("Wrong locale.", LocaleUtils.toLocale("en_US"), - b1.getLocale()); + assertEquals("Wrong locale.", new Locale("en", "US"), b1.getLocale()); Button b2 = (Button) hLayout.getComponent(1); - assertEquals("Wrong locale.", LocaleUtils.toLocale("en_GB"), - b2.getLocale()); + assertEquals("Wrong locale.", new Locale("en", "GB"), b2.getLocale()); Button b3 = (Button) hLayout.getComponent(2); assertEquals( "The component should have the same locale as its parent.", |