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

test templates were missing visitor-related templates. slight improvement to test generator.

This commit is contained in:
parrt 2016-11-05 16:26:01 -07:00
parent 803e72ba38
commit bcfa70c4e8
7 changed files with 108 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/adding-tests.md
View File

@ -14,6 +14,13 @@ templates = /Users/parrt/antlr/code/antlr4/runtime-testsuite/resources/org/antlr
target = ALL
browsers = false
viz = false
INFO: Generating target Java
INFO: Generating target Go
INFO: Generating target CSharp
INFO: Generating target Python2
INFO: Generating target Python3
INFO: Generating target JavaScript/Node
...
```
It basically runs the Java program:

8
runtime-testsuite/resources/org/antlr/v4/test/runtime/csharp/CSharp.test.stg
View File

@ -410,6 +410,14 @@ public class LeafListener : TBaseListener {
}
>>
ImportVisitor(X) ::= ""
BasicVisitor(X) ::= ""
WalkVisitor(s) ::= ""
LRWithLabelsVisitor(X) ::= ""
RuleGetterVisitor(X) ::= ""
LRVisitor(x) ::= ""
TokenGetterVisitor(x) ::= ""
DeclareContextListGettersFunction() ::= <<
void foo() {
SContext s = null;

30
runtime-testsuite/resources/org/antlr/v4/test/runtime/go/Go.test.stg
View File

@ -1,3 +1,14 @@
IgnoredTests ::= [
"Visitors.Basic": true,
"Visitors.LR": true,
"Visitors.LRWithLabels": true,
"Visitors.RuleGetters_1": true,
"Visitors.RuleGetters_2": true,
"Visitors.TokenGetters_1": true,
"Visitors.TokenGetters_2": true,
default: false
]
TestFile(file) ::= <<
/* This file is generated by TestGenerator, any edits will be overwritten by the next generation. */
package org.antlr.v4.test.runtime.go;
@ -432,6 +443,14 @@ func (*LeafListener) ExitInt(ctx *IntContext) {
}
>>
ImportVisitor(X) ::= ""
BasicVisitor(X) ::= ""
WalkVisitor(s) ::= ""
LRWithLabelsVisitor(X) ::= ""
RuleGetterVisitor(X) ::= ""
LRVisitor(x) ::= ""
TokenGetterVisitor(x) ::= ""
DeclareContextListGettersFunction() ::= <<
func foo() {
// TODO
@ -459,17 +478,6 @@ func pred(v bool) bool {
Invoke_pred(v) ::= <<pred(<v>)>>
IgnoredTests ::= [
"Visitors.Basic": true,
"Visitors.LR": true,
"Visitors.LRWithLabels": true,
"Visitors.RuleGetters_1": true,
"Visitors.RuleGetters_2": true,
"Visitors.TokenGetters_1": true,
"Visitors.TokenGetters_2": true,
default: false
]
isEmpty ::= [
"": true,
default: false

30
runtime-testsuite/resources/org/antlr/v4/test/runtime/java/Java.test.stg
View File

@ -1,3 +1,14 @@
IgnoredTests ::= [
"Visitors.Basic": true,
"Visitors.LR": true,
"Visitors.LRWithLabels": true,
"Visitors.RuleGetters_1": true,
"Visitors.RuleGetters_2": true,
"Visitors.TokenGetters_1": true,
"Visitors.TokenGetters_2": true,
default: false
]
TestFile(file) ::= <<
/* This file is generated by TestGenerator, any edits will be overwritten by the next generation. */
package org.antlr.v4.test.runtime.java;
@ -405,6 +416,14 @@ public static class LeafListener extends TBaseListener {
}
>>
ImportVisitor(X) ::= ""
BasicVisitor(X) ::= ""
WalkVisitor(s) ::= ""
LRWithLabelsVisitor(X) ::= ""
RuleGetterVisitor(X) ::= ""
LRVisitor(x) ::= ""
TokenGetterVisitor(x) ::= ""
DeclareContextListGettersFunction() ::= <<
void foo() {
SContext s = null;
@ -427,17 +446,6 @@ Declare_pred() ::= <<boolean pred(boolean v) {
Invoke_pred(v) ::= <<this.pred(<v>)>>
IgnoredTests ::= [
"Visitors.Basic": true,
"Visitors.LR": true,
"Visitors.LRWithLabels": true,
"Visitors.RuleGetters_1": true,
"Visitors.RuleGetters_2": true,
"Visitors.TokenGetters_1": true,
"Visitors.TokenGetters_2": true,
default: false
]
isEmpty ::= [
"": true,
default: false

8
runtime-testsuite/resources/org/antlr/v4/test/runtime/python2/Python2.test.stg
View File

@ -398,6 +398,14 @@ class LeafListener(TListener):
>>
ImportVisitor(X) ::= ""
BasicVisitor(X) ::= ""
WalkVisitor(s) ::= ""
LRWithLabelsVisitor(X) ::= ""
RuleGetterVisitor(X) ::= ""
LRVisitor(x) ::= ""
TokenGetterVisitor(x) ::= ""
DeclareContextListGettersFunction() ::= <<
def foo():
s = SContext()

8
runtime-testsuite/resources/org/antlr/v4/test/runtime/python3/Python3.test.stg
View File

@ -380,6 +380,14 @@ class LeafListener(MockListener):
>>
ImportVisitor(X) ::= ""
BasicVisitor(X) ::= ""
WalkVisitor(s) ::= ""
LRWithLabelsVisitor(X) ::= ""
RuleGetterVisitor(X) ::= ""
LRVisitor(x) ::= ""
TokenGetterVisitor(x) ::= ""
DeclareContextListGettersFunction() ::= <<
def foo():
s = SContext()

59
runtime-testsuite/src/org/antlr/v4/testgen/TestGenerator.java
View File

@ -29,6 +29,13 @@
*/
package org.antlr.v4.testgen;
import org.stringtemplate.v4.ST;
import org.stringtemplate.v4.STGroup;
import org.stringtemplate.v4.STGroupFile;
import org.stringtemplate.v4.StringRenderer;
import org.stringtemplate.v4.gui.STViz;
import org.stringtemplate.v4.misc.ErrorBuffer;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@ -39,15 +46,12 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
import org.stringtemplate.v4.ST;
import org.stringtemplate.v4.STGroup;
import org.stringtemplate.v4.STGroupFile;
import org.stringtemplate.v4.StringRenderer;
import org.stringtemplate.v4.gui.STViz;
public class TestGenerator {
public final static String[] targets = {"Go", "CSharp", "Java", "Python2", "Python3", "JavaScript/Node", "JavaScript/Safari", "JavaScript/Firefox", "JavaScript/Explorer", "JavaScript/Chrome"};
public final static String[] targets = {
"Java", "Go", "CSharp", "Python2", "Python3",
"JavaScript/Node", "JavaScript/Safari", "JavaScript/Firefox",
"JavaScript/Explorer", "JavaScript/Chrome"
};
/** Execute from antlr4 root dir:
* *
@ -92,38 +96,41 @@ public class TestGenerator {
}
i++;
}
System.out.println("rootDir = " + rootDir);
System.out.println("outputDir = " + outDir);
System.out.println("templates = " + templatesRoot);
System.out.println("target = " + target);
System.out.println("browsers = " + browsers);
System.out.println("viz = " + viz);
if(rootDir==null) {
System.out.println("rootDir is mandatory!" + rootDir);
return;
}
if(outDir==null)
outDir = rootDir + "/test";
if(templatesRoot==null)
templatesRoot = rootDir + "/resources/org/antlr/v4/test/runtime/templates";
if ( "ALL".equalsIgnoreCase(target)) {
genAllTargets(rootDir, outDir, templatesRoot, browsers, viz);
} else
}
else {
genTarget(rootDir, outDir, target, templatesRoot, viz);
}
}
public static void genAllTargets(String rootDir, String outDirRoot, String templatesRoot, boolean browsers, boolean viz) {
for(String target : targets) {
if(!browsers && "JavaScript/Safari".equals(target))
if(!browsers && "JavaScript/Safari".equals(target)) {
return;
}
genTarget(rootDir, outDirRoot, target, templatesRoot, viz);
}
}
public static void genTarget(final String rootDir, final String outDir, final String fullTarget, final String templatesDir, boolean viz) {
String[] parts = fullTarget.split("/");
String target = parts[0];
@ -203,9 +210,12 @@ public class TestGenerator {
Collection<String> testTemplates,
File targetFolder)
{
ErrorBuffer errors = new ErrorBuffer();
targetGroup.setListener(errors);
String testName = testDir.substring(testDir.lastIndexOf('/') + 1);
File targetFile = new File(targetFolder, "Test" + testName + ".java");
info("Generating file "+targetFile.getAbsolutePath());
// System.out.println("Generating file "+targetFile.getAbsolutePath());
List<ST> templates = new ArrayList<ST>();
for (String template : testTemplates) {
STGroup testGroup = new STGroupFile(testDir + "/" + template + STGroup.GROUP_FILE_EXTENSION);
@ -227,7 +237,10 @@ public class TestGenerator {
}
ST testFileTemplate = targetGroup.getInstanceOf("TestFile");
testFileTemplate.addAggr("file.{Options,name,tests}", index.rawGetDictionary("Options"), testName, templates);
testFileTemplate.addAggr("file.{Options,name,tests}",
index.rawGetDictionary("Options"),
testName,
templates);
if (visualize) {
STViz viz = testFileTemplate.inspect();
@ -238,7 +251,11 @@ public class TestGenerator {
}
try {
writeFile(targetFile, testFileTemplate.render());
String output = testFileTemplate.render();
if ( errors.errors.size()>0 ) {
System.err.println("errors in "+targetName+": "+errors);
}
writeFile(targetFile, output);
}
catch (IOException ex) {
error(String.format("Failed to write output file: %s", targetFile), ex);
@ -282,17 +299,19 @@ public class TestGenerator {
}
public File getOutputDir(String templateFolder) {
if(templateFolder.startsWith(rootDir))
if(templateFolder.startsWith(rootDir)) {
templateFolder = templateFolder.substring(rootDir.length());
if(templateFolder.startsWith("/resources"))
}
if(templateFolder.startsWith("/resources")) {
templateFolder = templateFolder.substring("/resources".length());
}
templateFolder = templateFolder.substring(0, templateFolder.indexOf("/templates"));
templateFolder += "/" + targetName.toLowerCase();
return new File(outputDir, templateFolder);
}
protected void info(String message) {
// System.out.println("INFO: " + message);
System.out.println("INFO: " + message);
}
protected void warn(String message) {