Remove DescriptorSerializationTest
This commit is contained in:
Natalia Ukhorskaya
-199
@@ -1,199 +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.descriptors.serialization;
|
||||
|
||||
import com.intellij.openapi.util.io.FileUtil;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import org.jetbrains.jet.ConfigurationKind;
|
||||
import org.jetbrains.jet.JetTestUtils;
|
||||
import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
|
||||
import org.jetbrains.jet.di.InjectorForJavaDescriptorResolver;
|
||||
import org.jetbrains.jet.di.InjectorForJavaDescriptorResolverUtil;
|
||||
import org.jetbrains.jet.lang.descriptors.*;
|
||||
import org.jetbrains.jet.lang.descriptors.impl.MutablePackageFragmentDescriptor;
|
||||
import org.jetbrains.jet.lang.descriptors.impl.PackageViewDescriptorImpl;
|
||||
import org.jetbrains.jet.lang.resolve.BindingTraceContext;
|
||||
import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver;
|
||||
import org.jetbrains.jet.lang.resolve.lazy.KotlinTestWithEnvironment;
|
||||
import org.jetbrains.jet.lang.resolve.lazy.LazyResolveTestUtil;
|
||||
import org.jetbrains.jet.lang.resolve.name.FqName;
|
||||
import org.jetbrains.jet.lang.resolve.name.Name;
|
||||
import org.jetbrains.jet.lang.resolve.scopes.JetScope;
|
||||
import org.jetbrains.jet.lang.resolve.scopes.WritableScope;
|
||||
import org.jetbrains.jet.storage.LockBasedStorageManager;
|
||||
import org.jetbrains.jet.test.util.RecursiveDescriptorComparator;
|
||||
import org.jetbrains.jet.utils.builtinsSerializer.ClassSerializationUtil;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.*;
|
||||
|
||||
import static org.jetbrains.jet.descriptors.serialization.NameSerializationUtil.createNameResolver;
|
||||
import static org.jetbrains.jet.descriptors.serialization.descriptors.AnnotationDeserializer.UNSUPPORTED;
|
||||
import static org.jetbrains.jet.lang.resolve.kotlin.DeserializedResolverUtils.naiveKotlinFqName;
|
||||
|
||||
public abstract class AbstractDescriptorSerializationTest extends KotlinTestWithEnvironment {
|
||||
public static final Name TEST_PACKAGE_NAME = Name.identifier("test");
|
||||
|
||||
@Override
|
||||
protected JetCoreEnvironment createEnvironment() {
|
||||
return createEnvironmentWithMockJdk(ConfigurationKind.JDK_ONLY);
|
||||
}
|
||||
|
||||
protected void doTest(@NotNull String path) throws IOException {
|
||||
File ktFile = new File(path);
|
||||
ModuleDescriptor moduleDescriptor = LazyResolveTestUtil.resolveEagerly(Collections.singletonList(
|
||||
JetTestUtils.createFile(ktFile.getName(), FileUtil.loadFile(ktFile, true), getProject())
|
||||
), getEnvironment());
|
||||
|
||||
PackageViewDescriptor testPackage = moduleDescriptor.getPackage(FqName.topLevel(TEST_PACKAGE_NAME));
|
||||
assert testPackage != null : "Test package not found: " + TEST_PACKAGE_NAME;
|
||||
|
||||
InjectorForJavaDescriptorResolver injector = InjectorForJavaDescriptorResolverUtil.create(getProject(), new BindingTraceContext());
|
||||
JavaDescriptorResolver javaDescriptorResolver = injector.getJavaDescriptorResolver();
|
||||
|
||||
PackageFragmentDescriptor deserialized = serializeAndDeserialize(javaDescriptorResolver, testPackage);
|
||||
|
||||
PackageViewDescriptorImpl deserializedPackageView =
|
||||
new PackageViewDescriptorImpl(moduleDescriptor, deserialized.getFqName(), Arrays.asList(deserialized));
|
||||
RecursiveDescriptorComparator
|
||||
.validateAndCompareDescriptors(testPackage, deserializedPackageView, RecursiveDescriptorComparator.RECURSIVE, null);
|
||||
}
|
||||
|
||||
@NotNull
|
||||
private static PackageFragmentDescriptor serializeAndDeserialize(
|
||||
@NotNull JavaDescriptorResolver javaDescriptorResolver,
|
||||
@NotNull PackageViewDescriptor testPackage
|
||||
) {
|
||||
List<ClassDescriptor> classesAndObjects = getAllClassesAndObjects(testPackage.getMemberScope());
|
||||
|
||||
Map<ClassDescriptor, byte[]> serializedClasses = serializeClasses(classesAndObjects);
|
||||
byte[] serializedPackage = serializePackage(testPackage);
|
||||
|
||||
Map<String, ClassData> classDataMap = new HashMap<String, ClassData>();
|
||||
|
||||
for (Map.Entry<ClassDescriptor, byte[]> entry : serializedClasses.entrySet()) {
|
||||
String key = naiveKotlinFqName(entry.getKey()).asString();
|
||||
ClassData value = ClassData.read(entry.getValue(), JavaProtoBufUtil.getExtensionRegistry());
|
||||
classDataMap.put(key, value);
|
||||
}
|
||||
|
||||
MutablePackageFragmentDescriptor packageFragment = JetTestUtils.createTestPackageFragment(TEST_PACKAGE_NAME, "<fake>");
|
||||
|
||||
DescriptorFinder descriptorFinder = new DescriptorFinderFromClassDataOrJava(
|
||||
javaDescriptorResolver, classDataMap, packageFragment.getContainingDeclaration().getPackageFragmentProvider());
|
||||
|
||||
for (ClassDescriptor classDescriptor : classesAndObjects) {
|
||||
ClassId classId = ClassSerializationUtil.instance$.getClassId(classDescriptor);
|
||||
ClassDescriptor descriptor = descriptorFinder.findClass(classId);
|
||||
assert descriptor != null : "Class not loaded: " + classId;
|
||||
packageFragment.getMemberScope().addClassifierDescriptor(descriptor);
|
||||
}
|
||||
|
||||
PackageData data = PackageData.read(serializedPackage, JavaProtoBufUtil.getExtensionRegistry());
|
||||
|
||||
DescriptorDeserializer deserializer = DescriptorDeserializer
|
||||
.create(new LockBasedStorageManager(), packageFragment, data.getNameResolver(), descriptorFinder, UNSUPPORTED);
|
||||
for (ProtoBuf.Callable proto : data.getPackageProto().getMemberList()) {
|
||||
CallableMemberDescriptor descriptor = deserializer.loadCallable(proto);
|
||||
if (descriptor instanceof FunctionDescriptor) {
|
||||
packageFragment.getMemberScope().addFunctionDescriptor((FunctionDescriptor) descriptor);
|
||||
}
|
||||
else if (descriptor instanceof PropertyDescriptor) {
|
||||
packageFragment.getMemberScope().addPropertyDescriptor((PropertyDescriptor) descriptor);
|
||||
}
|
||||
else {
|
||||
throw new IllegalStateException("Unknown descriptor type: " + descriptor);
|
||||
}
|
||||
}
|
||||
packageFragment.getMemberScope().changeLockLevel(WritableScope.LockLevel.READING);
|
||||
|
||||
return packageFragment;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
private static List<ClassDescriptor> getAllClassesAndObjects(@NotNull JetScope scope) {
|
||||
List<ClassDescriptor> classes = new ArrayList<ClassDescriptor>();
|
||||
for (DeclarationDescriptor descriptor : scope.getAllDescriptors()) {
|
||||
if (descriptor instanceof ClassDescriptor) {
|
||||
classes.add((ClassDescriptor) descriptor);
|
||||
}
|
||||
}
|
||||
return classes;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
private static byte[] serializePackage(@NotNull PackageViewDescriptor descriptor) {
|
||||
DescriptorSerializer serializer = new DescriptorSerializer();
|
||||
List<PackageFragmentDescriptor> fragments =
|
||||
descriptor.getModule().getPackageFragmentProvider().getPackageFragments(descriptor.getFqName());
|
||||
ProtoBuf.Package proto = serializer.packageProto(fragments).build();
|
||||
PackageData data = new PackageData(createNameResolver(serializer.getNameTable()), proto);
|
||||
return data.toBytes();
|
||||
}
|
||||
|
||||
@NotNull
|
||||
private static Map<ClassDescriptor, byte[]> serializeClasses(@NotNull Collection<ClassDescriptor> classes) {
|
||||
final Map<ClassDescriptor, byte[]> serializedClasses = new HashMap<ClassDescriptor, byte[]>();
|
||||
final DescriptorSerializer serializer = new DescriptorSerializer();
|
||||
|
||||
ClassSerializationUtil.instance$.serializeClasses(classes, serializer, new ClassSerializationUtil.Sink() {
|
||||
@Override
|
||||
public void writeClass(@NotNull ClassDescriptor classDescriptor, @NotNull ProtoBuf.Class classProto) {
|
||||
ClassData data = new ClassData(createNameResolver(serializer.getNameTable()), classProto);
|
||||
serializedClasses.put(classDescriptor, data.toBytes());
|
||||
}
|
||||
});
|
||||
|
||||
return serializedClasses;
|
||||
}
|
||||
|
||||
private static class DescriptorFinderFromClassDataOrJava extends AbstractDescriptorFinder {
|
||||
private final JavaDescriptorResolver javaDescriptorResolver;
|
||||
private final Map<String, ClassData> classDataMap;
|
||||
|
||||
public DescriptorFinderFromClassDataOrJava(
|
||||
@NotNull JavaDescriptorResolver javaDescriptorResolver,
|
||||
@NotNull Map<String, ClassData> classDataMap,
|
||||
@NotNull PackageFragmentProvider packageFragmentProvider
|
||||
) {
|
||||
super(new LockBasedStorageManager(), UNSUPPORTED, packageFragmentProvider);
|
||||
this.javaDescriptorResolver = javaDescriptorResolver;
|
||||
this.classDataMap = classDataMap;
|
||||
}
|
||||
|
||||
@Nullable
|
||||
@Override
|
||||
public ClassDescriptor findClass(@NotNull ClassId classId) {
|
||||
ClassDescriptor found = super.findClass(classId);
|
||||
return found != null ? found : javaDescriptorResolver.resolveClass(classId.asSingleFqName().toSafe());
|
||||
}
|
||||
|
||||
@Nullable
|
||||
@Override
|
||||
protected ClassData getClassData(@NotNull ClassId classId) {
|
||||
return classDataMap.get(classId.asSingleFqName().asString());
|
||||
}
|
||||
|
||||
@NotNull
|
||||
@Override
|
||||
public Collection<Name> getClassNames(@NotNull FqName packageName) {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
}
|
||||
}
|
||||
-1123
File diff suppressed because it is too large
Load Diff
@@ -38,7 +38,6 @@ import org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveDescriptorRenderer
|
||||
import org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveTest
|
||||
import org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveRecursiveComparingTest
|
||||
import org.jetbrains.jet.modules.xml.AbstractModuleXmlParserTest
|
||||
import org.jetbrains.jet.descriptors.serialization.AbstractDescriptorSerializationTest
|
||||
import org.jetbrains.jet.jvm.compiler.AbstractWriteSignatureTest
|
||||
import org.jetbrains.jet.cli.AbstractKotlincExecutableTest
|
||||
import org.jetbrains.jet.cfg.AbstractControlFlowTest
|
||||
@@ -214,17 +213,6 @@ fun main(args: Array<String>) {
|
||||
model("modules.xml", extension = "xml")
|
||||
}
|
||||
|
||||
testClass(javaClass<AbstractDescriptorSerializationTest>()) {
|
||||
model("loadJava/compiledKotlin/class")
|
||||
model("loadJava/compiledKotlin/classFun")
|
||||
model("loadJava/compiledKotlin/classObject")
|
||||
model("loadJava/compiledKotlin/constructor")
|
||||
model("loadJava/compiledKotlin/fun")
|
||||
model("loadJava/compiledKotlin/prop")
|
||||
model("loadJava/compiledKotlin/type")
|
||||
model("loadJava/compiledKotlin/visibility")
|
||||
}
|
||||
|
||||
testClass(javaClass<AbstractWriteSignatureTest>()) {
|
||||
model("writeSignature")
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user