Repository: zeppelin Updated Branches: refs/heads/master d8b54cf76 -> b11b6ec24
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/b11b6ec2/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterFactoryTest.java ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterFactoryTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterFactoryTest.java index 9df494f..e284164 100644 --- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterFactoryTest.java +++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterFactoryTest.java @@ -18,6 +18,7 @@ package org.apache.zeppelin.interpreter; import java.io.*; +import java.util.ArrayList; import java.util.LinkedList; import java.util.List; import java.util.Properties; @@ -78,6 +79,8 @@ public class InterpreterFactoryTest { } } +// mock1Setting = factory.createNewSetting("mock11", "mock1", new ArrayList<Dependency>(), new InterpreterOption(false), new Properties()); + InterpreterGroup interpreterGroup = mock1Setting.getInterpreterGroup("sharedProcess"); factory.createInterpretersForNote(mock1Setting, "sharedProcess", "session"); @@ -88,7 +91,7 @@ public class InterpreterFactoryTest { assertNull(factory.get("unknown")); // restart interpreter - factory.restart(mock1Setting.id()); + factory.restart(mock1Setting.getId()); assertNull(mock1Setting.getInterpreterGroup("sharedProcess").get("session")); } @@ -104,12 +107,12 @@ public class InterpreterFactoryTest { List<String> all = factory.getDefaultInterpreterSettingList(); // add setting with null option & properties expected nullArgumentException.class try { - factory.add("a mock", "mock2", new LinkedList<Dependency>(), null, new Properties()); + factory.add("mock2", new ArrayList<InterpreterInfo>(), new LinkedList<Dependency>(), new InterpreterOption(false), new Properties(), ""); } catch(NullArgumentException e) { assertEquals("Test null option" , e.getMessage(),new NullArgumentException("option").getMessage()); } try { - factory.add("a mock", "mock2", new LinkedList<Dependency>(), new InterpreterOption(false), null); + factory.add("mock2", new ArrayList<InterpreterInfo>(), new LinkedList<Dependency>(), new InterpreterOption(false), new Properties(), ""); } catch (NullArgumentException e){ assertEquals("Test null properties" , e.getMessage(),new NullArgumentException("properties").getMessage()); } @@ -124,10 +127,33 @@ public class InterpreterFactoryTest { // check if file saved assertTrue(new File(conf.getInterpreterSettingPath()).exists()); - factory.add("newsetting", "mock1", new LinkedList<Dependency>(), new InterpreterOption(false), new Properties()); + factory.createNewSetting("new-mock1", "mock1", new LinkedList<Dependency>(), new InterpreterOption(false), new Properties()); assertEquals(numInterpreters + 1, factory.get().size()); InterpreterFactory factory2 = new InterpreterFactory(conf, null, null, null, depResolver); assertEquals(numInterpreters + 1, factory2.get().size()); } + + @Test + public void testInterpreterAliases() throws IOException, RepositoryException { + factory = new InterpreterFactory(conf, null, null, null, depResolver); + final InterpreterInfo info1 = new InterpreterInfo("className1", "name1", true); + final InterpreterInfo info2 = new InterpreterInfo("className2", "name1", true); + factory.add("group1", new ArrayList<InterpreterInfo>(){{ + add(info1); + }}, new ArrayList<Dependency>(), new InterpreterOption(true), new Properties(), "/path1"); + factory.add("group2", new ArrayList<InterpreterInfo>(){{ + add(info2); + }}, new ArrayList<Dependency>(), new InterpreterOption(true), new Properties(), "/path2"); + + final InterpreterSetting setting1 = factory.createNewSetting("test-group1", "group1", new ArrayList<Dependency>(), new InterpreterOption(true), new Properties()); + final InterpreterSetting setting2 = factory.createNewSetting("test-group2", "group1", new ArrayList<Dependency>(), new InterpreterOption(true), new Properties()); + + factory.setInterpreters("note", new ArrayList<String>() {{ + add(setting1.getId()); + add(setting2.getId()); + }}); + + assertEquals("className1", factory.getInterpreter("note", "test-group1").getClassName()); + } } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/b11b6ec2/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NoteTest.java ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NoteTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NoteTest.java index 9a737e6..cff66ad 100644 --- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NoteTest.java +++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NoteTest.java @@ -118,7 +118,7 @@ public class NoteTest { @Test public void putDefaultReplNameIfInterpreterSettingPresent() { InterpreterSetting interpreterSetting = Mockito.mock(InterpreterSetting.class); - when(interpreterSetting.getGroup()).thenReturn("spark"); + when(interpreterSetting.getName()).thenReturn("spark"); when(interpreterFactory.getDefaultInterpreterSetting(anyString())) .thenReturn(interpreterSetting); @@ -132,7 +132,7 @@ public class NoteTest { @Test public void addParagraphWithLastReplName() { InterpreterSetting interpreterSetting = Mockito.mock(InterpreterSetting.class); - when(interpreterSetting.getGroup()).thenReturn("spark"); + when(interpreterSetting.getName()).thenReturn("spark"); when(interpreterFactory.getDefaultInterpreterSetting(anyString())) .thenReturn(interpreterSetting); @@ -147,7 +147,7 @@ public class NoteTest { @Test public void insertParagraphWithLastReplName() { InterpreterSetting interpreterSetting = Mockito.mock(InterpreterSetting.class); - when(interpreterSetting.getGroup()).thenReturn("spark"); + when(interpreterSetting.getName()).thenReturn("spark"); when(interpreterFactory.getDefaultInterpreterSetting(anyString())) .thenReturn(interpreterSetting); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/b11b6ec2/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java index 6790297..bfa97e0 100644 --- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java +++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java @@ -532,7 +532,7 @@ public class NotebookTest implements JobListenerFactory{ registry.add("o2", "object2", null, null); // restart interpreter - factory.restart(factory.getInterpreterSettings(note.getId()).get(0).id()); + factory.restart(factory.getInterpreterSettings(note.getId()).get(0).getId()); registry = factory.getInterpreterSettings(note.getId()).get(0).getInterpreterGroup("sharedProcess") .getAngularObjectRegistry(); @@ -608,7 +608,7 @@ public class NotebookTest implements JobListenerFactory{ while (paragraphs.get(0).getStatus() != Status.FINISHED) Thread.yield(); - factory.restart(factory.getInterpreterSettings(note.getId()).get(0).id()); + factory.restart(factory.getInterpreterSettings(note.getId()).get(0).getId()); boolean isAborted = false; for (Paragraph p : paragraphs) { @@ -634,7 +634,7 @@ public class NotebookTest implements JobListenerFactory{ // restart interpreter with per note session enabled for (InterpreterSetting setting : factory.getInterpreterSettings(note1.getId())) { setting.getOption().setPerNoteSession(true); - notebook.getInterpreterFactory().restart(setting.id()); + notebook.getInterpreterFactory().restart(setting.getId()); } note1.run(p1.getId()); @@ -679,7 +679,7 @@ public class NotebookTest implements JobListenerFactory{ // restart interpreter with per note session enabled for (InterpreterSetting setting : notebook.getInterpreterFactory().getInterpreterSettings(note1.getId())) { setting.getOption().setPerNoteSession(true); - notebook.getInterpreterFactory().restart(setting.id()); + notebook.getInterpreterFactory().restart(setting.getId()); } // run per note session enabled @@ -705,7 +705,7 @@ public class NotebookTest implements JobListenerFactory{ // restart interpreter with per note session enabled for (InterpreterSetting setting : factory.getInterpreterSettings(note1.getId())) { setting.getOption().setPerNoteSession(true); - notebook.getInterpreterFactory().restart(setting.id()); + notebook.getInterpreterFactory().restart(setting.getId()); } note1.run(p1.getId());
