From b7ff8fac57a540c369b0ded6f8307d554fe76660 Mon Sep 17 00:00:00 2001
From: littlezhou <wei.zhou@intel.com>
Date: Sat, 24 Mar 2018 19:08:43 +0800
Subject: [PATCH 1/2] Solve #1657, Remove regexp package dependency

---
 conf/zeppelin-site.xml                        |    8 -
 smart-integration/conf/zeppelin-site.xml      |    8 -
 .../src/test/resources/zeppelin-site.xml      |    8 -
 smart-server/conf/zeppelin-site.xml           |    8 -
 .../src/test/resources/zeppelin-site.xml      |    8 -
 smart-zeppelin/conf/zeppelin-site.xml         |    8 -
 smart-zeppelin/zeppelin-zengine/pom.xml       |   16 -
 .../zeppelin/conf/ZeppelinConfiguration.java  |    3 +-
 .../notebook/repo/GitNotebookRepo.java        |  187 ---
 .../notebook/repo/VFSNotebookRepo.java        |  341 -----
 .../helium/HeliumApplicationFactoryTest.java  |  373 -----
 .../interpreter/InterpreterFactoryTest.java   |  486 -------
 .../zeppelin/notebook/NotebookTest.java       | 1269 -----------------
 .../notebook/repo/GitNotebookRepoTest.java    |  366 -----
 .../NotebookRepoSyncInitializationTest.java   |  159 ---
 .../notebook/repo/NotebookRepoSyncTest.java   |  427 ------
 .../notebook/repo/VFSNotebookRepoTest.java    |  204 ---
 .../repo/mock/VFSNotebookRepoMock.java        |   42 -
 .../test/resources/test-zeppelin-site1.xml    |    6 -
 .../test/resources/test-zeppelin-site2.xml    |    6 -
 .../src/test/resources/zeppelin-site.xml      |    6 -
 21 files changed, 1 insertion(+), 3938 deletions(-)
 delete mode 100644 smart-zeppelin/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/GitNotebookRepo.java
 delete mode 100644 smart-zeppelin/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepo.java
 delete mode 100644 smart-zeppelin/zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumApplicationFactoryTest.java
 delete mode 100644 smart-zeppelin/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterFactoryTest.java
 delete mode 100644 smart-zeppelin/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java
 delete mode 100644 smart-zeppelin/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/GitNotebookRepoTest.java
 delete mode 100644 smart-zeppelin/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/NotebookRepoSyncInitializationTest.java
 delete mode 100644 smart-zeppelin/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/NotebookRepoSyncTest.java
 delete mode 100644 smart-zeppelin/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepoTest.java
 delete mode 100644 smart-zeppelin/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/mock/VFSNotebookRepoMock.java

diff --git a/conf/zeppelin-site.xml b/conf/zeppelin-site.xml
index 6670828eb29..b24d1e0cb14 100644
--- a/conf/zeppelin-site.xml
+++ b/conf/zeppelin-site.xml
@@ -144,14 +144,6 @@
 </property>
 -->
 
-<!-- Notebook storage layer using local file system
-<property>
-  <name>zeppelin.notebook.storage</name>
-  <value>org.apache.zeppelin.notebook.repo.VFSNotebookRepo</value>
-  <description>local notebook persistence layer implementation</description>
-</property>
--->
-
 <!-- For connecting your Zeppelin with ZeppelinHub -->
 <!--
 <property>
diff --git a/smart-integration/conf/zeppelin-site.xml b/smart-integration/conf/zeppelin-site.xml
index 386eabb151a..9cf6b8c82b1 100644
--- a/smart-integration/conf/zeppelin-site.xml
+++ b/smart-integration/conf/zeppelin-site.xml
@@ -144,14 +144,6 @@
 </property>
 -->
 
-<!-- Notebook storage layer using local file system
-<property>
-  <name>zeppelin.notebook.storage</name>
-  <value>org.apache.zeppelin.notebook.repo.VFSNotebookRepo</value>
-  <description>local notebook persistence layer implementation</description>
-</property>
--->
-
 <!-- For connecting your Zeppelin with ZeppelinHub -->
 <!--
 <property>
diff --git a/smart-integration/src/test/resources/zeppelin-site.xml b/smart-integration/src/test/resources/zeppelin-site.xml
index 386eabb151a..9cf6b8c82b1 100644
--- a/smart-integration/src/test/resources/zeppelin-site.xml
+++ b/smart-integration/src/test/resources/zeppelin-site.xml
@@ -144,14 +144,6 @@
 </property>
 -->
 
-<!-- Notebook storage layer using local file system
-<property>
-  <name>zeppelin.notebook.storage</name>
-  <value>org.apache.zeppelin.notebook.repo.VFSNotebookRepo</value>
-  <description>local notebook persistence layer implementation</description>
-</property>
--->
-
 <!-- For connecting your Zeppelin with ZeppelinHub -->
 <!--
 <property>
diff --git a/smart-server/conf/zeppelin-site.xml b/smart-server/conf/zeppelin-site.xml
index 386eabb151a..9cf6b8c82b1 100644
--- a/smart-server/conf/zeppelin-site.xml
+++ b/smart-server/conf/zeppelin-site.xml
@@ -144,14 +144,6 @@
 </property>
 -->
 
-<!-- Notebook storage layer using local file system
-<property>
-  <name>zeppelin.notebook.storage</name>
-  <value>org.apache.zeppelin.notebook.repo.VFSNotebookRepo</value>
-  <description>local notebook persistence layer implementation</description>
-</property>
--->
-
 <!-- For connecting your Zeppelin with ZeppelinHub -->
 <!--
 <property>
diff --git a/smart-server/src/test/resources/zeppelin-site.xml b/smart-server/src/test/resources/zeppelin-site.xml
index 386eabb151a..9cf6b8c82b1 100644
--- a/smart-server/src/test/resources/zeppelin-site.xml
+++ b/smart-server/src/test/resources/zeppelin-site.xml
@@ -144,14 +144,6 @@
 </property>
 -->
 
-<!-- Notebook storage layer using local file system
-<property>
-  <name>zeppelin.notebook.storage</name>
-  <value>org.apache.zeppelin.notebook.repo.VFSNotebookRepo</value>
-  <description>local notebook persistence layer implementation</description>
-</property>
--->
-
 <!-- For connecting your Zeppelin with ZeppelinHub -->
 <!--
 <property>
diff --git a/smart-zeppelin/conf/zeppelin-site.xml b/smart-zeppelin/conf/zeppelin-site.xml
index ca84d23c255..acafc5604ab 100644
--- a/smart-zeppelin/conf/zeppelin-site.xml
+++ b/smart-zeppelin/conf/zeppelin-site.xml
@@ -144,14 +144,6 @@
 </property>
 -->
 
-<!-- Notebook storage layer using local file system
-<property>
-  <name>zeppelin.notebook.storage</name>
-  <value>org.apache.zeppelin.notebook.repo.VFSNotebookRepo</value>
-  <description>local notebook persistence layer implementation</description>
-</property>
--->
-
 <!-- For connecting your Zeppelin with ZeppelinHub -->
 <!--
 <property>
diff --git a/smart-zeppelin/zeppelin-zengine/pom.xml b/smart-zeppelin/zeppelin-zengine/pom.xml
index e4642cf438e..77de445a40e 100644
--- a/smart-zeppelin/zeppelin-zengine/pom.xml
+++ b/smart-zeppelin/zeppelin-zengine/pom.xml
@@ -83,22 +83,6 @@
       <artifactId>commons-logging</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-vfs2</artifactId>
-      <version>${commons.vfs2.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.maven.scm</groupId>
-          <artifactId>maven-scm-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.codehaus.plexus</groupId>
-          <artifactId>plexus-utils</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
diff --git a/smart-zeppelin/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java b/smart-zeppelin/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
index da61b78a845..7528c9dfb1d 100644
--- a/smart-zeppelin/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
+++ b/smart-zeppelin/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
@@ -21,7 +21,6 @@
 import org.apache.commons.configuration.XMLConfiguration;
 import org.apache.commons.configuration.tree.ConfigurationNode;
 import org.apache.commons.lang.StringUtils;
-import org.apache.zeppelin.notebook.repo.GitNotebookRepo;
 import org.apache.zeppelin.util.Util;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -598,7 +597,7 @@ public static enum ConfVars {
     ZEPPELIN_NOTEBOOK_AZURE_CONNECTION_STRING("zeppelin.notebook.azure.connectionString", null),
     ZEPPELIN_NOTEBOOK_AZURE_SHARE("zeppelin.notebook.azure.share", "zeppelin"),
     ZEPPELIN_NOTEBOOK_AZURE_USER("zeppelin.notebook.azure.user", "user"),
-    ZEPPELIN_NOTEBOOK_STORAGE("zeppelin.notebook.storage", GitNotebookRepo.class.getName()),
+    ZEPPELIN_NOTEBOOK_STORAGE("zeppelin.notebook.storage", null),
     ZEPPELIN_NOTEBOOK_ONE_WAY_SYNC("zeppelin.notebook.one.way.sync", false),
     // whether by default note is public or private
     ZEPPELIN_NOTEBOOK_PUBLIC("zeppelin.notebook.public", true),
diff --git a/smart-zeppelin/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/GitNotebookRepo.java b/smart-zeppelin/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/GitNotebookRepo.java
deleted file mode 100644
index 29be75129ef..00000000000
--- a/smart-zeppelin/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/GitNotebookRepo.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.zeppelin.notebook.repo;
-
-import com.google.common.base.Joiner;
-import com.google.common.collect.Lists;
-import org.apache.zeppelin.conf.ZeppelinConfiguration;
-import org.apache.zeppelin.notebook.Note;
-import org.apache.zeppelin.user.AuthenticationInfo;
-import org.eclipse.jgit.api.Git;
-import org.eclipse.jgit.api.errors.GitAPIException;
-import org.eclipse.jgit.api.errors.NoHeadException;
-import org.eclipse.jgit.diff.DiffEntry;
-import org.eclipse.jgit.dircache.DirCache;
-import org.eclipse.jgit.internal.storage.file.FileRepository;
-import org.eclipse.jgit.lib.Constants;
-import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.lib.Repository;
-import org.eclipse.jgit.revwalk.RevCommit;
-import org.eclipse.jgit.treewalk.filter.PathFilter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.List;
-
-/**
- * NotebookRepo that hosts all the notebook FS in a single Git repo
- *
- * This impl intended to be simple and straightforward:
- *   - does not handle branches
- *   - only basic local git file repo, no remote Github push\pull yet
- *
- *   TODO(bzz): add default .gitignore
- */
-public class GitNotebookRepo extends VFSNotebookRepo {
-  private static final Logger LOG = LoggerFactory.getLogger(GitNotebookRepo.class);
-
-  private String localPath;
-  private Git git;
-
-  public GitNotebookRepo(ZeppelinConfiguration conf) throws IOException {
-    super(conf);
-    localPath = getRootDir().getName().getPath();
-    LOG.info("Opening a git repo at '{}'", localPath);
-    Repository localRepo = new FileRepository(Joiner.on(File.separator).join(localPath, ".git"));
-    if (!localRepo.getDirectory().exists()) {
-      LOG.info("Git repo {} does not exist, creating a new one", localRepo.getDirectory());
-      localRepo.create();
-    }
-    git = new Git(localRepo);
-  }
-
-  @Override
-  public synchronized void save(Note note, AuthenticationInfo subject) throws IOException {
-    super.save(note, subject);
-  }
-
-  /* implemented as git add+commit
-   * @param pattern is the noteId
-   * @param commitMessage is a commit message (checkpoint message)
-   * (non-Javadoc)
-   * @see org.apache.zeppelin.notebook.repo.VFSNotebookRepo#checkpoint(String, String)
-   */
-  @Override
-  public Revision checkpoint(String pattern, String commitMessage, AuthenticationInfo subject) {
-    Revision revision = Revision.EMPTY;
-    try {
-      List<DiffEntry> gitDiff = git.diff().call();
-      if (!gitDiff.isEmpty()) {
-        LOG.debug("Changes found for pattern '{}': {}", pattern, gitDiff);
-        DirCache added = git.add().addFilepattern(pattern).call();
-        LOG.debug("{} changes are about to be commited", added.getEntryCount());
-        RevCommit commit = git.commit().setMessage(commitMessage).call();
-        revision = new Revision(commit.getName(), commit.getShortMessage(), commit.getCommitTime());
-      } else {
-        LOG.debug("No changes found {}", pattern);
-      }
-    } catch (GitAPIException e) {
-      LOG.error("Failed to add+commit {} to Git", pattern, e);
-    }
-    return revision;
-  }
-
-  /**
-   * the idea is to:
-   * 1. stash current changes
-   * 2. remember head commit and checkout to the desired revision
-   * 3. get note and checkout back to the head
-   * 4. apply stash on top and remove it
-   */
-  @Override
-  public synchronized Note get(String noteId, String revId, AuthenticationInfo subject)
-      throws IOException {
-    Note note = null;
-    RevCommit stash = null;
-    try {
-      List<DiffEntry> gitDiff = git.diff().setPathFilter(PathFilter.create(noteId)).call();
-      boolean modified = !gitDiff.isEmpty();
-      if (modified) {
-        // stash changes
-        stash = git.stashCreate().call();
-        Collection<RevCommit> stashes = git.stashList().call();
-        LOG.debug("Created stash : {}, stash size : {}", stash, stashes.size());
-      }
-      ObjectId head = git.getRepository().resolve(Constants.HEAD);
-      // checkout to target revision
-      git.checkout().setStartPoint(revId).addPath(noteId).call();
-      // get the note
-      note = super.get(noteId, subject);
-      // checkout back to head
-      git.checkout().setStartPoint(head.getName()).addPath(noteId).call();
-      if (modified && stash != null) {
-        // unstash changes
-        ObjectId applied = git.stashApply().setStashRef(stash.getName()).call();
-        ObjectId dropped = git.stashDrop().setStashRef(0).call();
-        Collection<RevCommit> stashes = git.stashList().call();
-        LOG.debug("Stash applied as : {}, and dropped : {}, stash size: {}", applied, dropped,
-            stashes.size());
-      }
-    } catch (GitAPIException e) {
-      LOG.error("Failed to return note from revision \"{}\"", revId, e);
-    }
-    return note;
-  }
-
-  @Override
-  public List<Revision> revisionHistory(String noteId, AuthenticationInfo subject) {
-    List<Revision> history = Lists.newArrayList();
-    LOG.debug("Listing history for {}:", noteId);
-    try {
-      Iterable<RevCommit> logs = git.log().addPath(noteId).call();
-      for (RevCommit log: logs) {
-        history.add(new Revision(log.getName(), log.getShortMessage(), log.getCommitTime()));
-        LOG.debug(" - ({},{},{})", log.getName(), log.getCommitTime(), log.getFullMessage());
-      }
-    } catch (NoHeadException e) {
-      //when no initial commit exists
-      LOG.debug("No Head found for {}, {}", noteId, e.getMessage());
-    } catch (GitAPIException e) {
-      LOG.error("Failed to get logs for {}", noteId, e);
-    }
-    return history;
-  }
-
-  @Override
-  public Note setNoteRevision(String noteId, String revId, AuthenticationInfo subject)
-      throws IOException {
-    Note revisionNote = get(noteId, revId, subject);
-    if (revisionNote != null) {
-      save(revisionNote, subject);
-    }
-    return revisionNote;
-  }
-  
-  @Override
-  public void close() {
-    git.getRepository().close();
-  }
-
-  //DI replacements for Tests
-  Git getGit() {
-    return git;
-  }
-
-  void setGit(Git git) {
-    this.git = git;
-  }
-
-}
diff --git a/smart-zeppelin/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepo.java b/smart-zeppelin/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepo.java
deleted file mode 100644
index 04a707502e7..00000000000
--- a/smart-zeppelin/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepo.java
+++ /dev/null
@@ -1,341 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.zeppelin.notebook.repo;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Collections;
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.vfs2.FileContent;
-import org.apache.commons.vfs2.FileObject;
-import org.apache.commons.vfs2.FileSystemManager;
-import org.apache.commons.vfs2.FileType;
-import org.apache.commons.vfs2.NameScope;
-import org.apache.commons.vfs2.Selectors;
-import org.apache.commons.vfs2.VFS;
-import org.apache.zeppelin.conf.ZeppelinConfiguration;
-import org.apache.zeppelin.conf.ZeppelinConfiguration.ConfVars;
-import org.apache.zeppelin.notebook.ApplicationState;
-import org.apache.zeppelin.notebook.Note;
-import org.apache.zeppelin.notebook.NoteInfo;
-import org.apache.zeppelin.notebook.NotebookImportDeserializer;
-import org.apache.zeppelin.notebook.Paragraph;
-import org.apache.zeppelin.scheduler.Job.Status;
-import org.apache.zeppelin.user.AuthenticationInfo;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.collect.Lists;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-
-/**
-*
-*/
-public class VFSNotebookRepo implements NotebookRepo {
-  private static final Logger LOG = LoggerFactory.getLogger(VFSNotebookRepo.class);
-
-  private FileSystemManager fsManager;
-  private URI filesystemRoot;
-  private ZeppelinConfiguration conf;
-
-  public VFSNotebookRepo(ZeppelinConfiguration conf) throws IOException {
-    this.conf = conf;
-    setNotebookDirectory(conf.getNotebookDir());
-  }
-
-  private void setNotebookDirectory(String notebookDirPath) throws IOException {
-    try {
-      if (conf.isWindowsPath(notebookDirPath)) {
-        filesystemRoot = new File(notebookDirPath).toURI();
-      } else {
-        filesystemRoot = new URI(notebookDirPath);
-      }
-    } catch (URISyntaxException e1) {
-      throw new IOException(e1);
-    }
-
-    if (filesystemRoot.getScheme() == null) { // it is local path
-      File f = new File(conf.getRelativeDir(filesystemRoot.getPath()));
-      this.filesystemRoot = f.toURI();
-    }
-
-    fsManager = VFS.getManager();
-    FileObject file = fsManager.resolveFile(filesystemRoot.getPath());
-    if (!file.exists()) {
-      LOG.info("Notebook dir doesn't exist, create on is {}.", file.getName());
-      file.createFolder();
-    }
-  }
-
-  private String getNotebookDirPath() {
-    return filesystemRoot.getPath().toString();
-  }
-
-  private String getPath(String path) {
-    if (path == null || path.trim().length() == 0) {
-      return filesystemRoot.toString();
-    }
-    if (path.startsWith("/")) {
-      return filesystemRoot.toString() + path;
-    } else {
-      return filesystemRoot.toString() + "/" + path;
-    }
-  }
-
-  private boolean isDirectory(FileObject fo) throws IOException {
-    if (fo == null) return false;
-    if (fo.getType() == FileType.FOLDER) {
-      return true;
-    } else {
-      return false;
-    }
-  }
-
-  @Override
-  public List<NoteInfo> list(AuthenticationInfo subject) throws IOException {
-    FileObject rootDir = getRootDir();
-
-    FileObject[] children = rootDir.getChildren();
-
-    List<NoteInfo> infos = new LinkedList<>();
-    for (FileObject f : children) {
-      String fileName = f.getName().getBaseName();
-      if (f.isHidden()
-          || fileName.startsWith(".")
-          || fileName.startsWith("#")
-          || fileName.startsWith("~")) {
-        // skip hidden, temporary files
-        continue;
-      }
-
-      if (!isDirectory(f)) {
-        // currently single note is saved like, [NOTE_ID]/note.json.
-        // so it must be a directory
-        continue;
-      }
-
-      NoteInfo info = null;
-
-      try {
-        info = getNoteInfo(f);
-        if (info != null) {
-          infos.add(info);
-        }
-      } catch (Exception e) {
-        LOG.error("Can't read note " + f.getName().toString(), e);
-      }
-    }
-
-    return infos;
-  }
-
-  private Note getNote(FileObject noteDir) throws IOException {
-    if (!isDirectory(noteDir)) {
-      throw new IOException(noteDir.getName().toString() + " is not a directory");
-    }
-
-    FileObject noteJson = noteDir.resolveFile("note.json", NameScope.CHILD);
-    if (!noteJson.exists()) {
-      throw new IOException(noteJson.getName().toString() + " not found");
-    }
-
-    GsonBuilder gsonBuilder = new GsonBuilder();
-    gsonBuilder.setPrettyPrinting();
-    Gson gson = gsonBuilder.registerTypeAdapter(Date.class, new NotebookImportDeserializer())
-        .create();
-
-    FileContent content = noteJson.getContent();
-    InputStream ins = content.getInputStream();
-    String json = IOUtils.toString(ins, conf.getString(ConfVars.ZEPPELIN_ENCODING));
-    ins.close();
-
-    Note note = gson.fromJson(json, Note.class);
-//    note.setReplLoader(replLoader);
-//    note.jobListenerFactory = jobListenerFactory;
-
-    for (Paragraph p : note.getParagraphs()) {
-      if (p.getStatus() == Status.PENDING || p.getStatus() == Status.RUNNING) {
-        p.setStatus(Status.ABORT);
-      }
-
-      List<ApplicationState> appStates = p.getAllApplicationStates();
-      if (appStates != null) {
-        for (ApplicationState app : appStates) {
-          if (app.getStatus() != ApplicationState.Status.ERROR) {
-            app.setStatus(ApplicationState.Status.UNLOADED);
-          }
-        }
-      }
-    }
-
-    return note;
-  }
-
-  private NoteInfo getNoteInfo(FileObject noteDir) throws IOException {
-    Note note = getNote(noteDir);
-    return new NoteInfo(note);
-  }
-
-  @Override
-  public Note get(String noteId, AuthenticationInfo subject) throws IOException {
-    FileObject rootDir = fsManager.resolveFile(getPath("/"));
-    FileObject noteDir = rootDir.resolveFile(noteId, NameScope.CHILD);
-
-    return getNote(noteDir);
-  }
-
-  protected FileObject getRootDir() throws IOException {
-    FileObject rootDir = fsManager.resolveFile(getPath("/"));
-
-    if (!rootDir.exists()) {
-      throw new IOException("Root path does not exists");
-    }
-
-    if (!isDirectory(rootDir)) {
-      throw new IOException("Root path is not a directory");
-    }
-
-    return rootDir;
-  }
-
-  @Override
-  public synchronized void save(Note note, AuthenticationInfo subject) throws IOException {
-    GsonBuilder gsonBuilder = new GsonBuilder();
-    gsonBuilder.setPrettyPrinting();
-    Gson gson = gsonBuilder.create();
-    String json = gson.toJson(note);
-
-    FileObject rootDir = getRootDir();
-
-    FileObject noteDir = rootDir.resolveFile(note.getId(), NameScope.CHILD);
-
-    if (!noteDir.exists()) {
-      noteDir.createFolder();
-    }
-    if (!isDirectory(noteDir)) {
-      throw new IOException(noteDir.getName().toString() + " is not a directory");
-    }
-
-    FileObject noteJson = noteDir.resolveFile(".note.json", NameScope.CHILD);
-    // false means not appending. creates file if not exists
-    OutputStream out = noteJson.getContent().getOutputStream(false);
-    out.write(json.getBytes(conf.getString(ConfVars.ZEPPELIN_ENCODING)));
-    out.close();
-    noteJson.moveTo(noteDir.resolveFile("note.json", NameScope.CHILD));
-  }
-
-  @Override
-  public void remove(String noteId, AuthenticationInfo subject) throws IOException {
-    FileObject rootDir = fsManager.resolveFile(getPath("/"));
-    FileObject noteDir = rootDir.resolveFile(noteId, NameScope.CHILD);
-
-    if (!noteDir.exists()) {
-      // nothing to do
-      return;
-    }
-
-    if (!isDirectory(noteDir)) {
-      // it is not look like zeppelin note savings
-      throw new IOException("Can not remove " + noteDir.getName().toString());
-    }
-
-    noteDir.delete(Selectors.SELECT_SELF_AND_CHILDREN);
-  }
-
-  @Override
-  public void close() {
-    //no-op    
-  }
-
-  @Override
-  public Revision checkpoint(String noteId, String checkpointMsg, AuthenticationInfo subject)
-      throws IOException {
-    // no-op
-    LOG.warn("Checkpoint feature isn't supported in {}", this.getClass().toString());
-    return Revision.EMPTY;
-  }
-
-  @Override
-  public Note get(String noteId, String revId, AuthenticationInfo subject) throws IOException {
-    LOG.warn("Get note revision feature isn't supported in {}", this.getClass().toString());
-    return null;
-  }
-
-  @Override
-  public List<Revision> revisionHistory(String noteId, AuthenticationInfo subject) {
-    LOG.warn("Get Note revisions feature isn't supported in {}", this.getClass().toString());
-    return Collections.emptyList();
-  }
-
-  @Override
-  public List<NotebookRepoSettingsInfo> getSettings(AuthenticationInfo subject) {
-    NotebookRepoSettingsInfo repoSetting = NotebookRepoSettingsInfo.newInstance();
-    List<NotebookRepoSettingsInfo> settings = Lists.newArrayList();
-
-    repoSetting.name = "Notebook Path";
-    repoSetting.type = NotebookRepoSettingsInfo.Type.INPUT;
-    repoSetting.value = Collections.emptyList();
-    repoSetting.selected = getNotebookDirPath();
-
-    settings.add(repoSetting);
-    return settings;
-  }
-
-  @Override
-  public void updateSettings(Map<String, String> settings, AuthenticationInfo subject) {
-    if (settings == null || settings.isEmpty()) {
-      LOG.error("Cannot update {} with empty settings", this.getClass().getName());
-      return;
-    }
-    String newNotebookDirectotyPath = StringUtils.EMPTY;
-    if (settings.containsKey("Notebook Path")) {
-      newNotebookDirectotyPath = settings.get("Notebook Path");
-    }
-
-    if (StringUtils.isBlank(newNotebookDirectotyPath)) {
-      LOG.error("Notebook path is invalid");
-      return;
-    }
-    LOG.warn("{} will change notebook dir from {} to {}",
-        subject.getUser(), getNotebookDirPath(), newNotebookDirectotyPath);
-    try {
-      setNotebookDirectory(newNotebookDirectotyPath);
-    } catch (IOException e) {
-      LOG.error("Cannot update notebook directory", e);
-    }
-  }
-
-  @Override
-  public Note setNoteRevision(String noteId, String revId, AuthenticationInfo subject)
-      throws IOException {
-    // Auto-generated method stub
-    return null;
-  }
-
-}
diff --git a/smart-zeppelin/zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumApplicationFactoryTest.java b/smart-zeppelin/zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumApplicationFactoryTest.java
deleted file mode 100644
index c3eedb796f0..00000000000
--- a/smart-zeppelin/zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumApplicationFactoryTest.java
+++ /dev/null
@@ -1,373 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.zeppelin.helium;
-
-import com.google.common.collect.Maps;
-import org.apache.commons.io.FileUtils;
-import org.apache.zeppelin.conf.ZeppelinConfiguration;
-import org.apache.zeppelin.dep.Dependency;
-import org.apache.zeppelin.dep.DependencyResolver;
-import org.apache.zeppelin.interpreter.*;
-import org.apache.zeppelin.interpreter.mock.MockInterpreter1;
-import org.apache.zeppelin.interpreter.mock.MockInterpreter2;
-import org.apache.zeppelin.notebook.*;
-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;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Properties;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-
-public class HeliumApplicationFactoryTest implements JobListenerFactory {
-  private File tmpDir;
-  private File notebookDir;
-  private ZeppelinConfiguration conf;
-  private SchedulerFactory schedulerFactory;
-  private DependencyResolver depResolver;
-  private InterpreterFactory factory;
-  private InterpreterSettingManager interpreterSettingManager;
-  private VFSNotebookRepo notebookRepo;
-  private Notebook notebook;
-  private HeliumApplicationFactory heliumAppFactory;
-  private AuthenticationInfo anonymous;
-
-  @Before
-  public void setUp() throws Exception {
-    tmpDir = new File(System.getProperty("java.io.tmpdir")+"/ZepelinLTest_"+System.currentTimeMillis());
-    tmpDir.mkdirs();
-    File confDir = new File(tmpDir, "conf");
-    confDir.mkdirs();
-    notebookDir = new File(tmpDir + "/notebook");
-    notebookDir.mkdirs();
-
-    File home = new File(getClass().getClassLoader().getResource("note").getFile()) // zeppelin/zeppelin-zengine/target/test-classes/note
-        .getParentFile()               // zeppelin/zeppelin-zengine/target/test-classes
-        .getParentFile()               // zeppelin/zeppelin-zengine/target
-        .getParentFile()               // zeppelin/zeppelin-zengine
-        .getParentFile();              // zeppelin
-
-    System.setProperty(ZeppelinConfiguration.ConfVars.ZEPPELIN_HOME.getVarName(), home.getAbsolutePath());
-    System.setProperty(ZeppelinConfiguration.ConfVars.ZEPPELIN_CONF_DIR.getVarName(), tmpDir.getAbsolutePath() + "/conf");
-    System.setProperty(ZeppelinConfiguration.ConfVars.ZEPPELIN_NOTEBOOK_DIR.getVarName(), notebookDir.getAbsolutePath());
-
-    conf = new ZeppelinConfiguration();
-
-    this.schedulerFactory = new SchedulerFactory();
-
-    heliumAppFactory = new HeliumApplicationFactory();
-    depResolver = new DependencyResolver(tmpDir.getAbsolutePath() + "/local-repo");
-    interpreterSettingManager = new InterpreterSettingManager(conf, depResolver, new InterpreterOption(true));
-    factory = new InterpreterFactory(conf, null, null, heliumAppFactory, depResolver, false, interpreterSettingManager);
-    HashMap<String, String> env = new HashMap<>();
-    env.put("ZEPPELIN_CLASSPATH", new File("./target/test-classes").getAbsolutePath());
-    factory.setEnv(env);
-
-    ArrayList<InterpreterInfo> interpreterInfos = new ArrayList<>();
-    interpreterInfos.add(new InterpreterInfo(MockInterpreter1.class.getName(), "mock1", true, new HashMap<String, Object>()));
-    interpreterSettingManager.add("mock1", interpreterInfos, new ArrayList<Dependency>(), new InterpreterOption(),
-        Maps.<String, InterpreterProperty>newHashMap(), "mock1", null);
-    interpreterSettingManager.createNewSetting("mock1", "mock1", new ArrayList<Dependency>(), new InterpreterOption(true), new Properties());
-
-    ArrayList<InterpreterInfo> interpreterInfos2 = new ArrayList<>();
-    interpreterInfos2.add(new InterpreterInfo(MockInterpreter2.class.getName(), "mock2", true, new HashMap<String, Object>()));
-    interpreterSettingManager.add("mock2", interpreterInfos2, new ArrayList<Dependency>(), new InterpreterOption(),
-        Maps.<String, InterpreterProperty>newHashMap(), "mock2", null);
-    interpreterSettingManager.createNewSetting("mock2", "mock2", new ArrayList<Dependency>(), new InterpreterOption(), new Properties());
-
-    SearchService search = mock(SearchService.class);
-    notebookRepo = new VFSNotebookRepo(conf);
-    NotebookAuthorization notebookAuthorization = NotebookAuthorization.init(conf);
-    notebook = new Notebook(
-        conf,
-        notebookRepo,
-        schedulerFactory,
-        factory,
-        interpreterSettingManager,
-        this,
-        search,
-        notebookAuthorization,
-        new Credentials(false, null));
-
-    heliumAppFactory.setNotebook(notebook);
-
-    notebook.addNotebookEventListener(heliumAppFactory);
-
-    anonymous = new AuthenticationInfo("anonymous");
-  }
-
-  @After
-  public void tearDown() throws Exception {
-    List<InterpreterSetting> settings = interpreterSettingManager.get();
-    for (InterpreterSetting setting : settings) {
-      for (InterpreterGroup intpGroup : setting.getAllInterpreterGroups()) {
-        intpGroup.close();
-      }
-    }
-
-    FileUtils.deleteDirectory(tmpDir);
-    System.setProperty(ZeppelinConfiguration.ConfVars.ZEPPELIN_CONF_DIR.getVarName(),
-        ZeppelinConfiguration.ConfVars.ZEPPELIN_CONF_DIR.getStringValue());
-  }
-
-
-  @Test
-  public void testLoadRunUnloadApplication()
-      throws IOException, ApplicationException, InterruptedException {
-    // given
-    HeliumPackage pkg1 = new HeliumPackage(HeliumPackage.Type.APPLICATION,
-        "name1",
-        "desc1",
-        "",
-        HeliumTestApplication.class.getName(),
-        new String[][]{},
-        "", "");
-
-    Note note1 = notebook.createNote(anonymous);
-    interpreterSettingManager.setInterpreters("user", note1.getId(),interpreterSettingManager.getDefaultInterpreterSettingList());
-
-    Paragraph p1 = note1.addParagraph(AuthenticationInfo.ANONYMOUS);
-
-    // 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("repl1: job", p1.getResult().message().get(0).getData());
-
-    // when
-    assertEquals(0, p1.getAllApplicationStates().size());
-    String appId = heliumAppFactory.loadAndRun(pkg1, p1);
-    assertEquals(1, p1.getAllApplicationStates().size());
-    ApplicationState app = p1.getApplicationState(appId);
-    Thread.sleep(500); // wait for enough time
-
-    // then
-    assertEquals("Hello world 1", app.getOutput());
-
-    // when
-    heliumAppFactory.run(p1, appId);
-    Thread.sleep(500); // wait for enough time
-
-    // then
-    assertEquals("Hello world 2", app.getOutput());
-
-    // clean
-    heliumAppFactory.unload(p1, appId);
-    notebook.removeNote(note1.getId(), anonymous);
-  }
-
-  @Test
-  public void testUnloadOnParagraphRemove() throws IOException {
-    // given
-    HeliumPackage pkg1 = new HeliumPackage(HeliumPackage.Type.APPLICATION,
-        "name1",
-        "desc1",
-        "",
-        HeliumTestApplication.class.getName(),
-        new String[][]{},
-        "", "");
-
-    Note note1 = notebook.createNote(anonymous);
-    interpreterSettingManager.setInterpreters("user", note1.getId(), interpreterSettingManager.getDefaultInterpreterSettingList());
-
-    Paragraph p1 = note1.addParagraph(AuthenticationInfo.ANONYMOUS);
-
-    // 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());
-    String appId = heliumAppFactory.loadAndRun(pkg1, p1);
-    ApplicationState app = p1.getApplicationState(appId);
-    while (app.getStatus() != ApplicationState.Status.LOADED) {
-      Thread.yield();
-    }
-
-    // when remove paragraph
-    note1.removeParagraph("user", p1.getId());
-
-    // then
-    assertEquals(ApplicationState.Status.UNLOADED, app.getStatus());
-
-    // clean
-    notebook.removeNote(note1.getId(), anonymous);
-  }
-
-
-  @Test
-  public void testUnloadOnInterpreterUnbind() throws IOException {
-    // given
-    HeliumPackage pkg1 = new HeliumPackage(HeliumPackage.Type.APPLICATION,
-        "name1",
-        "desc1",
-        "",
-        HeliumTestApplication.class.getName(),
-        new String[][]{},
-        "", "");
-
-    Note note1 = notebook.createNote(anonymous);
-    notebook.bindInterpretersToNote("user", note1.getId(), interpreterSettingManager.getDefaultInterpreterSettingList());
-
-    Paragraph p1 = note1.addParagraph(AuthenticationInfo.ANONYMOUS);
-
-    // 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());
-    String appId = heliumAppFactory.loadAndRun(pkg1, p1);
-    ApplicationState app = p1.getApplicationState(appId);
-    while (app.getStatus() != ApplicationState.Status.LOADED) {
-      Thread.yield();
-    }
-
-    // when unbind interpreter
-    notebook.bindInterpretersToNote("user", note1.getId(), new LinkedList<String>());
-
-    // then
-    assertEquals(ApplicationState.Status.UNLOADED, app.getStatus());
-
-    // clean
-    notebook.removeNote(note1.getId(), anonymous);
-  }
-
-  @Test
-  public void testInterpreterUnbindOfNullReplParagraph() throws IOException {
-    // create note
-    Note note1 = notebook.createNote(anonymous);
-
-    // add paragraph with invalid magic
-    Paragraph p1 = note1.addParagraph(AuthenticationInfo.ANONYMOUS);
-    p1.setText("%fake ");
-
-    // make sure that p1's repl is null
-    Interpreter intp = p1.getCurrentRepl();
-    assertEquals(intp, null);
-
-    // Unbind all interpreter from note
-    // NullPointerException shouldn't occur here
-    notebook.bindInterpretersToNote("user", note1.getId(), new LinkedList<String>());
-
-    // remove note
-    notebook.removeNote(note1.getId(), anonymous);
-  }
-
-
-  @Test
-  public void testUnloadOnInterpreterRestart() throws IOException {
-    // given
-    HeliumPackage pkg1 = new HeliumPackage(HeliumPackage.Type.APPLICATION,
-        "name1",
-        "desc1",
-        "",
-        HeliumTestApplication.class.getName(),
-        new String[][]{},
-        "", "");
-
-    Note note1 = notebook.createNote(anonymous);
-    notebook.bindInterpretersToNote("user", note1.getId(), interpreterSettingManager.getDefaultInterpreterSettingList());
-    String mock1IntpSettingId = null;
-    for (InterpreterSetting setting : notebook.getBindedInterpreterSettings(note1.getId())) {
-      if (setting.getName().equals("mock1")) {
-        mock1IntpSettingId = setting.getId();
-        break;
-      }
-    }
-
-    Paragraph p1 = note1.addParagraph(AuthenticationInfo.ANONYMOUS);
-
-    // 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());
-    String appId = heliumAppFactory.loadAndRun(pkg1, p1);
-    ApplicationState app = p1.getApplicationState(appId);
-    while (app.getStatus() != ApplicationState.Status.LOADED) {
-      Thread.yield();
-    }
-    // wait until application is executed
-    while (!"Hello world 1".equals(app.getOutput())) {
-      Thread.yield();
-    }
-    // when restart interpreter
-    interpreterSettingManager.restart(mock1IntpSettingId);
-    while (app.getStatus() == ApplicationState.Status.LOADED) {
-      Thread.yield();
-    }
-    // then
-    assertEquals(ApplicationState.Status.UNLOADED, app.getStatus());
-
-    // clean
-    notebook.removeNote(note1.getId(), anonymous);
-  }
-
-  @Override
-  public ParagraphJobListener getParagraphJobListener(Note note) {
-    return new ParagraphJobListener() {
-      @Override
-      public void onOutputAppend(Paragraph paragraph, int idx, String output) {
-
-      }
-
-      @Override
-      public void onOutputUpdate(Paragraph paragraph, int idx, InterpreterResultMessage msg) {
-
-      }
-
-      @Override
-      public void onOutputUpdateAll(Paragraph paragraph, List<InterpreterResultMessage> msgs) {
-
-      }
-
-      @Override
-      public void onProgressUpdate(Job job, int progress) {
-
-      }
-
-      @Override
-      public void beforeStatusChange(Job job, Job.Status before, Job.Status after) {
-
-      }
-
-      @Override
-      public void afterStatusChange(Job job, Job.Status before, Job.Status after) {
-
-      }
-    };
-  }
-}
diff --git a/smart-zeppelin/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterFactoryTest.java b/smart-zeppelin/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterFactoryTest.java
deleted file mode 100644
index d6473379405..00000000000
--- a/smart-zeppelin/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterFactoryTest.java
+++ /dev/null
@@ -1,486 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.zeppelin.interpreter;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import java.io.*;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Properties;
-
-import com.google.common.collect.Maps;
-import com.google.gson.Gson;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.NullArgumentException;
-import org.apache.zeppelin.conf.ZeppelinConfiguration;
-import org.apache.zeppelin.conf.ZeppelinConfiguration.ConfVars;
-import org.apache.zeppelin.dep.Dependency;
-import org.apache.zeppelin.dep.DependencyResolver;
-import org.apache.zeppelin.interpreter.mock.MockInterpreter1;
-import org.apache.zeppelin.interpreter.mock.MockInterpreter2;
-import org.apache.zeppelin.user.AuthenticationInfo;
-import org.apache.zeppelin.interpreter.remote.RemoteInterpreter;
-import org.apache.zeppelin.notebook.JobListenerFactory;
-import org.apache.zeppelin.notebook.Note;
-import org.apache.zeppelin.notebook.Notebook;
-import org.apache.zeppelin.notebook.NotebookAuthorization;
-import org.apache.zeppelin.notebook.repo.NotebookRepo;
-import org.apache.zeppelin.notebook.repo.VFSNotebookRepo;
-import org.apache.zeppelin.scheduler.SchedulerFactory;
-import org.apache.zeppelin.search.SearchService;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.quartz.SchedulerException;
-import org.sonatype.aether.RepositoryException;
-
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.when;
-import static org.mockito.Mockito.verify;
-
-import org.mockito.Mock;
-
-public class InterpreterFactoryTest {
-
-  private InterpreterFactory factory;
-  private InterpreterSettingManager interpreterSettingManager;
-  private File tmpDir;
-  private ZeppelinConfiguration conf;
-  private InterpreterContext context;
-  private Notebook notebook;
-  private NotebookRepo notebookRepo;
-  private DependencyResolver depResolver;
-  private SchedulerFactory schedulerFactory;
-  private NotebookAuthorization notebookAuthorization;
-  @Mock
-  private JobListenerFactory jobListenerFactory;
-
-  @Before
-  public void setUp() throws Exception {
-    tmpDir = new File(System.getProperty("java.io.tmpdir")+"/ZeppelinLTest_"+System.currentTimeMillis());
-    tmpDir.mkdirs();
-    new File(tmpDir, "conf").mkdirs();
-    FileUtils.copyDirectory(new File("src/test/resources/interpreter"), new File(tmpDir, "interpreter"));
-
-    System.setProperty(ConfVars.ZEPPELIN_HOME.getVarName(), tmpDir.getAbsolutePath());
-    System.setProperty(ConfVars.ZEPPELIN_INTERPRETER_GROUP_ORDER.getVarName(),
-        "mock1,mock2,mock11,dev");
-    conf = new ZeppelinConfiguration();
-    schedulerFactory = new SchedulerFactory();
-    depResolver = new DependencyResolver(tmpDir.getAbsolutePath() + "/local-repo");
-    interpreterSettingManager = new InterpreterSettingManager(conf, depResolver, new InterpreterOption(true));
-    factory = new InterpreterFactory(conf, null, null, null, depResolver, false, interpreterSettingManager);
-    context = new InterpreterContext("note", "id", null, "title", "text", null, null, null, null, null, null, null);
-
-    ArrayList<InterpreterInfo> interpreterInfos = new ArrayList<>();
-    interpreterInfos.add(new InterpreterInfo(MockInterpreter1.class.getName(), "mock1", true, new HashMap<String, Object>()));
-    interpreterSettingManager.add("mock1", interpreterInfos, new ArrayList<Dependency>(), new InterpreterOption(),
-        Maps.<String, InterpreterProperty>newHashMap(), "mock1", null);
-    Properties intp1Properties = new Properties();
-    intp1Properties.put("PROPERTY_1", "VALUE_1");
-    intp1Properties.put("property_2", "value_2");
-    interpreterSettingManager.createNewSetting("mock1", "mock1", new ArrayList<Dependency>(), new InterpreterOption(true), intp1Properties);
-
-    ArrayList<InterpreterInfo> interpreterInfos2 = new ArrayList<>();
-    interpreterInfos2.add(new InterpreterInfo(MockInterpreter2.class.getName(), "mock2", true, new HashMap<String, Object>()));
-    interpreterSettingManager.add("mock2", interpreterInfos2, new ArrayList<Dependency>(), new InterpreterOption(),
-        Maps.<String, InterpreterProperty>newHashMap(), "mock2", null);
-    interpreterSettingManager.createNewSetting("mock2", "mock2", new ArrayList<Dependency>(), new InterpreterOption(), new Properties());
-
-    SearchService search = mock(SearchService.class);
-    notebookRepo = new VFSNotebookRepo(conf);
-    notebookAuthorization = NotebookAuthorization.init(conf);
-    notebook = new Notebook(conf, notebookRepo, schedulerFactory, factory, interpreterSettingManager, jobListenerFactory, search,
-        notebookAuthorization, null);
-  }
-
-  @After
-  public void tearDown() throws Exception {
-    FileUtils.deleteDirectory(tmpDir);
-  }
-
-  @Test
-  public void testBasic() {
-    List<InterpreterSetting> all = interpreterSettingManager.get();
-    InterpreterSetting mock1Setting = null;
-    for (InterpreterSetting setting : all) {
-      if (setting.getName().equals("mock1")) {
-        mock1Setting = setting;
-        break;
-      }
-    }
-
-//    mock1Setting = factory.createNewSetting("mock11", "mock1", new ArrayList<Dependency>(), new InterpreterOption(false), new Properties());
-
-    InterpreterGroup interpreterGroup = mock1Setting.getInterpreterGroup("user", "sharedProcess");
-    factory.createInterpretersForNote(mock1Setting, "user", "sharedProcess", "session");
-
-    // get interpreter
-    assertNotNull("get Interpreter", interpreterGroup.get("session").get(0));
-
-    // try to get unavailable interpreter
-    assertNull(interpreterSettingManager.get("unknown"));
-
-    // restart interpreter
-    interpreterSettingManager.restart(mock1Setting.getId());
-    assertNull(mock1Setting.getInterpreterGroup("user", "sharedProcess").get("session"));
-  }
-
-  @Test
-  public void testRemoteRepl() throws Exception {
-    interpreterSettingManager = new InterpreterSettingManager(conf, depResolver, new InterpreterOption(true));
-    ArrayList<InterpreterInfo> interpreterInfos = new ArrayList<>();
-    interpreterInfos.add(new InterpreterInfo(MockInterpreter1.class.getName(), "mock1", true, new HashMap<String, Object>()));
-    interpreterSettingManager.add("mock1", interpreterInfos, new ArrayList<Dependency>(), new InterpreterOption(),
-        Maps.<String, InterpreterProperty>newHashMap(), "mock1", null);
-    Properties intp1Properties = new Properties();
-    intp1Properties.put("PROPERTY_1", "VALUE_1");
-    intp1Properties.put("property_2", "value_2");
-    interpreterSettingManager.createNewSetting("mock1", "mock1", new ArrayList<Dependency>(), new InterpreterOption(true), intp1Properties);
-    factory = new InterpreterFactory(conf, null, null, null, depResolver, false, interpreterSettingManager);
-    List<InterpreterSetting> all = interpreterSettingManager.get();
-    InterpreterSetting mock1Setting = null;
-    for (InterpreterSetting setting : all) {
-      if (setting.getName().equals("mock1")) {
-        mock1Setting = setting;
-        break;
-      }
-    }
-    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);
-    LazyOpenInterpreter lazyInterpreter = (LazyOpenInterpreter)(interpreterGroup.get("session").get(0));
-    assertTrue(lazyInterpreter.getInnerInterpreter() instanceof RemoteInterpreter);
-    RemoteInterpreter remoteInterpreter = (RemoteInterpreter) lazyInterpreter.getInnerInterpreter();
-    assertEquals("VALUE_1", remoteInterpreter.getEnv().get("PROPERTY_1"));
-    assertEquals("value_2", remoteInterpreter.getProperty("property_2"));
-  }
-
-  /**
-   * 2 users' interpreters in scoped mode. Each user has one session. Restarting user1's interpreter
-   * won't affect user2's interpreter
-   * @throws Exception
-   */
-  @Test
-  public void testRestartInterpreterInScopedMode() throws Exception {
-    interpreterSettingManager = new InterpreterSettingManager(conf, depResolver, new InterpreterOption(true));
-    ArrayList<InterpreterInfo> interpreterInfos = new ArrayList<>();
-    interpreterInfos.add(new InterpreterInfo(MockInterpreter1.class.getName(), "mock1", true, new HashMap<String, Object>()));
-    interpreterSettingManager.add("mock1", interpreterInfos, new ArrayList<Dependency>(), new InterpreterOption(),
-        Maps.<String, InterpreterProperty>newHashMap(), "mock1", null);
-    Properties intp1Properties = new Properties();
-    intp1Properties.put("PROPERTY_1", "VALUE_1");
-    intp1Properties.put("property_2", "value_2");
-    interpreterSettingManager.createNewSetting("mock1", "mock1", new ArrayList<Dependency>(), new InterpreterOption(true), intp1Properties);
-    factory = new InterpreterFactory(conf, null, null, null, depResolver, false, interpreterSettingManager);
-    List<InterpreterSetting> all = interpreterSettingManager.get();
-    InterpreterSetting mock1Setting = null;
-    for (InterpreterSetting setting : all) {
-      if (setting.getName().equals("mock1")) {
-        mock1Setting = setting;
-        break;
-      }
-    }
-    mock1Setting.getOption().setPerUser("scoped");
-    mock1Setting.getOption().setPerNote("shared");
-    // set remote as false so that we won't create new remote interpreter process
-    mock1Setting.getOption().setRemote(false);
-    mock1Setting.getOption().setHost("localhost");
-    mock1Setting.getOption().setPort(2222);
-    InterpreterGroup interpreterGroup = mock1Setting.getInterpreterGroup("user1", "sharedProcess");
-    factory.createInterpretersForNote(mock1Setting, "user1", "sharedProcess", "user1");
-    factory.createInterpretersForNote(mock1Setting, "user2", "sharedProcess", "user2");
-
-    LazyOpenInterpreter interpreter1 = (LazyOpenInterpreter)interpreterGroup.get("user1").get(0);
-    interpreter1.open();
-    LazyOpenInterpreter interpreter2 = (LazyOpenInterpreter)interpreterGroup.get("user2").get(0);
-    interpreter2.open();
-
-    mock1Setting.closeAndRemoveInterpreterGroup("sharedProcess", "user1");
-    assertFalse(interpreter1.isOpen());
-    assertTrue(interpreter2.isOpen());
-  }
-
-  /**
-   * 2 users' interpreters in isolated mode. Each user has one interpreterGroup. Restarting user1's interpreter
-   * won't affect user2's interpreter
-   * @throws Exception
-   */
-  @Test
-  public void testRestartInterpreterInIsolatedMode() throws Exception {
-    interpreterSettingManager = new InterpreterSettingManager(conf, depResolver, new InterpreterOption(true));
-    ArrayList<InterpreterInfo> interpreterInfos = new ArrayList<>();
-    interpreterInfos.add(new InterpreterInfo(MockInterpreter1.class.getName(), "mock1", true, new HashMap<String, Object>()));
-    interpreterSettingManager.add("mock1", interpreterInfos, new ArrayList<Dependency>(), new InterpreterOption(),
-        Maps.<String, InterpreterProperty>newHashMap(), "mock1", null);
-    Properties intp1Properties = new Properties();
-    intp1Properties.put("PROPERTY_1", "VALUE_1");
-    intp1Properties.put("property_2", "value_2");
-    interpreterSettingManager.createNewSetting("mock1", "mock1", new ArrayList<Dependency>(), new InterpreterOption(true), intp1Properties);
-    factory = new InterpreterFactory(conf, null, null, null, depResolver, false, interpreterSettingManager);
-    List<InterpreterSetting> all = interpreterSettingManager.get();
-    InterpreterSetting mock1Setting = null;
-    for (InterpreterSetting setting : all) {
-      if (setting.getName().equals("mock1")) {
-        mock1Setting = setting;
-        break;
-      }
-    }
-    mock1Setting.getOption().setPerUser("isolated");
-    mock1Setting.getOption().setPerNote("shared");
-    // set remote as false so that we won't create new remote interpreter process
-    mock1Setting.getOption().setRemote(false);
-    mock1Setting.getOption().setHost("localhost");
-    mock1Setting.getOption().setPort(2222);
-    InterpreterGroup interpreterGroup1 = mock1Setting.getInterpreterGroup("user1", "note1");
-    InterpreterGroup interpreterGroup2 = mock1Setting.getInterpreterGroup("user2", "note2");
-    factory.createInterpretersForNote(mock1Setting, "user1", "note1", "shared_session");
-    factory.createInterpretersForNote(mock1Setting, "user2", "note2", "shared_session");
-
-    LazyOpenInterpreter interpreter1 = (LazyOpenInterpreter)interpreterGroup1.get("shared_session").get(0);
-    interpreter1.open();
-    LazyOpenInterpreter interpreter2 = (LazyOpenInterpreter)interpreterGroup2.get("shared_session").get(0);
-    interpreter2.open();
-
-    mock1Setting.closeAndRemoveInterpreterGroup("note1", "user1");
-    assertFalse(interpreter1.isOpen());
-    assertTrue(interpreter2.isOpen());
-  }
-
-  @Test
-  public void testFactoryDefaultList() throws IOException, RepositoryException {
-    // get default settings
-    List<String> all = interpreterSettingManager.getDefaultInterpreterSettingList();
-    assertTrue(interpreterSettingManager.get().size() >= all.size());
-  }
-
-  @Test
-  public void testExceptions() throws InterpreterException, IOException, RepositoryException {
-    List<String> all = interpreterSettingManager.getDefaultInterpreterSettingList();
-    // add setting with null option & properties expected nullArgumentException.class
-    try {
-      interpreterSettingManager.add("mock2", new ArrayList<InterpreterInfo>(), new LinkedList<Dependency>(), new InterpreterOption(false), Collections.EMPTY_MAP, "", null);
-    } catch(NullArgumentException e) {
-      assertEquals("Test null option" , e.getMessage(),new NullArgumentException("option").getMessage());
-    }
-    try {
-      interpreterSettingManager.add("mock2", new ArrayList<InterpreterInfo>(), new LinkedList<Dependency>(), new InterpreterOption(false), Collections.EMPTY_MAP, "", null);
-    } catch (NullArgumentException e){
-      assertEquals("Test null properties" , e.getMessage(),new NullArgumentException("properties").getMessage());
-    }
-  }
-
-
-  @Test
-  public void testSaveLoad() throws IOException, RepositoryException {
-    // interpreter settings
-    int numInterpreters = interpreterSettingManager.get().size();
-
-    // check if file saved
-    assertTrue(new File(conf.getInterpreterSettingPath()).exists());
-
-    interpreterSettingManager.createNewSetting("new-mock1", "mock1", new LinkedList<Dependency>(), new InterpreterOption(false), new Properties());
-    assertEquals(numInterpreters + 1, interpreterSettingManager.get().size());
-
-    interpreterSettingManager = new InterpreterSettingManager(conf, depResolver, new InterpreterOption(true));
-
-    /*
-     Current situation, if InterpreterSettinfRef doesn't have the key of InterpreterSetting, it would be ignored.
-     Thus even though interpreter.json have several interpreterSetting in that file, it would be ignored and would not be initialized from loadFromFile.
-     In this case, only "mock11" would be referenced from file under interpreter/mock, and "mock11" group would be initialized.
-     */
-    // TODO(jl): Decide how to handle the know referenced interpreterSetting.
-    assertEquals(1, interpreterSettingManager.get().size());
-  }
-
-  @Test
-  public void testInterpreterSettingPropertyClass() throws IOException, RepositoryException {
-    // check if default interpreter reference's property type is map
-    Map<String, InterpreterSetting> interpreterSettingRefs = interpreterSettingManager.getAvailableInterpreterSettings();
-    InterpreterSetting intpSetting = interpreterSettingRefs.get("mock1");
-    Map<String, InterpreterProperty> intpProperties =
-        (Map<String, InterpreterProperty>) intpSetting.getProperties();
-    assertTrue(intpProperties instanceof Map);
-
-    // check if interpreter instance is saved as Properties in conf/interpreter.json file
-    Properties properties = new Properties();
-    properties.put("key1", "value1");
-    properties.put("key2", "value2");
-
-    interpreterSettingManager.createNewSetting("newMock", "mock1", new LinkedList<Dependency>(), new InterpreterOption(false), properties);
-
-    String confFilePath = conf.getInterpreterSettingPath();
-    byte[] encoded = Files.readAllBytes(Paths.get(confFilePath));
-    String json = new String(encoded, "UTF-8");
-
-    Gson gson = new Gson();
-    InterpreterInfoSaving infoSaving = gson.fromJson(json, InterpreterInfoSaving.class);
-    Map<String, InterpreterSetting> interpreterSettings = infoSaving.interpreterSettings;
-    for (String key : interpreterSettings.keySet()) {
-      InterpreterSetting setting = interpreterSettings.get(key);
-      if (setting.getName().equals("newMock")) {
-        assertEquals(setting.getProperties().toString(), properties.toString());
-      }
-    }
-  }
-
-  @Test
-  public void testInterpreterAliases() throws IOException, RepositoryException {
-    interpreterSettingManager = new InterpreterSettingManager(conf, depResolver, new InterpreterOption(true));
-    factory = new InterpreterFactory(conf, null, null, null, depResolver, false, interpreterSettingManager);
-    final InterpreterInfo info1 = new InterpreterInfo("className1", "name1", true, null);
-    final InterpreterInfo info2 = new InterpreterInfo("className2", "name1", true, null);
-    interpreterSettingManager.add("group1", new ArrayList<InterpreterInfo>() {{
-      add(info1);
-    }}, new ArrayList<Dependency>(), new InterpreterOption(true), Collections.EMPTY_MAP, "/path1", null);
-    interpreterSettingManager.add("group2", new ArrayList<InterpreterInfo>(){{
-      add(info2);
-    }}, new ArrayList<Dependency>(), new InterpreterOption(true), Collections.EMPTY_MAP, "/path2", null);
-
-    final InterpreterSetting setting1 = interpreterSettingManager.createNewSetting("test-group1", "group1", new ArrayList<Dependency>(), new InterpreterOption(true), new Properties());
-    final InterpreterSetting setting2 = interpreterSettingManager.createNewSetting("test-group2", "group1", new ArrayList<Dependency>(), new InterpreterOption(true), new Properties());
-
-    interpreterSettingManager.setInterpreters("user", "note", new ArrayList<String>() {{
-      add(setting1.getId());
-      add(setting2.getId());
-    }});
-
-    assertEquals("className1", factory.getInterpreter("user1", "note", "test-group1").getClassName());
-    assertEquals("className1", factory.getInterpreter("user1", "note", "group1").getClassName());
-  }
-
-  @Test
-  public void testMultiUser() throws IOException, RepositoryException {
-    interpreterSettingManager = new InterpreterSettingManager(conf, depResolver, new InterpreterOption(true));
-    factory = new InterpreterFactory(conf, null, null, null, depResolver, true, interpreterSettingManager);
-    final InterpreterInfo info1 = new InterpreterInfo("className1", "name1", true, null);
-    interpreterSettingManager.add("group1", new ArrayList<InterpreterInfo>(){{
-      add(info1);
-    }}, new ArrayList<Dependency>(), new InterpreterOption(true), Collections.EMPTY_MAP, "/path1", null);
-
-    InterpreterOption perUserInterpreterOption = new InterpreterOption(true, InterpreterOption.ISOLATED, InterpreterOption.SHARED);
-    final InterpreterSetting setting1 = interpreterSettingManager.createNewSetting("test-group1", "group1", new ArrayList<Dependency>(), perUserInterpreterOption, new Properties());
-
-    interpreterSettingManager.setInterpreters("user1", "note", new ArrayList<String>() {{
-      add(setting1.getId());
-    }});
-
-    interpreterSettingManager.setInterpreters("user2", "note", new ArrayList<String>() {{
-      add(setting1.getId());
-    }});
-
-    assertNotEquals(factory.getInterpreter("user1", "note", "test-group1"), factory.getInterpreter("user2", "note", "test-group1"));
-  }
-
-
-  @Test
-  public void testInvalidInterpreterSettingName() {
-    try {
-      interpreterSettingManager.createNewSetting("new.mock1", "mock1", new LinkedList<Dependency>(), new InterpreterOption(false), new Properties());
-      fail("expect fail because of invalid InterpreterSetting Name");
-    } catch (IOException e) {
-      assertEquals("'.' is invalid for InterpreterSetting name.", e.getMessage());
-    }
-  }
-
-
-  @Test
-  public void getEditorSetting() throws IOException, RepositoryException, SchedulerException {
-    List<String> intpIds = new ArrayList<>();
-    for(InterpreterSetting intpSetting: interpreterSettingManager.get()) {
-      if (intpSetting.getName().startsWith("mock1")) {
-        intpIds.add(intpSetting.getId());
-      }
-    }
-    Note note = notebook.createNote(intpIds, new AuthenticationInfo("anonymous"));
-
-    Interpreter interpreter = factory.getInterpreter("user1", note.getId(), "mock11");
-    // get editor setting from interpreter-setting.json
-    Map<String, Object> editor = interpreterSettingManager.getEditorSetting(interpreter, "user1", note.getId(), "mock11");
-    assertEquals("java", editor.get("language"));
-
-    // when interpreter is not loaded via interpreter-setting.json
-    // or editor setting doesn't exit
-    editor = interpreterSettingManager.getEditorSetting(factory.getInterpreter("user1", note.getId(), "mock1"),"user1", note.getId(), "mock1");
-    assertEquals(null, editor.get("language"));
-
-    // when interpreter is not bound to note
-    editor = interpreterSettingManager.getEditorSetting(factory.getInterpreter("user1", note.getId(), "mock11"),"user1", note.getId(), "mock2");
-    assertEquals("text", editor.get("language"));
-  }
-
-  @Test
-  public void registerCustomInterpreterRunner() throws IOException {
-    InterpreterSettingManager spyInterpreterSettingManager = spy(interpreterSettingManager);
-
-    doNothing().when(spyInterpreterSettingManager).saveToFile();
-
-    ArrayList<InterpreterInfo> interpreterInfos1 = new ArrayList<>();
-    interpreterInfos1.add(new InterpreterInfo("name1.class", "name1", true, Maps.<String, Object>newHashMap()));
-
-    spyInterpreterSettingManager.add("normalGroup1", interpreterInfos1, Lists.<Dependency>newArrayList(), new InterpreterOption(true), Maps.<String, InterpreterProperty>newHashMap(), "/normalGroup1", null);
-
-    spyInterpreterSettingManager.createNewSetting("normalGroup1", "normalGroup1", Lists.<Dependency>newArrayList(), new InterpreterOption(true), new Properties());
-
-    ArrayList<InterpreterInfo> interpreterInfos2 = new ArrayList<>();
-    interpreterInfos2.add(new InterpreterInfo("name1.class", "name1", true, Maps.<String, Object>newHashMap()));
-
-    InterpreterRunner mockInterpreterRunner = mock(InterpreterRunner.class);
-
-    when(mockInterpreterRunner.getPath()).thenReturn("custom-linux-path.sh");
-
-    spyInterpreterSettingManager.add("customGroup1", interpreterInfos2, Lists.<Dependency>newArrayList(), new InterpreterOption(true), Maps.<String, InterpreterProperty>newHashMap(), "/customGroup1", mockInterpreterRunner);
-
-    spyInterpreterSettingManager.createNewSetting("customGroup1", "customGroup1", Lists.<Dependency>newArrayList(), new InterpreterOption(true), new Properties());
-
-    spyInterpreterSettingManager.setInterpreters("anonymous", "noteCustome", spyInterpreterSettingManager.getDefaultInterpreterSettingList());
-
-    factory.getInterpreter("anonymous", "noteCustome", "customGroup1");
-
-    verify(mockInterpreterRunner, times(1)).getPath();
-  }
-
-  @Test
-  public void interpreterRunnerTest() {
-    InterpreterRunner mockInterpreterRunner = mock(InterpreterRunner.class);
-    String testInterpreterRunner = "relativePath.sh";
-    when(mockInterpreterRunner.getPath()).thenReturn(testInterpreterRunner); // This test only for Linux
-    Interpreter i = factory.createRemoteRepl("path1", "sessionKey", "className", new Properties(), "settingId", "userName", false, mockInterpreterRunner);
-    String interpreterRunner = ((RemoteInterpreter) ((LazyOpenInterpreter) i).getInnerInterpreter()).getInterpreterRunner();
-    assertNotEquals(interpreterRunner, testInterpreterRunner);
-
-    testInterpreterRunner = "/AbsolutePath.sh";
-    when(mockInterpreterRunner.getPath()).thenReturn(testInterpreterRunner);
-    i = factory.createRemoteRepl("path1", "sessionKey", "className", new Properties(), "settingId", "userName", false, mockInterpreterRunner);
-    interpreterRunner = ((RemoteInterpreter) ((LazyOpenInterpreter) i).getInnerInterpreter()).getInterpreterRunner();
-    assertEquals(interpreterRunner, testInterpreterRunner);
-  }
-}
diff --git a/smart-zeppelin/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java b/smart-zeppelin/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java
deleted file mode 100644
index b4be918fa9a..00000000000
--- a/smart-zeppelin/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java
+++ /dev/null
@@ -1,1269 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.zeppelin.notebook;
-
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.mock;
-
-import com.google.common.collect.Maps;
-import java.io.File;
-import java.io.IOException;
-import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.zeppelin.conf.ZeppelinConfiguration;
-import org.apache.zeppelin.conf.ZeppelinConfiguration.ConfVars;
-import org.apache.zeppelin.dep.Dependency;
-import org.apache.zeppelin.dep.DependencyResolver;
-import org.apache.zeppelin.display.AngularObjectRegistry;
-import org.apache.zeppelin.interpreter.*;
-import org.apache.zeppelin.interpreter.mock.MockInterpreter1;
-import org.apache.zeppelin.interpreter.mock.MockInterpreter2;
-import org.apache.zeppelin.notebook.repo.NotebookRepo;
-import org.apache.zeppelin.notebook.repo.VFSNotebookRepo;
-import org.apache.zeppelin.resource.LocalResourcePool;
-import org.apache.zeppelin.resource.ResourcePoolUtils;
-import org.apache.zeppelin.scheduler.Job;
-import org.apache.zeppelin.scheduler.Job.Status;
-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;
-import org.quartz.SchedulerException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.sonatype.aether.RepositoryException;
-
-public class NotebookTest implements JobListenerFactory{
-  private static final Logger logger = LoggerFactory.getLogger(NotebookTest.class);
-
-  private File tmpDir;
-  private ZeppelinConfiguration conf;
-  private SchedulerFactory schedulerFactory;
-  private File notebookDir;
-  private Notebook notebook;
-  private NotebookRepo notebookRepo;
-  private InterpreterFactory factory;
-  private InterpreterSettingManager interpreterSettingManager;
-  private DependencyResolver depResolver;
-  private NotebookAuthorization notebookAuthorization;
-  private Credentials credentials;
-  private AuthenticationInfo anonymous = AuthenticationInfo.ANONYMOUS;
-
-  @Before
-  public void setUp() throws Exception {
-
-    tmpDir = new File(System.getProperty("java.io.tmpdir")+"/ZeppelinLTest_"+System.currentTimeMillis());
-    tmpDir.mkdirs();
-    new File(tmpDir, "conf").mkdirs();
-    notebookDir = new File(tmpDir + "/notebook");
-    notebookDir.mkdirs();
-
-    System.setProperty(ConfVars.ZEPPELIN_CONF_DIR.getVarName(), tmpDir.toString() + "/conf");
-    System.setProperty(ConfVars.ZEPPELIN_HOME.getVarName(), tmpDir.getAbsolutePath());
-    System.setProperty(ConfVars.ZEPPELIN_NOTEBOOK_DIR.getVarName(), notebookDir.getAbsolutePath());
-
-    conf = ZeppelinConfiguration.create();
-
-    this.schedulerFactory = new SchedulerFactory();
-
-    depResolver = new DependencyResolver(tmpDir.getAbsolutePath() + "/local-repo");
-    interpreterSettingManager = new InterpreterSettingManager(conf, depResolver, new InterpreterOption(false));
-    factory = new InterpreterFactory(conf, null, null, null, depResolver, false, interpreterSettingManager);
-
-    ArrayList<InterpreterInfo> interpreterInfos = new ArrayList<>();
-    interpreterInfos.add(new InterpreterInfo(MockInterpreter1.class.getName(), "mock1", true, new HashMap<String, Object>()));
-    interpreterSettingManager.add("mock1", interpreterInfos, new ArrayList<Dependency>(), new InterpreterOption(),
-        Maps.<String, InterpreterProperty>newHashMap(), "mock1", null);
-    interpreterSettingManager.createNewSetting("mock1", "mock1", new ArrayList<Dependency>(), new InterpreterOption(), new Properties());
-
-    ArrayList<InterpreterInfo> interpreterInfos2 = new ArrayList<>();
-    interpreterInfos2.add(new InterpreterInfo(MockInterpreter2.class.getName(), "mock2", true, new HashMap<String, Object>()));
-    interpreterSettingManager.add("mock2", interpreterInfos2, new ArrayList<Dependency>(), new InterpreterOption(),
-        Maps.<String, InterpreterProperty>newHashMap(), "mock2", null);
-    interpreterSettingManager.createNewSetting("mock2", "mock2", new ArrayList<Dependency>(), new InterpreterOption(), new Properties());
-
-
-    SearchService search = mock(SearchService.class);
-    notebookRepo = new VFSNotebookRepo(conf);
-    notebookAuthorization = NotebookAuthorization.init(conf);
-    credentials = new Credentials(conf.credentialsPersist(), conf.getCredentialsPath());
-
-    notebook = new Notebook(conf, notebookRepo, schedulerFactory, factory, interpreterSettingManager, this, search,
-        notebookAuthorization, credentials);
-  }
-
-  @After
-  public void tearDown() throws Exception {
-    delete(tmpDir);
-  }
-
-  @Test
-  public void testSelectingReplImplementation() throws IOException {
-    Note note = notebook.createNote(anonymous);
-    interpreterSettingManager.setInterpreters(anonymous.getUser(), note.getId(), interpreterSettingManager.getDefaultInterpreterSettingList());
-
-    // run with default repl
-    Paragraph p1 = note.addParagraph(AuthenticationInfo.ANONYMOUS);
-    Map config = p1.getConfig();
-    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().get(0).getData());
-
-    // run with specific repl
-    Paragraph p2 = note.addParagraph(AuthenticationInfo.ANONYMOUS);
-    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().get(0).getData());
-    notebook.removeNote(note.getId(), anonymous);
-  }
-
-  @Test
-  public void testReloadAndSetInterpreter() throws IOException {
-    // given a notebook
-    File srcDir = new File("src/test/resources/2A94M5J1Z");
-    File destDir = new File(notebookDir.getAbsolutePath() + "/2A94M5J1Z");
-    FileUtils.copyDirectory(srcDir, destDir);
-
-    // when load
-    notebook.reloadAllNotes(anonymous);
-    assertEquals(1, notebook.getAllNotes().size());
-
-    // then interpreter factory should be injected into all the paragraphs
-    Note note = notebook.getAllNotes().get(0);
-    assertNull(note.getParagraphs().get(0).getRepl(null));
-  }
-
-  @Test
-  public void testReloadAllNotes() throws IOException {
-    /**
-     * 2A94M5J1Z old date format without timezone
-     * 2BQA35CJZ new date format with timezone
-     */
-    String[] noteNames = new String[]{"2A94M5J1Z", "2BQA35CJZ"};
-
-    // copy the notebook
-    try {
-      for (String note : noteNames) {
-        File srcDir = new File("src/test/resources/" + note);
-        File destDir = new File(notebookDir.getAbsolutePath() + "/" + note);
-        FileUtils.copyDirectory(srcDir, destDir);
-      }
-    } catch (IOException e) {
-      logger.error(e.toString(), e);
-    }
-
-    // doesn't have copied notebook in memory before reloading
-    List<Note> notes = notebook.getAllNotes();
-    assertEquals(notes.size(), 0);
-
-    // load copied notebook on memory when reloadAllNotes() is called
-    Note copiedNote = notebookRepo.get("2A94M5J1Z", anonymous);
-    notebook.reloadAllNotes(anonymous);
-    notes = notebook.getAllNotes();
-    assertEquals(notes.size(), 2);
-    assertEquals(notes.get(1).getId(), copiedNote.getId());
-    assertEquals(notes.get(1).getName(), copiedNote.getName());
-    assertEquals(notes.get(1).getParagraphs(), copiedNote.getParagraphs());
-
-    // delete the notebook
-    for (String note : noteNames) {
-      File destDir = new File(notebookDir.getAbsolutePath() + "/" + note);
-      FileUtils.deleteDirectory(destDir);
-    }
-
-    // keep notebook in memory before reloading
-    notes = notebook.getAllNotes();
-    assertEquals(notes.size(), 2);
-
-    // delete notebook from notebook list when reloadAllNotes() is called
-    notebook.reloadAllNotes(anonymous);
-    notes = notebook.getAllNotes();
-    assertEquals(notes.size(), 0);
-  }
-
-  @Test
-  public void testLoadAllNotes() {
-    Note note;
-    try {
-      assertEquals(0, notebook.getAllNotes().size());
-      note = notebook.createNote(anonymous);
-      Paragraph p1 = note.addParagraph(AuthenticationInfo.ANONYMOUS);
-      Map config = p1.getConfig();
-      config.put("enabled", true);
-      p1.setConfig(config);
-      p1.setText("hello world");
-      note.persist(anonymous);
-    } catch (IOException fe) {
-      logger.warn("Failed to create note and paragraph. Possible problem with persisting note, safe to ignore", fe);
-    }
-
-    try {
-      notebook.loadAllNotes(anonymous);
-      assertEquals(1, notebook.getAllNotes().size());
-    } catch (IOException e) {
-      fail("Subject is non-emtpy anonymous, shouldn't fail");
-    }
-  }
-  
-  @Test
-  public void testPersist() throws IOException, SchedulerException, RepositoryException {
-    Note note = notebook.createNote(anonymous);
-
-    // run with default repl
-    Paragraph p1 = note.addParagraph(AuthenticationInfo.ANONYMOUS);
-    Map config = p1.getConfig();
-    config.put("enabled", true);
-    p1.setConfig(config);
-    p1.setText("hello world");
-    note.persist(anonymous);
-
-    Notebook notebook2 = new Notebook(
-        conf, notebookRepo, schedulerFactory,
-        new InterpreterFactory(conf, null, null, null, depResolver, false, interpreterSettingManager),
-        interpreterSettingManager, null, null, null, null);
-
-    assertEquals(1, notebook2.getAllNotes().size());
-    notebook.removeNote(note.getId(), anonymous);
-  }
-
-  @Test
-  public void testCreateNoteWithSubject() throws IOException, SchedulerException, RepositoryException {
-    AuthenticationInfo subject = new AuthenticationInfo("user1");
-    Note note = notebook.createNote(subject);
-
-    assertNotNull(notebook.getNotebookAuthorization().getOwners(note.getId()));
-    assertEquals(1, notebook.getNotebookAuthorization().getOwners(note.getId()).size());
-    Set<String> owners = new HashSet<>();
-    owners.add("user1");
-    assertEquals(owners, notebook.getNotebookAuthorization().getOwners(note.getId()));
-    notebook.removeNote(note.getId(), anonymous);
-  }
-
-  @Test
-  public void testClearParagraphOutput() throws IOException, SchedulerException{
-    Note note = notebook.createNote(anonymous);
-    Paragraph p1 = note.addParagraph(AuthenticationInfo.ANONYMOUS);
-    Map config = p1.getConfig();
-    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().get(0).getData());
-
-    // clear paragraph output/result
-    note.clearParagraphOutput(p1.getId(), null);
-    assertNull(p1.getResult());
-    notebook.removeNote(note.getId(), anonymous);
-  }
-
-  @Test
-  public void testRunBlankParagraph() throws IOException, SchedulerException, InterruptedException {
-    Note note = notebook.createNote(anonymous);
-    Paragraph p1 = note.addParagraph(AuthenticationInfo.ANONYMOUS);
-    p1.setText("");
-    p1.setAuthenticationInfo(anonymous);
-    note.run(p1.getId());
-
-    Thread.sleep(2 * 1000);
-    assertEquals(p1.getStatus(), Status.FINISHED);
-    assertNull(p1.getDateStarted());
-    notebook.removeNote(note.getId(), anonymous);
-  }
-
-  @Test
-  public void testRunAll() throws IOException {
-    Note note = notebook.createNote(anonymous);
-    interpreterSettingManager.setInterpreters("user", note.getId(), interpreterSettingManager.getDefaultInterpreterSettingList());
-
-    // p1
-    Paragraph p1 = note.addParagraph(AuthenticationInfo.ANONYMOUS);
-    Map config1 = p1.getConfig();
-    config1.put("enabled", true);
-    p1.setConfig(config1);
-    p1.setText("p1");
-
-    // p2
-    Paragraph p2 = note.addParagraph(AuthenticationInfo.ANONYMOUS);
-    Map config2 = p2.getConfig();
-    config2.put("enabled", false);
-    p2.setConfig(config2);
-    p2.setText("p2");
-
-    // p3
-    Paragraph p3 = note.addParagraph(AuthenticationInfo.ANONYMOUS);
-    p3.setText("p3");
-
-    // when
-    note.runAll();
-
-    // wait for finish
-    while(p3.isTerminated() == false) {
-      Thread.yield();
-    }
-
-    assertEquals("repl1: p1", p1.getResult().message().get(0).getData());
-    assertNull(p2.getResult());
-    assertEquals("repl1: p3", p3.getResult().message().get(0).getData());
-
-    notebook.removeNote(note.getId(), anonymous);
-  }
-
-  @Test
-  public void testSchedule() throws InterruptedException, IOException {
-    // create a note and a paragraph
-    Note note = notebook.createNote(anonymous);
-    interpreterSettingManager.setInterpreters("user", note.getId(), interpreterSettingManager.getDefaultInterpreterSettingList());
-
-    Paragraph p = note.addParagraph(AuthenticationInfo.ANONYMOUS);
-    Map config = new HashMap<>();
-    p.setConfig(config);
-    p.setText("p1");
-    Date dateFinished = p.getDateFinished();
-    assertNull(dateFinished);
-
-    // set cron scheduler, once a second
-    config = note.getConfig();
-    config.put("enabled", true);
-    config.put("cron", "* * * * * ?");
-    note.setConfig(config);
-    notebook.refreshCron(note.getId());
-    Thread.sleep(1 * 1000);
-
-    // remove cron scheduler.
-    config.put("cron", null);
-    note.setConfig(config);
-    notebook.refreshCron(note.getId());
-    Thread.sleep(1000);
-    dateFinished = p.getDateFinished();
-    assertNotNull(dateFinished);
-    Thread.sleep(1 * 1000);
-    assertEquals(dateFinished, p.getDateFinished());
-    notebook.removeNote(note.getId(), anonymous);
-  }
-
-  @Test
-  public void testSchedulePoolUsage() throws InterruptedException, IOException {
-    // create a note and a paragraph
-    Note note = notebook.createNote(anonymous);
-    interpreterSettingManager.setInterpreters("user", note.getId(), interpreterSettingManager.getDefaultInterpreterSettingList());
-    Paragraph p = note.addParagraph(AuthenticationInfo.ANONYMOUS);
-    Map config = Maps.newHashMap();
-    p.setConfig(config);
-    Date dateFinished = p.getDateFinished();
-    String result = getResultString(p.getResult());
-    assertEquals(result, StringUtils.EMPTY);
-    assertNull(dateFinished);
-    
-    // set cron scheduler, once a second
-    config = note.getConfig();
-    config.put("enabled", true);
-    config.put("cron", "* * * * * ?");
-    note.setConfig(config);
-    notebook.refreshCron(note.getId());
-    
-    // run job maxExecutionCount times
-    int maxExecutionCount = 13;
-    int maxRetryCount = 4 * maxExecutionCount;
-    int executionCount = 0;
-    int retryCount = 0;
-    String resultTemplate = "%text repl1: p";
-    p.setText("p" + executionCount);
-    
-    while (executionCount < maxExecutionCount) {
-      if (p.getDateFinished() != null && !p.getDateFinished().equals(dateFinished)) {
-        // paragraph has been executed
-        assertNotEquals(dateFinished, p.getDateFinished());
-        assertNotEquals(result, getResultString(p.getResult()));
-        assertEquals(p.getResult().toString(), resultTemplate + executionCount);
-        assertEquals(p.getStatus(), Status.FINISHED);
-        executionCount++;
-        dateFinished = p.getDateFinished();
-        result = getResultString(p.getResult());
-        p.setText("p" + executionCount);
-      }
-      Thread.sleep(1100);
-      if (++retryCount > maxRetryCount) {
-        logger.error("Couldn't schedule {} number of note executions after {} retries",
-            maxExecutionCount, maxRetryCount);
-        fail();
-      }
-    }
-    
-    // save results and update paragraph
-    dateFinished = p.getDateFinished();
-    result = getResultString(p.getResult());
-    p.setText("new text");
-    // remove cron scheduler
-    config.put("cron", null);
-    note.setConfig(config);
-    notebook.refreshCron(note.getId());
-    
-    Thread.sleep(1100);
-    
-    // ensure that hasn't been run again
-    assertEquals(dateFinished, p.getDateFinished());
-    assertEquals(result, getResultString(p.getResult()));
-  }
-  
-  private String getResultString(InterpreterResult result) {
-    return result == null ? StringUtils.EMPTY : result.toString();
-  }
-  
-  @Test
-  public void testAutoRestartInterpreterAfterSchedule() throws InterruptedException, IOException{
-    // create a note and a paragraph
-    Note note = notebook.createNote(anonymous);
-    interpreterSettingManager.setInterpreters(anonymous.getUser(), note.getId(), interpreterSettingManager.getDefaultInterpreterSettingList());
-    
-    Paragraph p = note.addParagraph(AuthenticationInfo.ANONYMOUS);
-    Map config = new HashMap<>();
-    p.setConfig(config);
-    p.setText("sleep 1000");
-
-    Paragraph p2 = note.addParagraph(AuthenticationInfo.ANONYMOUS);
-    p2.setConfig(config);
-    p2.setText("%mock2 sleep 500");
-
-    // set cron scheduler, once a second
-    config = note.getConfig();
-    config.put("enabled", true);
-    config.put("cron", "1/3 * * * * ?");
-    config.put("releaseresource", true);
-    note.setConfig(config);
-    notebook.refreshCron(note.getId());
-
-
-    MockInterpreter1 mock1 = ((MockInterpreter1) (((ClassloaderInterpreter)
-        ((LazyOpenInterpreter) factory.getInterpreter(anonymous.getUser(), note.getId(), "mock1")).getInnerInterpreter())
-        .getInnerInterpreter()));
-
-    MockInterpreter2 mock2 = ((MockInterpreter2) (((ClassloaderInterpreter)
-        ((LazyOpenInterpreter) factory.getInterpreter(anonymous.getUser(), note.getId(), "mock2")).getInnerInterpreter())
-        .getInnerInterpreter()));
-
-    // wait until interpreters are started
-    while (!mock1.isOpen() || !mock2.isOpen()) {
-      Thread.yield();
-    }
-
-    // wait until interpreters are closed
-    while (mock1.isOpen() || mock2.isOpen()) {
-      Thread.yield();
-    }
-
-    // remove cron scheduler.
-    config.put("cron", null);
-    note.setConfig(config);
-    notebook.refreshCron(note.getId());
-
-    // make sure all paragraph has been executed
-    assertNotNull(p.getDateFinished());
-    assertNotNull(p2.getDateFinished());
-    notebook.removeNote(note.getId(), anonymous);
-  }
-
-  @Test
-  public void testExportAndImportNote() throws IOException, CloneNotSupportedException,
-          InterruptedException, InterpreterException, SchedulerException, RepositoryException {
-    Note note = notebook.createNote(anonymous);
-    interpreterSettingManager.setInterpreters("user", note.getId(), interpreterSettingManager.getDefaultInterpreterSettingList());
-
-    final Paragraph p = note.addParagraph(AuthenticationInfo.ANONYMOUS);
-    String simpleText = "hello world";
-    p.setText(simpleText);
-
-    note.runAll();
-    while (p.isTerminated() == false || p.getResult() == null) {
-      Thread.yield();
-    }
-
-    String exportedNoteJson = notebook.exportNote(note.getId());
-
-    Note importedNote = notebook.importNote(exportedNoteJson, "Title", anonymous);
-
-    Paragraph p2 = importedNote.getParagraphs().get(0);
-
-    // Test
-    assertEquals(p.getId(), p2.getId());
-    assertEquals(p.text, p2.text);
-    assertEquals(p.getResult().message().get(0).getData(), p2.getResult().message().get(0).getData());
-
-    // Verify import note with subject
-    AuthenticationInfo subject = new AuthenticationInfo("user1");
-    Note importedNote2 = notebook.importNote(exportedNoteJson, "Title2", subject);
-    assertNotNull(notebook.getNotebookAuthorization().getOwners(importedNote2.getId()));
-    assertEquals(1, notebook.getNotebookAuthorization().getOwners(importedNote2.getId()).size());
-    Set<String> owners = new HashSet<>();
-    owners.add("user1");
-    assertEquals(owners, notebook.getNotebookAuthorization().getOwners(importedNote2.getId()));
-    notebook.removeNote(note.getId(), anonymous);
-    notebook.removeNote(importedNote.getId(), anonymous);
-    notebook.removeNote(importedNote2.getId(), anonymous);
-  }
-
-  @Test
-  public void testCloneNote() throws IOException, CloneNotSupportedException,
-      InterruptedException, InterpreterException, SchedulerException, RepositoryException {
-    Note note = notebook.createNote(anonymous);
-    interpreterSettingManager.setInterpreters("user", note.getId(), interpreterSettingManager.getDefaultInterpreterSettingList());
-
-    final Paragraph p = note.addParagraph(AuthenticationInfo.ANONYMOUS);
-    p.setText("hello world");
-    note.runAll();
-    while(p.isTerminated()==false || p.getResult()==null) Thread.yield();
-
-    p.setStatus(Status.RUNNING);
-    Note cloneNote = notebook.cloneNote(note.getId(), "clone note", anonymous);
-    Paragraph cp = cloneNote.paragraphs.get(0);
-    assertEquals(cp.getStatus(), Status.READY);
-
-    // Keep same ParagraphId
-    assertEquals(cp.getId(), p.getId());
-    assertEquals(cp.text, p.text);
-    assertEquals(cp.getResult().message().get(0).getData(), p.getResult().message().get(0).getData());
-
-    // Verify clone note with subject
-    AuthenticationInfo subject = new AuthenticationInfo("user1");
-    Note cloneNote2 = notebook.cloneNote(note.getId(), "clone note2", subject);
-    assertNotNull(notebook.getNotebookAuthorization().getOwners(cloneNote2.getId()));
-    assertEquals(1, notebook.getNotebookAuthorization().getOwners(cloneNote2.getId()).size());
-    Set<String> owners = new HashSet<>();
-    owners.add("user1");
-    assertEquals(owners, notebook.getNotebookAuthorization().getOwners(cloneNote2.getId()));
-    notebook.removeNote(note.getId(), anonymous);
-    notebook.removeNote(cloneNote.getId(), anonymous);
-    notebook.removeNote(cloneNote2.getId(), anonymous);
-  }
-
-  @Test
-  public void testCloneNoteWithNoName() throws IOException, CloneNotSupportedException,
-      InterruptedException {
-    Note note = notebook.createNote(anonymous);
-    interpreterSettingManager.setInterpreters(anonymous.getUser(), note.getId(), interpreterSettingManager.getDefaultInterpreterSettingList());
-
-    Note cloneNote = notebook.cloneNote(note.getId(), null, anonymous);
-    assertEquals(cloneNote.getName(), "Note " + cloneNote.getId());
-    notebook.removeNote(note.getId(), anonymous);
-    notebook.removeNote(cloneNote.getId(), anonymous);
-  }
-
-  @Test
-  public void testCloneNoteWithExceptionResult() throws IOException, CloneNotSupportedException,
-      InterruptedException {
-    Note note = notebook.createNote(anonymous);
-    interpreterSettingManager.setInterpreters(anonymous.getUser(), note.getId(), interpreterSettingManager.getDefaultInterpreterSettingList());
-
-    final Paragraph p = note.addParagraph(AuthenticationInfo.ANONYMOUS);
-    p.setText("hello world");
-    note.runAll();
-    while (p.isTerminated() == false || p.getResult() == null) {
-      Thread.yield();
-    }
-    // Force paragraph to have String type object
-    p.setResult("Exception");
-
-    Note cloneNote = notebook.cloneNote(note.getId(), "clone note with Exception result", anonymous);
-    Paragraph cp = cloneNote.paragraphs.get(0);
-
-    // Keep same ParagraphId
-    assertEquals(cp.getId(), p.getId());
-    assertEquals(cp.text, p.text);
-    assertNull(cp.getResult());
-    notebook.removeNote(note.getId(), anonymous);
-    notebook.removeNote(cloneNote.getId(), anonymous);
-  }
-
-  @Test
-  public void testResourceRemovealOnParagraphNoteRemove() throws IOException {
-    Note note = notebook.createNote(anonymous);
-    interpreterSettingManager.setInterpreters(anonymous.getUser(), note.getId(), interpreterSettingManager.getDefaultInterpreterSettingList());
-    for (InterpreterGroup intpGroup : InterpreterGroup.getAll()) {
-      intpGroup.setResourcePool(new LocalResourcePool(intpGroup.getId()));
-    }
-    Paragraph p1 = note.addParagraph(AuthenticationInfo.ANONYMOUS);
-    p1.setText("hello");
-    Paragraph p2 = note.addParagraph(AuthenticationInfo.ANONYMOUS);
-    p2.setText("%mock2 world");
-
-    note.runAll();
-    while (p1.isTerminated() == false || p1.getResult() == null) Thread.yield();
-    while (p2.isTerminated() == false || p2.getResult() == null) Thread.yield();
-
-    assertEquals(2, ResourcePoolUtils.getAllResources().size());
-
-    // remove a paragraph
-    note.removeParagraph(anonymous.getUser(), p1.getId());
-    assertEquals(1, ResourcePoolUtils.getAllResources().size());
-
-    // remove note
-    notebook.removeNote(note.getId(), anonymous);
-    assertEquals(0, ResourcePoolUtils.getAllResources().size());
-  }
-
-  @Test
-  public void testAngularObjectRemovalOnNotebookRemove() throws InterruptedException,
-      IOException {
-    // create a note and a paragraph
-    Note note = notebook.createNote(anonymous);
-    interpreterSettingManager.setInterpreters(anonymous.getUser(), note.getId(), interpreterSettingManager.getDefaultInterpreterSettingList());
-
-    AngularObjectRegistry registry = interpreterSettingManager
-        .getInterpreterSettings(note.getId()).get(0).getInterpreterGroup(anonymous.getUser(), "sharedProcess")
-        .getAngularObjectRegistry();
-
-    Paragraph p1 = note.addParagraph(AuthenticationInfo.ANONYMOUS);
-
-    // add paragraph scope object
-    registry.add("o1", "object1", note.getId(), p1.getId());
-
-    // add notebook scope object
-    registry.add("o2", "object2", note.getId(), null);
-
-    // add global scope object
-    registry.add("o3", "object3", null, null);
-
-    // remove notebook
-    notebook.removeNote(note.getId(), anonymous);
-
-    // notebook scope or paragraph scope object should be removed
-    assertNull(registry.get("o1", note.getId(), null));
-    assertNull(registry.get("o2", note.getId(), p1.getId()));
-
-    // global object sould be remained
-    assertNotNull(registry.get("o3", null, null));
-  }
-
-  @Test
-  public void testAngularObjectRemovalOnParagraphRemove() throws InterruptedException,
-      IOException {
-    // create a note and a paragraph
-    Note note = notebook.createNote(anonymous);
-    interpreterSettingManager.setInterpreters(anonymous.getUser(), note.getId(), interpreterSettingManager.getDefaultInterpreterSettingList());
-
-    AngularObjectRegistry registry = interpreterSettingManager
-        .getInterpreterSettings(note.getId()).get(0).getInterpreterGroup(anonymous.getUser(), "sharedProcess")
-        .getAngularObjectRegistry();
-
-    Paragraph p1 = note.addParagraph(AuthenticationInfo.ANONYMOUS);
-
-    // add paragraph scope object
-    registry.add("o1", "object1", note.getId(), p1.getId());
-
-    // add notebook scope object
-    registry.add("o2", "object2", note.getId(), null);
-
-    // add global scope object
-    registry.add("o3", "object3", null, null);
-
-    // remove notebook
-    note.removeParagraph(anonymous.getUser(), p1.getId());
-
-    // paragraph scope should be removed
-    assertNull(registry.get("o1", note.getId(), null));
-
-    // notebook scope and global object sould be remained
-    assertNotNull(registry.get("o2", note.getId(), null));
-    assertNotNull(registry.get("o3", null, null));
-    notebook.removeNote(note.getId(), anonymous);
-  }
-
-  @Test
-  public void testAngularObjectRemovalOnInterpreterRestart() throws InterruptedException,
-      IOException {
-    // create a note and a paragraph
-    Note note = notebook.createNote(anonymous);
-    interpreterSettingManager.setInterpreters(anonymous.getUser(), note.getId(), interpreterSettingManager.getDefaultInterpreterSettingList());
-
-    AngularObjectRegistry registry = interpreterSettingManager
-        .getInterpreterSettings(note.getId()).get(0).getInterpreterGroup(anonymous.getUser(), "sharedProcess")
-        .getAngularObjectRegistry();
-
-    // add local scope object
-    registry.add("o1", "object1", note.getId(), null);
-    // add global scope object
-    registry.add("o2", "object2", null, null);
-
-    // restart interpreter
-    interpreterSettingManager.restart(interpreterSettingManager.getInterpreterSettings(note.getId()).get(0).getId());
-    registry = interpreterSettingManager.getInterpreterSettings(note.getId()).get(0).getInterpreterGroup(anonymous.getUser(), "sharedProcess")
-    .getAngularObjectRegistry();
-
-    // local and global scope object should be removed
-    // But InterpreterGroup does not implement angularObjectRegistry per session (scoped, isolated)
-    // So for now, does not have good way to remove all objects in particular session on restart.
-    assertNotNull(registry.get("o1", note.getId(), null));
-    assertNotNull(registry.get("o2", null, null));
-    notebook.removeNote(note.getId(), anonymous);
-  }
-
-  @Test
-  public void testPermissions() throws IOException {
-    // create a note and a paragraph
-    Note note = notebook.createNote(anonymous);
-    NotebookAuthorization notebookAuthorization = notebook.getNotebookAuthorization();
-    // empty owners, readers or writers means note is public
-    assertEquals(notebookAuthorization.isOwner(note.getId(),
-            new HashSet<>(Arrays.asList("user2"))), true);
-    assertEquals(notebookAuthorization.isReader(note.getId(),
-            new HashSet<>(Arrays.asList("user2"))), true);
-    assertEquals(notebookAuthorization.isWriter(note.getId(),
-            new HashSet<>(Arrays.asList("user2"))), true);
-
-    notebookAuthorization.setOwners(note.getId(),
-            new HashSet<>(Arrays.asList("user1")));
-    notebookAuthorization.setReaders(note.getId(),
-            new HashSet<>(Arrays.asList("user1", "user2")));
-    notebookAuthorization.setWriters(note.getId(),
-            new HashSet<>(Arrays.asList("user1")));
-
-    assertEquals(notebookAuthorization.isOwner(note.getId(),
-        new HashSet<>(Arrays.asList("user2"))), false);
-    assertEquals(notebookAuthorization.isOwner(note.getId(),
-            new HashSet<>(Arrays.asList("user1"))), true);
-
-    assertEquals(notebookAuthorization.isReader(note.getId(),
-        new HashSet<>(Arrays.asList("user3"))), false);
-    assertEquals(notebookAuthorization.isReader(note.getId(),
-        new HashSet<>(Arrays.asList("user2"))), true);
-
-    assertEquals(notebookAuthorization.isWriter(note.getId(),
-        new HashSet<>(Arrays.asList("user2"))), false);
-    assertEquals(notebookAuthorization.isWriter(note.getId(),
-        new HashSet<>(Arrays.asList("user1"))), true);
-
-    // Test clearing of permssions
-    notebookAuthorization.setReaders(note.getId(), Sets.<String>newHashSet());
-    assertEquals(notebookAuthorization.isReader(note.getId(),
-        new HashSet<>(Arrays.asList("user2"))), true);
-    assertEquals(notebookAuthorization.isReader(note.getId(),
-        new HashSet<>(Arrays.asList("user3"))), true);
-
-    notebook.removeNote(note.getId(), anonymous);
-  }
-
-  @Test
-  public void testAuthorizationRoles() throws IOException {
-    String user1 = "user1";
-    String user2 = "user2";
-    Set<String> roles = Sets.newHashSet("admin");
-    // set admin roles for both user1 and user2
-    notebookAuthorization.setRoles(user1, roles);
-    notebookAuthorization.setRoles(user2, roles);
-    
-    Note note = notebook.createNote(new AuthenticationInfo(user1));
-    
-    // check that user1 is owner, reader and writer
-    assertEquals(notebookAuthorization.isOwner(note.getId(),
-        Sets.newHashSet(user1)), true);
-    assertEquals(notebookAuthorization.isReader(note.getId(),
-        Sets.newHashSet(user1)), true);
-    assertEquals(notebookAuthorization.isWriter(note.getId(),
-        Sets.newHashSet(user1)), true);
-    
-    // since user1 and user2 both have admin role, user2 will be reader and writer as well
-    assertEquals(notebookAuthorization.isOwner(note.getId(),
-        Sets.newHashSet(user2)), false);
-    assertEquals(notebookAuthorization.isReader(note.getId(),
-        Sets.newHashSet(user2)), true);
-    assertEquals(notebookAuthorization.isWriter(note.getId(),
-        Sets.newHashSet(user2)), true);
-    
-    // check that user1 has note listed in his workbench
-    Set<String> user1AndRoles = notebookAuthorization.getRoles(user1);
-    user1AndRoles.add(user1);
-    List<Note> user1Notes = notebook.getAllNotes(user1AndRoles);
-    assertEquals(user1Notes.size(), 1);
-    assertEquals(user1Notes.get(0).getId(), note.getId());
-    
-    // check that user2 has note listed in his workbech because of admin role
-    Set<String> user2AndRoles = notebookAuthorization.getRoles(user2);
-    user2AndRoles.add(user2);
-    List<Note> user2Notes = notebook.getAllNotes(user2AndRoles);
-    assertEquals(user2Notes.size(), 1);
-    assertEquals(user2Notes.get(0).getId(), note.getId());
-  }
-  
-  @Test
-  public void testAbortParagraphStatusOnInterpreterRestart() throws InterruptedException,
-      IOException {
-    Note note = notebook.createNote(anonymous);
-    interpreterSettingManager.setInterpreters(anonymous.getUser(), note.getId(), interpreterSettingManager.getDefaultInterpreterSettingList());
-
-    // create three paragraphs
-    Paragraph p1 = note.addParagraph(anonymous);
-    p1.setText("sleep 1000");
-    Paragraph p2 = note.addParagraph(anonymous);
-    p2.setText("sleep 1000");
-    Paragraph p3 = note.addParagraph(anonymous);
-    p3.setText("sleep 1000");
-
-
-    note.runAll();
-
-    // wait until first paragraph finishes and second paragraph starts
-    while (p1.getStatus() != Status.FINISHED || p2.getStatus() != Status.RUNNING) Thread.yield();
-
-    assertEquals(Status.FINISHED, p1.getStatus());
-    assertEquals(Status.RUNNING, p2.getStatus());
-    assertEquals(Status.PENDING, p3.getStatus());
-
-    // restart interpreter
-    interpreterSettingManager.restart(interpreterSettingManager.getInterpreterSettings(note.getId()).get(0).getId());
-
-    // make sure three differnt status aborted well.
-    assertEquals(Status.FINISHED, p1.getStatus());
-    assertEquals(Status.ABORT, p2.getStatus());
-    assertEquals(Status.ABORT, p3.getStatus());
-
-    notebook.removeNote(note.getId(), anonymous);
-  }
-
-  @Test
-  public void testPerSessionInterpreterCloseOnNoteRemoval() throws IOException {
-    // create a notes
-    Note note1  = notebook.createNote(anonymous);
-    Paragraph p1 = note1.addParagraph(AuthenticationInfo.ANONYMOUS);
-    p1.setText("getId");
-    p1.setAuthenticationInfo(anonymous);
-
-    // restart interpreter with per user session enabled
-    for (InterpreterSetting setting : interpreterSettingManager.getInterpreterSettings(note1.getId())) {
-      setting.getOption().setPerNote(setting.getOption().SCOPED);
-      notebook.getInterpreterSettingManager().restart(setting.getId());
-    }
-
-    note1.run(p1.getId());
-    while (p1.getStatus() != Status.FINISHED) Thread.yield();
-    InterpreterResult result = p1.getResult();
-
-    // remove note and recreate
-    notebook.removeNote(note1.getId(), anonymous);
-    note1 = notebook.createNote(anonymous);
-    p1 = note1.addParagraph(AuthenticationInfo.ANONYMOUS);
-    p1.setText("getId");
-    p1.setAuthenticationInfo(anonymous);
-
-    note1.run(p1.getId());
-    while (p1.getStatus() != Status.FINISHED) Thread.yield();
-    assertNotEquals(p1.getResult().message(), result.message());
-
-    notebook.removeNote(note1.getId(), anonymous);
-  }
-
-  @Test
-  public void testPerSessionInterpreter() throws IOException {
-    // create two notes
-    Note note1  = notebook.createNote(anonymous);
-    Paragraph p1 = note1.addParagraph(AuthenticationInfo.ANONYMOUS);
-
-    Note note2  = notebook.createNote(anonymous);
-    Paragraph p2 = note2.addParagraph(AuthenticationInfo.ANONYMOUS);
-
-    p1.setText("getId");
-    p1.setAuthenticationInfo(anonymous);
-    p2.setText("getId");
-    p2.setAuthenticationInfo(anonymous);
-
-    // run per note session disabled
-    note1.run(p1.getId());
-    note2.run(p2.getId());
-
-    while (p1.getStatus() != Status.FINISHED) Thread.yield();
-    while (p2.getStatus() != Status.FINISHED) Thread.yield();
-
-    assertEquals(p1.getResult().message().get(0).getData(), p2.getResult().message().get(0).getData());
-
-
-    // restart interpreter with per note session enabled
-    for (InterpreterSetting setting : notebook.getInterpreterSettingManager().getInterpreterSettings(note1.getId())) {
-      setting.getOption().setPerNote(InterpreterOption.SCOPED);
-      notebook.getInterpreterSettingManager().restart(setting.getId());
-    }
-
-    // run per note session enabled
-    note1.run(p1.getId());
-    note2.run(p2.getId());
-
-    while (p1.getStatus() != Status.FINISHED) Thread.yield();
-    while (p2.getStatus() != Status.FINISHED) Thread.yield();
-
-    assertNotEquals(p1.getResult().message(), p2.getResult().message().get(0).getData());
-
-    notebook.removeNote(note1.getId(), anonymous);
-    notebook.removeNote(note2.getId(), anonymous);
-  }
-
-
-  @Test
-  public void testPerNoteSessionInterpreter() throws IOException {
-    // create two notes
-    Note note1  = notebook.createNote(anonymous);
-    Paragraph p1 = note1.addParagraph(AuthenticationInfo.ANONYMOUS);
-
-    Note note2  = notebook.createNote(anonymous);
-    Paragraph p2 = note2.addParagraph(AuthenticationInfo.ANONYMOUS);
-
-    p1.setText("getId");
-    p1.setAuthenticationInfo(anonymous);
-    p2.setText("getId");
-    p2.setAuthenticationInfo(anonymous);
-
-    // shared mode.
-    note1.run(p1.getId());
-    note2.run(p2.getId());
-
-    while (p1.getStatus() != Status.FINISHED) Thread.yield();
-    while (p2.getStatus() != Status.FINISHED) Thread.yield();
-
-    assertEquals(p1.getResult().message().get(0).getData(), p2.getResult().message().get(0).getData());
-
-    // restart interpreter with scoped mode enabled
-    for (InterpreterSetting setting : notebook.getInterpreterSettingManager().getInterpreterSettings(note1.getId())) {
-      setting.getOption().setPerNote(InterpreterOption.SCOPED);
-      notebook.getInterpreterSettingManager().restart(setting.getId(), note1.getId(), anonymous.getUser());
-      notebook.getInterpreterSettingManager().restart(setting.getId(), note2.getId(), anonymous.getUser());
-    }
-
-    // run per note session enabled
-    note1.run(p1.getId());
-    note2.run(p2.getId());
-
-    while (p1.getStatus() != Status.FINISHED) Thread.yield();
-    while (p2.getStatus() != Status.FINISHED) Thread.yield();
-
-    assertNotEquals(p1.getResult().message().get(0).getData(), p2.getResult().message().get(0).getData());
-
-    // restart interpreter with isolated mode enabled
-    for (InterpreterSetting setting : notebook.getInterpreterSettingManager().getInterpreterSettings(note1.getId())) {
-      setting.getOption().setPerNote(InterpreterOption.ISOLATED);
-      notebook.getInterpreterSettingManager().restart(setting.getId(), note1.getId(), anonymous.getUser());
-      notebook.getInterpreterSettingManager().restart(setting.getId(), note2.getId(), anonymous.getUser());
-    }
-
-    // run per note process enabled
-    note1.run(p1.getId());
-    note2.run(p2.getId());
-
-    while (p1.getStatus() != Status.FINISHED) Thread.yield();
-    while (p2.getStatus() != Status.FINISHED) Thread.yield();
-
-    assertNotEquals(p1.getResult().message().get(0).getData(), p2.getResult().message().get(0).getData());
-
-    notebook.removeNote(note1.getId(), anonymous);
-    notebook.removeNote(note2.getId(), anonymous);
-  }
-
-  @Test
-  public void testPerSessionInterpreterCloseOnUnbindInterpreterSetting() throws IOException {
-    // create a notes
-    Note note1  = notebook.createNote(anonymous);
-    Paragraph p1 = note1.addParagraph(AuthenticationInfo.ANONYMOUS);
-    p1.setAuthenticationInfo(anonymous);
-    p1.setText("getId");
-
-    // restart interpreter with per note session enabled
-    for (InterpreterSetting setting : interpreterSettingManager.getInterpreterSettings(note1.getId())) {
-      setting.getOption().setPerNote(InterpreterOption.SCOPED);
-      notebook.getInterpreterSettingManager().restart(setting.getId());
-    }
-
-    note1.run(p1.getId());
-    while (p1.getStatus() != Status.FINISHED) Thread.yield();
-    InterpreterResult result = p1.getResult();
-
-
-    // unbind, and rebind setting. that result interpreter instance close
-    List<String> bindedSettings = notebook.getBindedInterpreterSettingsIds(note1.getId());
-    notebook.bindInterpretersToNote(anonymous.getUser(), note1.getId(), new LinkedList<String>());
-    notebook.bindInterpretersToNote(anonymous.getUser(), note1.getId(), bindedSettings);
-
-    note1.run(p1.getId());
-    while (p1.getStatus() != Status.FINISHED) Thread.yield();
-
-    assertNotEquals(result.message().get(0).getData(), p1.getResult().message().get(0).getData());
-
-    notebook.removeNote(note1.getId(), anonymous);
-  }
-
-  @Test
-  public void testNotebookEventListener() throws IOException {
-    final AtomicInteger onNoteRemove = new AtomicInteger(0);
-    final AtomicInteger onNoteCreate = new AtomicInteger(0);
-    final AtomicInteger onParagraphRemove = new AtomicInteger(0);
-    final AtomicInteger onParagraphCreate = new AtomicInteger(0);
-    final AtomicInteger unbindInterpreter = new AtomicInteger(0);
-
-    notebook.addNotebookEventListener(new NotebookEventListener() {
-      @Override
-      public void onNoteRemove(Note note) {
-        onNoteRemove.incrementAndGet();
-      }
-
-      @Override
-      public void onNoteCreate(Note note) {
-        onNoteCreate.incrementAndGet();
-      }
-
-      @Override
-      public void onUnbindInterpreter(Note note, InterpreterSetting setting) {
-        unbindInterpreter.incrementAndGet();
-      }
-
-      @Override
-      public void onParagraphRemove(Paragraph p) {
-        onParagraphRemove.incrementAndGet();
-      }
-
-      @Override
-      public void onParagraphCreate(Paragraph p) {
-        onParagraphCreate.incrementAndGet();
-      }
-
-      @Override
-      public void onParagraphStatusChange(Paragraph p, Status status) {
-      }
-    });
-
-    Note note1 = notebook.createNote(anonymous);
-    assertEquals(1, onNoteCreate.get());
-
-    Paragraph p1 = note1.addParagraph(AuthenticationInfo.ANONYMOUS);
-    assertEquals(1, onParagraphCreate.get());
-
-    note1.addCloneParagraph(p1);
-    assertEquals(2, onParagraphCreate.get());
-
-    note1.removeParagraph(anonymous.getUser(), p1.getId());
-    assertEquals(1, onParagraphRemove.get());
-
-    List<String> settings = notebook.getBindedInterpreterSettingsIds(note1.getId());
-    notebook.bindInterpretersToNote(anonymous.getUser(), note1.getId(), new LinkedList<String>());
-    assertEquals(settings.size(), unbindInterpreter.get());
-
-    notebook.removeNote(note1.getId(), anonymous);
-    assertEquals(1, onNoteRemove.get());
-    assertEquals(1, onParagraphRemove.get());
-  }
-
-  @Test
-  public void testNormalizeNoteName() throws IOException {
-    // create a notes
-    Note note1  = notebook.createNote(anonymous);
-
-    note1.setName("MyNote");
-    assertEquals(note1.getName(), "MyNote");
-
-    note1.setName("/MyNote");
-    assertEquals(note1.getName(), "/MyNote");
-
-    note1.setName("MyNote/sub");
-    assertEquals(note1.getName(), "MyNote/sub");
-
-    note1.setName("/MyNote/sub");
-    assertEquals(note1.getName(), "/MyNote/sub");
-
-    note1.setName("///////MyNote//////sub");
-    assertEquals(note1.getName(), "/MyNote/sub");
-
-    note1.setName("\\\\\\MyNote///sub");
-    assertEquals(note1.getName(), "/MyNote/sub");
-
-    notebook.removeNote(note1.getId(), anonymous);
-  }
-
-  @Test
-  public void testGetAllNotes() throws Exception {
-    Note note1 = notebook.createNote(anonymous);
-    Note note2 = notebook.createNote(anonymous);
-    assertEquals(2, notebook.getAllNotes(Sets.newHashSet("anonymous")).size());
-
-    notebook.getNotebookAuthorization().setOwners(note1.getId(), Sets.newHashSet("user1"));
-    notebook.getNotebookAuthorization().setWriters(note1.getId(), Sets.newHashSet("user1"));
-    notebook.getNotebookAuthorization().setReaders(note1.getId(), Sets.newHashSet("user1"));
-    assertEquals(1, notebook.getAllNotes(Sets.newHashSet("anonymous")).size());
-    assertEquals(2, notebook.getAllNotes(Sets.newHashSet("user1")).size());
-
-    notebook.getNotebookAuthorization().setOwners(note2.getId(), Sets.newHashSet("user2"));
-    notebook.getNotebookAuthorization().setWriters(note2.getId(), Sets.newHashSet("user2"));
-    notebook.getNotebookAuthorization().setReaders(note2.getId(), Sets.newHashSet("user2"));
-    assertEquals(0, notebook.getAllNotes(Sets.newHashSet("anonymous")).size());
-    assertEquals(1, notebook.getAllNotes(Sets.newHashSet("user1")).size());
-    assertEquals(1, notebook.getAllNotes(Sets.newHashSet("user2")).size());
-    notebook.removeNote(note1.getId(), anonymous);
-    notebook.removeNote(note2.getId(), anonymous);
-  }
-
-
-  @Test
-  public void testGetAllNotesWithDifferentPermissions() throws IOException {
-    HashSet<String> user1 = Sets.newHashSet("user1");
-    HashSet<String> user2 = Sets.newHashSet("user1");
-    List<Note> notes1 = notebook.getAllNotes(user1);
-    List<Note> notes2 = notebook.getAllNotes(user2);
-    assertEquals(notes1.size(), 0);
-    assertEquals(notes2.size(), 0);
-
-    //creates note and sets user1 owner
-    Note note = notebook.createNote(new AuthenticationInfo("user1"));
-
-    // note is public since readers and writers empty
-    notes1 = notebook.getAllNotes(user1);
-    notes2 = notebook.getAllNotes(user2);
-    assertEquals(notes1.size(), 1);
-    assertEquals(notes2.size(), 1);
-    
-    notebook.getNotebookAuthorization().setReaders(note.getId(), Sets.newHashSet("user1"));
-    //note is public since writers empty
-    notes1 = notebook.getAllNotes(user1);
-    notes2 = notebook.getAllNotes(user2);
-    assertEquals(notes1.size(), 1);
-    assertEquals(notes2.size(), 1);
-    
-    notebook.getNotebookAuthorization().setWriters(note.getId(), Sets.newHashSet("user1"));
-    notes1 = notebook.getAllNotes(user1);
-    notes2 = notebook.getAllNotes(user2);
-    assertEquals(notes1.size(), 1);
-    assertEquals(notes2.size(), 1);
-  }
-
-  @Test
-  public void testPublicPrivateNewNote() throws IOException, SchedulerException {
-    HashSet<String> user1 = Sets.newHashSet("user1");
-    HashSet<String> user2 = Sets.newHashSet("user2");
-    
-    // case of public note
-    assertTrue(conf.isNotebokPublic());
-    assertTrue(notebookAuthorization.isPublic());
-    
-    List<Note> notes1 = notebook.getAllNotes(user1);
-    List<Note> notes2 = notebook.getAllNotes(user2);
-    assertEquals(notes1.size(), 0);
-    assertEquals(notes2.size(), 0);
-    
-    // user1 creates note
-    Note notePublic = notebook.createNote(new AuthenticationInfo("user1"));
-    
-    // both users have note
-    notes1 = notebook.getAllNotes(user1);
-    notes2 = notebook.getAllNotes(user2);
-    assertEquals(notes1.size(), 1);
-    assertEquals(notes2.size(), 1);
-    assertEquals(notes1.get(0).getId(), notePublic.getId());
-    assertEquals(notes2.get(0).getId(), notePublic.getId());
-    
-    // user1 is only owner
-    assertEquals(notebookAuthorization.getOwners(notePublic.getId()).size(), 1);
-    assertEquals(notebookAuthorization.getReaders(notePublic.getId()).size(), 0);
-    assertEquals(notebookAuthorization.getWriters(notePublic.getId()).size(), 0);
-
-    // case of private note
-    System.setProperty(ConfVars.ZEPPELIN_NOTEBOOK_PUBLIC.getVarName(), "false");
-    ZeppelinConfiguration conf2 = ZeppelinConfiguration.create();
-    assertFalse(conf2.isNotebokPublic());
-    // notebook authorization reads from conf, so no need to re-initilize
-    assertFalse(notebookAuthorization.isPublic());
-    
-    // check that still 1 note per user
-    notes1 = notebook.getAllNotes(user1);
-    notes2 = notebook.getAllNotes(user2);
-    assertEquals(notes1.size(), 1);
-    assertEquals(notes2.size(), 1);
-    
-    // create private note
-    Note notePrivate = notebook.createNote(new AuthenticationInfo("user1"));
-    
-    // only user1 have notePrivate right after creation
-    notes1 = notebook.getAllNotes(user1);
-    notes2 = notebook.getAllNotes(user2);
-    assertEquals(notes1.size(), 2);
-    assertEquals(notes2.size(), 1);
-
-    // user1 have all rights
-    assertEquals(notebookAuthorization.getOwners(notePrivate.getId()).size(), 1);
-    assertEquals(notebookAuthorization.getReaders(notePrivate.getId()).size(), 1);
-    assertEquals(notebookAuthorization.getWriters(notePrivate.getId()).size(), 1);
-    
-    //set back public to true
-    System.setProperty(ConfVars.ZEPPELIN_NOTEBOOK_PUBLIC.getVarName(), "true");
-    ZeppelinConfiguration.create();
-  }
-  
-  private void delete(File file){
-    if(file.isFile()) file.delete();
-    else if(file.isDirectory()){
-      File [] files = file.listFiles();
-      if(files!=null && files.length>0){
-        for(File f : files){
-          delete(f);
-        }
-      }
-      file.delete();
-    }
-  }
-
-  @Override
-  public ParagraphJobListener getParagraphJobListener(Note note) {
-    return new ParagraphJobListener(){
-
-      @Override
-      public void onOutputAppend(Paragraph paragraph, int idx, String output) {
-
-      }
-
-      @Override
-      public void onOutputUpdate(Paragraph paragraph, int idx, InterpreterResultMessage msg) {
-
-      }
-
-      @Override
-      public void onOutputUpdateAll(Paragraph paragraph, List<InterpreterResultMessage> msgs) {
-
-      }
-
-      @Override
-      public void onProgressUpdate(Job job, int progress) {
-      }
-
-      @Override
-      public void beforeStatusChange(Job job, Status before, Status after) {
-      }
-
-      @Override
-      public void afterStatusChange(Job job, Status before, Status after) {
-      }
-    };
-  }
-}
diff --git a/smart-zeppelin/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/GitNotebookRepoTest.java b/smart-zeppelin/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/GitNotebookRepoTest.java
deleted file mode 100644
index 6249dfa2c05..00000000000
--- a/smart-zeppelin/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/GitNotebookRepoTest.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.zeppelin.notebook.repo;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.zeppelin.conf.ZeppelinConfiguration;
-import org.apache.zeppelin.conf.ZeppelinConfiguration.ConfVars;
-import org.apache.zeppelin.interpreter.mock.MockInterpreter1;
-import org.apache.zeppelin.interpreter.mock.MockInterpreter2;
-import org.apache.zeppelin.notebook.Note;
-import org.apache.zeppelin.notebook.NoteInfo;
-import org.apache.zeppelin.notebook.Paragraph;
-import org.apache.zeppelin.notebook.repo.NotebookRepo.Revision;
-import org.apache.zeppelin.user.AuthenticationInfo;
-import org.eclipse.jgit.api.Git;
-import org.eclipse.jgit.api.errors.GitAPIException;
-import org.eclipse.jgit.diff.DiffEntry;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.base.Joiner;
-
-public class GitNotebookRepoTest {
-  private static final Logger LOG = LoggerFactory.getLogger(GitNotebookRepoTest.class);
-
-  private static final String TEST_NOTE_ID = "2A94M5J1Z";
-  private static final String TEST_NOTE_ID2 = "2A94M5J2Z";
-
-  private File zeppelinDir;
-  private String notebooksDir;
-  private ZeppelinConfiguration conf;
-  private GitNotebookRepo notebookRepo;
-
-  @Before
-  public void setUp() throws Exception {
-    String zpath = System.getProperty("java.io.tmpdir") + "/ZeppelinTest_" + System.currentTimeMillis();
-    zeppelinDir = new File(zpath);
-    zeppelinDir.mkdirs();
-    new File(zeppelinDir, "conf").mkdirs();
-
-    notebooksDir = Joiner.on(File.separator).join(zpath, "notebook");
-    File notebookDir = new File(notebooksDir);
-    notebookDir.mkdirs();
-
-    String testNoteDir = Joiner.on(File.separator).join(notebooksDir, TEST_NOTE_ID);
-    String testNoteDir2 = Joiner.on(File.separator).join(notebooksDir, TEST_NOTE_ID2);
-    FileUtils.copyDirectory(new File(Joiner.on(File.separator).join("src", "test", "resources", TEST_NOTE_ID)),
-        new File(testNoteDir));
-    FileUtils.copyDirectory(new File(Joiner.on(File.separator).join("src", "test", "resources", TEST_NOTE_ID2)),
-        new File(testNoteDir2)
-    );
-
-    System.setProperty(ConfVars.ZEPPELIN_HOME.getVarName(), zeppelinDir.getAbsolutePath());
-    System.setProperty(ConfVars.ZEPPELIN_NOTEBOOK_DIR.getVarName(), notebookDir.getAbsolutePath());
-    System.setProperty(ConfVars.ZEPPELIN_NOTEBOOK_STORAGE.getVarName(), "org.apache.zeppelin.notebook.repo.GitNotebookRepo");
-
-    conf = ZeppelinConfiguration.create();
-  }
-
-  @After
-  public void tearDown() throws Exception {
-    if (!FileUtils.deleteQuietly(zeppelinDir)) {
-      LOG.error("Failed to delete {} ", zeppelinDir.getName());
-    }
-  }
-
-  @Test
-  public void initNonemptyNotebookDir() throws IOException, GitAPIException {
-    //given - .git does not exit
-    File dotGit = new File(Joiner.on(File.separator).join(notebooksDir, ".git"));
-    assertThat(dotGit.exists()).isEqualTo(false);
-
-    //when
-    notebookRepo = new GitNotebookRepo(conf);
-
-    //then
-    Git git = notebookRepo.getGit();
-    assertThat(git).isNotNull();
-
-    assertThat(dotGit.exists()).isEqualTo(true);
-    assertThat(notebookRepo.list(null)).isNotEmpty();
-
-    List<DiffEntry> diff = git.diff().call();
-    // no commit, diff isn't empty
-    assertThat(diff).isNotEmpty();
-  }
-
-  @Test
-  public void showNotebookHistoryEmptyTest() throws GitAPIException, IOException {
-    //given
-    notebookRepo = new GitNotebookRepo(conf);
-    assertThat(notebookRepo.list(null)).isNotEmpty();
-
-    //when
-    List<Revision> testNotebookHistory = notebookRepo.revisionHistory(TEST_NOTE_ID, null);
-
-    //then
-    //no initial commit, empty history
-    assertThat(testNotebookHistory).isEmpty();
-  }
-
-  @Test
-  public void showNotebookHistoryMultipleNotesTest() throws IOException {
-    //initial checks
-    notebookRepo = new GitNotebookRepo(conf);
-    assertThat(notebookRepo.list(null)).isNotEmpty();
-    assertThat(containsNote(notebookRepo.list(null), TEST_NOTE_ID)).isTrue();
-    assertThat(containsNote(notebookRepo.list(null), TEST_NOTE_ID2)).isTrue();
-    assertThat(notebookRepo.revisionHistory(TEST_NOTE_ID, null)).isEmpty();
-    assertThat(notebookRepo.revisionHistory(TEST_NOTE_ID2, null)).isEmpty();
-
-    //add commit to both notes
-    notebookRepo.checkpoint(TEST_NOTE_ID, "first commit, note1", null);
-    assertThat(notebookRepo.revisionHistory(TEST_NOTE_ID, null).size()).isEqualTo(1);
-    notebookRepo.checkpoint(TEST_NOTE_ID2, "first commit, note2", null);
-    assertThat(notebookRepo.revisionHistory(TEST_NOTE_ID2, null).size()).isEqualTo(1);
-
-    //modify, save and checkpoint first note
-    Note note = notebookRepo.get(TEST_NOTE_ID, null);
-    Paragraph p = note.addParagraph(AuthenticationInfo.ANONYMOUS);
-    Map<String, Object> config = p.getConfig();
-    config.put("enabled", true);
-    p.setConfig(config);
-    p.setText("%md note1 test text");
-    notebookRepo.save(note, null);
-    assertThat(notebookRepo.checkpoint(TEST_NOTE_ID, "second commit, note1", null)).isNotNull();
-    assertThat(notebookRepo.revisionHistory(TEST_NOTE_ID, null).size()).isEqualTo(2);
-    assertThat(notebookRepo.revisionHistory(TEST_NOTE_ID2, null).size()).isEqualTo(1);
-    assertThat(notebookRepo.checkpoint(TEST_NOTE_ID2, "first commit, note2", null))
-      .isEqualTo(Revision.EMPTY);
-    assertThat(notebookRepo.revisionHistory(TEST_NOTE_ID2, null).size()).isEqualTo(1);
-
-    //modify, save and checkpoint second note
-    note = notebookRepo.get(TEST_NOTE_ID2, null);
-    p = note.addParagraph(AuthenticationInfo.ANONYMOUS);
-    config = p.getConfig();
-    config.put("enabled", false);
-    p.setConfig(config);
-    p.setText("%md note2 test text");
-    notebookRepo.save(note, null);
-    assertThat(notebookRepo.checkpoint(TEST_NOTE_ID2, "second commit, note2", null)).isNotNull();
-    assertThat(notebookRepo.revisionHistory(TEST_NOTE_ID, null).size()).isEqualTo(2);
-    assertThat(notebookRepo.revisionHistory(TEST_NOTE_ID2, null).size()).isEqualTo(2);
-  }
-
-  @Test
-  public void addCheckpointTest() throws IOException {
-    // initial checks
-    notebookRepo = new GitNotebookRepo(conf);
-    assertThat(notebookRepo.list(null)).isNotEmpty();
-    assertThat(containsNote(notebookRepo.list(null), TEST_NOTE_ID)).isTrue();
-    assertThat(notebookRepo.revisionHistory(TEST_NOTE_ID, null)).isEmpty();
-
-    notebookRepo.checkpoint(TEST_NOTE_ID, "first commit", null);
-    List<Revision> notebookHistoryBefore = notebookRepo.revisionHistory(TEST_NOTE_ID, null);
-    assertThat(notebookRepo.revisionHistory(TEST_NOTE_ID, null)).isNotEmpty();
-    int initialCount = notebookHistoryBefore.size();
-    
-    // add changes to note
-    Note note = notebookRepo.get(TEST_NOTE_ID, null);
-    Paragraph p = note.addParagraph(AuthenticationInfo.ANONYMOUS);
-    Map<String, Object> config = p.getConfig();
-    config.put("enabled", true);
-    p.setConfig(config);
-    p.setText("%md checkpoint test text");
-    
-    // save and checkpoint note
-    notebookRepo.save(note, null);
-    notebookRepo.checkpoint(TEST_NOTE_ID, "second commit", null);
-    
-    // see if commit is added
-    List<Revision> notebookHistoryAfter = notebookRepo.revisionHistory(TEST_NOTE_ID, null);
-    assertThat(notebookHistoryAfter.size()).isEqualTo(initialCount + 1);
-  }
-  
-  private boolean containsNote(List<NoteInfo> notes, String noteId) {
-    for (NoteInfo note: notes) {
-      if (note.getId().equals(noteId)) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  @Test
-  public void getRevisionTest() throws IOException {
-    // initial checks
-    notebookRepo = new GitNotebookRepo(conf);
-    assertThat(notebookRepo.list(null)).isNotEmpty();
-    assertThat(containsNote(notebookRepo.list(null), TEST_NOTE_ID)).isTrue();
-    assertThat(notebookRepo.revisionHistory(TEST_NOTE_ID, null)).isEmpty();
-
-    // add first checkpoint
-    Revision revision_1 = notebookRepo.checkpoint(TEST_NOTE_ID, "first commit", null);
-    assertThat(notebookRepo.revisionHistory(TEST_NOTE_ID, null).size()).isEqualTo(1);
-    int paragraphCount_1 = notebookRepo.get(TEST_NOTE_ID, null).getParagraphs().size();
-
-    // add paragraph and save
-    Note note = notebookRepo.get(TEST_NOTE_ID, null);
-    Paragraph p1 = note.addParagraph(AuthenticationInfo.ANONYMOUS);
-    Map<String, Object> config = p1.getConfig();
-    config.put("enabled", true);
-    p1.setConfig(config);
-    p1.setText("checkpoint test text");
-    notebookRepo.save(note, null);
-
-    // second checkpoint
-    notebookRepo.checkpoint(TEST_NOTE_ID, "second commit", null);
-    assertThat(notebookRepo.revisionHistory(TEST_NOTE_ID, null).size()).isEqualTo(2);
-    int paragraphCount_2 = notebookRepo.get(TEST_NOTE_ID, null).getParagraphs().size();
-    assertThat(paragraphCount_2).isEqualTo(paragraphCount_1 + 1);
-
-    // get note from revision 1
-    Note noteRevision_1 = notebookRepo.get(TEST_NOTE_ID, revision_1.id, null);
-    assertThat(noteRevision_1.getParagraphs().size()).isEqualTo(paragraphCount_1);
-
-    // get current note
-    note = notebookRepo.get(TEST_NOTE_ID, null);
-    assertThat(note.getParagraphs().size()).isEqualTo(paragraphCount_2);
-
-    // add one more paragraph and save
-    Paragraph p2 = note.addParagraph(AuthenticationInfo.ANONYMOUS);
-    config.put("enabled", false);
-    p2.setConfig(config);
-    p2.setText("get revision when modified note test text");
-    notebookRepo.save(note, null);
-    note = notebookRepo.get(TEST_NOTE_ID, null);
-    int paragraphCount_3 = note.getParagraphs().size();
-    assertThat(paragraphCount_3).isEqualTo(paragraphCount_2 + 1);
-
-    // get revision 1 again
-    noteRevision_1 = notebookRepo.get(TEST_NOTE_ID, revision_1.id, null);
-    assertThat(noteRevision_1.getParagraphs().size()).isEqualTo(paragraphCount_1);
-
-    // check that note is unchanged
-    note = notebookRepo.get(TEST_NOTE_ID, null);
-    assertThat(note.getParagraphs().size()).isEqualTo(paragraphCount_3);
-  }
-
-  @Test
-  public void getRevisionFailTest() throws IOException {
-    // initial checks
-    notebookRepo = new GitNotebookRepo(conf);
-    assertThat(notebookRepo.list(null)).isNotEmpty();
-    assertThat(containsNote(notebookRepo.list(null), TEST_NOTE_ID)).isTrue();
-    assertThat(notebookRepo.revisionHistory(TEST_NOTE_ID, null)).isEmpty();
-
-    // add first checkpoint
-    Revision revision_1 = notebookRepo.checkpoint(TEST_NOTE_ID, "first commit", null);
-    assertThat(notebookRepo.revisionHistory(TEST_NOTE_ID, null).size()).isEqualTo(1);
-    int paragraphCount_1 = notebookRepo.get(TEST_NOTE_ID, null).getParagraphs().size();
-
-    // get current note
-    Note note = notebookRepo.get(TEST_NOTE_ID, null);
-    assertThat(note.getParagraphs().size()).isEqualTo(paragraphCount_1);
-
-    // add one more paragraph and save
-    Paragraph p1 = note.addParagraph(AuthenticationInfo.ANONYMOUS);
-    Map<String, Object> config = p1.getConfig();
-    config.put("enabled", true);
-    p1.setConfig(config);
-    p1.setText("get revision when modified note test text");
-    notebookRepo.save(note, null);
-    int paragraphCount_2 = note.getParagraphs().size();
-
-    // get note from revision 1
-    Note noteRevision_1 = notebookRepo.get(TEST_NOTE_ID, revision_1.id, null);
-    assertThat(noteRevision_1.getParagraphs().size()).isEqualTo(paragraphCount_1);
-
-    // get current note
-    note = notebookRepo.get(TEST_NOTE_ID, null);
-    assertThat(note.getParagraphs().size()).isEqualTo(paragraphCount_2);
-
-    // test for absent revision
-    Revision absentRevision = new Revision("absentId", StringUtils.EMPTY, 0);
-    note = notebookRepo.get(TEST_NOTE_ID, absentRevision.id, null);
-    assertThat(note).isNull();
-  }
-
-  @Test
-  public void setRevisionTest() throws IOException {
-    //create repo and check that note doesn't contain revisions
-    notebookRepo = new GitNotebookRepo(conf);
-    assertThat(notebookRepo.list(null)).isNotEmpty();
-    assertThat(containsNote(notebookRepo.list(null), TEST_NOTE_ID)).isTrue();
-    assertThat(notebookRepo.revisionHistory(TEST_NOTE_ID, null)).isEmpty();
-    
-    // get current note
-    Note note = notebookRepo.get(TEST_NOTE_ID, null);
-    int paragraphCount_1 = note.getParagraphs().size();
-    LOG.info("initial paragraph count: {}", paragraphCount_1);
-    
-    // checkpoint revision1
-    Revision revision1 = notebookRepo.checkpoint(TEST_NOTE_ID, "set revision: first commit", null);
-    //TODO(khalid): change to EMPTY after rebase
-    assertThat(revision1).isNotNull();
-    assertThat(notebookRepo.revisionHistory(TEST_NOTE_ID, null).size()).isEqualTo(1);
-    
-    // add one more paragraph and save
-    Paragraph p1 = note.addParagraph(AuthenticationInfo.ANONYMOUS);
-    Map<String, Object> config = p1.getConfig();
-    config.put("enabled", true);
-    p1.setConfig(config);
-    p1.setText("set revision sample text");
-    notebookRepo.save(note, null);
-    int paragraphCount_2 = note.getParagraphs().size();
-    assertThat(paragraphCount_2).isEqualTo(paragraphCount_1 + 1);
-    LOG.info("paragraph count after modification: {}", paragraphCount_2);
-    
-    // checkpoint revision2
-    Revision revision2 = notebookRepo.checkpoint(TEST_NOTE_ID, "set revision: second commit", null);
-    //TODO(khalid): change to EMPTY after rebase
-    assertThat(revision2).isNotNull();
-    assertThat(notebookRepo.revisionHistory(TEST_NOTE_ID, null).size()).isEqualTo(2);
-    
-    // set note to revision1
-    Note returnedNote = notebookRepo.setNoteRevision(note.getId(), revision1.id, null);
-    assertThat(returnedNote).isNotNull();
-    assertThat(returnedNote.getParagraphs().size()).isEqualTo(paragraphCount_1);
-    
-    // check note from repo
-    Note updatedNote = notebookRepo.get(note.getId(), null);
-    assertThat(updatedNote).isNotNull();
-    assertThat(updatedNote.getParagraphs().size()).isEqualTo(paragraphCount_1);
-    
-    // set back to revision2
-    returnedNote = notebookRepo.setNoteRevision(note.getId(), revision2.id, null);
-    assertThat(returnedNote).isNotNull();
-    assertThat(returnedNote.getParagraphs().size()).isEqualTo(paragraphCount_2);
-    
-    // check note from repo
-    updatedNote = notebookRepo.get(note.getId(), null);
-    assertThat(updatedNote).isNotNull();
-    assertThat(updatedNote.getParagraphs().size()).isEqualTo(paragraphCount_2);
-    
-    // try failure case - set to invalid revision
-    returnedNote = notebookRepo.setNoteRevision(note.getId(), "nonexistent_id", null);
-    assertThat(returnedNote).isNull();
-  }
-}
diff --git a/smart-zeppelin/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/NotebookRepoSyncInitializationTest.java b/smart-zeppelin/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/NotebookRepoSyncInitializationTest.java
deleted file mode 100644
index 53c052a43d2..00000000000
--- a/smart-zeppelin/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/NotebookRepoSyncInitializationTest.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.zeppelin.notebook.repo;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.apache.zeppelin.conf.ZeppelinConfiguration;
-import org.apache.zeppelin.conf.ZeppelinConfiguration.ConfVars;
-import org.apache.zeppelin.notebook.repo.mock.VFSNotebookRepoMock;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class NotebookRepoSyncInitializationTest {
-  private static final Logger LOG = LoggerFactory.getLogger(NotebookRepoSyncInitializationTest.class);
-  private String validFirstStorageClass = "org.apache.zeppelin.notebook.repo.VFSNotebookRepo";
-  private String validSecondStorageClass = "org.apache.zeppelin.notebook.repo.mock.VFSNotebookRepoMock";
-  private String invalidStorageClass = "org.apache.zeppelin.notebook.repo.DummyNotebookRepo";
-  private String validOneStorageConf = validFirstStorageClass;
-  private String validTwoStorageConf = validFirstStorageClass + "," + validSecondStorageClass;
-  private String invalidTwoStorageConf = validFirstStorageClass + "," + invalidStorageClass;
-  private String unsupportedStorageConf = validFirstStorageClass + "," + validSecondStorageClass + "," + validSecondStorageClass;
-  private String emptyStorageConf = "";
-  
-  @Before
-  public void setUp(){
-    //setup routine
-  }
-  
-  @After
-  public void tearDown() {
-    //tear-down routine 
-  }
-
-  @Test
-  public void validInitOneStorageTest() throws IOException {
-    // no need to initialize folder due to one storage
-    // set confs
-    System.setProperty(ConfVars.ZEPPELIN_NOTEBOOK_STORAGE.getVarName(), validOneStorageConf);
-    ZeppelinConfiguration conf = ZeppelinConfiguration.create();
-    // create repo
-    NotebookRepoSync notebookRepoSync = new NotebookRepoSync(conf);
-    // check proper initialization of one storage
-    assertEquals(notebookRepoSync.getRepoCount(), 1);
-    assertTrue(notebookRepoSync.getRepo(0) instanceof VFSNotebookRepo);
-  }
-
-  @Test
-  public void validInitTwoStorageTest() throws IOException {
-    // initialize folders for each storage
-    String zpath = System.getProperty("java.io.tmpdir") + "/ZeppelinLTest_" + System.currentTimeMillis();
-    File mainZepDir = new File(zpath);
-    mainZepDir.mkdirs();
-    new File(mainZepDir, "conf").mkdirs();
-    String mainNotePath = zpath+"/notebook";
-    String secNotePath = mainNotePath + "_secondary";
-    File mainNotebookDir = new File(mainNotePath);
-    File secNotebookDir = new File(secNotePath);
-    mainNotebookDir.mkdirs();
-    secNotebookDir.mkdirs();
-    
-    // set confs
-    System.setProperty(ConfVars.ZEPPELIN_HOME.getVarName(), mainZepDir.getAbsolutePath());
-    System.setProperty(ConfVars.ZEPPELIN_NOTEBOOK_DIR.getVarName(), mainNotebookDir.getAbsolutePath());
-    System.setProperty(ConfVars.ZEPPELIN_NOTEBOOK_STORAGE.getVarName(), validTwoStorageConf);
-    ZeppelinConfiguration conf = ZeppelinConfiguration.create();
-    // create repo
-    NotebookRepoSync notebookRepoSync = new NotebookRepoSync(conf);
-    // check that both initialized
-    assertEquals(notebookRepoSync.getRepoCount(), 2);
-    assertTrue(notebookRepoSync.getRepo(0) instanceof VFSNotebookRepo);
-    assertTrue(notebookRepoSync.getRepo(1) instanceof VFSNotebookRepoMock);
-  }
-  
-  @Test
-  public void invalidInitTwoStorageTest() throws IOException {
-    // set confs
-    System.setProperty(ConfVars.ZEPPELIN_NOTEBOOK_STORAGE.getVarName(), invalidTwoStorageConf);
-    ZeppelinConfiguration conf = ZeppelinConfiguration.create();
-    // create repo
-    NotebookRepoSync notebookRepoSync = new NotebookRepoSync(conf);
-    // check that second didn't initialize
-    LOG.info(" " + notebookRepoSync.getRepoCount());
-    assertEquals(notebookRepoSync.getRepoCount(), 1);
-    assertTrue(notebookRepoSync.getRepo(0) instanceof VFSNotebookRepo);
-  }
-  
-  @Test
-  public void initUnsupportedNumberStoragesTest() throws IOException {
-    // initialize folders for each storage, currently for 2 only
-    String zpath = System.getProperty("java.io.tmpdir") + "/ZeppelinLTest_" + System.currentTimeMillis();
-    File mainZepDir = new File(zpath);
-    mainZepDir.mkdirs();
-    new File(mainZepDir, "conf").mkdirs();
-    String mainNotePath = zpath+"/notebook";
-    String secNotePath = mainNotePath + "_secondary";
-    File mainNotebookDir = new File(mainNotePath);
-    File secNotebookDir = new File(secNotePath);
-    mainNotebookDir.mkdirs();
-    secNotebookDir.mkdirs();
-    
-    // set confs
-    System.setProperty(ConfVars.ZEPPELIN_HOME.getVarName(), mainZepDir.getAbsolutePath());
-    System.setProperty(ConfVars.ZEPPELIN_NOTEBOOK_DIR.getVarName(), mainNotebookDir.getAbsolutePath());
-    System.setProperty(ConfVars.ZEPPELIN_NOTEBOOK_STORAGE.getVarName(), unsupportedStorageConf);
-    ZeppelinConfiguration conf = ZeppelinConfiguration.create();
-    // create repo
-    NotebookRepoSync notebookRepoSync = new NotebookRepoSync(conf);
-    // check that first two storages initialized instead of three 
-    assertEquals(notebookRepoSync.getRepoCount(), 2);
-    assertTrue(notebookRepoSync.getRepo(0) instanceof VFSNotebookRepo);
-    assertTrue(notebookRepoSync.getRepo(1) instanceof VFSNotebookRepoMock);
-  }
-
-  @Test
-  public void initEmptyStorageTest() throws IOException {
-    // set confs
-    System.setProperty(ConfVars.ZEPPELIN_NOTEBOOK_STORAGE.getVarName(), emptyStorageConf);
-    ZeppelinConfiguration conf = ZeppelinConfiguration.create();
-    // create repo
-    NotebookRepoSync notebookRepoSync = new NotebookRepoSync(conf);
-    // check initialization of one default storage
-    assertEquals(notebookRepoSync.getRepoCount(), 1);
-    assertTrue(notebookRepoSync.getRepo(0) instanceof VFSNotebookRepo);
-  }
-  
-  @Test
-  public void initOneDummyStorageTest() throws IOException {
- // set confs
-    System.setProperty(ConfVars.ZEPPELIN_NOTEBOOK_STORAGE.getVarName(), invalidStorageClass);
-    ZeppelinConfiguration conf = ZeppelinConfiguration.create();
-    // create repo
-    NotebookRepoSync notebookRepoSync = new NotebookRepoSync(conf);
-    // check initialization of one default storage instead of invalid one
-    assertEquals(notebookRepoSync.getRepoCount(), 1);
-    assertTrue(notebookRepoSync.getRepo(0) instanceof VFSNotebookRepo);
-  }
-}
\ No newline at end of file
diff --git a/smart-zeppelin/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/NotebookRepoSyncTest.java b/smart-zeppelin/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/NotebookRepoSyncTest.java
deleted file mode 100644
index de1575a847b..00000000000
--- a/smart-zeppelin/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/NotebookRepoSyncTest.java
+++ /dev/null
@@ -1,427 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.zeppelin.notebook.repo;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.zeppelin.conf.ZeppelinConfiguration;
-import org.apache.zeppelin.conf.ZeppelinConfiguration.ConfVars;
-import org.apache.zeppelin.dep.DependencyResolver;
-import org.apache.zeppelin.interpreter.InterpreterFactory;
-import org.apache.zeppelin.interpreter.InterpreterOption;
-import org.apache.zeppelin.interpreter.InterpreterResultMessage;
-import org.apache.zeppelin.interpreter.InterpreterSettingManager;
-import org.apache.zeppelin.notebook.*;
-import org.apache.zeppelin.scheduler.Job;
-import org.apache.zeppelin.scheduler.Job.Status;
-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;
-import org.quartz.SchedulerException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-public class NotebookRepoSyncTest implements JobListenerFactory {
-
-  private File mainZepDir;
-  private ZeppelinConfiguration conf;
-  private SchedulerFactory schedulerFactory;
-  private File mainNotebookDir;
-  private File secNotebookDir;
-  private Notebook notebookSync;
-  private NotebookRepoSync notebookRepoSync;
-  private InterpreterFactory factory;
-  private InterpreterSettingManager interpreterSettingManager;
-  private DependencyResolver depResolver;
-  private SearchService search;
-  private NotebookAuthorization notebookAuthorization;
-  private Credentials credentials;
-  private AuthenticationInfo anonymous;
-  private static final Logger LOG = LoggerFactory.getLogger(NotebookRepoSyncTest.class);
-  
-  @Before
-  public void setUp() throws Exception {
-    String zpath = System.getProperty("java.io.tmpdir")+"/ZeppelinLTest_"+System.currentTimeMillis();
-    mainZepDir = new File(zpath);
-    mainZepDir.mkdirs();
-    new File(mainZepDir, "conf").mkdirs();
-    String mainNotePath = zpath+"/notebook";
-    String secNotePath = mainNotePath + "_secondary";
-    mainNotebookDir = new File(mainNotePath);
-    secNotebookDir = new File(secNotePath);
-    mainNotebookDir.mkdirs();
-    secNotebookDir.mkdirs();
-
-    System.setProperty(ConfVars.ZEPPELIN_HOME.getVarName(), mainZepDir.getAbsolutePath());
-    System.setProperty(ConfVars.ZEPPELIN_NOTEBOOK_DIR.getVarName(), mainNotebookDir.getAbsolutePath());
-    System.setProperty(ConfVars.ZEPPELIN_NOTEBOOK_STORAGE.getVarName(), "org.apache.zeppelin.notebook.repo.VFSNotebookRepo,org.apache.zeppelin.notebook.repo.mock.VFSNotebookRepoMock");
-    System.setProperty(ConfVars.ZEPPELIN_NOTEBOOK_ONE_WAY_SYNC.getVarName(), "false");
-    LOG.info("main Note dir : " + mainNotePath);
-    LOG.info("secondary note dir : " + secNotePath);
-    conf = ZeppelinConfiguration.create();
-
-    this.schedulerFactory = new SchedulerFactory();
-
-    depResolver = new DependencyResolver(mainZepDir.getAbsolutePath() + "/local-repo");
-    interpreterSettingManager = new InterpreterSettingManager(conf, depResolver, new InterpreterOption(true));
-    factory = new InterpreterFactory(conf, null, null, null, depResolver, false, interpreterSettingManager);
-    
-    search = mock(SearchService.class);
-    notebookRepoSync = new NotebookRepoSync(conf);
-    notebookAuthorization = NotebookAuthorization.init(conf);
-    credentials = new Credentials(conf.credentialsPersist(), conf.getCredentialsPath());
-    notebookSync = new Notebook(conf, notebookRepoSync, schedulerFactory, factory, interpreterSettingManager, this, search,
-            notebookAuthorization, credentials);
-    anonymous = new AuthenticationInfo("anonymous");
-  }
-
-  @After
-  public void tearDown() throws Exception {
-    delete(mainZepDir);
-  }
-  
-  @Test
-  public void testRepoCount() throws IOException {
-    assertTrue(notebookRepoSync.getMaxRepoNum() >= notebookRepoSync.getRepoCount());
-  }
-  
-  @Test
-  public void testSyncOnCreate() throws IOException {
-    /* check that both storage systems are empty */
-    assertTrue(notebookRepoSync.getRepoCount() > 1);
-    assertEquals(0, notebookRepoSync.list(0, anonymous).size());
-    assertEquals(0, notebookRepoSync.list(1, anonymous).size());
-    
-    /* create note */
-    Note note = notebookSync.createNote(anonymous);
-
-    // check that automatically saved on both storages
-    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, anonymous).size());
-    assertEquals(0, notebookRepoSync.list(1, anonymous).size());
-    
-    Note note = notebookSync.createNote(anonymous);
-
-    /* check that created in both storage systems */
-    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, anonymous).get(0).getId(), anonymous);
-    
-    /* check that deleted in both storages */
-    assertEquals(0, notebookRepoSync.list(0, anonymous).size());
-    assertEquals(0, notebookRepoSync.list(1, anonymous).size());
-    
-  }
-  
-  @Test
-  public void testSyncUpdateMain() throws IOException {
-    
-    /* create note */
-    Note note = notebookSync.createNote(anonymous);
-    Paragraph p1 = note.addParagraph(AuthenticationInfo.ANONYMOUS);
-    Map config = p1.getConfig();
-    config.put("enabled", true);
-    p1.setConfig(config);
-    p1.setText("hello world");
-    
-    /* new paragraph exists in note instance */
-    assertEquals(1, note.getParagraphs().size());
-    
-    /* new paragraph not yet saved into storages */
-    assertEquals(0, notebookRepoSync.get(0,
-        notebookRepoSync.list(0, anonymous).get(0).getId(), anonymous).getParagraphs().size());
-    assertEquals(0, notebookRepoSync.get(1,
-        notebookRepoSync.list(1, anonymous).get(0).getId(), anonymous).getParagraphs().size());
-    
-    /* save to storage under index 0 (first storage) */ 
-    notebookRepoSync.save(0, note, anonymous);
-    
-    /* check paragraph saved to first storage */
-    assertEquals(1, notebookRepoSync.get(0,
-        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, 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, anonymous).get(0).getId(), anonymous).getParagraphs().size());
-    /* check whether same paragraph id */
-    assertEquals(p1.getId(), notebookRepoSync.get(0,
-        notebookRepoSync.list(0, anonymous).get(0).getId(), anonymous).getLastParagraph().getId());
-    assertEquals(p1.getId(), notebookRepoSync.get(1,
-        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, anonymous).size());
-    assertEquals(0, notebookRepoSync.list(1, anonymous).size());
-
-    File srcDir = new File("src/test/resources/2A94M5J1Z");
-    File destDir = new File(secNotebookDir + "/2A94M5J1Z");
-
-    /* copy manually new notebook into secondary storage repo and check repos */
-    try {
-      FileUtils.copyDirectory(srcDir, destDir);
-    } catch (IOException e) {
-      LOG.error(e.toString(), e);
-    }
-    assertEquals(0, notebookRepoSync.list(0, anonymous).size());
-    assertEquals(1, notebookRepoSync.list(1, anonymous).size());
-
-    // After reloading notebooks repos should be synchronized
-    notebookSync.reloadAllNotes(anonymous);
-    assertEquals(1, notebookRepoSync.list(0, anonymous).size());
-    assertEquals(1, notebookRepoSync.list(1, anonymous).size());
-  }
-
-  @Test
-  public void testOneWaySyncOnReloadedList() throws IOException, SchedulerException {
-    System.setProperty(ConfVars.ZEPPELIN_NOTEBOOK_DIR.getVarName(), mainNotebookDir.getAbsolutePath());
-    System.setProperty(ConfVars.ZEPPELIN_NOTEBOOK_ONE_WAY_SYNC.getVarName(), "true");
-    conf = ZeppelinConfiguration.create();
-    notebookRepoSync = new NotebookRepoSync(conf);
-    notebookSync = new Notebook(conf, notebookRepoSync, schedulerFactory, factory, interpreterSettingManager, this, search,
-            notebookAuthorization, credentials);
-
-    // 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());
-
-    File srcDir = new File("src/test/resources/2A94M5J1Z");
-    File destDir = new File(secNotebookDir + "/2A94M5J1Z");
-
-    // copy manually new notebook into secondary storage repo and check repos
-    try {
-      FileUtils.copyDirectory(srcDir, destDir);
-    } catch (IOException e) {
-      LOG.error(e.toString(), e);
-    }
-    assertEquals(0, notebookRepoSync.list(0, null).size());
-    assertEquals(1, notebookRepoSync.list(1, null).size());
-
-    // after reloading the notebook should be wiped from secondary storage
-    notebookSync.reloadAllNotes(null);
-    assertEquals(0, notebookRepoSync.list(0, null).size());
-    assertEquals(0, notebookRepoSync.list(1, null).size());
-
-    destDir = new File(mainNotebookDir + "/2A94M5J1Z");
-
-    // copy manually new notebook into primary storage repo and check repos
-    try {
-      FileUtils.copyDirectory(srcDir, destDir);
-    } catch (IOException e) {
-      LOG.error(e.toString(), e);
-    }
-    assertEquals(1, notebookRepoSync.list(0, null).size());
-    assertEquals(0, notebookRepoSync.list(1, null).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());
-  }
-
-  @Test
-  public void testCheckpointOneStorage() throws IOException, SchedulerException {
-    System.setProperty(ConfVars.ZEPPELIN_NOTEBOOK_STORAGE.getVarName(), "org.apache.zeppelin.notebook.repo.GitNotebookRepo");
-    ZeppelinConfiguration vConf = ZeppelinConfiguration.create();
-
-    NotebookRepoSync vRepoSync = new NotebookRepoSync(vConf);
-    Notebook vNotebookSync = new Notebook(vConf, vRepoSync, schedulerFactory, factory, interpreterSettingManager, this, search,
-            notebookAuthorization, credentials);
-
-    // one git versioned storage initialized
-    assertThat(vRepoSync.getRepoCount()).isEqualTo(1);
-    assertThat(vRepoSync.getRepo(0)).isInstanceOf(GitNotebookRepo.class);
-    
-    GitNotebookRepo gitRepo = (GitNotebookRepo) vRepoSync.getRepo(0);
-    
-    // no notes
-    assertThat(vRepoSync.list(anonymous).size()).isEqualTo(0);
-    // create note
-    Note note = vNotebookSync.createNote(anonymous);
-    assertThat(vRepoSync.list(anonymous).size()).isEqualTo(1);
-    
-    String noteId = vRepoSync.list(anonymous).get(0).getId();
-    // first checkpoint
-    vRepoSync.checkpoint(noteId, "checkpoint message", anonymous);
-    int vCount = gitRepo.revisionHistory(noteId, anonymous).size();
-    assertThat(vCount).isEqualTo(1);
-    
-    Paragraph p = note.addParagraph(AuthenticationInfo.ANONYMOUS);
-    Map<String, Object> config = p.getConfig();
-    config.put("enabled", true);
-    p.setConfig(config);
-    p.setText("%md checkpoint test");
-    
-    // save and checkpoint again
-    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);
-  }
-  
-  @Test
-  public void testSyncWithAcl() throws IOException {
-    /* scenario 1 - note exists with acl on main storage */
-    AuthenticationInfo user1 = new AuthenticationInfo("user1");
-    Note note = notebookSync.createNote(user1);
-    assertEquals(0, note.getParagraphs().size());
-    
-    // saved on both storages
-    assertEquals(1, notebookRepoSync.list(0, null).size());
-    assertEquals(1, notebookRepoSync.list(1, null).size());
-    
-    /* check that user1 is the only owner */
-    NotebookAuthorization authInfo = NotebookAuthorization.getInstance();
-    Set<String> entity = new HashSet<String>();
-    entity.add(user1.getUser());
-    assertEquals(true, authInfo.isOwner(note.getId(), entity));
-    assertEquals(1, authInfo.getOwners(note.getId()).size());
-    assertEquals(0, authInfo.getReaders(note.getId()).size());
-    assertEquals(0, authInfo.getWriters(note.getId()).size());
-    
-    /* update note and save on secondary storage */
-    Paragraph p1 = note.addParagraph(AuthenticationInfo.ANONYMOUS);
-    p1.setText("hello world");
-    assertEquals(1, note.getParagraphs().size());
-    notebookRepoSync.save(1, note, null);
-    
-    /* check paragraph isn't saved into first storage */
-    assertEquals(0, notebookRepoSync.get(0,
-        notebookRepoSync.list(0, null).get(0).getId(), null).getParagraphs().size());
-    /* check paragraph is saved into second storage */
-    assertEquals(1, notebookRepoSync.get(1,
-        notebookRepoSync.list(1, null).get(0).getId(), null).getParagraphs().size());
-    
-    /* now sync by user1 */
-    notebookRepoSync.sync(user1);
-    
-    /* check that note updated and acl are same on main storage*/
-    assertEquals(1, notebookRepoSync.get(0,
-        notebookRepoSync.list(0, null).get(0).getId(), null).getParagraphs().size());
-    assertEquals(true, authInfo.isOwner(note.getId(), entity));
-    assertEquals(1, authInfo.getOwners(note.getId()).size());
-    assertEquals(0, authInfo.getReaders(note.getId()).size());
-    assertEquals(0, authInfo.getWriters(note.getId()).size());
-    
-    /* scenario 2 - note doesn't exist on main storage */
-    /* remove from main storage */
-    notebookRepoSync.remove(0, note.getId(), user1);
-    assertEquals(0, notebookRepoSync.list(0, null).size());
-    assertEquals(1, notebookRepoSync.list(1, null).size());
-    authInfo.removeNote(note.getId());
-    assertEquals(0, authInfo.getOwners(note.getId()).size());
-    assertEquals(0, authInfo.getReaders(note.getId()).size());
-    assertEquals(0, authInfo.getWriters(note.getId()).size());
-    
-    /* now sync - should bring note from secondary storage with added acl */
-    notebookRepoSync.sync(user1);
-    assertEquals(1, notebookRepoSync.list(0, null).size());
-    assertEquals(1, notebookRepoSync.list(1, null).size());
-    assertEquals(1, authInfo.getOwners(note.getId()).size());
-    assertEquals(1, authInfo.getReaders(note.getId()).size());
-    assertEquals(1, authInfo.getWriters(note.getId()).size());
-    assertEquals(true, authInfo.isOwner(note.getId(), entity));
-    assertEquals(true, authInfo.isReader(note.getId(), entity));
-    assertEquals(true, authInfo.isWriter(note.getId(), entity));
-  }
-
-  static void delete(File file){
-    if(file.isFile()) file.delete();
-      else if(file.isDirectory()){
-        File [] files = file.listFiles();
-        if(files!=null && files.length>0){
-          for(File f : files){
-            delete(f);
-          }
-        }
-        file.delete();
-      }
-  }
-
-  @Override
-  public ParagraphJobListener getParagraphJobListener(Note note) {
-    return new ParagraphJobListener(){
-
-      @Override
-      public void onOutputAppend(Paragraph paragraph, int idx, String output) {
-
-      }
-
-      @Override
-      public void onOutputUpdate(Paragraph paragraph, int idx, InterpreterResultMessage msg) {
-
-      }
-
-      @Override
-      public void onOutputUpdateAll(Paragraph paragraph, List<InterpreterResultMessage> msgs) {
-
-      }
-
-      @Override
-      public void onProgressUpdate(Job job, int progress) {
-      }
-
-      @Override
-      public void beforeStatusChange(Job job, Status before, Status after) {
-      }
-
-      @Override
-      public void afterStatusChange(Job job, Status before, Status after) {
-      }
-    };
-  }
-	
-}
diff --git a/smart-zeppelin/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepoTest.java b/smart-zeppelin/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepoTest.java
deleted file mode 100644
index 18f5fe9651e..00000000000
--- a/smart-zeppelin/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepoTest.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.zeppelin.notebook.repo;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import com.google.common.collect.Maps;
-import org.apache.commons.io.FileUtils;
-import org.apache.zeppelin.conf.ZeppelinConfiguration;
-import org.apache.zeppelin.conf.ZeppelinConfiguration.ConfVars;
-import org.apache.zeppelin.dep.Dependency;
-import org.apache.zeppelin.dep.DependencyResolver;
-import org.apache.zeppelin.interpreter.InterpreterFactory;
-import org.apache.zeppelin.interpreter.InterpreterInfo;
-import org.apache.zeppelin.interpreter.InterpreterOption;
-import org.apache.zeppelin.interpreter.InterpreterProperty;
-import org.apache.zeppelin.interpreter.InterpreterSettingManager;
-import org.apache.zeppelin.interpreter.mock.MockInterpreter1;
-import org.apache.zeppelin.notebook.JobListenerFactory;
-import org.apache.zeppelin.notebook.Note;
-import org.apache.zeppelin.notebook.Notebook;
-import org.apache.zeppelin.notebook.NotebookAuthorization;
-import org.apache.zeppelin.notebook.Paragraph;
-import org.apache.zeppelin.notebook.ParagraphJobListener;
-import org.apache.zeppelin.scheduler.SchedulerFactory;
-import org.apache.zeppelin.search.SearchService;
-import org.apache.zeppelin.user.AuthenticationInfo;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.collect.ImmutableMap;
-
-public class VFSNotebookRepoTest implements JobListenerFactory {
-  private static final Logger LOG = LoggerFactory.getLogger(VFSNotebookRepoTest.class);
-  private ZeppelinConfiguration conf;
-  private SchedulerFactory schedulerFactory;
-  private Notebook notebook;
-  private NotebookRepo notebookRepo;
-  private InterpreterSettingManager interpreterSettingManager;
-  private InterpreterFactory factory;
-  private DependencyResolver depResolver;
-  private NotebookAuthorization notebookAuthorization;
-
-  private File mainZepDir;
-  private File mainNotebookDir;
-
-  @Before
-  public void setUp() throws Exception {
-    String zpath = System.getProperty("java.io.tmpdir") + "/ZeppelinLTest_" + System.currentTimeMillis();
-    mainZepDir = new File(zpath);
-    mainZepDir.mkdirs();
-    new File(mainZepDir, "conf").mkdirs();
-    String mainNotePath = zpath + "/notebook";
-    mainNotebookDir = new File(mainNotePath);
-    mainNotebookDir.mkdirs();
-
-    System.setProperty(ConfVars.ZEPPELIN_HOME.getVarName(), mainZepDir.getAbsolutePath());
-    System.setProperty(ConfVars.ZEPPELIN_NOTEBOOK_DIR.getVarName(), mainNotebookDir.getAbsolutePath());
-    System.setProperty(ConfVars.ZEPPELIN_NOTEBOOK_STORAGE.getVarName(), "org.apache.zeppelin.notebook.repo.VFSNotebookRepo");
-    conf = ZeppelinConfiguration.create();
-
-    this.schedulerFactory = new SchedulerFactory();
-
-    this.schedulerFactory = new SchedulerFactory();
-    depResolver = new DependencyResolver(mainZepDir.getAbsolutePath() + "/local-repo");
-    interpreterSettingManager = new InterpreterSettingManager(conf, depResolver, new InterpreterOption(true));
-    factory = new InterpreterFactory(conf, null, null, null, depResolver, false, interpreterSettingManager);
-
-    ArrayList<InterpreterInfo> interpreterInfos = new ArrayList<>();
-    interpreterInfos.add(new InterpreterInfo(MockInterpreter1.class.getName(), "mock1", true, new HashMap<String, Object>()));
-    interpreterSettingManager.add("mock1", interpreterInfos, new ArrayList<Dependency>(), new InterpreterOption(),
-        Maps.<String, InterpreterProperty>newHashMap(), "mock1", null);
-    interpreterSettingManager.createNewSetting("mock1", "mock1", new ArrayList<Dependency>(), new InterpreterOption(), new Properties());
-
-    SearchService search = mock(SearchService.class);
-    notebookRepo = new VFSNotebookRepo(conf);
-    notebookAuthorization = NotebookAuthorization.init(conf);
-    notebook = new Notebook(conf, notebookRepo, schedulerFactory, factory, interpreterSettingManager, this, search,
-        notebookAuthorization, null);
-  }
-
-  @After
-  public void tearDown() throws Exception {
-    if (!FileUtils.deleteQuietly(mainZepDir)) {
-      LOG.error("Failed to delete {} ", mainZepDir.getName());
-    }
-  }
-
-  @Test
-  public void testInvalidJsonFile() throws IOException {
-    // given
-    int numNotes = notebookRepo.list(null).size();
-
-    // when create invalid json file
-    File testNoteDir = new File(mainNotebookDir, "test");
-    testNoteDir.mkdir();
-    FileUtils.writeStringToFile(new File(testNoteDir, "note.json"), "");
-
-    // then
-    assertEquals(numNotes, notebookRepo.list(null).size());
-  }
-
-  @Test
-  public void testSaveNotebook() throws IOException, InterruptedException {
-    AuthenticationInfo anonymous = new AuthenticationInfo("anonymous");
-    Note note = notebook.createNote(anonymous);
-    interpreterSettingManager.setInterpreters("user", note.getId(), interpreterSettingManager.getDefaultInterpreterSettingList());
-
-    Paragraph p1 = note.addParagraph(AuthenticationInfo.ANONYMOUS);
-    Map<String, Object> config = p1.getConfig();
-    config.put("enabled", true);
-    p1.setConfig(config);
-    p1.setText("%mock1 hello world");
-    p1.setAuthenticationInfo(anonymous);
-
-    note.run(p1.getId());
-    int timeout = 1;
-    while (!p1.isTerminated()) {
-      Thread.sleep(1000);
-      if (timeout++ > 10) {
-        break;
-      }
-    }
-    int i = 0;
-    int TEST_COUNT = 10;
-    while (i++ < TEST_COUNT) {
-      p1.setText("%mock1 hello zeppelin");
-      new Thread(new NotebookWriter(note)).start();
-      p1.setText("%mock1 hello world");
-      new Thread(new NotebookWriter(note)).start();
-    }
-
-    note.setName("SaveTest");
-    notebookRepo.save(note, null);
-    assertEquals(note.getName(), "SaveTest");
-    notebookRepo.remove(note.getId(), null);
-  }
-  
-  @Test
-  public void testUpdateSettings() throws IOException {
-    AuthenticationInfo subject = new AuthenticationInfo("anonymous");
-    File tmpDir = File.createTempFile("temp", Long.toString(System.nanoTime()));
-    Map<String, String> settings = ImmutableMap.of("Notebook Path", tmpDir.getAbsolutePath());
-    
-    List<NotebookRepoSettingsInfo> repoSettings = notebookRepo.getSettings(subject);
-    String originalDir = repoSettings.get(0).selected;
-    
-    notebookRepo.updateSettings(settings, subject);
-    repoSettings = notebookRepo.getSettings(subject);
-    assertEquals(repoSettings.get(0).selected, tmpDir.getAbsolutePath());
-    
-    // restaure
-    notebookRepo.updateSettings(ImmutableMap.of("Notebook Path", originalDir), subject);
-    FileUtils.deleteQuietly(tmpDir);
-  }
-
-  class NotebookWriter implements Runnable {
-    Note note;
-    public NotebookWriter(Note note) {
-      this.note = note;
-    }
-
-    @Override
-    public void run() {
-      try {
-        notebookRepo.save(note, null);
-      } catch (IOException e) {
-        LOG.error(e.toString(), e);
-      }
-    }
-  }
-
-  @Override
-  public ParagraphJobListener getParagraphJobListener(Note note) {
-    return null;
-  }
-}
diff --git a/smart-zeppelin/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/mock/VFSNotebookRepoMock.java b/smart-zeppelin/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/mock/VFSNotebookRepoMock.java
deleted file mode 100644
index 2674cce07ff..00000000000
--- a/smart-zeppelin/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/mock/VFSNotebookRepoMock.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.zeppelin.notebook.repo.mock;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import org.apache.commons.vfs2.VFS;
-import org.apache.zeppelin.conf.ZeppelinConfiguration;
-import org.apache.zeppelin.conf.ZeppelinConfiguration.ConfVars;
-import org.apache.zeppelin.notebook.repo.VFSNotebookRepo;
-
-public class VFSNotebookRepoMock extends VFSNotebookRepo {
-
-  private static ZeppelinConfiguration modifyNotebookDir(ZeppelinConfiguration conf) {
-    String secNotebookDir = conf.getNotebookDir() + "_secondary";
-    System.setProperty(ConfVars.ZEPPELIN_NOTEBOOK_DIR.getVarName(), secNotebookDir);
-    ZeppelinConfiguration secConf = ZeppelinConfiguration.create();
-    return secConf;
-  }
-
-  public VFSNotebookRepoMock(ZeppelinConfiguration conf) throws IOException {
-    super(modifyNotebookDir(conf));
-  }
-
-}
diff --git a/smart-zeppelin/zeppelin-zengine/src/test/resources/test-zeppelin-site1.xml b/smart-zeppelin/zeppelin-zengine/src/test/resources/test-zeppelin-site1.xml
index ae07ca99a08..da2702a0309 100644
--- a/smart-zeppelin/zeppelin-zengine/src/test/resources/test-zeppelin-site1.xml
+++ b/smart-zeppelin/zeppelin-zengine/src/test/resources/test-zeppelin-site1.xml
@@ -58,12 +58,6 @@
 </property>
 -->
 
-<property>
-  <name>zeppelin.notebook.storage</name>
-  <value>org.apache.zeppelin.notebook.repo.VFSNotebookRepo</value>
-  <description>notebook persistence layer implementation</description>
-</property>
-
 <property>
   <name>zeppelin.interpreter.dir</name>
   <value>interpreter</value>
diff --git a/smart-zeppelin/zeppelin-zengine/src/test/resources/test-zeppelin-site2.xml b/smart-zeppelin/zeppelin-zengine/src/test/resources/test-zeppelin-site2.xml
index b6c80b9ff60..13cbe74e3af 100644
--- a/smart-zeppelin/zeppelin-zengine/src/test/resources/test-zeppelin-site2.xml
+++ b/smart-zeppelin/zeppelin-zengine/src/test/resources/test-zeppelin-site2.xml
@@ -59,12 +59,6 @@
 </property>
 -->
 
-<property>
-  <name>zeppelin.notebook.storage</name>
-  <value>org.apache.zeppelin.notebook.repo.VFSNotebookRepo</value>
-  <description>notebook persistence layer implementation</description>
-</property>
-
 <property>
   <name>zeppelin.interpreter.dir</name>
   <value>interpreter</value>
diff --git a/smart-zeppelin/zeppelin-zengine/src/test/resources/zeppelin-site.xml b/smart-zeppelin/zeppelin-zengine/src/test/resources/zeppelin-site.xml
index 85c5e8bdedd..b252e147770 100644
--- a/smart-zeppelin/zeppelin-zengine/src/test/resources/zeppelin-site.xml
+++ b/smart-zeppelin/zeppelin-zengine/src/test/resources/zeppelin-site.xml
@@ -58,12 +58,6 @@
 </property>
 -->
 
-<property>
-  <name>zeppelin.notebook.storage</name>
-  <value>org.apache.zeppelin.notebook.repo.VFSNotebookRepo</value>
-  <description>notebook persistence layer implementation</description>
-</property>
-
 <property>
   <name>zeppelin.interpreter.dir</name>
   <value>interpreter</value>

From 7c12fcad13a9cd2ec562ee443ac20c50028b8ac0 Mon Sep 17 00:00:00 2001
From: littlezhou <wei.zhou@intel.com>
Date: Sat, 24 Mar 2018 20:16:23 +0800
Subject: [PATCH 2/2] Fix init

---
 .../apache/zeppelin/server/SmartZeppelinServer.java  | 12 ------------
 .../apache/zeppelin/conf/ZeppelinConfiguration.java  |  2 +-
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/smart-zeppelin/zeppelin-server/src/main/java/org/apache/zeppelin/server/SmartZeppelinServer.java b/smart-zeppelin/zeppelin-server/src/main/java/org/apache/zeppelin/server/SmartZeppelinServer.java
index ddf37183fda..1b7c14240ba 100644
--- a/smart-zeppelin/zeppelin-server/src/main/java/org/apache/zeppelin/server/SmartZeppelinServer.java
+++ b/smart-zeppelin/zeppelin-server/src/main/java/org/apache/zeppelin/server/SmartZeppelinServer.java
@@ -35,11 +35,9 @@
 import org.apache.zeppelin.interpreter.InterpreterSettingManager;
 import org.apache.zeppelin.notebook.Notebook;
 import org.apache.zeppelin.notebook.NotebookAuthorization;
-import org.apache.zeppelin.notebook.repo.NotebookRepoSync;
 import org.apache.zeppelin.rest.CredentialRestApi;
 import org.apache.zeppelin.rest.HeliumRestApi;
 import org.apache.zeppelin.rest.LoginRestApi;
-import org.apache.zeppelin.rest.NotebookRepoRestApi;
 import org.apache.zeppelin.rest.SecurityRestApi;
 import org.apache.zeppelin.rest.ZeppelinRestApi;
 import org.apache.zeppelin.scheduler.SchedulerFactory;
@@ -95,7 +93,6 @@ public class SmartZeppelinServer {
   private SchedulerFactory schedulerFactory;
   private InterpreterFactory replFactory;
   private SearchService noteSearchService;
-  private NotebookRepoSync notebookRepo;
   private NotebookAuthorization notebookAuthorization;
   private Credentials credentials;
   private DependencyResolver depResolver;
@@ -175,7 +172,6 @@ private void init() throws Exception {
     this.schedulerFactory = new SchedulerFactory();
     this.interpreterSettingManager = new InterpreterSettingManager(zconf, depResolver,
         new InterpreterOption(true));
-    this.notebookRepo = new NotebookRepoSync(zconf);
     this.noteSearchService = new LuceneSearch();
     this.notebookAuthorization = NotebookAuthorization.init(zconf);
     this.credentials = new Credentials(zconf.credentialsPersist(), zconf.getCredentialsPath());
@@ -376,14 +372,6 @@ public Set<Object> getSingletons() {
       /** Rest-api root endpoint */
       ZeppelinRestApi root = new ZeppelinRestApi();
       singletons.add(root);
-/*
-      NotebookRestApi notebookApi =
-        new NotebookRestApi(notebook, notebookWsServer, noteSearchService);
-      singletons.add(notebookApi);*/
-
-      NotebookRepoRestApi notebookRepoApi =
-        new NotebookRepoRestApi(notebookRepo);
-      singletons.add(notebookRepoApi);
 
       HeliumRestApi heliumApi = new HeliumRestApi(helium, notebook);
       singletons.add(heliumApi);
diff --git a/smart-zeppelin/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java b/smart-zeppelin/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
index 7528c9dfb1d..711d72a34a1 100644
--- a/smart-zeppelin/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
+++ b/smart-zeppelin/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
@@ -597,7 +597,7 @@ public static enum ConfVars {
     ZEPPELIN_NOTEBOOK_AZURE_CONNECTION_STRING("zeppelin.notebook.azure.connectionString", null),
     ZEPPELIN_NOTEBOOK_AZURE_SHARE("zeppelin.notebook.azure.share", "zeppelin"),
     ZEPPELIN_NOTEBOOK_AZURE_USER("zeppelin.notebook.azure.user", "user"),
-    ZEPPELIN_NOTEBOOK_STORAGE("zeppelin.notebook.storage", null),
+    ZEPPELIN_NOTEBOOK_STORAGE("zeppelin.notebook.storage", ""),
     ZEPPELIN_NOTEBOOK_ONE_WAY_SYNC("zeppelin.notebook.one.way.sync", false),
     // whether by default note is public or private
     ZEPPELIN_NOTEBOOK_PUBLIC("zeppelin.notebook.public", true),