Separate tests for ordering of deserialized members

compiler/testData/loadJava/compiledKotlin/memberOrder/innerClasses.kt

@@ -0,0 +1,10 @@
+package test
+
+class O {
+    class A1
+    inner class A2
+    class B1
+    inner class B2
+    trait C1
+    trait C2
+}

compiler/testData/loadJava/compiledKotlin/memberOrder/innerClasses.txt

@@ -0,0 +1,27 @@
+package test
+
+internal final class O {
+    /*primary*/ public constructor O()
+
+    internal final class A1 {
+        /*primary*/ public constructor A1()
+    }
+
+    internal final inner class A2 {
+        /*primary*/ public constructor A2()
+    }
+
+    internal final class B1 {
+        /*primary*/ public constructor B1()
+    }
+
+    internal final inner class B2 {
+        /*primary*/ public constructor B2()
+    }
+
+    internal trait C1 {
+    }
+
+    internal trait C2 {
+    }
+}

compiler/testData/loadJava/compiledKotlin/memberOrder/topLevelCallables.kt

@@ -0,0 +1,9 @@
+//ALLOW_AST_ACCESS
+package test
+
+val f1 = 1
+fun f2() = 1
+val f3 = 1
+fun f4() = 1
+fun f4(i: Int) = 1
+val f5 = 1

compiler/testData/loadJava/compiledKotlin/memberOrder/topLevelCallables.txt

@@ -0,0 +1,11 @@
+package test
+
+internal val f1: kotlin.Int = 1
+    internal fun <get-f1>(): kotlin.Int
+internal val f3: kotlin.Int = 1
+    internal fun <get-f3>(): kotlin.Int
+internal val f5: kotlin.Int = 1
+    internal fun <get-f5>(): kotlin.Int
+internal fun f2(): kotlin.Int
+internal fun f4(): kotlin.Int
+internal fun f4(/*0*/ i: kotlin.Int): kotlin.Int

compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java

@@ -1801,7 +1801,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
 
     @TestMetadata("compiler/testData/loadJava/compiledKotlin")
     @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({CompiledKotlin.Annotations.class, CompiledKotlin.Class.class, CompiledKotlin.ClassFun.class, CompiledKotlin.ClassObject.class, CompiledKotlin.Constructor.class, CompiledKotlin.DataClass.class, CompiledKotlin.Enum.class, CompiledKotlin.FromLoadJava.class, CompiledKotlin.Fun.class, CompiledKotlin.Inline.class, CompiledKotlin.PlatformTypes.class, CompiledKotlin.Prop.class, CompiledKotlin.Type.class, CompiledKotlin.Visibility.class})
+    @InnerTestClasses({CompiledKotlin.Annotations.class, CompiledKotlin.Class.class, CompiledKotlin.ClassFun.class, CompiledKotlin.ClassObject.class, CompiledKotlin.Constructor.class, CompiledKotlin.DataClass.class, CompiledKotlin.Enum.class, CompiledKotlin.FromLoadJava.class, CompiledKotlin.Fun.class, CompiledKotlin.Inline.class, CompiledKotlin.MemberOrder.class, CompiledKotlin.PlatformTypes.class, CompiledKotlin.Prop.class, CompiledKotlin.Type.class, CompiledKotlin.Visibility.class})
     @RunWith(JUnit3RunnerWithInners.class)
     public static class CompiledKotlin extends AbstractLoadJavaTest {
         public void testAllFilesPresentInCompiledKotlin() throws Exception {
@@ -4125,6 +4125,27 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
             }
         }
 
+        @TestMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class MemberOrder extends AbstractLoadJavaTest {
+            public void testAllFilesPresentInMemberOrder() throws Exception {
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/memberOrder"), Pattern.compile("^(.+)\\.kt$"), true);
+            }
+
+            @TestMetadata("innerClasses.kt")
+            public void testInnerClasses() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/innerClasses.kt");
+                doTestCompiledKotlin(fileName);
+            }
+
+            @TestMetadata("topLevelCallables.kt")
+            public void testTopLevelCallables() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/topLevelCallables.kt");
+                doTestCompiledKotlin(fileName);
+            }
+        }
+
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/platformTypes")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)

compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveRecursiveComparingTestGenerated.java

@@ -33,7 +33,7 @@ import java.util.regex.Pattern;
 public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyResolveRecursiveComparingTest {
     @TestMetadata("compiler/testData/loadJava/compiledKotlin")
     @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({CompiledKotlin.Annotations.class, CompiledKotlin.Class.class, CompiledKotlin.ClassFun.class, CompiledKotlin.ClassObject.class, CompiledKotlin.Constructor.class, CompiledKotlin.DataClass.class, CompiledKotlin.Enum.class, CompiledKotlin.FromLoadJava.class, CompiledKotlin.Fun.class, CompiledKotlin.Inline.class, CompiledKotlin.PlatformTypes.class, CompiledKotlin.Prop.class, CompiledKotlin.Type.class, CompiledKotlin.Visibility.class})
+    @InnerTestClasses({CompiledKotlin.Annotations.class, CompiledKotlin.Class.class, CompiledKotlin.ClassFun.class, CompiledKotlin.ClassObject.class, CompiledKotlin.Constructor.class, CompiledKotlin.DataClass.class, CompiledKotlin.Enum.class, CompiledKotlin.FromLoadJava.class, CompiledKotlin.Fun.class, CompiledKotlin.Inline.class, CompiledKotlin.MemberOrder.class, CompiledKotlin.PlatformTypes.class, CompiledKotlin.Prop.class, CompiledKotlin.Type.class, CompiledKotlin.Visibility.class})
     @RunWith(JUnit3RunnerWithInners.class)
     public static class CompiledKotlin extends AbstractLazyResolveRecursiveComparingTest {
         public void testAllFilesPresentInCompiledKotlin() throws Exception {
@@ -2357,6 +2357,27 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso
             }
         }
 
+        @TestMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class MemberOrder extends AbstractLazyResolveRecursiveComparingTest {
+            public void testAllFilesPresentInMemberOrder() throws Exception {
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/memberOrder"), Pattern.compile("^(.+)\\.kt$"), true);
+            }
+
+            @TestMetadata("innerClasses.kt")
+            public void testInnerClasses() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/innerClasses.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("topLevelCallables.kt")
+            public void testTopLevelCallables() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/topLevelCallables.kt");
+                doTest(fileName);
+            }
+        }
+
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/platformTypes")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)

idea/tests/org/jetbrains/jet/plugin/stubs/LazyResolveByStubTestGenerated.java

@@ -30,7 +30,7 @@ import java.util.regex.Pattern;
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/loadJava/compiledKotlin")
 @TestDataPath("$PROJECT_ROOT")
-@InnerTestClasses({LazyResolveByStubTestGenerated.Annotations.class, LazyResolveByStubTestGenerated.Class.class, LazyResolveByStubTestGenerated.ClassFun.class, LazyResolveByStubTestGenerated.ClassObject.class, LazyResolveByStubTestGenerated.Constructor.class, LazyResolveByStubTestGenerated.DataClass.class, LazyResolveByStubTestGenerated.Enum.class, LazyResolveByStubTestGenerated.FromLoadJava.class, LazyResolveByStubTestGenerated.Fun.class, LazyResolveByStubTestGenerated.Inline.class, LazyResolveByStubTestGenerated.PlatformTypes.class, LazyResolveByStubTestGenerated.Prop.class, LazyResolveByStubTestGenerated.Type.class, LazyResolveByStubTestGenerated.Visibility.class})
+@InnerTestClasses({LazyResolveByStubTestGenerated.Annotations.class, LazyResolveByStubTestGenerated.Class.class, LazyResolveByStubTestGenerated.ClassFun.class, LazyResolveByStubTestGenerated.ClassObject.class, LazyResolveByStubTestGenerated.Constructor.class, LazyResolveByStubTestGenerated.DataClass.class, LazyResolveByStubTestGenerated.Enum.class, LazyResolveByStubTestGenerated.FromLoadJava.class, LazyResolveByStubTestGenerated.Fun.class, LazyResolveByStubTestGenerated.Inline.class, LazyResolveByStubTestGenerated.MemberOrder.class, LazyResolveByStubTestGenerated.PlatformTypes.class, LazyResolveByStubTestGenerated.Prop.class, LazyResolveByStubTestGenerated.Type.class, LazyResolveByStubTestGenerated.Visibility.class})
 @RunWith(JUnit3RunnerWithInners.class)
 public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTest {
     public void testAllFilesPresentInCompiledKotlin() throws Exception {
@@ -2354,6 +2354,27 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
         }
     }
 
+    @TestMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class MemberOrder extends AbstractLazyResolveByStubTest {
+        public void testAllFilesPresentInMemberOrder() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/memberOrder"), Pattern.compile("^(.+)\\.kt$"), true);
+        }
+
+        @TestMetadata("innerClasses.kt")
+        public void testInnerClasses() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/innerClasses.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("topLevelCallables.kt")
+        public void testTopLevelCallables() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/topLevelCallables.kt");
+            doTest(fileName);
+        }
+    }
+
     @TestMetadata("compiler/testData/loadJava/compiledKotlin/platformTypes")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)