Serializing inner objects in NamespaceComparator

+ duplicating test removed
This commit is contained in:
Andrey Breslav
2012-08-08 19:25:58 +04:00
parent 1506955188
commit 2386757e7c
5 changed files with 9 additions and 21 deletions
@@ -1,5 +0,0 @@
package test
class B {
object Obj {}
}
@@ -1,6 +0,0 @@
namespace test
internal final class test.B : jet.Any {
public final /*constructor*/ fun <init>(): test.B
internal final val Obj: test.B.Obj
}
@@ -3,4 +3,8 @@ namespace test
internal final class test.A : jet.Any {
public final /*constructor*/ fun <init>(): test.A
internal final val B: test.A.B
internal final object test.A.B : jet.Any {
internal final /*constructor*/ fun <init>(): test.A.B
internal final fun foo(/*0*/ a: jet.Int): jet.String
}
}
@@ -1287,11 +1287,6 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
doTestSinglePackage("compiler/testData/lazyResolve/namespaceComparator/InnerClassNameClash.kt");
}
@TestMetadata("innerObject.kt")
public void testInnerObject() throws Exception {
doTestSinglePackage("compiler/testData/lazyResolve/namespaceComparator/innerObject.kt");
}
@TestMetadata("objectInClass.kt")
public void testObjectInClass() throws Exception {
doTestSinglePackage("compiler/testData/lazyResolve/namespaceComparator/objectInClass.kt");
@@ -743,11 +743,11 @@ public class NamespaceComparator {
memberStrings.add(memberSb.toString());
}
//for (DeclarationDescriptor object : memberScope.getObjectDescriptors()) {
// StringBuilder objectSb = new StringBuilder();
// new FullContentSerialier(objectSb).serialize(object);
// memberStrings.add(objectSb.toString());
//}
for (DeclarationDescriptor object : memberScope.getObjectDescriptors()) {
StringBuilder objectSb = new StringBuilder();
new FullContentSerialier(objectSb).serialize(object);
memberStrings.add(objectSb.toString());
}
Collections.sort(memberStrings, new MemberComparator());