forgetest1
/
antlr
forked from jasder/antlr
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

v4: code cleanup in BaseTest 

[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9500]
This commit is contained in:
sharwell 2011-11-30 09:56:32 -08:00
parent 918544f2b2
commit 417af93ca1
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tool/test/org/antlr/v4/test/BaseTest.java
View File

@ -38,6 +38,7 @@ import org.antlr.v4.runtime.atn.ATNState;
import org.antlr.v4.runtime.atn.DecisionState; import org.antlr.v4.runtime.atn.DecisionState;
import org.antlr.v4.runtime.atn.LexerATNSimulator; import org.antlr.v4.runtime.atn.LexerATNSimulator;
import org.antlr.v4.runtime.dfa.DFA; import org.antlr.v4.runtime.dfa.DFA;
import org.antlr.v4.runtime.misc.Nullable;
import org.antlr.v4.semantics.SemanticPipeline; import org.antlr.v4.semantics.SemanticPipeline;
import org.antlr.v4.tool.*; import org.antlr.v4.tool.*;
import org.junit.After; import org.junit.After;
@ -284,7 +285,7 @@ public abstract class BaseTest {
fileManager.getJavaFileObjectsFromFiles(Arrays.asList(f)); fileManager.getJavaFileObjectsFromFiles(Arrays.asList(f));
Iterable<String> compileOptions = Iterable<String> compileOptions =
Arrays.asList(new String[]{"-d", tmpdir, "-cp", tmpdir+pathSep+CLASSPATH} ); Arrays.asList("-d", tmpdir, "-cp", tmpdir+pathSep+CLASSPATH);
JavaCompiler.CompilationTask task = JavaCompiler.CompilationTask task =
compiler.getTask(null, fileManager, null, compileOptions, null, compiler.getTask(null, fileManager, null, compileOptions, null,
@ -522,7 +523,7 @@ public abstract class BaseTest {
/** Return true if all is well */ /** Return true if all is well */
protected boolean rawGenerateAndBuildRecognizer(String grammarFileName, protected boolean rawGenerateAndBuildRecognizer(String grammarFileName,
String grammarStr, String grammarStr,
String parserName, @Nullable String parserName,
String lexerName, String lexerName,
boolean debug, boolean debug,
String... extraOptions) String... extraOptions)
@ -544,10 +545,10 @@ public abstract class BaseTest {
} }
protected String rawExecRecognizer(String parserName, protected String rawExecRecognizer(String parserName,
String treeParserName, @Nullable String treeParserName,
String lexerName, String lexerName,
String parserStartRuleName, String parserStartRuleName,
String treeParserStartRuleName, @Nullable String treeParserStartRuleName,
boolean parserBuildsTrees, boolean parserBuildsTrees,
boolean parserBuildsTemplate, boolean parserBuildsTemplate,
boolean treeParserBuildsTrees, boolean treeParserBuildsTrees,
@ -1255,14 +1256,14 @@ public abstract class BaseTest {
* @return A string that represents all the keys in sorted order. * @return A string that represents all the keys in sorted order.
*/ */
public <K, V> String sortMapToString(Map<K, V> m) { public <K, V> String sortMapToString(Map<K, V> m) {
System.out.println("Map toString looks like: " + m.toString());
// Pass in crap, and get nothing back // Pass in crap, and get nothing back
// //
if (m == null) { if (m == null) {
return null; return null;
} }
System.out.println("Map toString looks like: " + m.toString());
// Sort the keys in the Map // Sort the keys in the Map
// //
TreeMap<K, V> nset = new TreeMap<K, V>(m); TreeMap<K, V> nset = new TreeMap<K, V>(m);