mirror of
https://github.com/apache/zeppelin
synced 2026-05-24 09:38:26 +00:00
Fixed tests to use AuthenticationInfo
This commit is contained in:
Jongyoul Lee
parent
012cf993b8
commit
47cc668ff9
8 changed files with 112 additions and 73 deletions
|
|
@ -27,6 +27,8 @@ import org.apache.zeppelin.notebook.repo.VFSNotebookRepo;
|
|||
import org.apache.zeppelin.scheduler.Job;
|
||||
import org.apache.zeppelin.scheduler.SchedulerFactory;
|
||||
import org.apache.zeppelin.search.SearchService;
|
||||
import org.apache.zeppelin.user.AuthenticationInfo;
|
||||
import org.apache.zeppelin.user.Credentials;
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
|
@ -50,6 +52,7 @@ public class HeliumApplicationFactoryTest implements JobListenerFactory {
|
|||
private VFSNotebookRepo notebookRepo;
|
||||
private Notebook notebook;
|
||||
private HeliumApplicationFactory heliumAppFactory;
|
||||
private AuthenticationInfo anonymous;
|
||||
|
||||
@Before
|
||||
public void setUp() throws Exception {
|
||||
|
|
@ -98,11 +101,13 @@ public class HeliumApplicationFactoryTest implements JobListenerFactory {
|
|||
this,
|
||||
search,
|
||||
notebookAuthorization,
|
||||
null);
|
||||
new Credentials(false, null));
|
||||
|
||||
heliumAppFactory.setNotebook(notebook);
|
||||
|
||||
notebook.addNotebookEventListener(heliumAppFactory);
|
||||
|
||||
anonymous = new AuthenticationInfo("anonymous");
|
||||
}
|
||||
|
||||
@After
|
||||
|
|
@ -131,13 +136,14 @@ public class HeliumApplicationFactoryTest implements JobListenerFactory {
|
|||
HeliumTestApplication.class.getName(),
|
||||
new String[][]{});
|
||||
|
||||
Note note1 = notebook.createNote(null);
|
||||
Note note1 = notebook.createNote(anonymous);
|
||||
factory.setInterpreters("user", note1.getId(),factory.getDefaultInterpreterSettingList());
|
||||
|
||||
Paragraph p1 = note1.addParagraph();
|
||||
|
||||
// make sure interpreter process running
|
||||
p1.setText("%mock1 job");
|
||||
p1.setAuthenticationInfo(anonymous);
|
||||
note1.run(p1.getId());
|
||||
while(p1.isTerminated()==false || p1.getResult()==null) Thread.yield();
|
||||
|
||||
|
|
@ -162,7 +168,7 @@ public class HeliumApplicationFactoryTest implements JobListenerFactory {
|
|||
|
||||
// clean
|
||||
heliumAppFactory.unload(p1, appId);
|
||||
notebook.removeNote(note1.getId(), null);
|
||||
notebook.removeNote(note1.getId(), anonymous);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -175,13 +181,14 @@ public class HeliumApplicationFactoryTest implements JobListenerFactory {
|
|||
HeliumTestApplication.class.getName(),
|
||||
new String[][]{});
|
||||
|
||||
Note note1 = notebook.createNote(null);
|
||||
Note note1 = notebook.createNote(anonymous);
|
||||
factory.setInterpreters("user", note1.getId(), factory.getDefaultInterpreterSettingList());
|
||||
|
||||
Paragraph p1 = note1.addParagraph();
|
||||
|
||||
// make sure interpreter process running
|
||||
p1.setText("%mock1 job");
|
||||
p1.setAuthenticationInfo(anonymous);
|
||||
note1.run(p1.getId());
|
||||
while(p1.isTerminated()==false || p1.getResult()==null) Thread.yield();
|
||||
|
||||
|
|
@ -199,7 +206,7 @@ public class HeliumApplicationFactoryTest implements JobListenerFactory {
|
|||
assertEquals(ApplicationState.Status.UNLOADED, app.getStatus());
|
||||
|
||||
// clean
|
||||
notebook.removeNote(note1.getId(), null);
|
||||
notebook.removeNote(note1.getId(), anonymous);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -213,13 +220,14 @@ public class HeliumApplicationFactoryTest implements JobListenerFactory {
|
|||
HeliumTestApplication.class.getName(),
|
||||
new String[][]{});
|
||||
|
||||
Note note1 = notebook.createNote(null);
|
||||
Note note1 = notebook.createNote(anonymous);
|
||||
notebook.bindInterpretersToNote("user", note1.getId(), factory.getDefaultInterpreterSettingList());
|
||||
|
||||
Paragraph p1 = note1.addParagraph();
|
||||
|
||||
// make sure interpreter process running
|
||||
p1.setText("%mock1 job");
|
||||
p1.setAuthenticationInfo(anonymous);
|
||||
note1.run(p1.getId());
|
||||
while(p1.isTerminated()==false || p1.getResult()==null) Thread.yield();
|
||||
|
||||
|
|
@ -237,13 +245,13 @@ public class HeliumApplicationFactoryTest implements JobListenerFactory {
|
|||
assertEquals(ApplicationState.Status.UNLOADED, app.getStatus());
|
||||
|
||||
// clean
|
||||
notebook.removeNote(note1.getId(), null);
|
||||
notebook.removeNote(note1.getId(), anonymous);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testInterpreterUnbindOfNullReplParagraph() throws IOException {
|
||||
// create note
|
||||
Note note1 = notebook.createNote(null);
|
||||
Note note1 = notebook.createNote(anonymous);
|
||||
|
||||
// add paragraph with invalid magic
|
||||
Paragraph p1 = note1.addParagraph();
|
||||
|
|
@ -258,7 +266,7 @@ public class HeliumApplicationFactoryTest implements JobListenerFactory {
|
|||
notebook.bindInterpretersToNote("user", note1.getId(), new LinkedList<String>());
|
||||
|
||||
// remove note
|
||||
notebook.removeNote(note1.getId(), null);
|
||||
notebook.removeNote(note1.getId(), anonymous);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -272,7 +280,7 @@ public class HeliumApplicationFactoryTest implements JobListenerFactory {
|
|||
HeliumTestApplication.class.getName(),
|
||||
new String[][]{});
|
||||
|
||||
Note note1 = notebook.createNote(null);
|
||||
Note note1 = notebook.createNote(anonymous);
|
||||
notebook.bindInterpretersToNote("user", note1.getId(), factory.getDefaultInterpreterSettingList());
|
||||
String mock1IntpSettingId = null;
|
||||
for (InterpreterSetting setting : notebook.getBindedInterpreterSettings(note1.getId())) {
|
||||
|
|
@ -286,6 +294,7 @@ public class HeliumApplicationFactoryTest implements JobListenerFactory {
|
|||
|
||||
// make sure interpreter process running
|
||||
p1.setText("%mock1 job");
|
||||
p1.setAuthenticationInfo(anonymous);
|
||||
note1.run(p1.getId());
|
||||
while(p1.isTerminated()==false || p1.getResult()==null) Thread.yield();
|
||||
assertEquals(0, p1.getAllApplicationStates().size());
|
||||
|
|
@ -307,7 +316,7 @@ public class HeliumApplicationFactoryTest implements JobListenerFactory {
|
|||
assertEquals(ApplicationState.Status.UNLOADED, app.getStatus());
|
||||
|
||||
// clean
|
||||
notebook.removeNote(note1.getId(), null);
|
||||
notebook.removeNote(note1.getId(), anonymous);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -224,7 +224,10 @@ public class InterpreterFactoryTest {
|
|||
add(info1);
|
||||
}}, new ArrayList<Dependency>(), new InterpreterOption(true), new Properties(), "/path1");
|
||||
|
||||
final InterpreterSetting setting1 = factory.createNewSetting("test-group1", "group1", new ArrayList<Dependency>(), new InterpreterOption(true), new Properties());
|
||||
InterpreterOption perUserInterpreterOption = new InterpreterOption(true);
|
||||
perUserInterpreterOption.setSession(true);
|
||||
perUserInterpreterOption.setPerUser(true);
|
||||
final InterpreterSetting setting1 = factory.createNewSetting("test-group1", "group1", new ArrayList<Dependency>(), perUserInterpreterOption, new Properties());
|
||||
|
||||
factory.setInterpreters("user1", "note", new ArrayList<String>() {{
|
||||
add(setting1.getId());
|
||||
|
|
|
|||
|
|
@ -97,13 +97,15 @@ public class NoteInterpreterLoaderTest {
|
|||
public void testNoteSession() throws IOException {
|
||||
factory.setInterpreters("user", "noteA", factory.getDefaultInterpreterSettingList());
|
||||
factory.getInterpreterSettings("noteA").get(0).getOption().setSession(true);
|
||||
factory.getInterpreterSettings("noteA").get(0).getOption().setPerNote(true);
|
||||
|
||||
factory.setInterpreters("user", "noteB", factory.getDefaultInterpreterSettingList());
|
||||
factory.getInterpreterSettings("noteB").get(0).getOption().setSession(true);
|
||||
factory.getInterpreterSettings("noteB").get(0).getOption().setPerNote(true);
|
||||
|
||||
// interpreters are not created before accessing it
|
||||
assertNull(factory.getInterpreterSettings("noteA").get(0).getInterpreterGroup("user", "shared_process").get("noteA"));
|
||||
assertNull(factory.getInterpreterSettings("noteB").get(0).getInterpreterGroup("user", "shared_process").get("noteB"));
|
||||
assertNull(factory.getInterpreterSettings("noteA").get(0).getInterpreterGroup("user", "noteA").get(":noteA"));
|
||||
assertNull(factory.getInterpreterSettings("noteB").get(0).getInterpreterGroup("user", "noteB").get(":noteB"));
|
||||
|
||||
factory.getInterpreter("user", "noteA", null).open();
|
||||
factory.getInterpreter("user", "noteB", null).open();
|
||||
|
|
@ -113,16 +115,16 @@ public class NoteInterpreterLoaderTest {
|
|||
factory.getInterpreter("user", "noteB", null).getInterpreterGroup().getId()));
|
||||
|
||||
// interpreters are created after accessing it
|
||||
assertNotNull(factory.getInterpreterSettings("noteA").get(0).getInterpreterGroup("user", "shared_process").get("noteA"));
|
||||
assertNotNull(factory.getInterpreterSettings("noteB").get(0).getInterpreterGroup("user", "shared_process").get("noteB"));
|
||||
assertNotNull(factory.getInterpreterSettings("noteA").get(0).getInterpreterGroup("user", "noteA").get(":noteA"));
|
||||
assertNotNull(factory.getInterpreterSettings("noteB").get(0).getInterpreterGroup("user", "noteB").get(":noteB"));
|
||||
|
||||
// when
|
||||
factory.closeNote("user", "noteA");
|
||||
factory.closeNote("user", "noteB");
|
||||
|
||||
// interpreters are destroyed after close
|
||||
assertNull(factory.getInterpreterSettings("noteA").get(0).getInterpreterGroup("user", "shared_process").get("noteA"));
|
||||
assertNull(factory.getInterpreterSettings("noteB").get(0).getInterpreterGroup("user", "shared_process").get("noteB"));
|
||||
assertNull(factory.getInterpreterSettings("noteA").get(0).getInterpreterGroup("user", "shared_process").get(":noteA"));
|
||||
assertNull(factory.getInterpreterSettings("noteB").get(0).getInterpreterGroup("user", "shared_process").get(":noteB"));
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -130,13 +132,15 @@ public class NoteInterpreterLoaderTest {
|
|||
public void testNotePerInterpreterProcess() throws IOException {
|
||||
factory.setInterpreters("user", "noteA", factory.getDefaultInterpreterSettingList());
|
||||
factory.getInterpreterSettings("noteA").get(0).getOption().setProcess(true);
|
||||
factory.getInterpreterSettings("noteA").get(0).getOption().setPerNote(true);
|
||||
|
||||
factory.setInterpreters("user", "noteB", factory.getDefaultInterpreterSettingList());
|
||||
factory.getInterpreterSettings("noteB").get(0).getOption().setProcess(true);
|
||||
factory.getInterpreterSettings("noteA").get(0).getOption().setPerNote(true);
|
||||
|
||||
// interpreters are not created before accessing it
|
||||
assertNull(factory.getInterpreterSettings("noteA").get(0).getInterpreterGroup("user", "noteA").get("noteA"));
|
||||
assertNull(factory.getInterpreterSettings("noteB").get(0).getInterpreterGroup("user", "noteB").get("noteB"));
|
||||
assertNull(factory.getInterpreterSettings("noteA").get(0).getInterpreterGroup("user", "noteA").get(":noteA"));
|
||||
assertNull(factory.getInterpreterSettings("noteB").get(0).getInterpreterGroup("user", "noteB").get(":noteB"));
|
||||
|
||||
factory.getInterpreter("user", "noteA", null).open();
|
||||
factory.getInterpreter("user", "noteB", null).open();
|
||||
|
|
@ -147,16 +151,16 @@ public class NoteInterpreterLoaderTest {
|
|||
factory.getInterpreter("user", "noteB", null).getInterpreterGroup().getId()));
|
||||
|
||||
// interpreters are created after accessing it
|
||||
assertNotNull(factory.getInterpreterSettings("noteA").get(0).getInterpreterGroup("user", "noteA").get("noteA"));
|
||||
assertNotNull(factory.getInterpreterSettings("noteB").get(0).getInterpreterGroup("user", "noteB").get("noteB"));
|
||||
assertNotNull(factory.getInterpreterSettings("noteA").get(0).getInterpreterGroup("user", "noteA").get(":noteA"));
|
||||
assertNotNull(factory.getInterpreterSettings("noteB").get(0).getInterpreterGroup("user", "noteB").get(":noteB"));
|
||||
|
||||
// when
|
||||
factory.closeNote("user", "noteA");
|
||||
factory.closeNote("user", "noteB");
|
||||
|
||||
// interpreters are destroyed after close
|
||||
assertNull(factory.getInterpreterSettings("noteA").get(0).getInterpreterGroup("user", "noteA").get("noteA"));
|
||||
assertNull(factory.getInterpreterSettings("noteB").get(0).getInterpreterGroup("user", "noteB").get("noteB"));
|
||||
assertNull(factory.getInterpreterSettings("noteA").get(0).getInterpreterGroup("user", "noteA").get(":noteA"));
|
||||
assertNull(factory.getInterpreterSettings("noteB").get(0).getInterpreterGroup("user", "noteB").get(":noteB"));
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ import org.apache.zeppelin.interpreter.InterpreterFactory;
|
|||
import org.apache.zeppelin.notebook.repo.NotebookRepo;
|
||||
import org.apache.zeppelin.scheduler.Scheduler;
|
||||
import org.apache.zeppelin.search.SearchService;
|
||||
import org.apache.zeppelin.user.AuthenticationInfo;
|
||||
import org.apache.zeppelin.user.Credentials;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
|
|
@ -58,6 +59,8 @@ public class NoteTest {
|
|||
@Mock
|
||||
InterpreterFactory interpreterFactory;
|
||||
|
||||
private AuthenticationInfo anonymous = new AuthenticationInfo("anonymous");
|
||||
|
||||
@Test
|
||||
public void runNormalTest() {
|
||||
when(interpreterFactory.getInterpreter(anyString(), anyString(), eq("spark"))).thenReturn(interpreter);
|
||||
|
|
@ -68,6 +71,7 @@ public class NoteTest {
|
|||
|
||||
Paragraph p = note.addParagraph();
|
||||
p.setText(pText);
|
||||
p.setAuthenticationInfo(anonymous);
|
||||
note.run(p.getId());
|
||||
|
||||
ArgumentCaptor<Paragraph> pCaptor = ArgumentCaptor.forClass(Paragraph.class);
|
||||
|
|
@ -87,7 +91,7 @@ public class NoteTest {
|
|||
|
||||
@Test
|
||||
public void addParagraphWithLastReplNameTest() {
|
||||
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();
|
||||
|
|
|
|||
|
|
@ -116,6 +116,7 @@ public class NotebookTest implements JobListenerFactory{
|
|||
config.put("enabled", true);
|
||||
p1.setConfig(config);
|
||||
p1.setText("hello world");
|
||||
p1.setAuthenticationInfo(anonymous);
|
||||
note.run(p1.getId());
|
||||
while(p1.isTerminated()==false || p1.getResult()==null) Thread.yield();
|
||||
assertEquals("repl1: hello world", p1.getResult().message());
|
||||
|
|
@ -124,6 +125,7 @@ public class NotebookTest implements JobListenerFactory{
|
|||
Paragraph p2 = note.addParagraph();
|
||||
p2.setConfig(config);
|
||||
p2.setText("%mock2 hello world");
|
||||
p2.setAuthenticationInfo(anonymous);
|
||||
note.run(p2.getId());
|
||||
while(p2.isTerminated()==false || p2.getResult()==null) Thread.yield();
|
||||
assertEquals("repl2: hello world", p2.getResult().message());
|
||||
|
|
@ -235,6 +237,7 @@ public class NotebookTest implements JobListenerFactory{
|
|||
config.put("enabled", true);
|
||||
p1.setConfig(config);
|
||||
p1.setText("hello world");
|
||||
p1.setAuthenticationInfo(anonymous);
|
||||
note.run(p1.getId());
|
||||
|
||||
while(p1.isTerminated() == false || p1.getResult() == null) Thread.yield();
|
||||
|
|
@ -688,13 +691,15 @@ public class NotebookTest implements JobListenerFactory{
|
|||
@Test
|
||||
public void testPerSessionInterpreterCloseOnNoteRemoval() throws IOException {
|
||||
// create a notes
|
||||
Note note1 = notebook.createNote(new AuthenticationInfo());
|
||||
Note note1 = notebook.createNote(anonymous);
|
||||
Paragraph p1 = note1.addParagraph();
|
||||
p1.setText("getId");
|
||||
p1.setAuthenticationInfo(anonymous);
|
||||
|
||||
// restart interpreter with per note session enabled
|
||||
for (InterpreterSetting setting : factory.getInterpreterSettings(note1.getId())) {
|
||||
setting.getOption().setSession(true);
|
||||
setting.getOption().setPerUser(true);
|
||||
notebook.getInterpreterFactory().restart(setting.getId());
|
||||
}
|
||||
|
||||
|
|
@ -707,6 +712,7 @@ public class NotebookTest implements JobListenerFactory{
|
|||
note1 = notebook.createNote(anonymous);
|
||||
p1 = note1.addParagraph();
|
||||
p1.setText("getId");
|
||||
p1.setAuthenticationInfo(anonymous);
|
||||
|
||||
note1.run(p1.getId());
|
||||
while (p1.getStatus() != Status.FINISHED) Thread.yield();
|
||||
|
|
@ -725,7 +731,9 @@ public class NotebookTest implements JobListenerFactory{
|
|||
Paragraph p2 = note2.addParagraph();
|
||||
|
||||
p1.setText("getId");
|
||||
p1.setAuthenticationInfo(anonymous);
|
||||
p2.setText("getId");
|
||||
p2.setAuthenticationInfo(anonymous);
|
||||
|
||||
// run per note session disabled
|
||||
note1.run(p1.getId());
|
||||
|
|
@ -740,6 +748,7 @@ public class NotebookTest implements JobListenerFactory{
|
|||
// restart interpreter with per note session enabled
|
||||
for (InterpreterSetting setting : notebook.getInterpreterFactory().getInterpreterSettings(note1.getId())) {
|
||||
setting.getOption().setSession(true);
|
||||
setting.getOption().setPerNote(true);
|
||||
notebook.getInterpreterFactory().restart(setting.getId());
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -42,6 +42,7 @@ import org.apache.zeppelin.scheduler.JobListener;
|
|||
import org.apache.zeppelin.scheduler.SchedulerFactory;
|
||||
import org.apache.zeppelin.search.SearchService;
|
||||
import org.apache.zeppelin.search.LuceneSearch;
|
||||
import org.apache.zeppelin.user.AuthenticationInfo;
|
||||
import org.apache.zeppelin.user.Credentials;
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
|
|
@ -65,6 +66,7 @@ public class NotebookRepoSyncTest implements JobListenerFactory {
|
|||
private SearchService search;
|
||||
private NotebookAuthorization notebookAuthorization;
|
||||
private Credentials credentials;
|
||||
private AuthenticationInfo anonymous;
|
||||
private static final Logger LOG = LoggerFactory.getLogger(NotebookRepoSyncTest.class);
|
||||
|
||||
@Before
|
||||
|
|
@ -103,6 +105,7 @@ public class NotebookRepoSyncTest implements JobListenerFactory {
|
|||
credentials = new Credentials(conf.credentialsPersist(), conf.getCredentialsPath());
|
||||
notebookSync = new Notebook(conf, notebookRepoSync, schedulerFactory, factory, this, search,
|
||||
notebookAuthorization, credentials);
|
||||
anonymous = new AuthenticationInfo("anonymous");
|
||||
}
|
||||
|
||||
@After
|
||||
|
|
@ -119,40 +122,40 @@ public class NotebookRepoSyncTest implements JobListenerFactory {
|
|||
public void testSyncOnCreate() throws IOException {
|
||||
/* check that both storage systems are empty */
|
||||
assertTrue(notebookRepoSync.getRepoCount() > 1);
|
||||
assertEquals(0, notebookRepoSync.list(0, null).size());
|
||||
assertEquals(0, notebookRepoSync.list(1, null).size());
|
||||
assertEquals(0, notebookRepoSync.list(0, anonymous).size());
|
||||
assertEquals(0, notebookRepoSync.list(1, anonymous).size());
|
||||
|
||||
/* create note */
|
||||
Note note = notebookSync.createNote(null);
|
||||
Note note = notebookSync.createNote(anonymous);
|
||||
|
||||
// check that automatically saved on both storages
|
||||
assertEquals(1, notebookRepoSync.list(0, null).size());
|
||||
assertEquals(1, notebookRepoSync.list(1, null).size());
|
||||
assertEquals(notebookRepoSync.list(0, null).get(0).getId(),notebookRepoSync.list(1, null).get(0).getId());
|
||||
|
||||
notebookSync.removeNote(notebookRepoSync.list(0, null).get(0).getId(), null);
|
||||
assertEquals(1, notebookRepoSync.list(0, anonymous).size());
|
||||
assertEquals(1, notebookRepoSync.list(1, anonymous).size());
|
||||
assertEquals(notebookRepoSync.list(0, anonymous).get(0).getId(),notebookRepoSync.list(1, anonymous).get(0).getId());
|
||||
|
||||
notebookSync.removeNote(notebookRepoSync.list(0, null).get(0).getId(), anonymous);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSyncOnDelete() throws IOException {
|
||||
/* create note */
|
||||
assertTrue(notebookRepoSync.getRepoCount() > 1);
|
||||
assertEquals(0, notebookRepoSync.list(0, null).size());
|
||||
assertEquals(0, notebookRepoSync.list(1, null).size());
|
||||
assertEquals(0, notebookRepoSync.list(0, anonymous).size());
|
||||
assertEquals(0, notebookRepoSync.list(1, anonymous).size());
|
||||
|
||||
Note note = notebookSync.createNote(null);
|
||||
Note note = notebookSync.createNote(anonymous);
|
||||
|
||||
/* check that created in both storage systems */
|
||||
assertEquals(1, notebookRepoSync.list(0, null).size());
|
||||
assertEquals(1, notebookRepoSync.list(1, null).size());
|
||||
assertEquals(notebookRepoSync.list(0, null).get(0).getId(),notebookRepoSync.list(1, null).get(0).getId());
|
||||
assertEquals(1, notebookRepoSync.list(0, anonymous).size());
|
||||
assertEquals(1, notebookRepoSync.list(1, anonymous).size());
|
||||
assertEquals(notebookRepoSync.list(0, anonymous).get(0).getId(),notebookRepoSync.list(1, anonymous).get(0).getId());
|
||||
|
||||
/* remove Note */
|
||||
notebookSync.removeNote(notebookRepoSync.list(0, null).get(0).getId(), null);
|
||||
notebookSync.removeNote(notebookRepoSync.list(0, anonymous).get(0).getId(), anonymous);
|
||||
|
||||
/* check that deleted in both storages */
|
||||
assertEquals(0, notebookRepoSync.list(0, null).size());
|
||||
assertEquals(0, notebookRepoSync.list(1, null).size());
|
||||
assertEquals(0, notebookRepoSync.list(0, anonymous).size());
|
||||
assertEquals(0, notebookRepoSync.list(1, anonymous).size());
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -160,7 +163,7 @@ public class NotebookRepoSyncTest implements JobListenerFactory {
|
|||
public void testSyncUpdateMain() throws IOException {
|
||||
|
||||
/* create note */
|
||||
Note note = notebookSync.createNote(null);
|
||||
Note note = notebookSync.createNote(anonymous);
|
||||
Paragraph p1 = note.addParagraph();
|
||||
Map config = p1.getConfig();
|
||||
config.put("enabled", true);
|
||||
|
|
@ -172,38 +175,38 @@ public class NotebookRepoSyncTest implements JobListenerFactory {
|
|||
|
||||
/* new paragraph not yet saved into storages */
|
||||
assertEquals(0, notebookRepoSync.get(0,
|
||||
notebookRepoSync.list(0, null).get(0).getId(), null).getParagraphs().size());
|
||||
notebookRepoSync.list(0, anonymous).get(0).getId(), anonymous).getParagraphs().size());
|
||||
assertEquals(0, notebookRepoSync.get(1,
|
||||
notebookRepoSync.list(1, null).get(0).getId(), null).getParagraphs().size());
|
||||
notebookRepoSync.list(1, anonymous).get(0).getId(), anonymous).getParagraphs().size());
|
||||
|
||||
/* save to storage under index 0 (first storage) */
|
||||
notebookRepoSync.save(0, note, null);
|
||||
notebookRepoSync.save(0, note, anonymous);
|
||||
|
||||
/* check paragraph saved to first storage */
|
||||
assertEquals(1, notebookRepoSync.get(0,
|
||||
notebookRepoSync.list(0, null).get(0).getId(), null).getParagraphs().size());
|
||||
notebookRepoSync.list(0, anonymous).get(0).getId(), anonymous).getParagraphs().size());
|
||||
/* check paragraph isn't saved to second storage */
|
||||
assertEquals(0, notebookRepoSync.get(1,
|
||||
notebookRepoSync.list(1, null).get(0).getId(), null).getParagraphs().size());
|
||||
notebookRepoSync.list(1, anonymous).get(0).getId(), anonymous).getParagraphs().size());
|
||||
/* apply sync */
|
||||
notebookRepoSync.sync(null);
|
||||
/* check whether added to second storage */
|
||||
assertEquals(1, notebookRepoSync.get(1,
|
||||
notebookRepoSync.list(1, null).get(0).getId(), null).getParagraphs().size());
|
||||
notebookRepoSync.list(1, anonymous).get(0).getId(), anonymous).getParagraphs().size());
|
||||
/* check whether same paragraph id */
|
||||
assertEquals(p1.getId(), notebookRepoSync.get(0,
|
||||
notebookRepoSync.list(0, null).get(0).getId(), null).getLastParagraph().getId());
|
||||
notebookRepoSync.list(0, anonymous).get(0).getId(), anonymous).getLastParagraph().getId());
|
||||
assertEquals(p1.getId(), notebookRepoSync.get(1,
|
||||
notebookRepoSync.list(1, null).get(0).getId(), null).getLastParagraph().getId());
|
||||
notebookRepoSync.remove(note.getId(), null);
|
||||
notebookRepoSync.list(1, anonymous).get(0).getId(), anonymous).getLastParagraph().getId());
|
||||
notebookRepoSync.remove(note.getId(), anonymous);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSyncOnReloadedList() throws IOException {
|
||||
/* check that both storage repos are empty */
|
||||
assertTrue(notebookRepoSync.getRepoCount() > 1);
|
||||
assertEquals(0, notebookRepoSync.list(0, null).size());
|
||||
assertEquals(0, notebookRepoSync.list(1, null).size());
|
||||
assertEquals(0, notebookRepoSync.list(0, anonymous).size());
|
||||
assertEquals(0, notebookRepoSync.list(1, anonymous).size());
|
||||
|
||||
File srcDir = new File("src/test/resources/2A94M5J1Z");
|
||||
File destDir = new File(secNotebookDir + "/2A94M5J1Z");
|
||||
|
|
@ -214,13 +217,13 @@ public class NotebookRepoSyncTest implements JobListenerFactory {
|
|||
} catch (IOException e) {
|
||||
LOG.error(e.toString(), e);
|
||||
}
|
||||
assertEquals(0, notebookRepoSync.list(0, null).size());
|
||||
assertEquals(1, notebookRepoSync.list(1, null).size());
|
||||
assertEquals(0, notebookRepoSync.list(0, anonymous).size());
|
||||
assertEquals(1, notebookRepoSync.list(1, anonymous).size());
|
||||
|
||||
// After reloading notebooks repos should be synchronized
|
||||
notebookSync.reloadAllNotes(null);
|
||||
assertEquals(1, notebookRepoSync.list(0, null).size());
|
||||
assertEquals(1, notebookRepoSync.list(1, null).size());
|
||||
notebookSync.reloadAllNotes(anonymous);
|
||||
assertEquals(1, notebookRepoSync.list(0, anonymous).size());
|
||||
assertEquals(1, notebookRepoSync.list(1, anonymous).size());
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -287,15 +290,15 @@ public class NotebookRepoSyncTest implements JobListenerFactory {
|
|||
GitNotebookRepo gitRepo = (GitNotebookRepo) vRepoSync.getRepo(0);
|
||||
|
||||
// no notes
|
||||
assertThat(vRepoSync.list(null).size()).isEqualTo(0);
|
||||
assertThat(vRepoSync.list(anonymous).size()).isEqualTo(0);
|
||||
// create note
|
||||
Note note = vNotebookSync.createNote(null);
|
||||
assertThat(vRepoSync.list(null).size()).isEqualTo(1);
|
||||
Note note = vNotebookSync.createNote(anonymous);
|
||||
assertThat(vRepoSync.list(anonymous).size()).isEqualTo(1);
|
||||
|
||||
String noteId = vRepoSync.list(null).get(0).getId();
|
||||
String noteId = vRepoSync.list(anonymous).get(0).getId();
|
||||
// first checkpoint
|
||||
vRepoSync.checkpoint(noteId, "checkpoint message", null);
|
||||
int vCount = gitRepo.revisionHistory(noteId, null).size();
|
||||
vRepoSync.checkpoint(noteId, "checkpoint message", anonymous);
|
||||
int vCount = gitRepo.revisionHistory(noteId, anonymous).size();
|
||||
assertThat(vCount).isEqualTo(1);
|
||||
|
||||
Paragraph p = note.addParagraph();
|
||||
|
|
@ -305,10 +308,10 @@ public class NotebookRepoSyncTest implements JobListenerFactory {
|
|||
p.setText("%md checkpoint test");
|
||||
|
||||
// save and checkpoint again
|
||||
vRepoSync.save(note, null);
|
||||
vRepoSync.checkpoint(noteId, "checkpoint message 2", null);
|
||||
assertThat(gitRepo.revisionHistory(noteId, null).size()).isEqualTo(vCount + 1);
|
||||
notebookRepoSync.remove(note.getId(), null);
|
||||
vRepoSync.save(note, anonymous);
|
||||
vRepoSync.checkpoint(noteId, "checkpoint message 2", anonymous);
|
||||
assertThat(gitRepo.revisionHistory(noteId, anonymous).size()).isEqualTo(vCount + 1);
|
||||
notebookRepoSync.remove(note.getId(), anonymous);
|
||||
}
|
||||
|
||||
static void delete(File file){
|
||||
|
|
|
|||
|
|
@ -32,10 +32,12 @@ import org.apache.zeppelin.interpreter.InterpreterFactory;
|
|||
import org.apache.zeppelin.interpreter.InterpreterOption;
|
||||
import org.apache.zeppelin.interpreter.mock.MockInterpreter1;
|
||||
import org.apache.zeppelin.notebook.*;
|
||||
import org.apache.zeppelin.notebook.repo.zeppelinhub.security.Authentication;
|
||||
import org.apache.zeppelin.scheduler.JobListener;
|
||||
import org.apache.zeppelin.scheduler.SchedulerFactory;
|
||||
import org.apache.zeppelin.search.SearchService;
|
||||
import org.apache.zeppelin.search.LuceneSearch;
|
||||
import org.apache.zeppelin.user.AuthenticationInfo;
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
|
@ -106,7 +108,8 @@ public class VFSNotebookRepoTest implements JobListenerFactory {
|
|||
|
||||
@Test
|
||||
public void testSaveNotebook() throws IOException, InterruptedException {
|
||||
Note note = notebook.createNote(null);
|
||||
AuthenticationInfo anonymous = new AuthenticationInfo("anonymous");
|
||||
Note note = notebook.createNote(anonymous);
|
||||
factory.setInterpreters("user", note.getId(), factory.getDefaultInterpreterSettingList());
|
||||
|
||||
Paragraph p1 = note.addParagraph();
|
||||
|
|
@ -114,6 +117,7 @@ public class VFSNotebookRepoTest implements JobListenerFactory {
|
|||
config.put("enabled", true);
|
||||
p1.setConfig(config);
|
||||
p1.setText("%mock1 hello world");
|
||||
p1.setAuthenticationInfo(anonymous);
|
||||
|
||||
note.run(p1.getId());
|
||||
int timeout = 1;
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@ import org.apache.zeppelin.interpreter.InterpreterFactory;
|
|||
import org.apache.zeppelin.notebook.Note;
|
||||
import org.apache.zeppelin.notebook.Paragraph;
|
||||
import org.apache.zeppelin.notebook.repo.NotebookRepo;
|
||||
import org.apache.zeppelin.user.AuthenticationInfo;
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
import org.junit.BeforeClass;
|
||||
|
|
@ -41,6 +42,7 @@ public class LuceneSearchTest {
|
|||
private static NotebookRepo notebookRepoMock;
|
||||
private static InterpreterFactory interpreterFactory;
|
||||
private SearchService notebookIndex;
|
||||
private AuthenticationInfo anonymous;
|
||||
|
||||
@BeforeClass
|
||||
public static void beforeStartUp() {
|
||||
|
|
@ -54,6 +56,7 @@ public class LuceneSearchTest {
|
|||
@Before
|
||||
public void startUp() {
|
||||
notebookIndex = new LuceneSearch();
|
||||
anonymous = new AuthenticationInfo("anonymous");
|
||||
}
|
||||
|
||||
@After
|
||||
|
|
@ -202,7 +205,7 @@ public class LuceneSearchTest {
|
|||
//when
|
||||
Paragraph p1 = note1.getLastParagraph();
|
||||
p1.setText("no no no");
|
||||
note1.persist(null);
|
||||
note1.persist(anonymous);
|
||||
|
||||
//then
|
||||
assertThat(resultForQuery("Notebook1").size()).isEqualTo(1);
|
||||
|
|
@ -226,7 +229,7 @@ public class LuceneSearchTest {
|
|||
|
||||
//when
|
||||
note1.setName("NotebookN");
|
||||
note1.persist(null);
|
||||
note1.persist(anonymous);
|
||||
|
||||
//then
|
||||
assertThat(resultForQuery("Notebook1")).isEmpty();
|
||||
|
|
|
|||
Loading…
Reference in a new issue