From 119cb661cd7d76ecd1f2a5ea9b45acb4e2a3302d Mon Sep 17 00:00:00 2001
From: Mikhail Pyltsin <Mikhail.Pyltsin@jetbrains.com>
Date: Tue, 18 Feb 2025 15:10:08 +0100
Subject: [PATCH] [java-frontend] IJPL-178336 Fix FrontendJavaTypingTest

GitOrigin-RevId: 2e04dcb38d9e6436420cf929e3298d58f8b2bc90
---
 .../intellij.java.frontback.tests.iml         |  1 -
 .../AbstractBasicJavaTypingTest.java          | 35 ---------------
 .../java/codeInsight/JavaTypingTest.java      | 43 +++++++++++++++++++
 3 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/java/java-frontback-tests/intellij.java.frontback.tests.iml b/java/java-frontback-tests/intellij.java.frontback.tests.iml
index a219ccab798d..81b909ac5e0f 100644
--- a/java/java-frontback-tests/intellij.java.frontback.tests.iml
+++ b/java/java-frontback-tests/intellij.java.frontback.tests.iml
@@ -20,6 +20,5 @@
     <orderEntry type="module" module-name="intellij.platform.tests" exported="" scope="TEST" />
     <orderEntry type="module" module-name="intellij.tools.ide.metrics.benchmark" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.testFramework.shared" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.java.impl" scope="TEST" />
   </component>
 </module>
\ No newline at end of file
diff --git a/java/java-frontback-tests/testSrc/com/intellij/codeInsight/AbstractBasicJavaTypingTest.java b/java/java-frontback-tests/testSrc/com/intellij/codeInsight/AbstractBasicJavaTypingTest.java
index 0fb929dd7d16..8e2bef9985d1 100644
--- a/java/java-frontback-tests/testSrc/com/intellij/codeInsight/AbstractBasicJavaTypingTest.java
+++ b/java/java-frontback-tests/testSrc/com/intellij/codeInsight/AbstractBasicJavaTypingTest.java
@@ -175,41 +175,6 @@ public abstract class AbstractBasicJavaTypingTest extends BasePlatformTestCase {
     doTest('}');
   }
 
-  public void testCloseBracesAfterSwitchRule() {
-    setLanguageLevel(LanguageLevel.JDK_21);
-    doTest('{');
-  }
-
-  public void testCloseBracesAfterSwitchRuleNewLine() {
-    setLanguageLevel(LanguageLevel.JDK_21);
-    doTest('{');
-  }
-
-  public void testCloseBracesAfterSwitchRuleNewLine2() {
-    setLanguageLevel(LanguageLevel.JDK_21);
-    doTest('{');
-  }
-
-  public void testCloseBracesAfterSwitchRule2ThrowStatement() {
-    setLanguageLevel(LanguageLevel.JDK_21);
-    doTest('{');
-  }
-
-  public void testCloseBracesAfterSwitchRule2Expression() {
-    setLanguageLevel(LanguageLevel.JDK_21);
-    doTest('{');
-  }
-
-  public void testCloseBracesAfterSwitchRule3Expression() {
-    setLanguageLevel(LanguageLevel.JDK_21);
-    doTest('{');
-  }
-
-  public void testCloseBracesAfterSwitchRule3ExpressionOldLine() {
-    setLanguageLevel(LanguageLevel.JDK_21);
-    doTest('{');
-  }
-
   protected void setLanguageLevel(@NotNull LanguageLevel level) {
     IdeaTestUtil.setProjectLanguageLevel(getProject(), level, myFixture.getTestRootDisposable());
   }
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/JavaTypingTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/JavaTypingTest.java
index 64e00a523dac..5c6a08eba533 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInsight/JavaTypingTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/JavaTypingTest.java
@@ -3,6 +3,7 @@ package com.intellij.java.codeInsight;
 
 import com.intellij.application.options.CodeStyle;
 import com.intellij.codeInsight.AbstractBasicJavaTypingTest;
+import com.intellij.pom.java.LanguageLevel;
 import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
 
 public class JavaTypingTest extends AbstractBasicJavaTypingTest {
@@ -62,4 +63,46 @@ public class JavaTypingTest extends AbstractBasicJavaTypingTest {
 
   //doesn't support in general case because of resolving
   public void testQuestionAfterPolyadic2() { doTest('?'); }
+
+  //doesn't support because of formatting
+  public void testCloseBracesAfterSwitchRule() {
+    setLanguageLevel(LanguageLevel.JDK_21);
+    doTest('{');
+  }
+
+  //doesn't support because of formatting
+  public void testCloseBracesAfterSwitchRuleNewLine() {
+    setLanguageLevel(LanguageLevel.JDK_21);
+    doTest('{');
+  }
+
+  //doesn't support because of formatting
+  public void testCloseBracesAfterSwitchRuleNewLine2() {
+    setLanguageLevel(LanguageLevel.JDK_21);
+    doTest('{');
+  }
+
+  //doesn't support because of formatting
+  public void testCloseBracesAfterSwitchRule2ThrowStatement() {
+    setLanguageLevel(LanguageLevel.JDK_21);
+    doTest('{');
+  }
+
+  //doesn't support because of formatting
+  public void testCloseBracesAfterSwitchRule2Expression() {
+    setLanguageLevel(LanguageLevel.JDK_21);
+    doTest('{');
+  }
+
+  //doesn't support because of formatting
+  public void testCloseBracesAfterSwitchRule3Expression() {
+    setLanguageLevel(LanguageLevel.JDK_21);
+    doTest('{');
+  }
+
+  //doesn't support because of formatting
+  public void testCloseBracesAfterSwitchRule3ExpressionOldLine() {
+    setLanguageLevel(LanguageLevel.JDK_21);
+    doTest('{');
+  }
 }