From a8d0ccce7ec14b1d49fe57857fad4b200d9da61e Mon Sep 17 00:00:00 2001 From: gyowoo1113 Date: Fri, 17 Jul 2026 22:25:28 +0900 Subject: [PATCH] [ZEPPELIN-6435] Remove frontend build dependency from IndexHtmlServletTest --- .../zeppelin/server/IndexHtmlServletTest.java | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/server/IndexHtmlServletTest.java b/zeppelin-server/src/test/java/org/apache/zeppelin/server/IndexHtmlServletTest.java index 22af77db147..69885f7a41f 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/server/IndexHtmlServletTest.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/server/IndexHtmlServletTest.java @@ -25,11 +25,12 @@ import java.io.IOException; import java.io.PrintWriter; import java.net.URL; - +import java.nio.file.Files; +import java.nio.file.Path; import org.apache.zeppelin.conf.ZeppelinConfiguration; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; import jakarta.servlet.ServletConfig; import jakarta.servlet.ServletContext; @@ -43,8 +44,9 @@ class IndexHtmlServletTest { private final static String TEST_HEAD_ADDON = ""; private final static String FILE_PATH_INDEX_HTML_ZEPPELIN_WEB = "../zeppelin-web/dist/index.html"; - private final static String FILE_PATH_INDEX_HTML_ZEPPELIN_WEB_ANGULAR = "../zeppelin-web-angular/dist/zeppelin/index.html"; - + + @TempDir + Path tempDir; @Test void testZeppelinWebHtmlAddon() throws IOException, ServletException { @@ -80,16 +82,24 @@ void testZeppelinWebHtmlAddon() throws IOException, ServletException { } @Test - @Disabled("ignored due to zeppelin-web-angular not build for core tests") void testZeppelinWebAngularHtmlAddon() throws IOException, ServletException { ZeppelinConfiguration zConf = mock(ZeppelinConfiguration.class); when(zConf.getHtmlBodyAddon()).thenReturn(TEST_BODY_ADDON); when(zConf.getHtmlHeadAddon()).thenReturn(TEST_HEAD_ADDON); + Path indexHtml = tempDir.resolve("index.html"); + Files.writeString( + indexHtml, + "\n" + + "\n" + + " Zeppelin\n" + + " \n" + + "\n"); + ServletConfig sc = mock(ServletConfig.class); ServletContext ctx = mock(ServletContext.class); when(ctx.getResource("/index.html")) - .thenReturn(new URL("file:" + FILE_PATH_INDEX_HTML_ZEPPELIN_WEB_ANGULAR)); + .thenReturn(indexHtml.toUri().toURL()); when(sc.getServletContext()).thenReturn(ctx); IndexHtmlServlet servlet = new IndexHtmlServlet(zConf, null); @@ -106,8 +116,7 @@ void testZeppelinWebAngularHtmlAddon() throws IOException, ServletException { // Get Content String content = new String(out.toString()); - assertThat(content, containsString(TEST_BODY_ADDON)); - assertThat(content, containsString(TEST_HEAD_ADDON)); - + assertThat(content, containsString(TEST_HEAD_ADDON + "")); + assertThat(content, containsString(TEST_BODY_ADDON + "")); } }