Skip to content

[ZEPPELIN-6435] Remove frontend build dependency from IndexHtmlServletTest #5314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gyowoo1113 wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −9
Open

[ZEPPELIN-6435] Remove frontend build dependency from IndexHtmlServletTest #5314

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 18 additions & 9 deletions zeppelin-server/src/test/java/org/apache/zeppelin/server/IndexHtmlServletTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -43,8 +44,9 @@ class IndexHtmlServletTest {
private final static String TEST_HEAD_ADDON = "<!-- bar -->";

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 {
Expand Down Expand Up @@ -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,
"<!doctype html>\n"
+ "<html>\n"
+ " <head><title>Zeppelin</title></head>\n"
+ " <body><zeppelin-root></zeppelin-root></body>\n"
+ "</html>\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);
Expand All @@ -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 + "</head>"));
assertThat(content, containsString(TEST_BODY_ADDON + "</body>"));
}
}
Loading