From b16d41fed374a00630a813ef549fe72b8f3053b4 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Tue, 13 May 2025 18:03:10 +0200 Subject: [PATCH] IJI-2602 drop inheritFromPackageLocal test data as now such code is fixed and leads to compilation error GitOrigin-RevId: f2fdaa44068e2da3081e65005487ebbfe09edd33 --- tools/apiDump/testData/api-dump.txt | 21 --------- .../apiDump/testData/exposed-private-api.txt | 1 - .../JPackageLocalClass.java | 45 ------------------- .../JPublicClassFromPackageLocalRunnable.java | 10 ----- .../JPublicFinalInheritor.java | 21 --------- .../JPublicInheritor.java | 21 --------- 6 files changed, 119 deletions(-) delete mode 100644 tools/apiDump/testData/src/inheritFromPackageLocal/JPackageLocalClass.java delete mode 100644 tools/apiDump/testData/src/inheritFromPackageLocal/JPublicClassFromPackageLocalRunnable.java delete mode 100644 tools/apiDump/testData/src/inheritFromPackageLocal/JPublicFinalInheritor.java delete mode 100644 tools/apiDump/testData/src/inheritFromPackageLocal/JPublicInheritor.java diff --git a/tools/apiDump/testData/api-dump.txt b/tools/apiDump/testData/api-dump.txt index aeac8d963eaa..721ad9ca30ee 100644 --- a/tools/apiDump/testData/api-dump.txt +++ b/tools/apiDump/testData/api-dump.txt @@ -158,24 +158,3 @@ a:com.intellij.tools.apiDump.testData.generics2.JGenericMiddleClassWithOverride - com.intellij.tools.apiDump.testData.generics2.JGenericInterface - ():V - genericMethod(java.lang.Number):java.lang.Number -c:com.intellij.tools.apiDump.testData.inheritFromPackageLocal.JPublicClassFromPackageLocalRunnable -- java.lang.Runnable -- ():V -- run():V -f:com.intellij.tools.apiDump.testData.inheritFromPackageLocal.JPublicFinalInheritor -- publicField:java.lang.Object -- ():V -- packagePrivateMethodWithPackagePrivateReturnType():com.intellij.tools.apiDump.testData.inheritFromPackageLocal.JPublicFinalInheritor -- publicMethod():V -- s:publicStaticMethod():V -c:com.intellij.tools.apiDump.testData.inheritFromPackageLocal.JPublicInheritor -- p:protectedField:java.lang.Object -- publicField:java.lang.Object -- ():V -- p:(B):V -- packagePrivateMethodWithPackagePrivateReturnType():com.intellij.tools.apiDump.testData.inheritFromPackageLocal.JPublicInheritor -- p:protectedMethod():V -- p:protectedMethodWithPackagePrivateReturnType():com.intellij.tools.apiDump.testData.inheritFromPackageLocal.JPackageLocalClass -- ps:protectedStaticMethod():V -- publicMethod():V -- s:publicStaticMethod():V diff --git a/tools/apiDump/testData/exposed-private-api.txt b/tools/apiDump/testData/exposed-private-api.txt index 1f3c5cb1f9cc..e69de29bb2d1 100644 --- a/tools/apiDump/testData/exposed-private-api.txt +++ b/tools/apiDump/testData/exposed-private-api.txt @@ -1 +0,0 @@ -com/intellij/tools/apiDump/testData/inheritFromPackageLocal/JPackageLocalClass diff --git a/tools/apiDump/testData/src/inheritFromPackageLocal/JPackageLocalClass.java b/tools/apiDump/testData/src/inheritFromPackageLocal/JPackageLocalClass.java deleted file mode 100644 index b5ecd0be7c26..000000000000 --- a/tools/apiDump/testData/src/inheritFromPackageLocal/JPackageLocalClass.java +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.tools.apiDump.testData.inheritFromPackageLocal; - -import org.jetbrains.annotations.ApiStatus.Internal; - -//@formatter:off -@SuppressWarnings({"PublicConstructorInNonPublicClass", "unused"}) -class JPackageLocalClass { - public Object publicField; - protected Object protectedField; - @Internal public Object internalField; - @Internal protected Object internalProtectedField; - private Object privateField; - Object packageLocalField; - - public JPackageLocalClass() {} - protected JPackageLocalClass(byte b) {} - @Internal public JPackageLocalClass(int b) {} - @Internal protected JPackageLocalClass(long b) {} - private JPackageLocalClass(char d) {} - JPackageLocalClass(double c) {} - - public void publicMethod() {} - protected void protectedMethod() {} - @Internal public void internalMethod() {} - @Internal protected void internalProtectedMethod() {} - private void privateMethod() {} - void packagePrivateMethod() {} - - public static void publicStaticMethod() {} - protected static void protectedStaticMethod() {} - @Internal public static void internalStaticMethod() {} - @Internal protected static void internalProtectedStaticMethod() {} - private static void privateStaticMethod() {} - static void packagePrivateStaticMethod() {} - - JPackageLocalClass packagePrivateMethodWithPackagePrivateReturnType() { return null; } - protected JPackageLocalClass protectedMethodWithPackagePrivateReturnType() { return null; } - - public static class PublicClass {} - protected static class ProtectedClass {} - static class PackageLocalClass {} - @Internal public static class InternalClass {} -} -//@formatter:on diff --git a/tools/apiDump/testData/src/inheritFromPackageLocal/JPublicClassFromPackageLocalRunnable.java b/tools/apiDump/testData/src/inheritFromPackageLocal/JPublicClassFromPackageLocalRunnable.java deleted file mode 100644 index 91b1dc606367..000000000000 --- a/tools/apiDump/testData/src/inheritFromPackageLocal/JPublicClassFromPackageLocalRunnable.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.intellij.tools.apiDump.testData.inheritFromPackageLocal; - -class JPackageLocalRunnable implements Runnable { - - @Override - public void run() { } -} - -public class JPublicClassFromPackageLocalRunnable extends JPackageLocalRunnable { -} diff --git a/tools/apiDump/testData/src/inheritFromPackageLocal/JPublicFinalInheritor.java b/tools/apiDump/testData/src/inheritFromPackageLocal/JPublicFinalInheritor.java deleted file mode 100644 index cb86391f439d..000000000000 --- a/tools/apiDump/testData/src/inheritFromPackageLocal/JPublicFinalInheritor.java +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.tools.apiDump.testData.inheritFromPackageLocal; - -import org.jetbrains.annotations.ApiStatus.Internal; - -//@formatter:off -@SuppressWarnings({"unused", "ProtectedMemberInFinalClass"}) -public final class JPublicFinalInheritor extends JPackageLocalClass { - - public JPublicFinalInheritor() { } - protected JPublicFinalInheritor(byte b) { super(b); } - @Internal public JPublicFinalInheritor(int b) { super(b); } - @Internal protected JPublicFinalInheritor(long b) { super(b); } - JPublicFinalInheritor(double c) { super(c); } - - @Override - public JPublicFinalInheritor packagePrivateMethodWithPackagePrivateReturnType() { - return null; - } -} -//@formatter:on diff --git a/tools/apiDump/testData/src/inheritFromPackageLocal/JPublicInheritor.java b/tools/apiDump/testData/src/inheritFromPackageLocal/JPublicInheritor.java deleted file mode 100644 index e2065ef1bdc8..000000000000 --- a/tools/apiDump/testData/src/inheritFromPackageLocal/JPublicInheritor.java +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.tools.apiDump.testData.inheritFromPackageLocal; - -import org.jetbrains.annotations.ApiStatus.Internal; - -//@formatter:off -@SuppressWarnings("unused") -public class JPublicInheritor extends JPackageLocalClass { - - public JPublicInheritor() { } - protected JPublicInheritor(byte b) { super(b); } - @Internal public JPublicInheritor(int b) { super(b); } - @Internal protected JPublicInheritor(long b) { super(b); } - JPublicInheritor(double c) { super(c); } - - @Override - public JPublicInheritor packagePrivateMethodWithPackagePrivateReturnType() { - return null; - } -} -//@formatter:on