From 5d0381f0738f8510ba27767eed423e5775e7c398 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 13 Nov 2013 16:30:12 +0400 Subject: [PATCH] Using FqName instead of FqNameUnsafe for package predicate. --- .../lazy/AbstractLazyResolveDiagnosticsTest.java | 5 ++--- ...bstractLazyResolveNamespaceComparingTest.java | 7 +++---- .../test/util/RecursiveDescriptorComparator.java | 16 ++++++++-------- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveDiagnosticsTest.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveDiagnosticsTest.java index 78b76185a2c..5a3fec89c2a 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveDiagnosticsTest.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveDiagnosticsTest.java @@ -24,7 +24,6 @@ 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.FqNameUnsafe; import org.jetbrains.jet.lang.resolve.name.Name; import java.io.File; @@ -56,9 +55,9 @@ public abstract class AbstractLazyResolveDiagnosticsTest extends AbstractJetDiag final Set names = LazyResolveTestUtil.getTopLevelPackagesFromFileList(jetFiles); validateAndCompareDescriptors( expected, actual, - RECURSIVE.filterRecursion(new Predicate() { + RECURSIVE.filterRecursion(new Predicate() { @Override - public boolean apply(FqNameUnsafe fqName) { + public boolean apply(FqName fqName) { if (fqName.isRoot()) return true; if (fqName.parent().isRoot()) { return names.contains(fqName.shortName()); diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveNamespaceComparingTest.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveNamespaceComparingTest.java index e4395dc9d66..cb0a37e5412 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveNamespaceComparingTest.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveNamespaceComparingTest.java @@ -26,7 +26,6 @@ import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetPsiFactory; import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.jet.test.util.RecursiveDescriptorComparator; import org.junit.Assert; @@ -83,10 +82,10 @@ public abstract class AbstractLazyResolveNamespaceComparingTest extends KotlinTe RecursiveDescriptorComparator.validateAndCompareDescriptors( expected, actual, RecursiveDescriptorComparator.DONT_INCLUDE_METHODS_OF_OBJECT.filterRecursion( - new Predicate() { + new Predicate() { @Override - public boolean apply(FqNameUnsafe fqName) { - return !KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME.toUnsafe().equals(fqName); + public boolean apply(FqName fqName) { + return !KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME.equals(fqName); } }) .checkPrimaryConstructors(checkPrimaryConstructors) diff --git a/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorComparator.java b/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorComparator.java index f52ea22b684..25c853539d0 100644 --- a/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorComparator.java +++ b/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorComparator.java @@ -28,7 +28,6 @@ import org.jetbrains.jet.jvm.compiler.ExpectedLoadErrorsUtil; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.resolve.MemberComparator; import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.renderer.DescriptorRenderer; import org.jetbrains.jet.renderer.DescriptorRendererBuilder; @@ -51,14 +50,14 @@ public class RecursiveDescriptorComparator { .setVerbose(true).build(); public static final Configuration DONT_INCLUDE_METHODS_OF_OBJECT = new Configuration(false, false, false, - Predicates.alwaysTrue(), + Predicates.alwaysTrue(), FORBID_ERROR_TYPES, DEFAULT_RENDERER); public static final Configuration RECURSIVE = new Configuration(false, false, true, - Predicates.alwaysTrue(), + Predicates.alwaysTrue(), FORBID_ERROR_TYPES, DEFAULT_RENDERER); public static final Configuration RECURSIVE_ALL = new Configuration(true, true, true, - Predicates.alwaysTrue(), + Predicates.alwaysTrue(), FORBID_ERROR_TYPES, DEFAULT_RENDERER); private static final ImmutableSet JAVA_OBJECT_METHOD_NAMES = ImmutableSet.of( @@ -145,7 +144,8 @@ public class RecursiveDescriptorComparator { && JAVA_OBJECT_METHOD_NAMES.contains(subDescriptor.getName().asString()) && !conf.includeMethodsOfJavaObject || - subDescriptor instanceof PackageViewDescriptor && !conf.recurseIntoPackage.apply(((PackageViewDescriptor) subDescriptor).getFqName().toUnsafe()); // TODO 2 accept safe fq name instead + subDescriptor instanceof PackageViewDescriptor + && !conf.recurseIntoPackage.apply(((PackageViewDescriptor) subDescriptor).getFqName()); } private void appendSubDescriptors( @@ -232,7 +232,7 @@ public class RecursiveDescriptorComparator { private final boolean checkPrimaryConstructors; private final boolean checkPropertyAccessors; private final boolean includeMethodsOfJavaObject; - private final Predicate recurseIntoPackage; + private final Predicate recurseIntoPackage; private final DescriptorRenderer renderer; private final DescriptorValidator.ValidationVisitor validationStrategy; @@ -241,7 +241,7 @@ public class RecursiveDescriptorComparator { boolean checkPrimaryConstructors, boolean checkPropertyAccessors, boolean includeMethodsOfJavaObject, - Predicate recurseIntoPackage, + Predicate recurseIntoPackage, DescriptorValidator.ValidationVisitor validationStrategy, DescriptorRenderer renderer ) { @@ -253,7 +253,7 @@ public class RecursiveDescriptorComparator { this.renderer = renderer; } - public Configuration filterRecursion(@NotNull Predicate recurseIntoPackage) { + public Configuration filterRecursion(@NotNull Predicate recurseIntoPackage) { return new Configuration(checkPrimaryConstructors, checkPropertyAccessors, includeMethodsOfJavaObject, recurseIntoPackage, validationStrategy, renderer); }