phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'pr-2177'

Browse Source 
[lang-test] Factorize parsing logic for tests
This commit is contained in:
Andreas Dangel
2020-01-10 12:29:38 +01:00
parent 63221805a3 c53d9508e9
commit 398b683565
134 changed files with 1786 additions and 2534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pmd-modelica/pom.xml
View File

@@ -77,6 +77,18 @@
<artifactId>pmd-core</artifactId>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-lang-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-lang-test</artifactId>

42
pmd-modelica/src/test/java/net/sourceforge/pmd/lang/modelica/ModelicaLoader.java
View File

@@ -1,42 +0,0 @@
/**
* BSD-style license; for more info see http://pmd.sourceforge.net/license.html
*/
package net.sourceforge.pmd.lang.modelica;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
import org.apache.tools.ant.filters.StringInputStream;
import net.sourceforge.pmd.lang.LanguageRegistry;
import net.sourceforge.pmd.lang.LanguageVersionHandler;
import net.sourceforge.pmd.lang.Parser;
import net.sourceforge.pmd.lang.ast.Node;
import net.sourceforge.pmd.lang.modelica.ast.ASTStoredDefinition;
public class ModelicaLoader {
private ModelicaLoader() {
}
public static ASTStoredDefinition parse(final String resourceName) {
final InputStream inputStream = ModelicaLoader.class.getResourceAsStream(resourceName);
return parse(resourceName, new InputStreamReader(inputStream));
}
public static ASTStoredDefinition parse(final String fileName, final String contents) {
final InputStream inputStream = new StringInputStream(contents);
return parse(fileName, new InputStreamReader(inputStream));
}
public static ASTStoredDefinition parse(final String fileName, Reader source) {
final LanguageVersionHandler modelicaLang = LanguageRegistry.getLanguage(ModelicaLanguageModule.NAME)
.getDefaultVersion()
.getLanguageVersionHandler();
final Parser parser = modelicaLang.getParser(modelicaLang.getDefaultParserOptions());
final Node node = parser.parse(fileName, source);
modelicaLang.getSymbolFacade().start(node);
return (ASTStoredDefinition) node;
}
}

9
pmd-modelica/src/test/java/net/sourceforge/pmd/lang/modelica/ModelicaParserTest.java
View File

@@ -4,21 +4,16 @@
package net.sourceforge.pmd.lang.modelica;
import org.junit.Assert;
import org.junit.Test;
import net.sourceforge.pmd.lang.modelica.ast.ASTStoredDefinition;
public class ModelicaParserTest {
@Test
public void testParsingGrapgical() {
ASTStoredDefinition node = ModelicaLoader.parse("ParserTestGraphical.mo");
Assert.assertNotNull(node);
ModelicaParsingHelper.DEFAULT.parseResource("ParserTestGraphical.mo");
}
@Test
public void testParsingTextual() {
ASTStoredDefinition node = ModelicaLoader.parse("ParserTestTextual.mo");
Assert.assertNotNull(node);
ModelicaParsingHelper.DEFAULT.parseResource("ParserTestTextual.mo");
}
}

25
pmd-modelica/src/test/java/net/sourceforge/pmd/lang/modelica/ModelicaParsingHelper.java Normal file
View File

@@ -0,0 +1,25 @@
/**
* BSD-style license; for more info see http://pmd.sourceforge.net/license.html
*/
package net.sourceforge.pmd.lang.modelica;
import net.sourceforge.pmd.lang.ast.test.BaseParsingHelper;
import net.sourceforge.pmd.lang.modelica.ast.ASTStoredDefinition;
public class ModelicaParsingHelper extends BaseParsingHelper<ModelicaParsingHelper, ASTStoredDefinition> {
/** This runs all processing stages when parsing. */
public static final ModelicaParsingHelper DEFAULT = new ModelicaParsingHelper(Params.getDefaultProcess());
private ModelicaParsingHelper(Params params) {
super(ModelicaLanguageModule.NAME, ASTStoredDefinition.class, params);
}
@Override
protected ModelicaParsingHelper clone(Params params) {
return new ModelicaParsingHelper(params);
}
}

35
pmd-modelica/src/test/java/net/sourceforge/pmd/lang/modelica/resolver/ModelicaResolverTest.java
View File

@@ -9,7 +9,7 @@ import java.util.List;
import org.junit.Assert;
import org.junit.Test;
import net.sourceforge.pmd.lang.modelica.ModelicaLoader;
import net.sourceforge.pmd.lang.modelica.ModelicaParsingHelper;
import net.sourceforge.pmd.lang.modelica.ast.ASTExtendsClause;
import net.sourceforge.pmd.lang.modelica.ast.ASTStoredDefinition;
import net.sourceforge.pmd.lang.modelica.ast.ModelicaClassSpecifierNode;
@@ -17,6 +17,9 @@ import net.sourceforge.pmd.lang.modelica.ast.ModelicaNode;
import net.sourceforge.pmd.lang.modelica.ast.ModelicaParserVisitorAdapter;
public class ModelicaResolverTest {
private final ModelicaParsingHelper modelica = ModelicaParsingHelper.DEFAULT;
private static class NodeFinder extends ModelicaParserVisitorAdapter {
private ModelicaNode result;
private Class<?> nodeClass;
@@ -54,13 +57,13 @@ public class ModelicaResolverTest {
}
private ResolutionResult<ResolvableEntity> resolveIn(int best, int hidden, ResolutionState state, SubcomponentResolver resolver, boolean absolute, String[] names) {
ResolutionResult result = resolver.safeResolveComponent(ResolvableEntity.class, state, CompositeName.create(absolute, names));
ResolutionResult<ResolvableEntity> result = resolver.safeResolveComponent(ResolvableEntity.class, state, CompositeName.create(absolute, names));
ensureCounts(result, best, hidden);
return result;
}
private ResolutionResult<ResolvableEntity> resolveIn(int best, int hidden, ResolutionState state, ModelicaScope resolver, boolean absolute, String[] names) {
ResolutionResult result = resolver.safeResolveLexically(ResolvableEntity.class, state, CompositeName.create(absolute, names));
ResolutionResult<ResolvableEntity> result = resolver.safeResolveLexically(ResolvableEntity.class, state, CompositeName.create(absolute, names));
ensureCounts(result, best, hidden);
return result;
}
@@ -91,7 +94,7 @@ public class ModelicaResolverTest {
+ " Real x;"
+ "end TestPackage;";
ASTStoredDefinition ast = ModelicaLoader.parse(null, contents);
ASTStoredDefinition ast = modelica.parse(contents);
Assert.assertNotNull(ast);
Assert.assertTrue(ast.getMostSpecificScope() instanceof ModelicaSourceFileScope);
@@ -114,7 +117,7 @@ public class ModelicaResolverTest {
+ " Real x;"
+ "end TestPackage;";
ASTStoredDefinition ast = ModelicaLoader.parse(null, contents);
ASTStoredDefinition ast = modelica.parse(contents);
ModelicaSourceFileScope sourceFileScope = (ModelicaSourceFileScope) ast.getMostSpecificScope();
Assert.assertEquals(1, sourceFileScope.getContainedDeclarations().size());
@@ -143,7 +146,7 @@ public class ModelicaResolverTest {
+ " end B;"
+ "end Test;";
ASTStoredDefinition ast = ModelicaLoader.parse(null, contents);
ASTStoredDefinition ast = modelica.parse(contents);
List<ASTExtendsClause> extendsClauses = ast.findDescendantsOfType(ASTExtendsClause.class);
Assert.assertEquals(1, extendsClauses.size());
@@ -161,7 +164,7 @@ public class ModelicaResolverTest {
+ " end TestModel;"
+ "end TestPackage;";
ASTStoredDefinition ast = ModelicaLoader.parse(null, contents);
ASTStoredDefinition ast = modelica.parse(contents);
testResolvedTypeCount(1, 0, ast.getMostSpecificScope(), true, "TestPackage", "TestModel", "TestSubmodel");
}
@@ -176,7 +179,7 @@ public class ModelicaResolverTest {
+ " end TestModel;"
+ "end TestPackage;";
ASTStoredDefinition ast = ModelicaLoader.parse(null, contents);
ASTStoredDefinition ast = modelica.parse(contents);
testResolvedTypeCount(1, 0, ast.getMostSpecificScope(), false, "TestPackage", "TestModel", "TestSubmodel");
}
@@ -193,7 +196,7 @@ public class ModelicaResolverTest {
+ " Real x;"
+ "end TestPackage;";
ASTStoredDefinition ast = ModelicaLoader.parse(null, contents);
ASTStoredDefinition ast = modelica.parse(contents);
ResolutionResult<ResolvableEntity> testModelCandidates = testResolvedTypeCount(1, 0, ast.getMostSpecificScope(), true, "TestPackage", "TestModel");
ModelicaClassScope testModelScope = ((ModelicaClassType) testModelCandidates.getBestCandidates().get(0)).getClassScope();
@@ -220,7 +223,7 @@ public class ModelicaResolverTest {
+ " end A;"
+ "end Test;";
ASTStoredDefinition ast = ModelicaLoader.parse(null, contents);
ASTStoredDefinition ast = modelica.parse(contents);
List<ResolvableEntity> xs = testResolvedTypeCount(1, 0, ast.getMostSpecificScope(), false, "Test", "A", "x").getBestCandidates();
Assert.assertEquals(
@@ -236,7 +239,7 @@ public class ModelicaResolverTest {
+ "model Test\n"
+ "end Test;\n";
ASTStoredDefinition ast = ModelicaLoader.parse(null, contents);
ASTStoredDefinition ast = modelica.parse(contents);
RootScope rootScope = (RootScope) ast.getMostSpecificScope().getParent();
List<ResolvableEntity> nestedTest = testResolvedTypeCount(1, 0, rootScope, false, "TestPackage", "SubPackage", "Test").getBestCandidates();
@@ -263,7 +266,7 @@ public class ModelicaResolverTest {
+ " extends A;"
+ "end B;";
ASTStoredDefinition ast = ModelicaLoader.parse(null, contents);
ASTStoredDefinition ast = modelica.parse(contents);
testResolvedTypeCount(1, 0, ast.getMostSpecificScope(), false, "B", "X");
}
@@ -284,7 +287,7 @@ public class ModelicaResolverTest {
+ " extends A;"
+ "end B;";
ASTStoredDefinition ast = ModelicaLoader.parse(null, contents);
ASTStoredDefinition ast = modelica.parse(contents);
testResolvedTypeCount(1, 0, ast.getMostSpecificScope(), false, "A", "Z");
testResolvedTypeCount(0, 0, ast.getMostSpecificScope(), false, "B", "Z");
@@ -299,7 +302,7 @@ public class ModelicaResolverTest {
+ " end B;"
+ "end A;";
ASTStoredDefinition ast = ModelicaLoader.parse(null, contents);
ASTStoredDefinition ast = modelica.parse(contents);
List<ResolvableEntity> xs = testResolvedComponentCount(1, 0, ast.getMostSpecificScope(), true, "A", "B", "x").getBestCandidates();
ModelicaComponentDeclaration x = (ModelicaComponentDeclaration) xs.get(0);
@@ -321,13 +324,13 @@ public class ModelicaResolverTest {
+ " end X;"
+ "end Test;";
ASTStoredDefinition ast = ModelicaLoader.parse(null, contents);
ASTStoredDefinition ast = modelica.parse(contents);
testResolvedTypeCount(1, 0, ast.getMostSpecificScope(), true, "Test", "X", "X");
testResolvedTypeCount(1, 0, ast.getMostSpecificScope(), false, "Test", "X", "X");
ResolutionResult<ResolvableEntity> result = testResolvedComponentCount(1, 0, ast.getMostSpecificScope(), false, "Test", "X", "mdl");
ModelicaComponentDeclaration mdl = (ModelicaComponentDeclaration) result.getBestCandidates().get(0);
ensureCounts(((ModelicaComponentDeclaration) mdl).getTypeCandidates(), 1, 0);
ensureCounts(mdl.getTypeCandidates(), 1, 0);
}
}