Kapt3: Fix flaky integration tests on Windows agents

Author: yanex

plugins/kapt3/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3IntegrationTest.kt

@@ -164,7 +164,7 @@ abstract class AbstractKotlinKapt3IntegrationTest : CodegenTestCase() {
 
             this.savedStubs = stubs
                     .map { it.toString() }
-                    .sortedBy(String::hashCode)
+                    .sorted()
                     .joinToString(AbstractKotlinKapt3Test.FILE_SEPARATOR)
 
             super.saveStubs(stubs)

plugins/kapt3/testData/kotlinRunner/NestedClasses.it.txt

@@ -1,3 +1,10 @@
+package error;
+
+public final class NonExistentClass {
+}
+
+////////////////////
+
 package test;
 
 @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
@@ -47,10 +54,3 @@ public final class Simple {
         }
     }
 }
-
-////////////////////
-
-package error;
-
-public final class NonExistentClass {
-}

plugins/kapt3/testData/kotlinRunner/Overloads.it.txt

@@ -1,3 +1,10 @@
+package error;
+
+public final class NonExistentClass {
+}
+
+////////////////////
+
 package test;
 
 @MyAnnotation()
@@ -37,10 +44,3 @@ package test;
 @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
 public abstract @interface MyAnnotation {
 }
-
-////////////////////
-
-package error;
-
-public final class NonExistentClass {
-}

plugins/kapt3/testData/kotlinRunner/Simple.it.txt

@@ -1,3 +1,18 @@
+package error;
+
+public final class NonExistentClass {
+}
+
+////////////////////
+
+package test;
+
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface MyAnnotation {
+}
+
+////////////////////
+
 package test;
 
 public enum EnumClass {
@@ -12,15 +27,14 @@ public enum EnumClass {
 
 package test;
 
-@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
-public abstract @interface MyAnnotation {
-}
-
-////////////////////
-
-package error;
+public enum EnumClass2 {
+    /*public static final*/ WHITE /* = new WHITE(null) */,
+    /*public static final*/ RED /* = new RED(null) */;
+    private final java.lang.String blah = null;
 
-public final class NonExistentClass {
+    EnumClass2(@org.jetbrains.annotations.NotNull()
+    java.lang.String blah) {
+    }
 }
 
 ////////////////////
@@ -41,17 +55,3 @@ public final class Simple {
         super();
     }
 }
-
-////////////////////
-
-package test;
-
-public enum EnumClass2 {
-    /*public static final*/ WHITE /* = new WHITE(null) */,
-    /*public static final*/ RED /* = new RED(null) */;
-    private final java.lang.String blah = null;
-
-    EnumClass2(@org.jetbrains.annotations.NotNull()
-    java.lang.String blah) {
-    }
-}