NamespaceComparator now serializes kind, if it's not DECLARATION.

Lots of test data changed to include members' kinds.

compiler/tests/org/jetbrains/jet/test/util/NamespaceComparator.java

@@ -394,6 +394,12 @@ public class NamespaceComparator {
                 sb.append("override /*").append(fun.getOverriddenDescriptors().size()).append("*/ ");
             }
 
+            if (fun.getKind() != CallableMemberDescriptor.Kind.DECLARATION) {
+                sb.append("/*");
+                new Serializer(sb).serialize(fun.getKind());
+                sb.append("*/ ");
+            }
+
             if (fun instanceof ConstructorDescriptor) {
                 sb.append("/*constructor*/ ");
             }
@@ -464,6 +470,12 @@ public class NamespaceComparator {
                 sb.append("override /*").append(prop.getOverriddenDescriptors().size()).append("*/ ");
             }
 
+            if (prop.getKind() != CallableMemberDescriptor.Kind.DECLARATION) {
+                sb.append("/*");
+                new Serializer(sb).serialize(prop.getKind());
+                sb.append("*/ ");
+            }
+
             if (prop.isVar()) {
                 sb.append("var ");
             }
@@ -531,6 +543,10 @@ public class NamespaceComparator {
             sb.append(visibility);
         }
 
+        public void serialize(CallableMemberDescriptor.Kind kind) {
+            sb.append(kind.name().toLowerCase());
+        }
+
         public void serialize(AnnotationDescriptor annotation) {
             new TypeSerializer(sb).serialize(annotation.getType());
             sb.append("(");