diff --git service/src/test/org/apache/hive/service/server/TestHS2HttpServer.java service/src/test/org/apache/hive/service/server/TestHS2HttpServer.java index 663a26689478a578962e37d4509192350d0f6b85..8a1f129470f0deb8ec5121294ec7e33afb337efa 100644 --- service/src/test/org/apache/hive/service/server/TestHS2HttpServer.java +++ service/src/test/org/apache/hive/service/server/TestHS2HttpServer.java @@ -90,7 +90,7 @@ public void testStackServlet() throws Exception { @Test public void testContextRootUrlRewrite() throws Exception { - String datePattern = "[a-zA-Z]{3} [a-zA-Z]{3} [0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]+\\[[0-9]+]"; + String datePattern = "[a-zA-Z]{3} [a-zA-Z]{3} [0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}"; String dateMask = "xxxMasked_DateTime_xxx"; String baseURL = "http://localhost:" + webUIPort + "/"; String contextRootContent = getURLResponseAsString(baseURL); @@ -98,8 +98,9 @@ public void testContextRootUrlRewrite() throws Exception { String jspUrl = "http://localhost:" + webUIPort + "/hiveserver2.jsp"; String jspContent = getURLResponseAsString(jspUrl); - Assert.assertEquals(contextRootContent.replaceAll(datePattern, dateMask), - jspContent.replaceAll(datePattern, dateMask)); + String expected = contextRootContent.replaceAll(datePattern, dateMask); + String actual = jspContent.replaceAll(datePattern, dateMask); + Assert.assertEquals(expected, actual); } @Test