Fix invalid test cases

AhyoungRyu · AhyoungRyu · commit 8fe33c4869bc · 2017-01-23T12:18:56.000+09:00
diff --git a/shell/src/test/java/org/apache/zeppelin/shell/ShellInterpreterTest.java b/shell/src/test/java/org/apache/zeppelin/shell/ShellInterpreterTest.java
@@ -22,7 +22,6 @@
 
 import java.util.Properties;
 
-import org.apache.commons.exec.ExecuteException;
 import org.apache.zeppelin.interpreter.InterpreterContext;
 import org.apache.zeppelin.interpreter.InterpreterResult;
 import org.apache.zeppelin.interpreter.InterpreterResult.Code;
@@ -33,13 +32,16 @@
 public class ShellInterpreterTest {
 
   private ShellInterpreter shell;
+  private InterpreterContext context;
+  private InterpreterResult result;
 
   @Before
   public void setUp() throws Exception {
     Properties p = new Properties();
     p.setProperty("shell.command.timeout.millisecs", "60000");
     shell = new ShellInterpreter(p);
 
+    context = new InterpreterContext("", "1", null, "", "", null, null, null, null, null, null, null);
     shell.open();
   }
 
@@ -49,8 +51,6 @@ public void tearDown() throws Exception {
 
   @Test
   public void test() {
-    InterpreterContext context = new InterpreterContext("", "1", null, "", "", null, null, null, null, null, null, null);
-    InterpreterResult result;
     if (System.getProperty("os.name").startsWith("Windows")) {
       result = shell.interpret("dir", context);
     } else {
@@ -65,29 +65,23 @@ public void test() {
 
   @Test
   public void testInvalidCommand(){
-    InterpreterContext context = new InterpreterContext("", "1", null, "", "", null, null, null, null, null, null, null);
-    InterpreterResult result;
     if (System.getProperty("os.name").startsWith("Windows")) {
       result = shell.interpret("invalid_command\ndir", context);
     } else {
       result = shell.interpret("invalid_command\nls", context);
     }
-    assertEquals(InterpreterResult.Code.SUCCESS, result.code());
-    assertTrue(result.message().get(0).getData().contains("invalid_command"));
+    assertEquals(Code.SUCCESS, result.code());
+    assertTrue(shell.executors.isEmpty());
   }
 
   @Test
   public void testShellTimeout() {
-    InterpreterContext context = new InterpreterContext("", "1", null, "", "", null, null, null, null, null, null, null);
-    InterpreterResult result;
-
     if (System.getProperty("os.name").startsWith("Windows")) {
       result = shell.interpret("timeout 61", context);
     } else {
       result = shell.interpret("sleep 61", context);
     }
 
-    assertEquals(InterpreterResult.Code.SUCCESS, result.code());
     assertEquals(Code.INCOMPLETE, result.code());
     assertTrue(result.message().get(0).getData().contains("Paragraph received a SIGTERM"));
   }
