opendev/gerrit
Code Issues Proposed changes

RequestUtilTest: Convert to use Google Truth

Browse Source 
Change-Id: Ib6d4cbded2ce2c9d731ff9621ed69dc7c136265d
This commit is contained in:
David Pursehouse
2015-06-03 14:49:16 +09:00
parent 572fdc6f7f
commit c3f35e61b8
2 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gerrit-util-http/BUCK
View File

@@ -12,6 +12,7 @@ java_test(
':http', ':http',
'//lib:junit', '//lib:junit',
'//lib:servlet-api-3_1', '//lib:servlet-api-3_1',
'//lib:truth',
'//lib/easymock:easymock', '//lib/easymock:easymock',
], ],
source_under_test = [':http'], source_under_test = [':http'],

38
gerrit-util-http/src/test/java/com/google/gerrit/util/http/RequestUtilTest.java
View File

@@ -14,11 +14,11 @@
package com.google.gerrit.util.http; package com.google.gerrit.util.http;
import static com.google.common.truth.Truth.assertThat;
import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.replay;
import static org.easymock.EasyMock.verify; import static org.easymock.EasyMock.verify;
import static org.junit.Assert.assertEquals;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
@@ -47,36 +47,36 @@ public class RequestUtilTest {
@Test @Test
public void emptyContextPath() { public void emptyContextPath() {
assertEquals("/foo/bar", RequestUtil.getEncodedPathInfo( assertThat(RequestUtil.getEncodedPathInfo(
mockRequest("/s/foo/bar", "", "/s"))); mockRequest("/s/foo/bar", "", "/s"))).isEqualTo("/foo/bar");
assertEquals("/foo%2Fbar", RequestUtil.getEncodedPathInfo( assertThat(RequestUtil.getEncodedPathInfo(
mockRequest("/s/foo%2Fbar", "", "/s"))); mockRequest("/s/foo%2Fbar", "", "/s"))).isEqualTo("/foo%2Fbar");
} }
@Test @Test
public void emptyServletPath() { public void emptyServletPath() {
assertEquals("/foo/bar", RequestUtil.getEncodedPathInfo( assertThat(RequestUtil.getEncodedPathInfo(
mockRequest("/c/foo/bar", "/c", ""))); mockRequest("/c/foo/bar", "", "/c"))).isEqualTo("/foo/bar");
assertEquals("/foo%2Fbar", RequestUtil.getEncodedPathInfo( assertThat(RequestUtil.getEncodedPathInfo(
mockRequest("/c/foo%2Fbar", "/c", ""))); mockRequest("/c/foo%2Fbar", "", "/c"))).isEqualTo("/foo%2Fbar");
} }
@Test @Test
public void trailingSlashes() { public void trailingSlashes() {
assertEquals("/foo/bar/", RequestUtil.getEncodedPathInfo( assertThat(RequestUtil.getEncodedPathInfo(
mockRequest("/c/s/foo/bar/", "/c", "/s"))); mockRequest("/c/s/foo/bar/", "/c", "/s"))).isEqualTo("/foo/bar/");
assertEquals("/foo/bar/", RequestUtil.getEncodedPathInfo( assertThat(RequestUtil.getEncodedPathInfo(
mockRequest("/c/s/foo/bar///", "/c", "/s"))); mockRequest("/c/s/foo/bar///", "/c", "/s"))).isEqualTo("/foo/bar/");
assertEquals("/foo%2Fbar/", RequestUtil.getEncodedPathInfo( assertThat(RequestUtil.getEncodedPathInfo(
mockRequest("/c/s/foo%2Fbar/", "/c", "/s"))); mockRequest("/c/s/foo%2Fbar/", "/c", "/s"))).isEqualTo("/foo%2Fbar/");
assertEquals("/foo%2Fbar/", RequestUtil.getEncodedPathInfo( assertThat(RequestUtil.getEncodedPathInfo(
mockRequest("/c/s/foo%2Fbar///", "/c", "/s"))); mockRequest("/c/s/foo%2Fbar///", "/c", "/s"))).isEqualTo("/foo%2Fbar/");
} }
@Test @Test
public void servletPathMatchesRequestPath() { public void servletPathMatchesRequestPath() {
assertEquals(null, RequestUtil.getEncodedPathInfo( assertThat(RequestUtil.getEncodedPathInfo(
mockRequest("/c/s", "/c", "/s"))); mockRequest("/c/s", "/c", "/s"))).isNull();
} }
private HttpServletRequest mockRequest(String uri, String contextPath, String servletPath) { private HttpServletRequest mockRequest(String uri, String contextPath, String servletPath) {