This is an automated email from the ASF dual-hosted git repository.
pdallig pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git
The following commit(s) were added to refs/heads/master by this push:
new efc5fb8fb1 [ZEPPELIN-5884] fix: wrong path of test folder in Java
Interpreter (#4569)
efc5fb8fb1 is described below
commit efc5fb8fb16cf3105eefa0f0af9aeb7f4eb6dba4
Author: Thai Tran <tranvant...@users.noreply.github.com>
AuthorDate: Sat Feb 25 00:49:24 2023 +0700
[ZEPPELIN-5884] fix: wrong path of test folder in Java Interpreter (#4569)
---
.../apache/zeppelin/java/JavaInterpreterTest.java | 0
.../zeppelin/java/JavaInterpreterUtilsTest.java} | 60 +++++++-------
.../zeppelin/java/JavaInterpreterUtilsTest.java | 95 ----------------------
3 files changed, 29 insertions(+), 126 deletions(-)
diff --git a/java/src/test/org/apache/zeppelin/java/JavaInterpreterTest.java
b/java/src/test/java/org/apache/zeppelin/java/JavaInterpreterTest.java
similarity index 100%
copy from java/src/test/org/apache/zeppelin/java/JavaInterpreterTest.java
copy to java/src/test/java/org/apache/zeppelin/java/JavaInterpreterTest.java
diff --git a/java/src/test/org/apache/zeppelin/java/JavaInterpreterTest.java
b/java/src/test/java/org/apache/zeppelin/java/JavaInterpreterUtilsTest.java
similarity index 60%
rename from java/src/test/org/apache/zeppelin/java/JavaInterpreterTest.java
rename to
java/src/test/java/org/apache/zeppelin/java/JavaInterpreterUtilsTest.java
index 57dc195b20..03f634c552 100644
--- a/java/src/test/org/apache/zeppelin/java/JavaInterpreterTest.java
+++ b/java/src/test/java/org/apache/zeppelin/java/JavaInterpreterUtilsTest.java
@@ -25,14 +25,18 @@ import org.junit.Test;
import java.io.PrintWriter;
import java.io.StringWriter;
+import java.util.HashMap;
+import java.util.Map;
import java.util.Properties;
import static org.junit.Assert.assertEquals;
-/**
- * JavaInterpreterTest
- */
-public class JavaInterpreterTest {
+public class JavaInterpreterUtilsTest {
+
+ private static final String TABLE_RESULT_1 = "%table\n" +
+ "Word\tCount\n" +
+ "world\t5\n" +
+ "hello\t4";
private static JavaInterpreter java;
private static InterpreterContext context;
@@ -51,49 +55,43 @@ public class JavaInterpreterTest {
}
@Test
- public void testStaticRepl() {
-
- StringWriter writer = new StringWriter();
- PrintWriter out = new PrintWriter(writer);
- out.println("public class HelloWorld {");
- out.println(" public static void main(String args[]) {");
- out.println(" System.out.println(\"This is in another java file\");");
- out.println(" }");
- out.println("}");
- out.close();
+ public void testDisplayTableFromSimpleMapUtil() {
- InterpreterResult res = java.interpret(writer.toString(), context);
+ Map<String, Long> counts = new HashMap<>();
+ counts.put("hello", 4L);
+ counts.put("world", 5L);
- assertEquals(InterpreterResult.Code.SUCCESS, res.code());
- assertEquals(InterpreterResult.Type.TEXT, res.message().get(0).getType());
- }
+ assertEquals(
+ TABLE_RESULT_1,
+ JavaInterpreterUtils.displayTableFromSimpleMap("Word", "Count",
counts)
+ );
- @Test
- public void testStaticReplWithoutMain() {
-
- StringBuffer sourceCode = new StringBuffer();
- sourceCode.append("package org.mdkt;\n");
- sourceCode.append("public class HelloClass {\n");
- sourceCode.append(" public String hello() { return \"hello\"; }");
- sourceCode.append("}");
- InterpreterResult res = java.interpret(sourceCode.toString(), context);
- assertEquals(InterpreterResult.Code.ERROR, res.code());
}
@Test
- public void testStaticReplWithSyntaxError() {
+ public void testStaticReplWithDisplayTableFromSimpleMapUtilReturnTableType()
{
StringWriter writer = new StringWriter();
PrintWriter out = new PrintWriter(writer);
+ out.println("import java.util.HashMap;");
+ out.println("import java.util.Map;");
+ out.println("import org.apache.zeppelin.java.JavaInterpreterUtils;");
out.println("public class HelloWorld {");
out.println(" public static void main(String args[]) {");
- out.println(" System.out.prin(\"This is in another java file\");");
+ out.println(" Map<String, Long> counts = new HashMap<>();");
+ out.println(" counts.put(\"hello\",4L);");
+ out.println(" counts.put(\"world\",5L);");
+ out.println(" System.out.println("
+ + "JavaInterpreterUtils.displayTableFromSimpleMap(\"Word\",
\"Count\", counts)"
+ + ");");
out.println(" }");
out.println("}");
out.close();
+
InterpreterResult res = java.interpret(writer.toString(), context);
- assertEquals(InterpreterResult.Code.ERROR, res.code());
+ assertEquals(InterpreterResult.Code.SUCCESS, res.code());
+ assertEquals(InterpreterResult.Type.TABLE, res.message().get(0).getType());
}
}
diff --git
a/java/src/test/org/apache/zeppelin/java/JavaInterpreterUtilsTest.java
b/java/src/test/org/apache/zeppelin/java/JavaInterpreterUtilsTest.java
deleted file mode 100644
index 798152be83..0000000000
--- a/java/src/test/org/apache/zeppelin/java/JavaInterpreterUtilsTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.zeppelin.java;
-
-import org.apache.zeppelin.interpreter.InterpreterContext;
-import org.apache.zeppelin.interpreter.InterpreterResult;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-import static org.junit.Assert.assertEquals;
-
-public class JavaInterpreterUtilsTest {
-
- private static final String TABLE_RESULT_1 = "%table\n" +
- "Word\tCount\n" +
- "world\t5\n" +
- "hello\t4";
-
- private static JavaInterpreter java;
- private static InterpreterContext context;
-
- @BeforeClass
- public static void setUp() {
- Properties p = new Properties();
- java = new JavaInterpreter(p);
- java.open();
- context = InterpreterContext.builder().build();
- }
-
- @AfterClass
- public static void tearDown() {
- java.close();
- }
-
- @Test
- public void testDisplayTableFromSimpleMapUtil() {
-
- Map<String, Long> counts = new HashMap<>();
- counts.put("hello",4L);
- counts.put("world",5L);
-
- assertEquals(
- TABLE_RESULT_1,
- JavaInterpreterUtils.displayTableFromSimpleMap("Word",
"Count", counts)
- );
-
- }
-
- @Test
- public void
testStaticReplWithDisplayTableFromSimpleMapUtilReturnTableType() {
-
- StringWriter writer = new StringWriter();
- PrintWriter out = new PrintWriter(writer);
- out.println("import java.util.HashMap;");
- out.println("import java.util.Map;");
- out.println("import org.apache.zeppelin.java.JavaInterpreterUtils;");
- out.println("public class HelloWorld {");
- out.println(" public static void main(String args[]) {");
- out.println(" Map<String, Long> counts = new HashMap<>();");
- out.println(" counts.put(\"hello\",4L);");
- out.println(" counts.put(\"world\",5L);");
- out.println("
System.out.println(JavaInterpreterUtils.displayTableFromSimpleMap(\"Word\",
\"Count\", counts));");
- out.println(" }");
- out.println("}");
- out.close();
-
- InterpreterResult res = java.interpret(writer.toString(), context);
-
- assertEquals(InterpreterResult.Code.SUCCESS, res.code());
- assertEquals(InterpreterResult.Type.TABLE,
res.message().get(0).getType());
- }
-
-}
