Fixed trailing slash trimming in VaadinPortletService.

Change-Id: Ia9f6230219adfb1fcb29b88ad819e3209770e1fc

4 files changed, 56 insertions, 3 deletions

diff --git a/shared/build.xml b/shared/build.xml
index 73a0a8df7f..966d250d66 100644
--- a/shared/build.xml
+++ b/shared/build.xml
@@ -15,7 +15,7 @@
     <property name="src.filtered" location="${result.dir}/filtered-src" />
     <property name="src" location="${src.filtered}" />
     <path id="classpath.compile.custom" />
-
+    <path id="classpath.test.custom" />
 
     <target name="jar">
         <property name="shared.osgi.import" value="org.json;version=&quot;0.0.20080701&quot;, com.google.gwt.thirdparty.guava.common.annotations;version=&quot;10.0.1.rebased&quot;, com.google.gwt.thirdparty.guava.common.base;version=&quot;10.0.1.rebased&quot;, com.google.gwt.thirdparty.guava.common.base.internal;version=&quot;10.0.1.rebased&quot;, com.google.gwt.thirdparty.guava.common.cache;version=&quot;10.0.1.rebased&quot;, com.google.gwt.thirdparty.guava.common.collect;version=&quot;10.0.1.rebased&quot;, com.google.gwt.thirdparty.guava.common.eventbus;version=&quot;10.0.1.rebased&quot;, com.google.gwt.thirdparty.guava.common.io;version=&quot;10.0.1.rebased&quot;, com.google.gwt.thirdparty.guava.common.net;version=&quot;10.0.1.rebased&quot;, com.google.gwt.thirdparty.guava.common.primitives;version=&quot;10.0.1.rebased&quot;, com.google.gwt.thirdparty.guava.common.util.concurrent;version=&quot;10.0.1.rebased&quot;, com.google.gwt.thirdparty.streamhtmlparser;version=&quot;0.1.5.r10-rebased&quot;, com.google.gwt.thirdparty.streamhtmlparser.impl;version=&quot;0.1.5.r10-rebased&quot;, com.google.gwt.thirdparty.streamhtmlparser.util;version=&quot;0.1.5.r10-rebased&quot;, org.w3c.flute.parser;version=&quot;1.3.0.gg2&quot;, org.w3c.flute.parser.selectors;version=&quot;1.3.0.gg2&quot;, org.w3c.flute.util;version=&quot;1.3.0.gg2&quot;" />
@@ -57,8 +57,7 @@
     </target>
 
     <target name="test" depends="checkstyle">
-        <!--<antcall target="common.test.run" /> -->
-        <echo>WHAT? No tests for ${module.name}!</echo>
+        <antcall target="common.test.run" />
     </target>
 
 </project>
diff --git a/shared/ivy.xml b/shared/ivy.xml
index 3b044e9ab4..b4b5878294 100644
--- a/shared/ivy.xml
+++ b/shared/ivy.xml
@@ -22,6 +22,8 @@
     <dependencies>
         <dependency org="com.vaadin" name="vaadin-shared-deps"
             rev="1.0.2" conf="build,ide,test->default" />
+        <dependency org="junit" name="junit" rev="4.11"
+                    conf="test,ide -> default" />
     </dependencies>
 
 </ivy-module>
diff --git a/shared/src/com/vaadin/shared/util/SharedUtil.java b/shared/src/com/vaadin/shared/util/SharedUtil.java
index 80efe68d83..449685705f 100644
--- a/shared/src/com/vaadin/shared/util/SharedUtil.java
+++ b/shared/src/com/vaadin/shared/util/SharedUtil.java
@@ -44,4 +44,13 @@ public class SharedUtil implements Serializable {
         return o1.equals(o2);
     }
 
+    /**
+     * Trims trailing slashes (if any) from a string.
+     * @param value The string value to be trimmed. Cannot be null.
+     * @return String value without trailing slashes.
+     */
+    public static String trimTrailingSlashes(String value) {
+        return value.replaceAll("/*$", "");
+    }
+
 }
diff --git a/shared/tests/src/com/vaadin/shared/util/SharedUtilTests.java b/shared/tests/src/com/vaadin/shared/util/SharedUtilTests.java
new file mode 100644
index 0000000000..b593032bd6
--- /dev/null
+++ b/shared/tests/src/com/vaadin/shared/util/SharedUtilTests.java
@@ -0,0 +1,43 @@
+package com.vaadin.shared.util;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+public class SharedUtilTests {
+
+    private SharedUtil sut;
+
+    @Before
+    public void setup() {
+        sut = new SharedUtil();
+    }
+
+    @Test
+    public void trailingSlashIsTrimmed() {
+        assertThat(sut.trimTrailingSlashes("/path/"), is("/path"));
+    }
+
+    @Test
+    public void noTrailingSlashForTrimming() {
+        assertThat(sut.trimTrailingSlashes("/path"), is("/path"));
+    }
+
+    @Test
+    public void trailingSlashesAreTrimmed() {
+        assertThat(sut.trimTrailingSlashes("/path///"), is("/path"));
+    }
+
+    @Test
+    public void emptyStringIsHandled() {
+        assertThat(sut.trimTrailingSlashes(""), is(""));
+    }
+
+    @Test
+    public void rootSlashIsTrimmed() {
+        assertThat(sut.trimTrailingSlashes("/"), is(""));
+    }
+
+}