From 2386757e7c59a070ef07c0259f1d1d4209911c21 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Wed, 8 Aug 2012 19:25:58 +0400
Subject: [PATCH] Serializing inner objects in NamespaceComparator

+ duplicating test removed
---
 .../lazyResolve/namespaceComparator/innerObject.kt     |  5 -----
 .../lazyResolve/namespaceComparator/innerObject.txt    |  6 ------
 .../lazyResolve/namespaceComparator/objectInClass.txt  |  4 ++++
 .../LazyResolveNamespaceComparingTestGenerated.java    |  5 -----
 .../jetbrains/jet/test/util/NamespaceComparator.java   | 10 +++++-----
 5 files changed, 9 insertions(+), 21 deletions(-)
 delete mode 100644 compiler/testData/lazyResolve/namespaceComparator/innerObject.kt
 delete mode 100644 compiler/testData/lazyResolve/namespaceComparator/innerObject.txt

diff --git a/compiler/testData/lazyResolve/namespaceComparator/innerObject.kt b/compiler/testData/lazyResolve/namespaceComparator/innerObject.kt
deleted file mode 100644
index 5c3a9cfce8d..00000000000
--- a/compiler/testData/lazyResolve/namespaceComparator/innerObject.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-class B {
-  object Obj {}
-}
\ No newline at end of file
diff --git a/compiler/testData/lazyResolve/namespaceComparator/innerObject.txt b/compiler/testData/lazyResolve/namespaceComparator/innerObject.txt
deleted file mode 100644
index 3d5137b41d0..00000000000
--- a/compiler/testData/lazyResolve/namespaceComparator/innerObject.txt
+++ /dev/null
@@ -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
-}
diff --git a/compiler/testData/lazyResolve/namespaceComparator/objectInClass.txt b/compiler/testData/lazyResolve/namespaceComparator/objectInClass.txt
index 4e77eee6965..24ba83cf0be 100644
--- a/compiler/testData/lazyResolve/namespaceComparator/objectInClass.txt
+++ b/compiler/testData/lazyResolve/namespaceComparator/objectInClass.txt
@@ -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
+    }
 }
diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
index 4d452133d30..905059c724f 100644
--- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
@@ -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");
diff --git a/compiler/tests/org/jetbrains/jet/test/util/NamespaceComparator.java b/compiler/tests/org/jetbrains/jet/test/util/NamespaceComparator.java
index df905e87823..f562af15f7d 100644
--- a/compiler/tests/org/jetbrains/jet/test/util/NamespaceComparator.java
+++ b/compiler/tests/org/jetbrains/jet/test/util/NamespaceComparator.java
@@ -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());