From c9c165702ac3c9902a586dddcfefbac6d8fed32a Mon Sep 17 00:00:00 2001
From: Eugene Zhuravlev <jeka@intellij.com>
Date: Sat, 15 Jun 2019 15:17:10 +0200
Subject: [PATCH] adapt test data to get the same and stable results with both
 javac6 and javac11

GitOrigin-RevId: 54f46ef3a7198e74af9088e52a57420c27fe0b2f
---
 .../conservativeNonIncremental/.idea/misc.xml  |  2 +-
 .../conservativeNonIncremental1/.idea/misc.xml |  2 +-
 .../fieldModifiers/setPackagePrivate.log       | 11 ++++-------
 .../setPackagePrivate/src/ppp/Client.java      | 18 ++++++++----------
 .../setPackagePrivate/src/qqq/BaseImpl.java    | 11 +++++++++++
 .../src/qqq/BaseImpl.java.new                  | 11 +++++++++++
 .../setPackagePrivate/src/qqq/Util.java        | 12 ------------
 .../setPackagePrivate/src/qqq/Util.java.new    | 12 ------------
 8 files changed, 36 insertions(+), 43 deletions(-)
 create mode 100644 java/java-tests/testData/compileServer/incremental/fieldModifiers/setPackagePrivate/src/qqq/BaseImpl.java
 create mode 100644 java/java-tests/testData/compileServer/incremental/fieldModifiers/setPackagePrivate/src/qqq/BaseImpl.java.new
 delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldModifiers/setPackagePrivate/src/qqq/Util.java
 delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldModifiers/setPackagePrivate/src/qqq/Util.java.new

diff --git a/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/.idea/misc.xml
index c9b3f81e777b..fea2212201e1 100644
--- a/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/.idea/misc.xml
+++ b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/.idea/misc.xml
@@ -42,7 +42,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA jdk" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" project-jdk-name="IDEA jdk" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
diff --git a/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/.idea/misc.xml
index c9b3f81e777b..fea2212201e1 100644
--- a/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/.idea/misc.xml
+++ b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/.idea/misc.xml
@@ -42,7 +42,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA jdk" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" project-jdk-name="IDEA jdk" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
diff --git a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPackagePrivate.log b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPackagePrivate.log
index daca5f62de94..febbc016fe66 100644
--- a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPackagePrivate.log
+++ b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPackagePrivate.log
@@ -1,15 +1,12 @@
 Cleaning output files:
-out/production/SetPackagePrivate/qqq/Util$1.class
-out/production/SetPackagePrivate/qqq/Util$Base.class
-out/production/SetPackagePrivate/qqq/Util$BaseImpl.class
-out/production/SetPackagePrivate/qqq/Util.class
+out/production/SetPackagePrivate/qqq/Base.class
+out/production/SetPackagePrivate/qqq/BaseImpl.class
 End of files
 Compiling files:
-src/qqq/Util.java
+src/qqq/BaseImpl.java
 End of files
 Cleaning output files:
-out/production/SetPackagePrivate/ppp/Client$MyUtil$1.class
-out/production/SetPackagePrivate/ppp/Client$MyUtil.class
+out/production/SetPackagePrivate/ppp/Client$1.class
 out/production/SetPackagePrivate/ppp/Client.class
 End of files
 Compiling files:
diff --git a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPackagePrivate/src/ppp/Client.java b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPackagePrivate/src/ppp/Client.java
index 31afe491a49b..35a0ffb31a3e 100644
--- a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPackagePrivate/src/ppp/Client.java
+++ b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPackagePrivate/src/ppp/Client.java
@@ -1,16 +1,14 @@
 package ppp;
 
-import qqq.Util;
+import qqq.BaseImpl;
 
 public class Client {
-  private static class MyUtil extends Util {
-    public static void perform() {
-      BaseImpl impl = new BaseImpl() {
-        @Override
-        protected void init() {
-          System.out.println(myMessage);
-        }
-      };
-    }
+  public static void perform() {
+    BaseImpl impl = new BaseImpl() {
+      @Override
+      protected void init() {
+        System.out.println(myMessage);
+      }
+    };
   }
 }
diff --git a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPackagePrivate/src/qqq/BaseImpl.java b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPackagePrivate/src/qqq/BaseImpl.java
new file mode 100644
index 000000000000..c3cf0b619629
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPackagePrivate/src/qqq/BaseImpl.java
@@ -0,0 +1,11 @@
+package qqq;
+
+public class BaseImpl extends Base {
+  protected void init() {
+  }
+}
+
+class Base {
+  protected String myMessage = "msg";
+}
+
diff --git a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPackagePrivate/src/qqq/BaseImpl.java.new b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPackagePrivate/src/qqq/BaseImpl.java.new
new file mode 100644
index 000000000000..f05d20d16418
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPackagePrivate/src/qqq/BaseImpl.java.new
@@ -0,0 +1,11 @@
+package qqq;
+
+public class BaseImpl extends Base {
+  protected void init() {
+  }
+}
+
+class Base {
+  String myMessage = "msg";
+}
+
diff --git a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPackagePrivate/src/qqq/Util.java b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPackagePrivate/src/qqq/Util.java
deleted file mode 100644
index 2fd0318e5139..000000000000
--- a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPackagePrivate/src/qqq/Util.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package qqq;
-
-public class Util {
-  private static class Base {
-    protected String myMessage = "msg";
-  }
-
-  protected static class BaseImpl extends Base {
-    protected void init() {
-    }
-  }
-}
diff --git a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPackagePrivate/src/qqq/Util.java.new b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPackagePrivate/src/qqq/Util.java.new
deleted file mode 100644
index 601d18a34c35..000000000000
--- a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPackagePrivate/src/qqq/Util.java.new
+++ /dev/null
@@ -1,12 +0,0 @@
-package qqq;
-
-public class Util {
-  private static class Base {
-    String myMessage = "msg";
-  }
-
-  protected static class BaseImpl extends Base {
-    protected void init() {
-    }
-  }
-}