Vojtech Szocs has uploaded a new change for review. Change subject: root: Fix SplashServletTest ......................................................................
root: Fix SplashServletTest Mocked getServletContext().getContextPath() to return empty string. Change-Id: Ic29f9d89529700a9820240d9a07232c56324818c Signed-off-by: Vojtech Szocs <[email protected]> --- M backend/manager/modules/root/src/test/java/org/ovirt/engine/core/SplashServletTest.java 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/04/15104/1 diff --git a/backend/manager/modules/root/src/test/java/org/ovirt/engine/core/SplashServletTest.java b/backend/manager/modules/root/src/test/java/org/ovirt/engine/core/SplashServletTest.java index 7da9d97..911df13 100644 --- a/backend/manager/modules/root/src/test/java/org/ovirt/engine/core/SplashServletTest.java +++ b/backend/manager/modules/root/src/test/java/org/ovirt/engine/core/SplashServletTest.java @@ -10,6 +10,8 @@ import java.util.Locale; import javax.servlet.RequestDispatcher; +import javax.servlet.ServletConfig; +import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; @@ -36,6 +38,12 @@ @Mock RequestDispatcher mockDispatcher; + @Mock + ServletConfig mockConfig; + + @Mock + ServletContext mockContext; + @Captor ArgumentCaptor<Cookie> cookieCaptor; @@ -43,7 +51,10 @@ @Before public void setUp() throws Exception { + when(mockConfig.getServletContext()).thenReturn(mockContext); + when(mockContext.getContextPath()).thenReturn(""); // Root webapp context path testServlet = new SplashServlet(); + testServlet.init(mockConfig); } @Test -- To view, visit http://gerrit.ovirt.org/15104 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic29f9d89529700a9820240d9a07232c56324818c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Vojtech Szocs <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
