From efc5fb8fb16cf3105eefa0f0af9aeb7f4eb6dba4 Mon Sep 17 00:00:00 2001 From: Thai Tran Date: Sat, 25 Feb 2023 00:49:24 +0700 Subject: [PATCH] [ZEPPELIN-5884] fix: wrong path of test folder in Java Interpreter (#4569) --- .../zeppelin/java/JavaInterpreterTest.java | 0 .../java/JavaInterpreterUtilsTest.java | 97 +++++++++++++++++++ .../java/JavaInterpreterUtilsTest.java | 95 ------------------ 3 files changed, 97 insertions(+), 95 deletions(-) rename java/src/test/{ => java}/org/apache/zeppelin/java/JavaInterpreterTest.java (100%) create mode 100644 java/src/test/java/org/apache/zeppelin/java/JavaInterpreterUtilsTest.java delete mode 100644 java/src/test/org/apache/zeppelin/java/JavaInterpreterUtilsTest.java 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% rename from java/src/test/org/apache/zeppelin/java/JavaInterpreterTest.java rename to java/src/test/java/org/apache/zeppelin/java/JavaInterpreterTest.java diff --git a/java/src/test/java/org/apache/zeppelin/java/JavaInterpreterUtilsTest.java b/java/src/test/java/org/apache/zeppelin/java/JavaInterpreterUtilsTest.java new file mode 100644 index 00000000000..03f634c5527 --- /dev/null +++ b/java/src/test/java/org/apache/zeppelin/java/JavaInterpreterUtilsTest.java @@ -0,0 +1,97 @@ +/* + * 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 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 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()); + } + +} 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 798152be83b..00000000000 --- 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 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 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()); - } - -}