From e42c2fdcab8163301ca143de4c3997c8da7476fd Mon Sep 17 00:00:00 2001 From: Denis Zhdanov Date: Mon, 19 Apr 2010 19:26:51 +0400 Subject: [PATCH] IDEA-54000 Move java formatting tests to community edition Moved from 'idea-tests' to 'java-tests' because java formatter belongs to community edition --- .../testData/psi/formatter/java/1.java | 5 +++ .../testData/psi/formatter/java/1_after.java | 5 +++ .../testData/psi/formatter/java/2.java | 6 +++ .../testData/psi/formatter/java/2_after.java | 7 +++ .../testData/psi/formatter/java/3.java | 15 +++++++ .../testData/psi/formatter/java/3_after.java | 16 +++++++ .../testData/psi/formatter/java/4.java | 11 +++++ .../testData/psi/formatter/java/4_after.java | 11 +++++ .../psi/formatter/java/AlignAssignment.java | 8 ++++ .../formatter/java/AlignAssignment_after.java | 9 ++++ .../testData/psi/formatter/java/AlignFor.java | 10 +++++ .../psi/formatter/java/AlignFor_after.java | 11 +++++ .../psi/formatter/java/AlignMultiLine.java | 7 +++ .../formatter/java/AlignMultiLine_after.java | 8 ++++ .../psi/formatter/java/AnonymousInner2.java | 7 +++ .../formatter/java/AnonymousInner2_after.java | 8 ++++ .../formatter/java/AnonymousInnerClasses.java | 17 +++++++ .../java/AnonymousInnerClasses_after.java | 18 ++++++++ .../testData/psi/formatter/java/Assert.java | 5 +++ .../psi/formatter/java/Assert_after.java | 6 +++ .../testData/psi/formatter/java/Blocks.java | 34 ++++++++++++++ .../psi/formatter/java/Blocks_after.java | 25 +++++++++++ .../psi/formatter/java/BreakInsideIf.java | 7 +++ .../formatter/java/BreakInsideIf_after.java | 8 ++++ .../psi/formatter/java/CastInsideElse.java | 9 ++++ .../formatter/java/CastInsideElse_after.java | 10 +++++ .../java/ChainedMethodsAlignment.java | 36 +++++++++++++++ .../java/ChainedMethodsAlignment_after.java | 45 +++++++++++++++++++ .../testData/psi/formatter/java/Continue.java | 5 +++ .../psi/formatter/java/Continue_after.java | 6 +++ .../psi/formatter/java/DoubleCast.java | 6 +++ .../psi/formatter/java/DoubleCast_after.java | 6 +++ 32 files changed, 387 insertions(+) create mode 100644 java/java-tests/testData/psi/formatter/java/1.java create mode 100644 java/java-tests/testData/psi/formatter/java/1_after.java create mode 100644 java/java-tests/testData/psi/formatter/java/2.java create mode 100644 java/java-tests/testData/psi/formatter/java/2_after.java create mode 100644 java/java-tests/testData/psi/formatter/java/3.java create mode 100644 java/java-tests/testData/psi/formatter/java/3_after.java create mode 100644 java/java-tests/testData/psi/formatter/java/4.java create mode 100644 java/java-tests/testData/psi/formatter/java/4_after.java create mode 100644 java/java-tests/testData/psi/formatter/java/AlignAssignment.java create mode 100644 java/java-tests/testData/psi/formatter/java/AlignAssignment_after.java create mode 100644 java/java-tests/testData/psi/formatter/java/AlignFor.java create mode 100644 java/java-tests/testData/psi/formatter/java/AlignFor_after.java create mode 100644 java/java-tests/testData/psi/formatter/java/AlignMultiLine.java create mode 100644 java/java-tests/testData/psi/formatter/java/AlignMultiLine_after.java create mode 100644 java/java-tests/testData/psi/formatter/java/AnonymousInner2.java create mode 100644 java/java-tests/testData/psi/formatter/java/AnonymousInner2_after.java create mode 100644 java/java-tests/testData/psi/formatter/java/AnonymousInnerClasses.java create mode 100644 java/java-tests/testData/psi/formatter/java/AnonymousInnerClasses_after.java create mode 100644 java/java-tests/testData/psi/formatter/java/Assert.java create mode 100644 java/java-tests/testData/psi/formatter/java/Assert_after.java create mode 100644 java/java-tests/testData/psi/formatter/java/Blocks.java create mode 100644 java/java-tests/testData/psi/formatter/java/Blocks_after.java create mode 100644 java/java-tests/testData/psi/formatter/java/BreakInsideIf.java create mode 100644 java/java-tests/testData/psi/formatter/java/BreakInsideIf_after.java create mode 100644 java/java-tests/testData/psi/formatter/java/CastInsideElse.java create mode 100644 java/java-tests/testData/psi/formatter/java/CastInsideElse_after.java create mode 100644 java/java-tests/testData/psi/formatter/java/ChainedMethodsAlignment.java create mode 100644 java/java-tests/testData/psi/formatter/java/ChainedMethodsAlignment_after.java create mode 100644 java/java-tests/testData/psi/formatter/java/Continue.java create mode 100644 java/java-tests/testData/psi/formatter/java/Continue_after.java create mode 100644 java/java-tests/testData/psi/formatter/java/DoubleCast.java create mode 100644 java/java-tests/testData/psi/formatter/java/DoubleCast_after.java diff --git a/java/java-tests/testData/psi/formatter/java/1.java b/java/java-tests/testData/psi/formatter/java/1.java new file mode 100644 index 000000000000..e091662103a8 --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/1.java @@ -0,0 +1,5 @@ + class Test { + class Inner{ + int myField; + } + } \ No newline at end of file diff --git a/java/java-tests/testData/psi/formatter/java/1_after.java b/java/java-tests/testData/psi/formatter/java/1_after.java new file mode 100644 index 000000000000..37b2894b07e0 --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/1_after.java @@ -0,0 +1,5 @@ + class Test { + class Inner{ + int myField; + } + } \ No newline at end of file diff --git a/java/java-tests/testData/psi/formatter/java/2.java b/java/java-tests/testData/psi/formatter/java/2.java new file mode 100644 index 000000000000..f63511f37aa2 --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/2.java @@ -0,0 +1,6 @@ +class Foo { + void foo() { + foo( + ); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/psi/formatter/java/2_after.java b/java/java-tests/testData/psi/formatter/java/2_after.java new file mode 100644 index 000000000000..65147e23eddf --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/2_after.java @@ -0,0 +1,7 @@ + +class Foo { + void foo() { + foo( + ); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/psi/formatter/java/3.java b/java/java-tests/testData/psi/formatter/java/3.java new file mode 100644 index 000000000000..784a880cc0e9 --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/3.java @@ -0,0 +1,15 @@ +public class A { + private void foo() { + Runnable a = new Runnable() { + private int a; + + public void run() { + newMethod(); + } + +private void newMethod() { + a = 2; +} + }; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/psi/formatter/java/3_after.java b/java/java-tests/testData/psi/formatter/java/3_after.java new file mode 100644 index 000000000000..3173918df402 --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/3_after.java @@ -0,0 +1,16 @@ + +public class A { + private void foo() { + Runnable a = new Runnable() { + private int a; + + public void run() { + newMethod(); + } + + private void newMethod() { + a = 2; + } + }; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/psi/formatter/java/4.java b/java/java-tests/testData/psi/formatter/java/4.java new file mode 100644 index 000000000000..fe15bcdce5b8 --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/4.java @@ -0,0 +1,11 @@ +class Foo { +void foo(){ +try { + // comment before + g(); + // comment after +} catch (Exception e) { + e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. +} +} +} \ No newline at end of file diff --git a/java/java-tests/testData/psi/formatter/java/4_after.java b/java/java-tests/testData/psi/formatter/java/4_after.java new file mode 100644 index 000000000000..fff51ade7c6c --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/4_after.java @@ -0,0 +1,11 @@ +class Foo { +void foo(){ + try { + // comment before + g(); + // comment after + } catch (Exception e) { + e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. + } +} +} \ No newline at end of file diff --git a/java/java-tests/testData/psi/formatter/java/AlignAssignment.java b/java/java-tests/testData/psi/formatter/java/AlignAssignment.java new file mode 100644 index 000000000000..cee55a5bc21c --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/AlignAssignment.java @@ -0,0 +1,8 @@ +class Foo{ + void foo() { + someVariable = x = + x + + y; + + } +} \ No newline at end of file diff --git a/java/java-tests/testData/psi/formatter/java/AlignAssignment_after.java b/java/java-tests/testData/psi/formatter/java/AlignAssignment_after.java new file mode 100644 index 000000000000..2f58cb64dbd5 --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/AlignAssignment_after.java @@ -0,0 +1,9 @@ + +class Foo { + void foo() { + someVariable = x = + x + + y; + + } +} \ No newline at end of file diff --git a/java/java-tests/testData/psi/formatter/java/AlignFor.java b/java/java-tests/testData/psi/formatter/java/AlignFor.java new file mode 100644 index 000000000000..75ca88f0c1fe --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/AlignFor.java @@ -0,0 +1,10 @@ +class Foo { + void foo(){ + for (int i = 0; + i < 5; + i++) { + doSomething(i); + } + + } +} \ No newline at end of file diff --git a/java/java-tests/testData/psi/formatter/java/AlignFor_after.java b/java/java-tests/testData/psi/formatter/java/AlignFor_after.java new file mode 100644 index 000000000000..3fe84f3ab92c --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/AlignFor_after.java @@ -0,0 +1,11 @@ + +class Foo { + void foo() { + for (int i = 0; + i < 5; + i++) { + doSomething(i); + } + + } +} \ No newline at end of file diff --git a/java/java-tests/testData/psi/formatter/java/AlignMultiLine.java b/java/java-tests/testData/psi/formatter/java/AlignMultiLine.java new file mode 100644 index 000000000000..8b52f5db6ce0 --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/AlignMultiLine.java @@ -0,0 +1,7 @@ +class Foo{ + public void foo(){ + int someVariable = (y + + z + ); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/psi/formatter/java/AlignMultiLine_after.java b/java/java-tests/testData/psi/formatter/java/AlignMultiLine_after.java new file mode 100644 index 000000000000..16f3917242ca --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/AlignMultiLine_after.java @@ -0,0 +1,8 @@ + +class Foo { + public void foo() { + int someVariable = (y + + z + ); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/psi/formatter/java/AnonymousInner2.java b/java/java-tests/testData/psi/formatter/java/AnonymousInner2.java new file mode 100644 index 000000000000..9dbc29f75445 --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/AnonymousInner2.java @@ -0,0 +1,7 @@ +class A { + A IMPL = new A() { + void f(boolean b) { + bar(); + } + }; +} diff --git a/java/java-tests/testData/psi/formatter/java/AnonymousInner2_after.java b/java/java-tests/testData/psi/formatter/java/AnonymousInner2_after.java new file mode 100644 index 000000000000..29f47de29b84 --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/AnonymousInner2_after.java @@ -0,0 +1,8 @@ + +class A { + A IMPL = new A() { + void f(boolean b) { + bar(); + } + }; +} diff --git a/java/java-tests/testData/psi/formatter/java/AnonymousInnerClasses.java b/java/java-tests/testData/psi/formatter/java/AnonymousInnerClasses.java new file mode 100644 index 000000000000..6f9b8475a1fd --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/AnonymousInnerClasses.java @@ -0,0 +1,17 @@ +public class A { + void f() { + new My() { + public void f() { + int i = 9; + int j = 9; + } + }; + new My() { + public void f() { + l(); + l(); + } + }; + } + +} \ No newline at end of file diff --git a/java/java-tests/testData/psi/formatter/java/AnonymousInnerClasses_after.java b/java/java-tests/testData/psi/formatter/java/AnonymousInnerClasses_after.java new file mode 100644 index 000000000000..5c8f39fd8b73 --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/AnonymousInnerClasses_after.java @@ -0,0 +1,18 @@ + +public class A { + void f() { + new My() { + public void f() { + int i = 9; + int j = 9; + } + }; + new My() { + public void f() { + l(); + l(); + } + }; + } + +} \ No newline at end of file diff --git a/java/java-tests/testData/psi/formatter/java/Assert.java b/java/java-tests/testData/psi/formatter/java/Assert.java new file mode 100644 index 000000000000..39ff3d51a356 --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/Assert.java @@ -0,0 +1,5 @@ +class Foo { + void foo () { + assert false; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/psi/formatter/java/Assert_after.java b/java/java-tests/testData/psi/formatter/java/Assert_after.java new file mode 100644 index 000000000000..7ae0e2e5683b --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/Assert_after.java @@ -0,0 +1,6 @@ + +class Foo { + void foo() { + assert false; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/psi/formatter/java/Blocks.java b/java/java-tests/testData/psi/formatter/java/Blocks.java new file mode 100644 index 000000000000..75f591d84f91 --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/Blocks.java @@ -0,0 +1,34 @@ +class Foo { + void foo(){ + if (a) + { + } + + while(a) + { + } + + do + { + } while(a); + + + try + { + } + catch(Exception e) + { + } + finally + { + } + + switch(a) + { + } + + for(a) + { + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/psi/formatter/java/Blocks_after.java b/java/java-tests/testData/psi/formatter/java/Blocks_after.java new file mode 100644 index 000000000000..5b2f14a041b0 --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/Blocks_after.java @@ -0,0 +1,25 @@ + +class Foo { + void foo() { + if (a) { + } + + while (a) { + } + + do { + } while (a); + + + try { + } catch (Exception e) { + } finally { + } + + switch (a) { + } + + for (a) { + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/psi/formatter/java/BreakInsideIf.java b/java/java-tests/testData/psi/formatter/java/BreakInsideIf.java new file mode 100644 index 000000000000..d32f26de3b72 --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/BreakInsideIf.java @@ -0,0 +1,7 @@ +class Foo{ + public void a(){ + if (b) { + break; + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/psi/formatter/java/BreakInsideIf_after.java b/java/java-tests/testData/psi/formatter/java/BreakInsideIf_after.java new file mode 100644 index 000000000000..b6b179ef8934 --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/BreakInsideIf_after.java @@ -0,0 +1,8 @@ + +class Foo { + public void a() { + if (b) { + break; + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/psi/formatter/java/CastInsideElse.java b/java/java-tests/testData/psi/formatter/java/CastInsideElse.java new file mode 100644 index 000000000000..7c2130a8c899 --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/CastInsideElse.java @@ -0,0 +1,9 @@ +class Foo { + public void foo(){ + if (a) { + + } else { +((String)value) + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/psi/formatter/java/CastInsideElse_after.java b/java/java-tests/testData/psi/formatter/java/CastInsideElse_after.java new file mode 100644 index 000000000000..d5abb1b5a390 --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/CastInsideElse_after.java @@ -0,0 +1,10 @@ + +class Foo { + public void foo() { + if (a) { + + } else { + ((String) value) + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/psi/formatter/java/ChainedMethodsAlignment.java b/java/java-tests/testData/psi/formatter/java/ChainedMethodsAlignment.java new file mode 100644 index 000000000000..158695bf92fe --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/ChainedMethodsAlignment.java @@ -0,0 +1,36 @@ +class FormattingTest { + + private static FormattingTest staticFoo; + private FormattingTest instanceFoo; + + @SuppressWarnings({"AccessStaticViaInstance"}) + public void test() { + + // Long chained method calls with initial instance target - method calls are aligned to the first method + // call place. + instanceFoo.instanceMethodWithQuiteLongNameIndeed().staticMethodWithQuiteLongNameIndeed().instanceMethodWithQuiteLongNameIndeed().instanceMethodWithQuiteLongNameIndeed().staticMethodWithQuiteLongNameIndeed(); + + // Long chained method calls with initial static target - method calls are aligned to the first method + // call place. + staticFoo.instanceMethodWithQuiteLongNameIndeed().staticMethodWithQuiteLongNameIndeed().instanceMethodWithQuiteLongNameIndeed().instanceMethodWithQuiteLongNameIndeed().staticMethodWithQuiteLongNameIndeed(); + + // Interleaved method call chains - every sub-chain is aligned to its own target + instanceFoo.instanceMethodWithQuiteLongNameIndeed().staticMethodWithQuiteLongNameIndeed().instanceMethodWithQuiteLongNameIndeed().instanceFoo.instanceMethodWithQuiteLongNameIndeed().staticMethodWithQuiteLongNameIndeed().instanceMethodWithQuiteLongNameIndeed(); + + // Interleaved method call chains with manual line break - every sub-chain is aligned to its own + // target and manual line break is preserved. + instanceFoo.instanceMethodWithQuiteLongNameIndeed().staticMethodWithQuiteLongNameIndeed() + .instanceFoo.instanceMethodWithQuiteLongNameIndeed().staticMethodWithQuiteLongNameIndeed().instanceMethodWithQuiteLongNameIndeed(); + + // Chained calls with implicit target - method calls are not aligned and use continuation indent instead. + instanceMethodWithQuiteLongNameIndeed().instanceMethodWithQuiteLongNameIndeed().instanceMethodWithQuiteLongNameIndeed().instanceMethodWithQuiteLongNameIndeed(); + } + + public FormattingTest instanceMethodWithQuiteLongNameIndeed() { + return instanceFoo; + } + + public static FormattingTest staticMethodWithQuiteLongNameIndeed() { + return staticFoo; + } +} diff --git a/java/java-tests/testData/psi/formatter/java/ChainedMethodsAlignment_after.java b/java/java-tests/testData/psi/formatter/java/ChainedMethodsAlignment_after.java new file mode 100644 index 000000000000..eef0a90e838e --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/ChainedMethodsAlignment_after.java @@ -0,0 +1,45 @@ +class FormattingTest { + + private static FormattingTest staticFoo; + private FormattingTest instanceFoo; + + @SuppressWarnings({"AccessStaticViaInstance"}) + public void test() { + + // Long chained method calls with initial instance target - method calls are aligned to the first method + // call place. + instanceFoo.instanceMethodWithQuiteLongNameIndeed().staticMethodWithQuiteLongNameIndeed() + .instanceMethodWithQuiteLongNameIndeed().instanceMethodWithQuiteLongNameIndeed() + .staticMethodWithQuiteLongNameIndeed(); + + // Long chained method calls with initial static target - method calls are aligned to the first method + // call place. + staticFoo.instanceMethodWithQuiteLongNameIndeed().staticMethodWithQuiteLongNameIndeed() + .instanceMethodWithQuiteLongNameIndeed().instanceMethodWithQuiteLongNameIndeed() + .staticMethodWithQuiteLongNameIndeed(); + + // Interleaved method call chains - every sub-chain is aligned to its own target + instanceFoo.instanceMethodWithQuiteLongNameIndeed().staticMethodWithQuiteLongNameIndeed() + .instanceMethodWithQuiteLongNameIndeed().instanceFoo.instanceMethodWithQuiteLongNameIndeed() + .staticMethodWithQuiteLongNameIndeed() + .instanceMethodWithQuiteLongNameIndeed(); + + // Interleaved method call chains with manual line break - every sub-chain is aligned to its own + // target and manual line break is preserved. + instanceFoo.instanceMethodWithQuiteLongNameIndeed().staticMethodWithQuiteLongNameIndeed() + .instanceFoo.instanceMethodWithQuiteLongNameIndeed().staticMethodWithQuiteLongNameIndeed() + .instanceMethodWithQuiteLongNameIndeed(); + + // Chained calls with implicit target - method calls are not aligned and use continuation indent instead. + instanceMethodWithQuiteLongNameIndeed().instanceMethodWithQuiteLongNameIndeed() + .instanceMethodWithQuiteLongNameIndeed().instanceMethodWithQuiteLongNameIndeed(); + } + + public FormattingTest instanceMethodWithQuiteLongNameIndeed() { + return instanceFoo; + } + + public static FormattingTest staticMethodWithQuiteLongNameIndeed() { + return staticFoo; + } +} diff --git a/java/java-tests/testData/psi/formatter/java/Continue.java b/java/java-tests/testData/psi/formatter/java/Continue.java new file mode 100644 index 000000000000..7177a32d6f62 --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/Continue.java @@ -0,0 +1,5 @@ +class A { + void foo() { + continue; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/psi/formatter/java/Continue_after.java b/java/java-tests/testData/psi/formatter/java/Continue_after.java new file mode 100644 index 000000000000..bc51845e99c8 --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/Continue_after.java @@ -0,0 +1,6 @@ + +class A { + void foo() { + continue; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/psi/formatter/java/DoubleCast.java b/java/java-tests/testData/psi/formatter/java/DoubleCast.java new file mode 100644 index 000000000000..88eee70341dc --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/DoubleCast.java @@ -0,0 +1,6 @@ + +class C { + { + String q = (String) ( (String)"abc" ); + } +} diff --git a/java/java-tests/testData/psi/formatter/java/DoubleCast_after.java b/java/java-tests/testData/psi/formatter/java/DoubleCast_after.java new file mode 100644 index 000000000000..6e8ca73ea416 --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/DoubleCast_after.java @@ -0,0 +1,6 @@ + +class C { + { + String q = (String) ((String) "abc"); + } +}