azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow error types in some cases for lazy resolve tests

Browse Source
This commit is contained in:
Andrey Breslav
2013-06-07 19:45:50 +04:00
parent 77261a5922
commit 0d0d1ed300
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveNamespaceComparingTest.java
+11 -5
View File
@@ -44,18 +44,18 @@ public abstract class AbstractLazyResolveNamespaceComparingTest extends KotlinTe
} }
protected void doTestCheckingPrimaryConstructors(String testFileName) throws IOException { protected void doTestCheckingPrimaryConstructors(String testFileName) throws IOException {
doTest(testFileName, true, false); doTest(testFileName, true, false, true);
} }
protected void doTestCheckingPrimaryConstructorsAndAccessors(String testFileName) throws IOException { protected void doTestCheckingPrimaryConstructorsAndAccessors(String testFileName) throws IOException {
doTest(testFileName, true, true); doTest(testFileName, true, true, false);
} }
protected void doTestNotCheckingPrimaryConstructors(String testFileName) throws IOException { protected void doTestNotCheckingPrimaryConstructors(String testFileName) throws IOException {
doTest(testFileName, false, false); doTest(testFileName, false, false, false);
} }
private void doTest(String testFileName, boolean checkPrimaryConstructors, boolean checkPropertyAccessors) throws IOException { private void doTest(String testFileName, boolean checkPrimaryConstructors, boolean checkPropertyAccessors, boolean allowErrorTypes) throws IOException {
List<JetFile> files = JetTestUtils List<JetFile> files = JetTestUtils
.createTestFiles(testFileName, FileUtil.loadFile(new File(testFileName), true), .createTestFiles(testFileName, FileUtil.loadFile(new File(testFileName), true),
new JetTestUtils.TestFileFactory<JetFile>() { new JetTestUtils.TestFileFactory<JetFile>() {
@@ -78,7 +78,13 @@ public abstract class AbstractLazyResolveNamespaceComparingTest extends KotlinTe
File serializeResultsTo = new File(FileUtil.getNameWithoutExtension(testFileName) + ".txt"); File serializeResultsTo = new File(FileUtil.getNameWithoutExtension(testFileName) + ".txt");
DescriptorValidator.validate(expected, actual); if (allowErrorTypes) {
DescriptorValidator.validateIgnoringErrorTypes(expected, actual);
}
else {
DescriptorValidator.validate(expected, actual);
}
NamespaceComparator.compareNamespaces( NamespaceComparator.compareNamespaces(
expected, actual, NamespaceComparator.DONT_INCLUDE_METHODS_OF_OBJECT.filterRecursion( expected, actual, NamespaceComparator.DONT_INCLUDE_METHODS_OF_OBJECT.filterRecursion(