Alexander Wels has uploaded a new change for review. Change subject: userportal,webadmin: Fix failing unit tests ......................................................................
userportal,webadmin: Fix failing unit tests - Fixed failing unit tests when the environment doesn't have ENGINE_ETC defined. Change-Id: I8ad20a52daa459188e15e512bb78c97a07364cbc Signed-off-by: Alexander Wels <[email protected]> --- M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/BrandingServlet.java M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GwtDynamicHostPageServlet.java M frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/server/gwt/AbstractGwtDynamicHostPageServletTest.java M frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/server/gwt/BrandingServletTest.java 4 files changed, 16 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/75/15575/1 diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/BrandingServlet.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/BrandingServlet.java index 0996c53..afa9b6e 100644 --- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/BrandingServlet.java +++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/BrandingServlet.java @@ -45,6 +45,14 @@ setBrandingManager(new BrandingManager()); } + /** + * Init with passed in etcDir location. + * @param etcDir The etc directory. + */ + public void init(final File etcDir) { + setBrandingManager(new BrandingManager(etcDir)); + } + @Override public void doGet(final HttpServletRequest request, final HttpServletResponse response) throws IOException, diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GwtDynamicHostPageServlet.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GwtDynamicHostPageServlet.java index 7a4e7eb..5ca440e 100644 --- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GwtDynamicHostPageServlet.java +++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GwtDynamicHostPageServlet.java @@ -96,7 +96,9 @@ @Override public void init() { this.mapper = new ObjectMapper(); - setBrandingManager(new BrandingManager()); + if (brandingManager == null) { + setBrandingManager(new BrandingManager()); + } } @Override diff --git a/frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/server/gwt/AbstractGwtDynamicHostPageServletTest.java b/frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/server/gwt/AbstractGwtDynamicHostPageServletTest.java index fcc8178..ee89642 100644 --- a/frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/server/gwt/AbstractGwtDynamicHostPageServletTest.java +++ b/frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/server/gwt/AbstractGwtDynamicHostPageServletTest.java @@ -99,8 +99,8 @@ protected void setUpTestServlet() throws NoSuchAlgorithmException { testServlet = getTestServletSpy(); testServlet.setBackend(mockBackend); - testServlet.init(); testServlet.setBrandingManager(mockBrandingManager); + testServlet.init(); doReturn(mockDigest).when(testServlet).createMd5Digest(); } diff --git a/frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/server/gwt/BrandingServletTest.java b/frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/server/gwt/BrandingServletTest.java index e6dd177..0d0139d 100644 --- a/frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/server/gwt/BrandingServletTest.java +++ b/frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/server/gwt/BrandingServletTest.java @@ -45,8 +45,11 @@ @Before public void setUp() throws Exception { + File etcDir = new File(this.getClass().getClassLoader(). + getResource("./org/ovirt/engine/ui/frontend/server/gwt") //$NON-NLS-1$ + .getFile()); testServlet = new BrandingServlet(); - testServlet.init(); + testServlet.init(etcDir); testServlet.setBrandingManager(mockBrandingManager); when(mockBrandingManager.getBrandingRootPath()).thenReturn(mockFile); when(mockFile.getAbsolutePath()).thenReturn("/abs/test"); //$NON-NLS-1$ -- To view, visit http://gerrit.ovirt.org/15575 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8ad20a52daa459188e15e512bb78c97a07364cbc Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alexander Wels <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
