add more test

zjffdu · zjffdu · commit fee61f9b6d12 · 2016-10-17T10:35:37.000+08:00
diff --git a/livy/src/main/java/org/apache/zeppelin/livy/LivyHelper.java b/livy/src/main/java/org/apache/zeppelin/livy/LivyHelper.java
@@ -321,6 +321,7 @@ private Map getStatusById(InterpreterContext context,
             + userSessionMap.get(context.getAuthenticationInfo().getUser())
             + "/statements/" + id,
         "GET", null, context.getParagraphId());
+    LOGGER.debug("statement {} response: {}", id, json);
     try {
       Map jsonMap = gson.fromJson(json,
           new TypeToken<Map>() {
diff --git a/livy/src/test/java/org/apache/zeppelin/livy/LivyHelperTest.java b/livy/src/test/java/org/apache/zeppelin/livy/LivyHelperTest.java
@@ -28,6 +28,7 @@
 import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
+import org.slf4j.LoggerFactory;
 
 import java.util.HashMap;
 import java.util.Properties;
@@ -63,7 +64,7 @@ public void prepareContext() throws Exception {
     livyHelper.property = properties;
     livyHelper.paragraphHttpMap = new HashMap<>();
     livyHelper.gson = new GsonBuilder().setPrettyPrinting().create();
-
+    livyHelper.LOGGER = LoggerFactory.getLogger(LivyHelper.class);
 
     doReturn("{\"id\":1,\"state\":\"idle\",\"kind\":\"spark\",\"proxyUser\":\"null\",\"log\":[]}")
         .when(livyHelper)
@@ -80,7 +81,7 @@ public void prepareContext() throws Exception {
         .executeHTTP(
             livyHelper.property.getProperty("zeppelin.livy.url") + "/sessions/1/statements",
             "POST",
-            "{\"code\": \"print(1)\" }",
+            "{\"code\": \"print(1)\"}",
             null
         );
 
diff --git a/livy/src/test/java/org/apache/zeppelin/livy/LivyIntegrationTest.java b/livy/src/test/java/org/apache/zeppelin/livy/LivyIntegrationTest.java
@@ -32,6 +32,7 @@
 import java.util.Properties;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 public class LivyIntegrationTest {
@@ -117,6 +118,53 @@ public void testSparkInterpreter() {
     assertEquals(InterpreterResult.Type.TABLE, result.type());
     // TODO (zjffdu), \t at the end of each line is not necessary, it is a bug of LivySparkSQLInterpreter
     assertEquals("_1\t_2\t\nhello\t20\t\n", result.message());
+
+    // single line comment
+    outputListener.reset();
+    String singleLineComment = "// my comment";
+    result = sparkInterpreter.interpret(singleLineComment, context);
+    assertEquals(InterpreterResult.Code.SUCCESS, result.code());
+    assertEquals(InterpreterResult.Type.TEXT, result.type());
+    assertNull(result.message());
+
+    // multiple line comment
+    outputListener.reset();
+    String multipleLineComment = "/* multiple \n" + "line \n" + "comment */";
+    result = sparkInterpreter.interpret(multipleLineComment, context);
+    assertEquals(InterpreterResult.Code.SUCCESS, result.code());
+    assertEquals(InterpreterResult.Type.TEXT, result.type());
+    assertNull(result.message());
+
+    // multi-line string
+    outputListener.reset();
+    String multiLineString = "val str = \"\"\"multiple\n" +
+            "line\"\"\"\n" +
+            "println(str)";
+    result = sparkInterpreter.interpret(multiLineString, context);
+    assertEquals(InterpreterResult.Code.SUCCESS, result.code());
+    assertEquals(InterpreterResult.Type.TEXT, result.type());
+    assertNull(result.message());
+    assertTrue(outputListener.getOutputAppended().contains("multiple\nline"));
+
+    // case class
+    outputListener.reset();
+    String caseClassCode = "case class Person(id:Int, \n" +
+            "name:String)\n" +
+            "val p=Person(1, \"name_a\")";
+    result = sparkInterpreter.interpret(caseClassCode, context);
+    assertEquals(InterpreterResult.Code.SUCCESS, result.code());
+    assertEquals(InterpreterResult.Type.TEXT, result.type());
+    assertNull(result.message());
+    assertTrue(outputListener.getOutputAppended().contains("defined class Person"));
+
+    // object class
+    outputListener.reset();
+    String objectClassCode = "object Person {}";
+    result = sparkInterpreter.interpret(objectClassCode, context);
+    assertEquals(InterpreterResult.Code.SUCCESS, result.code());
+    assertEquals(InterpreterResult.Type.TEXT, result.type());
+    assertNull(result.message());
+    assertTrue(outputListener.getOutputAppended().contains("defined module Person"));
   }
 
   @Test
diff --git a/livy/src/test/resources/log4j.properties b/livy/src/test/resources/log4j.properties
@@ -20,3 +20,5 @@ log4j.rootLogger = INFO, stdout
 log4j.appender.stdout = org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout = org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%5p [%d] ({%t} %F[%M]:%L) - %m%n
+
+log4j.logger.org.apache.zeppelin.livy=DEBUG
