From 2ae12865158241b0bab068c972ea08e27d34f330 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Mon, 1 Sep 2014 14:31:08 +0400 Subject: [PATCH] Remove lazy base test - there won't be lazy and eager mode soon --- .../AbstractLazyResolveDiagnosticsTest.java | 72 ------------------- 1 file changed, 72 deletions(-) delete mode 100644 compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveDiagnosticsTest.java diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveDiagnosticsTest.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveDiagnosticsTest.java deleted file mode 100644 index a826017f41e..00000000000 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveDiagnosticsTest.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright 2010-2013 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.jet.lang.resolve.lazy; - -import com.google.common.base.Predicate; -import com.intellij.openapi.util.io.FileUtil; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.checkers.BaseDiagnosticsTest; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; -import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.Name; - -import java.io.File; -import java.util.List; -import java.util.Set; - -import static org.jetbrains.jet.test.util.RecursiveDescriptorComparator.RECURSIVE; -import static org.jetbrains.jet.test.util.RecursiveDescriptorComparator.validateAndCompareDescriptors; - -public abstract class AbstractLazyResolveDiagnosticsTest extends BaseDiagnosticsTest { - - public static final File TEST_DATA_DIR = new File("compiler/testData/diagnostics/tests"); - - @Override - protected void analyzeAndCheck(File testDataFile, List files) { - List jetFiles = getJetFiles(files); - ModuleDescriptor lazyModule = LazyResolveTestUtil.resolveLazily(jetFiles, getEnvironment()); - ModuleDescriptor eagerModule = LazyResolveTestUtil.resolveEagerly(jetFiles, getEnvironment()); - - String path = JetTestUtils.getFilePath(new File(FileUtil.getRelativePath(TEST_DATA_DIR, testDataFile))); - PackageViewDescriptor expected = eagerModule.getPackage(FqName.ROOT); - PackageViewDescriptor actual = lazyModule.getPackage(FqName.ROOT); - - String txtFileRelativePath = path.replaceAll("\\.kt$|\\.kts$", ".txt"); - File txtFile = new File("compiler/testData/lazyResolve/diagnostics/" + txtFileRelativePath); - - // Only recurse into those packages mentioned in the files - // Otherwise we'll be examining the whole JDK - final Set names = LazyResolveTestUtil.getTopLevelPackagesFromFileList(jetFiles); - validateAndCompareDescriptors( - expected, actual, - RECURSIVE.filterRecursion(new Predicate() { - @Override - public boolean apply(DeclarationDescriptor descriptor) { - if (descriptor instanceof PackageViewDescriptor) { - FqName fqName = ((PackageViewDescriptor) descriptor).getFqName(); - return fqName.isRoot() || !fqName.parent().isRoot() || names.contains(fqName.shortName()); - } - - return true; - } - }), - txtFile); - } -}