Fixed test after rebase

jongyoul · jongyoul · commit 510942b50b4c · 2016-10-19T15:08:24.000+09:00
diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
@@ -788,6 +788,8 @@ protected Note importNote(NotebookSocket conn, HashSet<String> userAndRoles,
       AuthenticationInfo subject = null;
       if (fromMessage.principal != null) {
         subject = new AuthenticationInfo(fromMessage.principal);
+      } else {
+        subject = new AuthenticationInfo("anonymous");
       }
       note = notebook.importNote(noteJson, noteName, subject);
       note.persist(subject);
diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Paragraph.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Paragraph.java
@@ -586,6 +586,7 @@ public String getMagic() {
   }
 
   private boolean isValidInterpreter(String replName) {
-    return factory.getInterpreter(note.getId(), replName) != null;
+    return factory.getInterpreter("",
+        note.getId(), replName) != null;
   }
 }
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
@@ -141,8 +141,8 @@ public void testRemoteRepl() throws Exception {
         break;
       }
     }
-    InterpreterGroup interpreterGroup = mock1Setting.getInterpreterGroup("sharedProcess");
-    factory.createInterpretersForNote(mock1Setting, "sharedProcess", "session");
+    InterpreterGroup interpreterGroup = mock1Setting.getInterpreterGroup("user", "sharedProcess");
+    factory.createInterpretersForNote(mock1Setting, "user", "sharedProcess", "session");
     // get interpreter
     assertNotNull("get Interpreter", interpreterGroup.get("session").get(0));
     assertTrue(interpreterGroup.get("session").get(0) instanceof LazyOpenInterpreter);
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
@@ -103,7 +103,7 @@ public void addParagraphWithLastReplNameTest() {
 
   @Test
   public void insertParagraphWithLastReplNameTest() {
-    when(interpreterFactory.getInterpreter(anyString(), eq("spark"))).thenReturn(interpreter);
+    when(interpreterFactory.getInterpreter(anyString(), anyString(), eq("spark"))).thenReturn(interpreter);
 
     Note note = new Note(repo, interpreterFactory, jobListenerFactory, index, credentials, noteEventListener);
     Paragraph p1 = note.addParagraph();
@@ -115,7 +115,7 @@ public void insertParagraphWithLastReplNameTest() {
 
   @Test
   public void insertParagraphWithInvalidReplNameTest() {
-    when(interpreterFactory.getInterpreter(anyString(), eq("invalid"))).thenReturn(null);
+    when(interpreterFactory.getInterpreter(anyString(), anyString(), eq("invalid"))).thenReturn(null);
 
     Note note = new Note(repo, interpreterFactory, jobListenerFactory, index, credentials, noteEventListener);
     Paragraph p1 = note.addParagraph();

Original file line number	Diff line number	Diff line change
`@@ -788,6 +788,8 @@ protected Note importNote(NotebookSocket conn, HashSet<String> userAndRoles,`
`788`	`788`	`AuthenticationInfo subject = null;`
`789`	`789`	`if (fromMessage.principal != null) {`
`790`	`790`	`subject = new AuthenticationInfo(fromMessage.principal);`
	`791`	`+ } else {`
	`792`	`+ subject = new AuthenticationInfo("anonymous");`
`791`	`793`	`}`
`792`	`794`	`note = notebook.importNote(noteJson, noteName, subject);`
`793`	`795`	`note.persist(subject);`
Original file line number	Diff line number	Diff line change
`@@ -586,6 +586,7 @@ public String getMagic() {`
`586`	`586`	`}`
`587`	`587`
`588`	`588`	`private boolean isValidInterpreter(String replName) {`
`589`		`- return factory.getInterpreter(note.getId(), replName) != null;`
	`589`	`+ return factory.getInterpreter("",`
	`590`	`+ note.getId(), replName) != null;`
`590`	`591`	`}`
`591`	`592`	`}`
Original file line number	Diff line number	Diff line change
`@@ -141,8 +141,8 @@ public void testRemoteRepl() throws Exception {`
`141`	`141`	`break;`
`142`	`142`	`}`
`143`	`143`	`}`
`144`		`- InterpreterGroup interpreterGroup = mock1Setting.getInterpreterGroup("sharedProcess");`
`145`		`- factory.createInterpretersForNote(mock1Setting, "sharedProcess", "session");`
	`144`	`+ InterpreterGroup interpreterGroup = mock1Setting.getInterpreterGroup("user", "sharedProcess");`
	`145`	`+ factory.createInterpretersForNote(mock1Setting, "user", "sharedProcess", "session");`
`146`	`146`	`// get interpreter`
`147`	`147`	`assertNotNull("get Interpreter", interpreterGroup.get("session").get(0));`
`148`	`148`	`assertTrue(interpreterGroup.get("session").get(0) instanceof LazyOpenInterpreter);`