1 files changed, 7 insertions, 30 deletions
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/AccessLogRequestLogTest.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/AccessLogRequestLogTest.java
index 1048d7b6422..d5043f7b989 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/AccessLogRequestLogTest.java
+++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/AccessLogRequestLogTest.java
@@ -15,11 +15,12 @@ import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
+import static org.testng.Assert.assertTrue;
 
 /**
- * @author bakksjo
+ * @author Oyvind Bakksjo
+ * @author bjorncs
  */
-@SuppressWarnings("deprecation") // AccessLogEntry.setURI/getURI are deprecated
 public class AccessLogRequestLogTest {
     @Test
     public void requireThatQueryWithUnquotedSpecialCharactersIsHandled() {
@@ -30,7 +31,8 @@ public class AccessLogRequestLogTest {
 
         AccessLogRequestLog.populateAccessLogEntryFromHttpServletRequest(httpServletRequest, accessLogEntry);
 
-        assertThat(accessLogEntry.getURI(), is(not(nullValue())));
+        assertThat(accessLogEntry.getRawPath(), is(not(nullValue())));
+        assertTrue(accessLogEntry.getRawQuery().isPresent());
     }
 
     @Test
@@ -44,37 +46,12 @@ public class AccessLogRequestLogTest {
 
         AccessLogRequestLog.populateAccessLogEntryFromHttpServletRequest(httpServletRequest, accessLogEntry);
 
-        assertThat(accessLogEntry.getURI().toString(), is(path + '?' + query));
+        assertThat(accessLogEntry.getRawPath(), is(path));
+        assertThat(accessLogEntry.getRawQuery().get(), is(query));
 
     }
 
     @Test
-    public void requireThatNoQueryPartIsHandledWhenRequestIsMalformed() {
-        final HttpServletRequest httpServletRequest = mock(HttpServletRequest.class);
-        final String path = "/s>earch/";
-        when(httpServletRequest.getRequestURI()).thenReturn(path);
-        final String query = null;
-        when(httpServletRequest.getQueryString()).thenReturn(query);
-        final AccessLogEntry accessLogEntry = new AccessLogEntry();
-
-        AccessLogRequestLog.populateAccessLogEntryFromHttpServletRequest(httpServletRequest, accessLogEntry);
-
-        assertThat(accessLogEntry.getURI().toString(), is("/s%3Eearch/"));
-
-    }
-
-    @Test
-    public void invalid_percent_escape_patterns_in_query_string_are_escaped() {
-        HttpServletRequest httpServletRequest = mock(HttpServletRequest.class);
-        when(httpServletRequest.getRequestURI()).thenReturn("/search/");
-        when(httpServletRequest.getQueryString()).thenReturn("q=%%2");
-
-        AccessLogEntry accessLogEntry = new AccessLogEntry();
-        AccessLogRequestLog.populateAccessLogEntryFromHttpServletRequest(httpServletRequest, accessLogEntry);
-        assertThat(accessLogEntry.getURI().toString(), is("/search/?q=%25%252"));
-    }
-
-    @Test
     public void raw_path_and_query_are_set_from_request() {
         HttpServletRequest httpServletRequest = mock(HttpServletRequest.class);
         String rawPath = "//search/";