pull up conflicts: check package local/protected access

java/java-tests/testData/refactoring/extractSuperClass/conflictUsingPackageLocalMethod/after/a/Sup.java

@@ -0,0 +1,4 @@
+package a;
+public class Sup {
+  void foo(){}
+}

java/java-tests/testData/refactoring/extractSuperClass/conflictUsingPackageLocalMethod/after/a/Test.java

@@ -0,0 +1,7 @@
+package a;
+
+public class Test extends Sup {
+    void x() {
+      foo();
+    }
+}

java/java-tests/testData/refactoring/extractSuperClass/conflictUsingPackageLocalMethod/after/b/E.java

@@ -0,0 +1,2 @@
+package b;
+class E{}

java/java-tests/testData/refactoring/extractSuperClass/conflictUsingPackageLocalMethod/after/b/TestSubclass.java

@@ -0,0 +1,6 @@
+package b;
+
+import a.Test;
+
+public class TestSubclass  extends Test {
+    }

java/java-tests/testData/refactoring/extractSuperClass/conflictUsingPackageLocalMethod/before/a/Sup.java

@@ -0,0 +1,4 @@
+package a;
+public class Sup {
+  void foo(){}
+}

java/java-tests/testData/refactoring/extractSuperClass/conflictUsingPackageLocalMethod/before/a/Test.java

@@ -0,0 +1,6 @@
+package a;
+public class Test extends Sup {
+    void x() {
+      foo();
+    }
+}

java/java-tests/testData/refactoring/extractSuperClass/conflictUsingPackageLocalMethod/before/b/E.java

@@ -0,0 +1,2 @@
+package b;
+class E{}

java/java-tests/testData/refactoring/extractSuperClass/conflictUsingPackageLocalSuperClass/after/a/Sup.java

@@ -0,0 +1,2 @@
+package a;
+class Sup {}

java/java-tests/testData/refactoring/extractSuperClass/conflictUsingPackageLocalSuperClass/after/a/Test.java

@@ -0,0 +1,5 @@
+package a;
+
+public class Test extends Sup {
+    void foo(){}
+}

java/java-tests/testData/refactoring/extractSuperClass/conflictUsingPackageLocalSuperClass/after/b/TestSubclass.java

@@ -0,0 +1,6 @@
+package b;
+
+import a.Test;
+
+public class TestSubclass  extends Test {
+    }

java/java-tests/testData/refactoring/extractSuperClass/conflictUsingPackageLocalSuperClass/before/a/Sup.java

@@ -0,0 +1,2 @@
+package a;
+class Sup {}

java/java-tests/testData/refactoring/extractSuperClass/conflictUsingPackageLocalSuperClass/before/a/Test.java

@@ -0,0 +1,4 @@
+package a;
+public class Test extends Sup {
+    void foo(){}
+}