azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't test DescriptorFinder logic in KotlinClass test

Browse Source 
LoadCompiledKotlin and DescriptorSerialization tests should cover this.
KotlinClassAnnotationTest should only test that the correct annotation is
written
This commit is contained in:
Alexander Udalov
2013-07-16 23:07:57 +04:00
parent 49604f6298
commit f3f0260e69
2 changed files with 12 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/codegen/KotlinPackageAnnotationTest.java
+5 -5
View File
@@ -20,6 +20,7 @@ import jet.KotlinPackage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.ConfigurationKind;
import org.jetbrains.jet.descriptors.serialization.JavaProtoBufUtil;
import org.jetbrains.jet.descriptors.serialization.NameResolver;
import org.jetbrains.jet.descriptors.serialization.PackageData;
import org.jetbrains.jet.descriptors.serialization.ProtoBuf;
import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
@@ -55,16 +56,15 @@ public class KotlinPackageAnnotationTest extends CodegenTestCase {
PackageData data = JavaProtoBufUtil.readPackageDataFrom(kotlinPackage.data());
Set<String> callableNames = collectCallableNames(data);
Set<String> callableNames = collectCallableNames(data.getPackageProto().getMemberList(), data.getNameResolver());
assertSameElements(Arrays.asList("foo", "bar", "C"), callableNames);
}
@NotNull
private static Set<String> collectCallableNames(@NotNull PackageData data) {
public static Set<String> collectCallableNames(@NotNull List<ProtoBuf.Callable> members, @NotNull NameResolver nameResolver) {
Set<String> callableNames = new HashSet<String>();
List<ProtoBuf.Callable> list = data.getPackageProto().getMemberList();
for (ProtoBuf.Callable callable : list) {
callableNames.add(data.getNameResolver().getName(callable.getName()).asString());
for (ProtoBuf.Callable callable : members) {
callableNames.add(nameResolver.getName(callable.getName()).asString());
}
return callableNames;
}