From d01193f8a375d13d0d39635a645b71c3c226e55a Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 26 Dec 2012 19:33:59 +0400 Subject: [PATCH] Removed output filter from NamespaceComparator. --- ...ractLazyResolveNamespaceComparingTest.java | 15 ++++---- .../jet/test/util/NamespaceComparator.java | 35 +++++-------------- 2 files changed, 17 insertions(+), 33 deletions(-) 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 cee5dd6cce1..9a6b6b148bd 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveNamespaceComparingTest.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveNamespaceComparingTest.java @@ -25,7 +25,9 @@ import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetPsiFactory; +import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe; import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.jet.test.util.NamespaceComparator; import java.io.File; @@ -70,11 +72,12 @@ public abstract class AbstractLazyResolveNamespaceComparingTest extends KotlinTe File serializeResultsTo = new File(FileUtil.getNameWithoutExtension(testFileName) + ".txt"); NamespaceComparator.compareNamespaces(expected, actual, - NamespaceComparator.DONT_INCLUDE_METHODS_OF_OBJECT.filterOutput(new Predicate() { - @Override - public boolean apply(NamespaceDescriptor namespaceDescriptor) { - return !namespaceDescriptor.getName().equals(Name.identifier("jet")); - } - }).checkPrimaryConstructors(checkPrimaryConstructors), serializeResultsTo); + NamespaceComparator.DONT_INCLUDE_METHODS_OF_OBJECT.filterRecusion( + new Predicate() { + @Override + public boolean apply(FqNameUnsafe fqName) { + return !KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME.toUnsafe().equals(fqName); + } + }).checkPrimaryConstructors(checkPrimaryConstructors), serializeResultsTo); } } diff --git a/compiler/tests/org/jetbrains/jet/test/util/NamespaceComparator.java b/compiler/tests/org/jetbrains/jet/test/util/NamespaceComparator.java index 20d7f7ab17e..afce024322d 100644 --- a/compiler/tests/org/jetbrains/jet/test/util/NamespaceComparator.java +++ b/compiler/tests/org/jetbrains/jet/test/util/NamespaceComparator.java @@ -19,28 +19,19 @@ package org.jetbrains.jet.test.util; import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.io.FileUtil; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.codegen.PropertyCodegen; import org.jetbrains.jet.jvm.compiler.ExpectedLoadErrorsUtil; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.MemberComparator; -import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; 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 org.jetbrains.jet.lang.resolve.scopes.JetScope; -import org.jetbrains.jet.lang.types.ErrorUtils; -import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.TypeProjection; -import org.jetbrains.jet.lang.types.Variance; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.jet.renderer.DescriptorRenderer; import org.jetbrains.jet.renderer.DescriptorRendererBuilder; import org.jetbrains.jet.utils.Printer; @@ -49,7 +40,6 @@ import org.junit.ComparisonFailure; import java.io.File; import java.io.IOException; -import java.lang.reflect.Method; import java.util.*; /** @@ -97,38 +87,31 @@ public class NamespaceComparator { return serialized; } - public static final Configuration DONT_INCLUDE_METHODS_OF_OBJECT = new Configuration(false, false, Predicates.alwaysTrue(), Predicates.alwaysTrue()); - public static final Configuration RECURSIVE = new Configuration(false, true, Predicates.alwaysTrue(), Predicates.alwaysTrue()); + public static final Configuration DONT_INCLUDE_METHODS_OF_OBJECT = new Configuration(false, false, Predicates.alwaysTrue()); + public static final Configuration RECURSIVE = new Configuration(false, true, Predicates.alwaysTrue()); public static class Configuration { private final boolean checkPrimaryConstructors; private final boolean includeObject; private final Predicate recurseIntoPackage; - private final Predicate includeIntoOutput; public Configuration( boolean checkPrimaryConstructors, boolean includeObject, - Predicate recurseIntoPackage, - Predicate includeIntoOutput + Predicate recurseIntoPackage ) { this.checkPrimaryConstructors = checkPrimaryConstructors; this.includeObject = includeObject; this.recurseIntoPackage = recurseIntoPackage; - this.includeIntoOutput = includeIntoOutput; - } - - public Configuration filterOutput(@NotNull Predicate includeIntoOutput) { - return new Configuration(checkPrimaryConstructors, includeObject, recurseIntoPackage, includeIntoOutput); } public Configuration filterRecusion(@NotNull Predicate recurseIntoPackage) { - return new Configuration(checkPrimaryConstructors, includeObject, recurseIntoPackage, includeIntoOutput); + return new Configuration(checkPrimaryConstructors, includeObject, recurseIntoPackage); } public Configuration checkPrimaryConstructors(boolean checkPrimaryConstructors) { - return new Configuration(checkPrimaryConstructors, includeObject, recurseIntoPackage, includeIntoOutput); + return new Configuration(checkPrimaryConstructors, includeObject, recurseIntoPackage); } } @@ -172,11 +155,9 @@ public class NamespaceComparator { } else { String comparison = doCompareNamespaces(namespaceDescriptorA, namespaceDescriptorB); - if (conf.includeIntoOutput.apply(namespaceDescriptorA)) { - sb.append("// \n"); - sb.append(comparison); - sb.append("// \n"); - } + sb.append("// \n"); + sb.append(comparison); + sb.append("// \n"); } } }