Update to latest change in interpeter constructs

echarles · echarles · commit 2300ebc9163c · 2016-03-08T10:57:29.000+01:00
diff --git a/spark/src/main/java/org/apache/zeppelin/spark/SparkRInterpreter.java b/spark/src/main/java/org/apache/zeppelin/spark/SparkRInterpreter.java
@@ -157,19 +157,22 @@ public List<String> completion(String buf, int cursor) {
   }
 
   private SparkInterpreter getSparkInterpreter() {
-    for (Interpreter intp : getInterpreterGroup()) {
-      if (intp.getClassName().equals(SparkInterpreter.class.getName())) {
-        Interpreter p = intp;
-        while (p instanceof WrappedInterpreter) {
-          if (p instanceof LazyOpenInterpreter) {
-            p.open();
-          }
-          p = ((WrappedInterpreter) p).getInnerInterpreter();
-        }
-        return (SparkInterpreter) p;
+    LazyOpenInterpreter lazy = null;
+    SparkInterpreter spark = null;
+    Interpreter p = getInterpreterInTheSameSessionByClassName(SparkInterpreter.class.getName());
+
+    while (p instanceof WrappedInterpreter) {
+      if (p instanceof LazyOpenInterpreter) {
+        lazy = (LazyOpenInterpreter) p;
       }
+      p = ((WrappedInterpreter) p).getInnerInterpreter();
+    }
+    spark = (SparkInterpreter) p;
+
+    if (lazy != null) {
+      lazy.open();
     }
-    return null;
+    return spark;
   }
 
   protected static ZeppelinRFactory zeppelinR() {
diff --git a/spark/src/test/java/org/apache/zeppelin/spark/SparkRInterpreterTest.java b/spark/src/test/java/org/apache/zeppelin/spark/SparkRInterpreterTest.java
@@ -31,6 +31,7 @@
 import org.junit.*;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -43,6 +44,7 @@
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest(SparkRInterpreter.ZeppelinRFactory.class)
+@PowerMockIgnore({"org.apache.spark.*", "org.apache.hadoop.*", "akka.*", "org.w3c.*", "javax.xml.*", "org.xml.*", "scala.*", "org.apache.cxf.*"})
 public class SparkRInterpreterTest {
   private static final Logger LOGGER = LoggerFactory.getLogger(SparkRInterpreterTest.class);
 
@@ -74,7 +76,6 @@ private static void initInterpreters() {
 
     sparkInterpreter = new SparkInterpreter(p);
     intpGroup = new InterpreterGroup();
-    intpGroup.add(sparkInterpreter);
 
     zeppelinRFactory = mock(SparkRInterpreter.ZeppelinRFactory.class);
     doNothing().when(zeppelinRFactory).open(Mockito.anyString(), Mockito.anyString(), any(SparkInterpreter.class));
@@ -83,7 +84,6 @@ private static void initInterpreters() {
     mockStatic(SparkRInterpreter.ZeppelinRFactory.class);
     when(SparkRInterpreter.ZeppelinRFactory.instance()).thenReturn(zeppelinRFactory);
 
-    intpGroup.add(sparkRInterpreter);
     sparkRInterpreter = new SparkRInterpreter(p);
     sparkRInterpreter.setInterpreterGroup(intpGroup);
     sparkRInterpreter.open();
