Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

test: Add some tests

Browse source
This commit is contained in:
1ambda 2017-01-11 05:04:57 +09:00
parent 49a4a1107d
commit 2d4aa7d905
2 changed files with 58 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
python/src/main/java/org/apache/zeppelin/python/PythonCondaInterpreter.java
View file

@ -38,17 +38,17 @@ public class PythonCondaInterpreter extends Interpreter {
public static final String CONDA_PYTHON_PATH = "/bin/python";
public static final String DEFAULT_ZEPPELIN_PYTHON = "python";
private Pattern condaEnvListPattern = Pattern.compile("([^\\s]*)[\\s*]*\\s(.*)");
private Pattern listEnvPattern = Pattern.compile("env\\s*list\\s?");
private Pattern envPattern = Pattern.compile("env\\s*(.*)");
private Pattern listPattern = Pattern.compile("list");
private Pattern createPattern = Pattern.compile("create\\s*(.*)");
private Pattern activatePattern = Pattern.compile("activate\\s*(.*)");
private Pattern deactivatePattern = Pattern.compile("deactivate");
private Pattern installPattern = Pattern.compile("install\\s*(.*)");
private Pattern uninstallPattern = Pattern.compile("uninstall\\s*(.*)");
private Pattern helpPattern = Pattern.compile("help");
private Pattern infoPattern = Pattern.compile("info");
public static final Pattern PATTERN_OUTPUT_ENV_LIST = Pattern.compile("([^\\s]*)[\\s*]*\\s(.*)");
public static final Pattern PATTERN_COMMAND_ENV_LIST = Pattern.compile("env\\s*list\\s?");
public static final Pattern PATTERN_COMMAND_ENV = Pattern.compile("env\\s*(.*)");
public static final Pattern PATTERN_COMMAND_LIST = Pattern.compile("list");
public static final Pattern PATTERN_COMMAND_CREATE = Pattern.compile("create\\s*(.*)");
public static final Pattern PATTERN_COMMAND_ACTIVATE = Pattern.compile("activate\\s*(.*)");
public static final Pattern PATTERN_COMMAND_DEACTIVATE = Pattern.compile("deactivate");
public static final Pattern PATTERN_COMMAND_INSTALL = Pattern.compile("install\\s*(.*)");
public static final Pattern PATTERN_COMMAND_UNINSTALL = Pattern.compile("uninstall\\s*(.*)");
public static final Pattern PATTERN_COMMAND_HELP = Pattern.compile("help");
public static final Pattern PATTERN_COMMAND_INFO = Pattern.compile("info");
public PythonCondaInterpreter(Properties property) {
super(property);
@ -67,21 +67,21 @@ public class PythonCondaInterpreter extends Interpreter {
@Override
public InterpreterResult interpret(String st, InterpreterContext context) {
InterpreterOutput out = context.out;
Matcher activateMatcher = activatePattern.matcher(st);
Matcher createMatcher = createPattern.matcher(st);
Matcher installMatcher = installPattern.matcher(st);
Matcher uninstallMatcher = uninstallPattern.matcher(st);
Matcher envMatcher = envPattern.matcher(st);
Matcher activateMatcher = PATTERN_COMMAND_ACTIVATE.matcher(st);
Matcher createMatcher = PATTERN_COMMAND_CREATE.matcher(st);
Matcher installMatcher = PATTERN_COMMAND_INSTALL.matcher(st);
Matcher uninstallMatcher = PATTERN_COMMAND_UNINSTALL.matcher(st);
Matcher envMatcher = PATTERN_COMMAND_ENV.matcher(st);
try {
if (listEnvPattern.matcher(st).matches()) {
if (PATTERN_COMMAND_ENV_LIST.matcher(st).matches()) {
String result = runCondaEnvList();
return new InterpreterResult(Code.SUCCESS, Type.HTML, result);
} else if (envMatcher.matches()) {
// `envMatcher` should be used after `listEnvMatcher`
String result = runCondaEnv(getRestArgsFromMatcher(envMatcher));
return new InterpreterResult(Code.SUCCESS, Type.HTML, result);
} else if (listPattern.matcher(st).matches()) {
} else if (PATTERN_COMMAND_LIST.matcher(st).matches()) {
String result = runCondaList();
return new InterpreterResult(Code.SUCCESS, Type.HTML, result);
} else if (createMatcher.matches()) {
@ -90,7 +90,7 @@ public class PythonCondaInterpreter extends Interpreter {
} else if (activateMatcher.matches()) {
String envName = activateMatcher.group(1).trim();
return runCondaActivate(envName);
} else if (deactivatePattern.matcher(st).matches()) {
} else if (PATTERN_COMMAND_DEACTIVATE.matcher(st).matches()) {
return runCondaDeactivate();
} else if (installMatcher.matches()) {
String result = runCondaInstall(getRestArgsFromMatcher(installMatcher));
@ -98,10 +98,10 @@ public class PythonCondaInterpreter extends Interpreter {
} else if (uninstallMatcher.matches()) {
String result = runCondaUninstall(getRestArgsFromMatcher(uninstallMatcher));
return new InterpreterResult(Code.SUCCESS, Type.HTML, result);
} else if (st == null || helpPattern.matcher(st).matches()) {
} else if (st == null || PATTERN_COMMAND_HELP.matcher(st).matches()) {
runCondaHelp(out);
return new InterpreterResult(Code.SUCCESS);
} else if (infoPattern.matcher(st).matches()) {
} else if (PATTERN_COMMAND_INFO.matcher(st).matches()) {
String result = runCondaInfo();
return new InterpreterResult(Code.SUCCESS, Type.HTML, result);
} else {
@ -159,7 +159,7 @@ public class PythonCondaInterpreter extends Interpreter {
return python;
}
private String runCondaCommandForTextOutput(String title, List<String> commands)
public static String runCondaCommandForTextOutput(String title, List<String> commands)
throws IOException, InterruptedException {
StringBuilder sb = new StringBuilder();
@ -289,7 +289,7 @@ public class PythonCondaInterpreter extends Interpreter {
return runCondaCommandForTextOutput("Package Uninstallation", restArgs);
}
private String wrapCondaBasicOutputStyle(String title, String content) {
public static String wrapCondaBasicOutputStyle(String title, String content) {
StringBuilder sb = new StringBuilder();
if (null != title && !title.isEmpty()) {
sb.append("<h4>").append(title).append("</h4>\n");
@ -299,7 +299,7 @@ public class PythonCondaInterpreter extends Interpreter {
return sb.toString();
}
private String wrapCondaTableOutputStyle(String title, Map<String, String> kv) {
public static String wrapCondaTableOutputStyle(String title, Map<String, String> kv) {
StringBuilder sb = new StringBuilder();
if (null != title && !title.isEmpty()) {
@ -321,7 +321,7 @@ public class PythonCondaInterpreter extends Interpreter {
return sb.toString();
}
private Map<String, String> parseCondaCommonStdout(String out)
public static Map<String, String> parseCondaCommonStdout(String out)
throws IOException, InterruptedException {
Map<String, String> kv = new LinkedHashMap<String, String>();
@ -330,7 +330,7 @@ public class PythonCondaInterpreter extends Interpreter {
if (s == null || s.isEmpty() || s.startsWith("#")) {
continue;
}
Matcher match = condaEnvListPattern.matcher(s);
Matcher match = PATTERN_OUTPUT_ENV_LIST.matcher(s);
if (!match.matches()) {
continue;
@ -370,7 +370,7 @@ public class PythonCondaInterpreter extends Interpreter {
}
}
protected int runCommand(StringBuilder sb, List<String> command)
public static int runCommand(StringBuilder sb, List<String> command)
throws IOException, InterruptedException {
ProcessBuilder builder = new ProcessBuilder(command);
@ -387,7 +387,7 @@ public class PythonCondaInterpreter extends Interpreter {
return r;
}
protected int runCommand(StringBuilder sb, String ... command)
public static int runCommand(StringBuilder sb, String ... command)
throws IOException, InterruptedException {
List<String> list = new ArrayList<>(command.length);
@ -398,7 +398,7 @@ public class PythonCondaInterpreter extends Interpreter {
return runCommand(sb, list);
}
private List<String> getRestArgsFromMatcher(Matcher m) {
public static List<String> getRestArgsFromMatcher(Matcher m) {
// Arrays.asList just returns fixed-size, so we should use ctor instead of
return new ArrayList<>(Arrays.asList(m.group(1).split(" ")));
}

29
python/src/test/java/org/apache/zeppelin/python/PythonCondaInterpreterTest.java
View file

@ -24,6 +24,7 @@ import org.junit.Test;
import java.io.IOException;
import java.util.*;
import java.util.regex.Matcher;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@ -89,6 +90,34 @@ public class PythonCondaInterpreterTest {
verify(python).setPythonCommand("python");
}
@Test
public void testParseCondaCommonStdout()
throws IOException, InterruptedException {
StringBuilder sb = new StringBuilder()
.append("# comment1\n")
.append("# comment2\n")
.append("env1 /location1\n")
.append("env2 /location2\n");
Map<String, String> locationPerEnv =
PythonCondaInterpreter.parseCondaCommonStdout(sb.toString());
assertEquals("/location1", locationPerEnv.get("env1"));
assertEquals("/location2", locationPerEnv.get("env2"));
}
@Test
public void testGetRestArgsFromMatcher() {
Matcher m =
PythonCondaInterpreter.PATTERN_COMMAND_ENV.matcher("env remove --name test --yes");
m.matches();
List<String> restArgs = PythonCondaInterpreter.getRestArgsFromMatcher(m);
List<String> expected = Arrays.asList(new String[]{"remove", "--name", "test", "--yes"});
assertEquals(expected, restArgs);
}
private InterpreterContext getInterpreterContext() {
return new InterpreterContext(
"noteId",