Move Java-specific part of EnterActionTest to java-tests module

GitOrigin-RevId: 4c83c726cb3cfb95920054b04737ff0f1a88be40

java/java-tests/testData/codeInsight/enterAction/BeforeElse_after.java

@@ -0,0 +1,12 @@
+public class Foo {
+    public static void main(String[] args) {
+        public void foo(int a) {
+            if (a == 0) {
+            }
+            <caret>
+            else if (a == 1) {
+            }
+          }
+
+    }
+}

java/java-tests/testData/codeInsight/enterAction/BeforeElse_before.java

@@ -0,0 +1,11 @@
+public class Foo {
+    public static void main(String[] args) {
+        public void foo(int a) {
+            if (a == 0) {
+            }<caret> 
+            else if (a == 1) {
+            }
+          }
+
+    }
+}

java/java-tests/testData/codeInsight/enterAction/BinaryExpressionAsParameter.java

@@ -0,0 +1,13 @@
+class Foo {
+  void foo(){
+    public void testDocComment2() throws Exception{
+      doTextTest("class Test {\n" +
+               "/**\n" +
+               "/**\n" +
+               "/**\n" +
+               "/**\n<caret>" +
+               "}");
+  }
+
+  }
+}

java/java-tests/testData/codeInsight/enterAction/BinaryExpressionAsParameter_after.java

@@ -0,0 +1,14 @@
+class Foo {
+  void foo(){
+    public void testDocComment2() throws Exception{
+      doTextTest("class Test {\n" +
+               "/**\n" +
+               "/**\n" +
+               "/**\n" +
+               "/**\n" +
+                 "<caret>" +
+               "}");
+  }
+
+  }
+}

java/java-tests/testData/codeInsight/enterAction/Comment.java

@@ -0,0 +1,6 @@
+class Foo {
+    /* test test teset
+    test test teste<caret>
+    test test test test
+    */
+}

java/java-tests/testData/codeInsight/enterAction/Comment_after.java

@@ -0,0 +1,7 @@
+class Foo {
+    /* test test teset
+    test test teste
+    <caret>
+    test test test test
+    */
+}

java/java-tests/testData/codeInsight/enterAction/EndOfClass.java

@@ -0,0 +1,5 @@
+class Foo {
+ 
+}<caret>
+
+

java/java-tests/testData/codeInsight/enterAction/EndOfClass_after.java

@@ -0,0 +1,6 @@
+class Foo {
+ 
+}
+<caret>
+
+

java/java-tests/testData/codeInsight/enterAction/InsideClassFile.java

@@ -0,0 +1,5 @@
+import java.sun.*;
+
+<caret>
+
+class Foo{}

java/java-tests/testData/codeInsight/enterAction/InsideClassFile_after.java

@@ -0,0 +1,6 @@
+import java.sun.*;
+
+
+<caret>
+
+class Foo{}

java/java-tests/testData/codeInsight/enterAction/JavaDocSplitWhenLeadingAsterisksAreDisabled.java

@@ -0,0 +1,2 @@
+/**<caret> comment */
+class Test {}

java/java-tests/testData/codeInsight/enterAction/JavaDocSplitWhenLeadingAsterisksAreDisabled_after.java

@@ -0,0 +1,3 @@
+/**
+ <caret>comment */
+class Test {}

java/java-tests/testData/codeInsight/enterAction/SCR1647.java

@@ -0,0 +1,8 @@
+class Foo {
+		void foo() {<caret>
+				foo();
+				foo();
+				foo();
+				foo();
+		}
+}

java/java-tests/testData/codeInsight/enterAction/SCR1647_after.java

@@ -0,0 +1,9 @@
+class Foo {
+		void foo() {
+				<caret>
+				foo();
+				foo();
+				foo();
+				foo();
+		}
+}

java/java-tests/testData/codeInsight/enterAction/SCR26493/after1.java

@@ -0,0 +1,4 @@
+public class Test {
+    int i = 
+            <caret>
+}

java/java-tests/testData/codeInsight/enterAction/SCR26493/before1.java

@@ -0,0 +1,3 @@
+public class Test {
+    int i = <caret>
+}

java/java-tests/testData/codeInsight/enterAction/SCR9799.java

@@ -0,0 +1,6 @@
+class A{
+  /**<caret>
+  void foo() {
+    "Some value*/ end."
+  }
+}

java/java-tests/testData/codeInsight/enterAction/SCR9799_after.java

@@ -0,0 +1,8 @@
+class A{
+  /**
+   * <caret>
+   */
+  void foo() {
+    "Some value*/ end."
+  }
+}

java/java-tests/testData/codeInsight/enterAction/SaveSpaceAfter.java

@@ -0,0 +1,6 @@
+class Foo {
+  void foo() {
+    int i;<caret>
+    int j;
+  }
+}

java/java-tests/testData/codeInsight/enterAction/SaveSpaceAfter_after.java

@@ -0,0 +1,7 @@
+class Foo {
+  void foo() {
+    int i;
+    <caret>
+    int j;
+  }
+}

java/java-tests/testData/codeInsight/enterAction/SimpleEnter.java

@@ -0,0 +1,5 @@
+class Foo {
+    void foo(){
+        <caret>int i = 1;
+    }
+}

java/java-tests/testData/codeInsight/enterAction/SimpleEnter2.java

@@ -0,0 +1,7 @@
+class Foo {
+    void foo(){
+        int i;
+<caret>
+        int j;
+    }
+}

java/java-tests/testData/codeInsight/enterAction/SimpleEnter2_after.java

@@ -0,0 +1,8 @@
+class Foo {
+    void foo(){
+        int i;
+
+        <caret>
+        int j;
+    }
+}

java/java-tests/testData/codeInsight/enterAction/SimpleEnter_after.java

@@ -0,0 +1,6 @@
+class Foo {
+    void foo(){
+        
+        <caret>int i = 1;
+    }
+}

java/java-tests/testData/codeInsight/enterAction/afterLbrace/After1.java

@@ -0,0 +1,11 @@
+public class TestClass {
+    public void f1() {
+    }
+
+    public void f2() {
+        <caret>
+    }
+
+    public void f3() {
+    }
+}

java/java-tests/testData/codeInsight/enterAction/afterLbrace/After2.java

@@ -0,0 +1,12 @@
+public class TestClass {
+    public void f1() {
+    }
+
+    public void f2() {
+        <caret>
+        
+    }
+
+    public void f3() {
+    }
+}

java/java-tests/testData/codeInsight/enterAction/afterLbrace/After3.java

@@ -0,0 +1,6 @@
+class TestClass {
+    void foo(int a,
+             int b){
+        <caret>
+    }
+}

java/java-tests/testData/codeInsight/enterAction/afterLbrace/Before1.java

@@ -0,0 +1,9 @@
+public class TestClass {
+    public void f1() {
+    }
+
+    public void f2() {<caret>
+
+    public void f3() {
+    }
+}

java/java-tests/testData/codeInsight/enterAction/afterLbrace/Before2.java

@@ -0,0 +1,11 @@
+public class TestClass {
+    public void f1() {
+    }
+
+    public void f2() {<caret>
+        
+    }
+
+    public void f3() {
+    }
+}

java/java-tests/testData/codeInsight/enterAction/afterLbrace/Before3.java

@@ -0,0 +1,4 @@
+class TestClass {
+    void foo(int a,
+             int b){<caret>
+}

java/java-tests/testData/codeInsight/enterAction/afterLbrace/LbraceWithRParen.java

@@ -0,0 +1,5 @@
+class TestClass {
+    {
+        list.add(new Runnable(){<caret>)
+    }
+}

java/java-tests/testData/codeInsight/enterAction/afterLbrace/LbraceWithRParen_after.java

@@ -0,0 +1,7 @@
+class TestClass {
+    {
+        list.add(new Runnable(){
+            <caret>
+        })
+    }
+}

java/java-tests/testData/codeInsight/enterAction/afterLbrace/LbraceWithSemicolon.java

@@ -0,0 +1,5 @@
+class TestClass {
+    {
+        new MyObject(){<caret>;
+    }
+}

java/java-tests/testData/codeInsight/enterAction/afterLbrace/LbraceWithSemicolon_after.java

@@ -0,0 +1,7 @@
+class TestClass {
+    {
+        new MyObject(){
+            <caret>
+        };
+    }
+}

java/java-tests/testData/codeInsight/enterAction/afterLbrace/LbraceWithStatement1.java

@@ -0,0 +1,5 @@
+class TestClass {
+    {
+        if (a) {<caret>break
+    }
+}

java/java-tests/testData/codeInsight/enterAction/afterLbrace/LbraceWithStatement1_after.java

@@ -0,0 +1,7 @@
+class TestClass {
+    {
+        if (a) {
+            <caret>break
+        }
+    }
+}

java/java-tests/testData/codeInsight/enterAction/afterLbrace/WithinBraces.java

@@ -0,0 +1,5 @@
+class A{
+    {
+        new Runnable(){<caret>}
+    }
+}

java/java-tests/testData/codeInsight/enterAction/afterLbrace/WithinBracesWithSpaceAfterCaret.java

@@ -0,0 +1,5 @@
+class A{
+    {
+        new Runnable(){<caret> }
+    }
+}

java/java-tests/testData/codeInsight/enterAction/afterLbrace/WithinBracesWithSpaceAfterCaret_after.java

@@ -0,0 +1,7 @@
+class A{
+    {
+        new Runnable(){
+            <caret>
+        }
+    }
+}

java/java-tests/testData/codeInsight/enterAction/afterLbrace/WithinBracesWithSpaceBeforeCaret.java

@@ -0,0 +1,5 @@
+class A{
+    {
+        new Runnable(){ <caret>}
+    }
+}

java/java-tests/testData/codeInsight/enterAction/afterLbrace/WithinBracesWithSpaceBeforeCaret_after.java

@@ -0,0 +1,7 @@
+class A{
+    {
+        new Runnable(){ 
+            <caret>
+        }
+    }
+}

java/java-tests/testData/codeInsight/enterAction/afterLbrace/WithinBraces_after.java

@@ -0,0 +1,7 @@
+class A{
+    {
+        new Runnable(){
+            <caret>
+        }
+    }
+}

java/java-tests/testData/codeInsight/enterAction/blockComment/after.java

@@ -0,0 +1,5 @@
+public class Test {
+  /*
+   * <caret>
+   */
+}

java/java-tests/testData/codeInsight/enterAction/blockComment/before.java

@@ -0,0 +1,3 @@
+public class Test {
+  /*<caret>
+}

java/java-tests/testData/codeInsight/enterAction/bug1/After.java

@@ -0,0 +1,4 @@
+
+<caret>
+public class Test{
+}

java/java-tests/testData/codeInsight/enterAction/bug1/Before.java

@@ -0,0 +1,3 @@
+<caret>
+public class Test{
+}

java/java-tests/testData/codeInsight/enterAction/indent/InArgList1.java

@@ -0,0 +1,5 @@
+class A{
+  {
+    method(a,<caret>)
+  }
+}

java/java-tests/testData/codeInsight/enterAction/indent/InArgList1_after.java

@@ -0,0 +1,6 @@
+class A{
+  {
+    method(a,
+           <caret>)
+  }
+}

java/java-tests/testData/codeInsight/enterAction/indent/InArgList2.java

@@ -0,0 +1,5 @@
+class A{
+  {
+    method(a, <caret>)
+  }
+}

java/java-tests/testData/codeInsight/enterAction/indent/InArgList2_after.java

@@ -0,0 +1,6 @@
+class A{
+  {
+    method(a, 
+           <caret>)
+  }
+}

java/java-tests/testData/codeInsight/enterAction/indent/InArgList3.java

@@ -0,0 +1,5 @@
+class A{
+    {
+        method(a<caret>)
+    }
+}

java/java-tests/testData/codeInsight/enterAction/indent/InArgList3_after.java

@@ -0,0 +1,6 @@
+class A{
+    {
+        method(a
+        <caret>)
+    }
+}

java/java-tests/testData/codeInsight/enterAction/indent/InArgList4.java

@@ -0,0 +1,5 @@
+class A{
+  {
+    method(a,<caret>
+  }
+}

java/java-tests/testData/codeInsight/enterAction/indent/InArgList4_after.java

@@ -0,0 +1,6 @@
+class A{
+  {
+    method(a,
+           <caret>
+  }
+}

java/java-tests/testData/codeInsight/enterAction/javaDoc/after1.java

@@ -0,0 +1,8 @@
+/**
+ * <caret>
+ */
+class Test {
+    /**
+     */
+     public void foo();
+}

java/java-tests/testData/codeInsight/enterAction/javaDoc/after2.java

@@ -0,0 +1,7 @@
+class Test {
+    /**
+     * <caret>
+     * @param param
+     */
+    public void foo(int param);
+}

java/java-tests/testData/codeInsight/enterAction/javaDoc/after3.java

@@ -0,0 +1,7 @@
+class Test {
+    /**
+     * <caret>
+     * @param param
+     */
+    public void foo(int param);
+}

java/java-tests/testData/codeInsight/enterAction/javaDoc/after4.java

@@ -0,0 +1,5 @@
+/**
+ * 
+ * @param <T>
+ */
+class Test<T> {}

java/java-tests/testData/codeInsight/enterAction/javaDoc/after5.java

@@ -0,0 +1,8 @@
+class Test {
+    /**
+     * 
+     * @param t
+     * @param <T>
+     */
+  <T> void foo (T t){}
+}

java/java-tests/testData/codeInsight/enterAction/javaDoc/after6.java

@@ -0,0 +1,16 @@
+public class A {
+   /**
+    * @param p parameter description
+    * @param t invalid parameter description
+    */
+   void foo(int p, int q) {}
+}
+
+class B extends A {
+    /**
+     * <caret>
+     * @param p parameter description
+     * @param q
+     */
+   void foo(int p, int q){}
+}

java/java-tests/testData/codeInsight/enterAction/javaDoc/afterCommentEndLike.java

@@ -0,0 +1,8 @@
+/**
+ * <caret>
+ */
+class A {
+    int foo() {
+       return 1 */*comment*/ 1
+    }
+}

java/java-tests/testData/codeInsight/enterAction/javaDoc/afterInlineTag.java

@@ -0,0 +1,5 @@
+class Test {
+  /** @return The super-type of this - may return 
+   * {@code null}*/
+  public abstract int foo(int param);
+}

java/java-tests/testData/codeInsight/enterAction/javaDoc/before1.java

@@ -0,0 +1,6 @@
+/**<caret>
+class Test {
+    /**
+     */
+     public void foo();
+}

java/java-tests/testData/codeInsight/enterAction/javaDoc/before2.java

@@ -0,0 +1,4 @@
+class Test {
+/**<caret>
+    public void foo(int param);
+}

java/java-tests/testData/codeInsight/enterAction/javaDoc/before3.java

@@ -0,0 +1,3 @@
+class Test {
+/**<caret>public void foo(int param);
+}

java/java-tests/testData/codeInsight/enterAction/javaDoc/before4.java

@@ -0,0 +1,2 @@
+/**<caret>
+class Test<T> {}

java/java-tests/testData/codeInsight/enterAction/javaDoc/before5.java

@@ -0,0 +1,4 @@
+class Test {
+  /**<caret>
+  <T> void foo (T t){}
+}

java/java-tests/testData/codeInsight/enterAction/javaDoc/before6.java

@@ -0,0 +1,12 @@
+public class A {
+   /**
+    * @param p parameter description
+    * @param t invalid parameter description
+    */
+   void foo(int p, int q) {}
+}
+
+class B extends A {
+   /**<caret>
+   void foo(int p, int q){}
+}

java/java-tests/testData/codeInsight/enterAction/javaDoc/beforeCommentEndLike.java

@@ -0,0 +1,6 @@
+/**<caret>
+class A {
+    int foo() {
+       return 1 */*comment*/ 1
+    }
+}

java/java-tests/testData/codeInsight/enterAction/javaDoc/beforeInlineTag.java

@@ -0,0 +1,4 @@
+class Test {
+  /** @return The super-type of this - may return <caret>{@code null}*/
+  public abstract int foo(int param);
+}

java/java-tests/testData/codeInsight/enterAction/javaDoc/state0.java

@@ -0,0 +1,5 @@
+public class TestClass {
+    /**<caret>
+    public void f1() {
+    }
+}

java/java-tests/testData/codeInsight/enterAction/javaDoc/state1.java

@@ -0,0 +1,7 @@
+public class TestClass {
+    /**
+     * <caret>
+     */
+    public void f1() {
+    }
+}

java/java-tests/testData/codeInsight/enterAction/javaDoc/state2.java

@@ -0,0 +1,8 @@
+public class TestClass {
+    /**
+     * 
+     * <caret>
+     */
+    public void f1() {
+    }
+}

java/java-tests/testData/codeInsight/enterAction/lineComment/AtLineEnd.java

@@ -0,0 +1,5 @@
+public class Foo {
+    {
+        // abc<caret>
+    }
+}

java/java-tests/testData/codeInsight/enterAction/lineComment/AtLineEnd_after.java

@@ -0,0 +1,6 @@
+public class Foo {
+    {
+        // abc
+        <caret>
+    }
+}

java/java-tests/testData/codeInsight/enterAction/lineComment/AtTrailingSpaces.java

@@ -0,0 +1,5 @@
+public class Foo {
+    {
+        // abc<caret> 
+    }
+}

java/java-tests/testData/codeInsight/enterAction/lineComment/AtTrailingSpaces_after.java

@@ -0,0 +1,6 @@
+public class Foo {
+    {
+        // abc
+        <caret>
+    }
+}

java/java-tests/testData/codeInsight/enterAction/lineComment/BeforeAnother.java

@@ -0,0 +1,5 @@
+public class Foo {
+    {
+        // abc<caret> //def
+    }
+}

java/java-tests/testData/codeInsight/enterAction/lineComment/BeforeAnotherWithSpace.java

@@ -0,0 +1,5 @@
+public class Foo {
+    {
+        // abc<caret> // def
+    }
+}

java/java-tests/testData/codeInsight/enterAction/lineComment/BeforeAnotherWithSpace_after.java

@@ -0,0 +1,6 @@
+public class Foo {
+    {
+        // abc 
+        // <caret>def
+    }
+}

java/java-tests/testData/codeInsight/enterAction/lineComment/BeforeAnother_after.java

@@ -0,0 +1,6 @@
+public class Foo {
+    {
+        // abc 
+        // <caret>def
+    }
+}

java/java-tests/testData/codeInsight/enterAction/lineComment/SCR13247.java

@@ -0,0 +1,3 @@
+public class Foo {
+    // abc<caret> def
+}

java/java-tests/testData/codeInsight/enterAction/lineComment/SCR13247_after.java

@@ -0,0 +1,4 @@
+public class Foo {
+    // abc
+    // <caret>def
+}

java/java-tests/testData/codeInsight/enterAction/settings/NoInsertBrace.java

@@ -0,0 +1,3 @@
+class A{
+  void foo(){<caret>
+}

java/java-tests/testData/codeInsight/enterAction/settings/NoInsertBrace_after.java

@@ -0,0 +1,4 @@
+class A{
+  void foo(){
+      <caret>
+}

java/java-tests/testData/codeInsight/enterAction/settings/NoJavadocStub.java

@@ -0,0 +1,5 @@
+class A{
+    /**<caret>
+    void foo(int p){
+    }
+}

java/java-tests/testData/codeInsight/enterAction/settings/NoJavadocStub_after.java

@@ -0,0 +1,7 @@
+class A{
+    /**
+     * <caret>
+     */
+    void foo(int p){
+    }
+}

java/java-tests/testData/codeInsight/enterAction/settings/NoSmartIndent.java

@@ -0,0 +1,4 @@
+class A{
+  void foo(){<caret>
+  }
+}

java/java-tests/testData/codeInsight/enterAction/settings/NoSmartIndentInsertBrace.java

@@ -0,0 +1,3 @@
+class A{
+  void foo(){<caret>
+}

java/java-tests/testData/codeInsight/enterAction/settings/NoSmartIndentInsertBrace_after.java

@@ -0,0 +1,5 @@
+class A{
+  void foo(){
+      <caret>
+  }
+}

java/java-tests/testData/codeInsight/enterAction/settings/NoSmartIndent_after.java

@@ -0,0 +1,5 @@
+class A{
+  void foo(){
+  <caret>
+  }
+}

java/java-tests/testData/codeInsight/enterAction/splitLiteral/After.java

@@ -0,0 +1,6 @@
+class Foo {
+  void foo() {
+    String s = "abc" +
+            "<caret>def";
+  }
+}

java/java-tests/testData/codeInsight/enterAction/splitLiteral/Before.java

@@ -0,0 +1,5 @@
+class Foo {
+  void foo() {
+    String s = "abc<caret>def";
+  }
+}

java/java-tests/testData/codeInsight/enterAction/splitLiteral/Escape.java

@@ -0,0 +1,5 @@
+public class Test {
+    {
+        String s = "abc\<caret>ndef";
+    }
+}

java/java-tests/testData/codeInsight/enterAction/splitLiteral/Escape_after.java

@@ -0,0 +1,6 @@
+public class Test {
+    {
+        String s = "abc\n" +
+                "<caret>def";
+    }
+}

java/testFramework/src/com/intellij/codeInsight/AbstractEnterActionTestCase.java

@@ -3,9 +3,11 @@
  */
 package com.intellij.codeInsight;
 
+import com.intellij.application.options.CodeStyle;
 import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.codeStyle.CodeStyleManager;
+import com.intellij.psi.codeStyle.CodeStyleSettings;
 import com.intellij.testFramework.LightJavaCodeInsightTestCase;
 import org.jetbrains.annotations.NonNls;
 
@@ -18,10 +20,6 @@ public abstract class AbstractEnterActionTestCase extends LightJavaCodeInsightTe
     assertEquals(expected, actial);
   }
 
-  protected void doTest() throws Exception {
-    doTest("java");
-  }
-
   protected void doTextTest(@NonNls String ext, @NonNls String before, @NonNls String after) {
     configureFromFileText("a." + ext, before);
     performAction();
@@ -39,4 +37,8 @@ public abstract class AbstractEnterActionTestCase extends LightJavaCodeInsightTe
   protected void performAction() {
     type('\n');
   }
+
+  protected CodeStyleSettings getCodeStyleSettings() {
+    return CodeStyle.getSettings(getProject());
+  }
 }