From b57e5fa9713b13e54dd7de9901fd4b2ec3c4fbc6 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Tue, 2 Sep 2014 13:58:34 +0400 Subject: [PATCH] LTDA: Compare constructed descriptors only with test files --- .../tests/org/jetbrains/jet/JetTestUtils.java | 2 +- ...stractLazyResolveRecursiveComparingTest.java | 17 ++++++----------- .../lazy/LazyResolveStdlibLoadingTest.java | 2 +- .../lang/resolve/lazy/LazyResolveTestUtil.java | 11 +++++++++-- .../jetbrains/jet/types/JetTypeCheckerTest.java | 2 +- 5 files changed, 18 insertions(+), 16 deletions(-) diff --git a/compiler/tests/org/jetbrains/jet/JetTestUtils.java b/compiler/tests/org/jetbrains/jet/JetTestUtils.java index 94b7bbcf901..dac36402df3 100644 --- a/compiler/tests/org/jetbrains/jet/JetTestUtils.java +++ b/compiler/tests/org/jetbrains/jet/JetTestUtils.java @@ -438,7 +438,7 @@ public class JetTestUtils { } } } - LazyResolveTestUtil.resolveEagerly(jetFiles, environment); + LazyResolveTestUtil.resolve(jetFiles, environment); } @NotNull diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveRecursiveComparingTest.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveRecursiveComparingTest.java index b35acc6af11..7fa77f84315 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveRecursiveComparingTest.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveRecursiveComparingTest.java @@ -61,21 +61,16 @@ public abstract class AbstractLazyResolveRecursiveComparingTest extends KotlinTe } ); - ModuleDescriptor eagerModule = LazyResolveTestUtil.resolveEagerly(files, getEnvironment()); - ModuleDescriptor lazyModule = LazyResolveTestUtil.resolveLazily(files, getEnvironment()); + ModuleDescriptor module = LazyResolveTestUtil.resolve(files, getEnvironment()); - FqName test = new FqName("test"); - - PackageViewDescriptor actual = lazyModule.getPackage(test); - Assert.assertNotNull("Package for name " + test + " is null after lazy resolve", actual); - - PackageViewDescriptor expected = eagerModule.getPackage(test); - Assert.assertNotNull("Package for name " + test + " is null after eager resolve", expected); + String testedPackage = "test"; + PackageViewDescriptor testPackage = module.getPackage(new FqName(testedPackage)); + Assert.assertNotNull("Package for name '" + testedPackage + "' is null after resolve", testPackage); File serializeResultsTo = new File(FileUtil.getNameWithoutExtension(testFileName) + ".txt"); - RecursiveDescriptorComparator.validateAndCompareDescriptors( - expected, actual, RecursiveDescriptorComparator.DONT_INCLUDE_METHODS_OF_OBJECT + RecursiveDescriptorComparator.validateAndCompareDescriptorWithFile( + testPackage, RecursiveDescriptorComparator.DONT_INCLUDE_METHODS_OF_OBJECT .filterRecursion(RecursiveDescriptorComparator.SKIP_BUILT_INS_PACKAGES) .checkPrimaryConstructors(checkPrimaryConstructors) .checkPropertyAccessors(checkPropertyAccessors) diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveStdlibLoadingTest.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveStdlibLoadingTest.java index af5f722e1d3..3ee57ef3605 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveStdlibLoadingTest.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveStdlibLoadingTest.java @@ -48,7 +48,7 @@ public class LazyResolveStdlibLoadingTest extends KotlinTestWithEnvironmentManag ) { Set packageShortNames = LazyResolveTestUtil.getTopLevelPackagesFromFileList(files); - ModuleDescriptor module = LazyResolveTestUtil.resolveEagerly(files, stdlibEnvironment); + ModuleDescriptor module = LazyResolveTestUtil.resolve(files, stdlibEnvironment); ModuleDescriptor lazyModule = LazyResolveTestUtil.resolveLazily(files, stdlibEnvironment); for (Name name : packageShortNames) { diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java index 1f366f6af10..168ff66822e 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java @@ -44,12 +44,19 @@ public class LazyResolveTestUtil { private LazyResolveTestUtil() { } - public static ModuleDescriptor resolveEagerly(List files, JetCoreEnvironment environment) { + public static ModuleDescriptor resolve(List files, JetCoreEnvironment environment) { + return doResolve(files, environment); + } + + private static ModuleDescriptor doResolve(List files, JetCoreEnvironment environment) { JetTestUtils.newTrace(environment); GlobalContextImpl globalContext = ContextPackage.GlobalContext(); TopDownAnalysisParameters params = TopDownAnalysisParameters.create( - globalContext.getStorageManager(), globalContext.getExceptionTracker(), Predicates.alwaysTrue(), false, false); + globalContext.getStorageManager(), + globalContext.getExceptionTracker(), + Predicates.alwaysTrue(), + false, false); CliLightClassGenerationSupport support = CliLightClassGenerationSupport.getInstanceForCli(environment.getProject()); BindingTrace sharedTrace = support.getTrace(); ModuleDescriptorImpl sharedModule = support.newModule(); diff --git a/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java b/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java index f4d7e4874cb..6e644c9fd6e 100644 --- a/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java +++ b/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java @@ -585,7 +585,7 @@ public class JetTypeCheckerTest extends JetLiteFixture { } private WritableScope getDeclarationsScope(String path) throws IOException { - ModuleDescriptor moduleDescriptor = LazyResolveTestUtil.resolveEagerly( + ModuleDescriptor moduleDescriptor = LazyResolveTestUtil.resolve( Collections.singletonList(JetTestUtils.loadJetFile(getProject(), new File(path))), getEnvironment() );