From ab189ea14e32abb614ab9c0b0e059633ffc07bad Mon Sep 17 00:00:00 2001 From: Teemu Suo-Anttila Date: Thu, 17 Mar 2016 13:26:35 +0200 Subject: Fix shared test file name Change-Id: Ib3c42fedbe23453ff65831f91e3baaae45dda38b --- .../com/vaadin/shared/util/SharedUtilTest.java | 121 +++++++++++++++++++++ .../com/vaadin/shared/util/SharedUtilTests.java | 121 --------------------- 2 files changed, 121 insertions(+), 121 deletions(-) create mode 100644 shared/src/test/java/com/vaadin/shared/util/SharedUtilTest.java delete mode 100644 shared/src/test/java/com/vaadin/shared/util/SharedUtilTests.java diff --git a/shared/src/test/java/com/vaadin/shared/util/SharedUtilTest.java b/shared/src/test/java/com/vaadin/shared/util/SharedUtilTest.java new file mode 100644 index 0000000000..081f594a97 --- /dev/null +++ b/shared/src/test/java/com/vaadin/shared/util/SharedUtilTest.java @@ -0,0 +1,121 @@ +package com.vaadin.shared.util; + +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertThat; + +import java.util.Locale; + +import org.junit.Assert; +import org.junit.Test; + +public class SharedUtilTest { + + @Test + public void trailingSlashIsTrimmed() { + assertThat(SharedUtil.trimTrailingSlashes("/path/"), is("/path")); + } + + @Test + public void noTrailingSlashForTrimming() { + assertThat(SharedUtil.trimTrailingSlashes("/path"), is("/path")); + } + + @Test + public void trailingSlashesAreTrimmed() { + assertThat(SharedUtil.trimTrailingSlashes("/path///"), is("/path")); + } + + @Test + public void emptyStringIsHandled() { + assertThat(SharedUtil.trimTrailingSlashes(""), is("")); + } + + @Test + public void rootSlashIsTrimmed() { + assertThat(SharedUtil.trimTrailingSlashes("/"), is("")); + } + + @Test + public void camelCaseToHumanReadable() { + Assert.assertEquals("First Name", + SharedUtil.camelCaseToHumanFriendly("firstName")); + Assert.assertEquals("First Name", + SharedUtil.camelCaseToHumanFriendly("first name")); + Assert.assertEquals("First Name2", + SharedUtil.camelCaseToHumanFriendly("firstName2")); + Assert.assertEquals("First", + SharedUtil.camelCaseToHumanFriendly("first")); + Assert.assertEquals("First", + SharedUtil.camelCaseToHumanFriendly("First")); + Assert.assertEquals("Some XYZ Abbreviation", + SharedUtil.camelCaseToHumanFriendly("SomeXYZAbbreviation")); + + // Javadoc examples + Assert.assertEquals("My Bean Container", + SharedUtil.camelCaseToHumanFriendly("MyBeanContainer")); + Assert.assertEquals("Awesome URL Factory", + SharedUtil.camelCaseToHumanFriendly("AwesomeURLFactory")); + Assert.assertEquals("Some Uri Action", + SharedUtil.camelCaseToHumanFriendly("SomeUriAction")); + + } + + @Test + public void splitCamelCase() { + assertCamelCaseSplit("firstName", "first", "Name"); + assertCamelCaseSplit("fooBar", "foo", "Bar"); + assertCamelCaseSplit("fooBar", "foo", "Bar"); + assertCamelCaseSplit("fBar", "f", "Bar"); + assertCamelCaseSplit("FBar", "F", "Bar"); + assertCamelCaseSplit("MYCdi", "MY", "Cdi"); + assertCamelCaseSplit("MyCDIUI", "My", "CDIUI"); + assertCamelCaseSplit("MyCDIUITwo", "My", "CDIUI", "Two"); + assertCamelCaseSplit("first name", "first", "name"); + + } + + private void assertCamelCaseSplit(String camelCaseString, String... parts) { + String[] splitParts = SharedUtil.splitCamelCase(camelCaseString); + Assert.assertArrayEquals(parts, splitParts); + } + + @Test + public void join() { + String s1 = "foo-bar-baz"; + String s2 = "foo--bar"; + + Assert.assertEquals("foobarbaz", SharedUtil.join(s1.split("-"), "")); + Assert.assertEquals("foo!bar!baz", SharedUtil.join(s1.split("-"), "!")); + Assert.assertEquals("foo!!bar!!baz", + SharedUtil.join(s1.split("-"), "!!")); + + Assert.assertEquals("foo##bar", SharedUtil.join(s2.split("-"), "#")); + } + + @Test + public void dashSeparatedToCamelCase() { + Assert.assertEquals(null, SharedUtil.dashSeparatedToCamelCase(null)); + Assert.assertEquals("", SharedUtil.dashSeparatedToCamelCase("")); + Assert.assertEquals("foo", SharedUtil.dashSeparatedToCamelCase("foo")); + Assert.assertEquals("fooBar", + SharedUtil.dashSeparatedToCamelCase("foo-bar")); + Assert.assertEquals("fooBar", + SharedUtil.dashSeparatedToCamelCase("foo--bar")); + Assert.assertEquals("fooBarBaz", + SharedUtil.dashSeparatedToCamelCase("foo-bar-baz")); + Assert.assertEquals("fooBarBaz", + SharedUtil.dashSeparatedToCamelCase("foo-Bar-Baz")); + } + + @Test + public void methodUppercaseWithTurkishLocale() { + Locale defaultLocale = Locale.getDefault(); + try { + Locale.setDefault(new Locale("tr", "TR")); + Assert.assertEquals("Integer", SharedUtil.capitalize("integer")); + } finally { + Locale.setDefault(defaultLocale); + } + } + +} diff --git a/shared/src/test/java/com/vaadin/shared/util/SharedUtilTests.java b/shared/src/test/java/com/vaadin/shared/util/SharedUtilTests.java deleted file mode 100644 index e77501a446..0000000000 --- a/shared/src/test/java/com/vaadin/shared/util/SharedUtilTests.java +++ /dev/null @@ -1,121 +0,0 @@ -package com.vaadin.shared.util; - -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; - -import java.util.Locale; - -import org.junit.Assert; -import org.junit.Test; - -public class SharedUtilTests { - - @Test - public void trailingSlashIsTrimmed() { - assertThat(SharedUtil.trimTrailingSlashes("/path/"), is("/path")); - } - - @Test - public void noTrailingSlashForTrimming() { - assertThat(SharedUtil.trimTrailingSlashes("/path"), is("/path")); - } - - @Test - public void trailingSlashesAreTrimmed() { - assertThat(SharedUtil.trimTrailingSlashes("/path///"), is("/path")); - } - - @Test - public void emptyStringIsHandled() { - assertThat(SharedUtil.trimTrailingSlashes(""), is("")); - } - - @Test - public void rootSlashIsTrimmed() { - assertThat(SharedUtil.trimTrailingSlashes("/"), is("")); - } - - @Test - public void camelCaseToHumanReadable() { - Assert.assertEquals("First Name", - SharedUtil.camelCaseToHumanFriendly("firstName")); - Assert.assertEquals("First Name", - SharedUtil.camelCaseToHumanFriendly("first name")); - Assert.assertEquals("First Name2", - SharedUtil.camelCaseToHumanFriendly("firstName2")); - Assert.assertEquals("First", - SharedUtil.camelCaseToHumanFriendly("first")); - Assert.assertEquals("First", - SharedUtil.camelCaseToHumanFriendly("First")); - Assert.assertEquals("Some XYZ Abbreviation", - SharedUtil.camelCaseToHumanFriendly("SomeXYZAbbreviation")); - - // Javadoc examples - Assert.assertEquals("My Bean Container", - SharedUtil.camelCaseToHumanFriendly("MyBeanContainer")); - Assert.assertEquals("Awesome URL Factory", - SharedUtil.camelCaseToHumanFriendly("AwesomeURLFactory")); - Assert.assertEquals("Some Uri Action", - SharedUtil.camelCaseToHumanFriendly("SomeUriAction")); - - } - - @Test - public void splitCamelCase() { - assertCamelCaseSplit("firstName", "first", "Name"); - assertCamelCaseSplit("fooBar", "foo", "Bar"); - assertCamelCaseSplit("fooBar", "foo", "Bar"); - assertCamelCaseSplit("fBar", "f", "Bar"); - assertCamelCaseSplit("FBar", "F", "Bar"); - assertCamelCaseSplit("MYCdi", "MY", "Cdi"); - assertCamelCaseSplit("MyCDIUI", "My", "CDIUI"); - assertCamelCaseSplit("MyCDIUITwo", "My", "CDIUI", "Two"); - assertCamelCaseSplit("first name", "first", "name"); - - } - - private void assertCamelCaseSplit(String camelCaseString, String... parts) { - String[] splitParts = SharedUtil.splitCamelCase(camelCaseString); - Assert.assertArrayEquals(parts, splitParts); - } - - @Test - public void join() { - String s1 = "foo-bar-baz"; - String s2 = "foo--bar"; - - Assert.assertEquals("foobarbaz", SharedUtil.join(s1.split("-"), "")); - Assert.assertEquals("foo!bar!baz", SharedUtil.join(s1.split("-"), "!")); - Assert.assertEquals("foo!!bar!!baz", - SharedUtil.join(s1.split("-"), "!!")); - - Assert.assertEquals("foo##bar", SharedUtil.join(s2.split("-"), "#")); - } - - @Test - public void dashSeparatedToCamelCase() { - Assert.assertEquals(null, SharedUtil.dashSeparatedToCamelCase(null)); - Assert.assertEquals("", SharedUtil.dashSeparatedToCamelCase("")); - Assert.assertEquals("foo", SharedUtil.dashSeparatedToCamelCase("foo")); - Assert.assertEquals("fooBar", - SharedUtil.dashSeparatedToCamelCase("foo-bar")); - Assert.assertEquals("fooBar", - SharedUtil.dashSeparatedToCamelCase("foo--bar")); - Assert.assertEquals("fooBarBaz", - SharedUtil.dashSeparatedToCamelCase("foo-bar-baz")); - Assert.assertEquals("fooBarBaz", - SharedUtil.dashSeparatedToCamelCase("foo-Bar-Baz")); - } - - @Test - public void methodUppercaseWithTurkishLocale() { - Locale defaultLocale = Locale.getDefault(); - try { - Locale.setDefault(new Locale("tr", "TR")); - Assert.assertEquals("Integer", SharedUtil.capitalize("integer")); - } finally { - Locale.setDefault(defaultLocale); - } - } - -} -- cgit v1.2.3