From e8777a2477fc8366414228e1f2d9df04a05e6dbf Mon Sep 17 00:00:00 2001 From: Denis Zhdanov Date: Mon, 19 Apr 2010 19:27:17 +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/ForEach.java | 6 ++ .../psi/formatter/java/ForEach_after.java | 7 +++ .../testData/psi/formatter/java/If.java | 7 +++ .../testData/psi/formatter/java/IfBraces.java | 6 ++ .../psi/formatter/java/IfBraces_after.java | 8 +++ .../testData/psi/formatter/java/IfElse.java | 60 ++++++++++++++++++ .../psi/formatter/java/IfElse_after.java | 62 +++++++++++++++++++ .../testData/psi/formatter/java/If_after.java | 8 +++ .../formatter/java/InnerClassAsParameter.java | 10 +++ .../java/InnerClassAsParameter_after.java | 11 ++++ .../testData/psi/formatter/java/JavaDoc.java | 10 +++ .../psi/formatter/java/JavaDoc_after.java | 13 ++++ .../testData/psi/formatter/java/Label.java | 6 ++ .../psi/formatter/java/Label_after1.java | 8 +++ .../java/LongAnnotationsAreNotWrapped.java | 4 ++ .../LongAnnotationsAreNotWrapped_after.java | 5 ++ .../java/MethodCallInAssignment.java | 6 ++ .../java/MethodCallInAssignment_after.java | 7 +++ .../testData/psi/formatter/java/New.java | 7 +++ .../psi/formatter/java/New_after.java | 7 +++ .../formatter/java/NullMethodParameter.java | 4 ++ .../java/NullMethodParameter_after.java | 10 +++ .../formatter/java/ParametersAlignment.java | 12 ++++ .../java/ParametersAlignment_after.java | 12 ++++ 24 files changed, 296 insertions(+) create mode 100644 java/java-tests/testData/psi/formatter/java/ForEach.java create mode 100644 java/java-tests/testData/psi/formatter/java/ForEach_after.java create mode 100644 java/java-tests/testData/psi/formatter/java/If.java create mode 100644 java/java-tests/testData/psi/formatter/java/IfBraces.java create mode 100644 java/java-tests/testData/psi/formatter/java/IfBraces_after.java create mode 100644 java/java-tests/testData/psi/formatter/java/IfElse.java create mode 100644 java/java-tests/testData/psi/formatter/java/IfElse_after.java create mode 100644 java/java-tests/testData/psi/formatter/java/If_after.java create mode 100644 java/java-tests/testData/psi/formatter/java/InnerClassAsParameter.java create mode 100644 java/java-tests/testData/psi/formatter/java/InnerClassAsParameter_after.java create mode 100644 java/java-tests/testData/psi/formatter/java/JavaDoc.java create mode 100644 java/java-tests/testData/psi/formatter/java/JavaDoc_after.java create mode 100644 java/java-tests/testData/psi/formatter/java/Label.java create mode 100644 java/java-tests/testData/psi/formatter/java/Label_after1.java create mode 100644 java/java-tests/testData/psi/formatter/java/LongAnnotationsAreNotWrapped.java create mode 100644 java/java-tests/testData/psi/formatter/java/LongAnnotationsAreNotWrapped_after.java create mode 100644 java/java-tests/testData/psi/formatter/java/MethodCallInAssignment.java create mode 100644 java/java-tests/testData/psi/formatter/java/MethodCallInAssignment_after.java create mode 100644 java/java-tests/testData/psi/formatter/java/New.java create mode 100644 java/java-tests/testData/psi/formatter/java/New_after.java create mode 100644 java/java-tests/testData/psi/formatter/java/NullMethodParameter.java create mode 100644 java/java-tests/testData/psi/formatter/java/NullMethodParameter_after.java create mode 100644 java/java-tests/testData/psi/formatter/java/ParametersAlignment.java create mode 100644 java/java-tests/testData/psi/formatter/java/ParametersAlignment_after.java diff --git a/java/java-tests/testData/psi/formatter/java/ForEach.java b/java/java-tests/testData/psi/formatter/java/ForEach.java new file mode 100644 index 000000000000..7aa35079b03e --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/ForEach.java @@ -0,0 +1,6 @@ +class C { + { + for(String s :collection) { + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/psi/formatter/java/ForEach_after.java b/java/java-tests/testData/psi/formatter/java/ForEach_after.java new file mode 100644 index 000000000000..569b4c5c0187 --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/ForEach_after.java @@ -0,0 +1,7 @@ + +class C { + { + for (String s : collection) { + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/psi/formatter/java/If.java b/java/java-tests/testData/psi/formatter/java/If.java new file mode 100644 index 000000000000..5b464f42c8ed --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/If.java @@ -0,0 +1,7 @@ + +class Foo { + void foo() { + if (a) { + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/psi/formatter/java/IfBraces.java b/java/java-tests/testData/psi/formatter/java/IfBraces.java new file mode 100644 index 000000000000..6f37553f69c0 --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/IfBraces.java @@ -0,0 +1,6 @@ +class Foo { + void foo() { + if (a) + return; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/psi/formatter/java/IfBraces_after.java b/java/java-tests/testData/psi/formatter/java/IfBraces_after.java new file mode 100644 index 000000000000..05053d2da146 --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/IfBraces_after.java @@ -0,0 +1,8 @@ + +class Foo { + void foo() { + if (a) { + return; + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/psi/formatter/java/IfElse.java b/java/java-tests/testData/psi/formatter/java/IfElse.java new file mode 100644 index 000000000000..37ab11b2edd6 --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/IfElse.java @@ -0,0 +1,60 @@ + +public class Foo { + public void foo(boolean a, int x, + int y, int z) { + label1: + do { + try { + if (x > 0) { + int someVariable = a ? + x : + y; + } + else if (x < 0) { + int someVariable = (y + + z + ); + someVariable = x = + x + + y; + } + else { + label2: + for (int i = 0; + i < 5; + i++) + doSomething(i); + } + switch (a) { + case 0: + doCase0(); + break; + default: + doDefault(); + } + } + catch (Exception e) { + processException(e.getMessage(), + x + y, z, a); + } + finally { + processFinally(); + } + } + while (true); + + if (2 < 3) return; + if (3 < 4) + return; + do x++ while (x < 10000); + while (x < 50000) x++; + for (int i = 0; i < 5; i++) System.out.println(i); + } + + private class InnerClass implements I1, + I2 { + public void bar() throws E1, + E2 { + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/psi/formatter/java/IfElse_after.java b/java/java-tests/testData/psi/formatter/java/IfElse_after.java new file mode 100644 index 000000000000..2f102dec7f58 --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/IfElse_after.java @@ -0,0 +1,62 @@ + +public class Foo { + public void foo(boolean a, int x, + int y, int z) { + label1: + do { + try { + if (x > 0) { + int someVariable = a ? + x : + y; + } + else + if (x < 0) { + int someVariable = (y + + z + ); + someVariable = x = + x + + y; + } + else { + label2: + for (int i = 0; + i < 5; + i++) { + doSomething(i); + } + } + switch (a) { + case 0: + doCase0(); + break; + default: + doDefault(); + } + } + catch (Exception e) { + processException(e.getMessage(), + x + y, z, a); + } + finally { + processFinally(); + } + } + while (true); + + if (2 < 3) return; + if (3 < 4) + return; + do x++ while (x < 10000); + while (x < 50000) x++; + for (int i = 0; i < 5; i++) System.out.println(i); + } + + private class InnerClass implements I1, + I2 { + public void bar() throws E1, + E2 { + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/psi/formatter/java/If_after.java b/java/java-tests/testData/psi/formatter/java/If_after.java new file mode 100644 index 000000000000..7671935ef5d7 --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/If_after.java @@ -0,0 +1,8 @@ + +class Foo { + void foo() { + if (a) + { + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/psi/formatter/java/InnerClassAsParameter.java b/java/java-tests/testData/psi/formatter/java/InnerClassAsParameter.java new file mode 100644 index 000000000000..b5240f24723e --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/InnerClassAsParameter.java @@ -0,0 +1,10 @@ +class Foo{ +public void foo(){ +bar_call(new Runnable(){ +void run(){ +bar(); +bar(); +} +}); +} +} \ No newline at end of file diff --git a/java/java-tests/testData/psi/formatter/java/InnerClassAsParameter_after.java b/java/java-tests/testData/psi/formatter/java/InnerClassAsParameter_after.java new file mode 100644 index 000000000000..013cd928aa6c --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/InnerClassAsParameter_after.java @@ -0,0 +1,11 @@ + +class Foo { + public void foo() { + bar_call(new Runnable() { + void run() { + bar(); + bar(); + } + }); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/psi/formatter/java/JavaDoc.java b/java/java-tests/testData/psi/formatter/java/JavaDoc.java new file mode 100644 index 000000000000..8b9e6e11918a --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/JavaDoc.java @@ -0,0 +1,10 @@ +public class Test { + void anotherMethod(String s); + String field; + /** + * @param anObject + */ + void method(Test anObject, String field1) { + anObject.anotherMethod(field1); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/psi/formatter/java/JavaDoc_after.java b/java/java-tests/testData/psi/formatter/java/JavaDoc_after.java new file mode 100644 index 000000000000..40364cabe5a8 --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/JavaDoc_after.java @@ -0,0 +1,13 @@ + +public class Test { + void anotherMethod(String s); + + String field; + + /** + * @param anObject + */ + void method(Test anObject, String field1) { + anObject.anotherMethod(field1); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/psi/formatter/java/Label.java b/java/java-tests/testData/psi/formatter/java/Label.java new file mode 100644 index 000000000000..449be9cb87fb --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/Label.java @@ -0,0 +1,6 @@ + +class X { + void Y() { + z: for (int i = 0; i < 24; i++) {} + } +} \ No newline at end of file diff --git a/java/java-tests/testData/psi/formatter/java/Label_after1.java b/java/java-tests/testData/psi/formatter/java/Label_after1.java new file mode 100644 index 000000000000..9155482cecd1 --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/Label_after1.java @@ -0,0 +1,8 @@ + +class X { + void Y() { +z: + for (int i = 0; i < 24; i++) { + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/psi/formatter/java/LongAnnotationsAreNotWrapped.java b/java/java-tests/testData/psi/formatter/java/LongAnnotationsAreNotWrapped.java new file mode 100644 index 000000000000..0a5b7a1eda63 --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/LongAnnotationsAreNotWrapped.java @@ -0,0 +1,4 @@ +@XmlType(name = "submissionData", + propOrder = {"submissionId", "submitterId", "contestId", "submittedDate", "submissionContent", "passedScreening", "placement", "paidFor", "price", "markedForPurchase", "removed"}) +public class SubmissionData { +} \ No newline at end of file diff --git a/java/java-tests/testData/psi/formatter/java/LongAnnotationsAreNotWrapped_after.java b/java/java-tests/testData/psi/formatter/java/LongAnnotationsAreNotWrapped_after.java new file mode 100644 index 000000000000..6cbb921e26f5 --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/LongAnnotationsAreNotWrapped_after.java @@ -0,0 +1,5 @@ +@XmlType(name = "submissionData", + propOrder = {"submissionId", "submitterId", "contestId", "submittedDate", "submissionContent", + "passedScreening", "placement", "paidFor", "price", "markedForPurchase", "removed"}) +public class SubmissionData { +} \ No newline at end of file diff --git a/java/java-tests/testData/psi/formatter/java/MethodCallInAssignment.java b/java/java-tests/testData/psi/formatter/java/MethodCallInAssignment.java new file mode 100644 index 000000000000..eda361d29762 --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/MethodCallInAssignment.java @@ -0,0 +1,6 @@ +class Foo{ + void foo(){ + ClassBar bar = + createBar(); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/psi/formatter/java/MethodCallInAssignment_after.java b/java/java-tests/testData/psi/formatter/java/MethodCallInAssignment_after.java new file mode 100644 index 000000000000..69007b6dd5d6 --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/MethodCallInAssignment_after.java @@ -0,0 +1,7 @@ + +class Foo { + void foo() { + ClassBar bar = + createBar(); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/psi/formatter/java/New.java b/java/java-tests/testData/psi/formatter/java/New.java new file mode 100644 index 000000000000..0ccb3aa7a0a0 --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/New.java @@ -0,0 +1,7 @@ + +public class C { + C ourC = + new C( + new C() + ); +} \ No newline at end of file diff --git a/java/java-tests/testData/psi/formatter/java/New_after.java b/java/java-tests/testData/psi/formatter/java/New_after.java new file mode 100644 index 000000000000..6c78e475928e --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/New_after.java @@ -0,0 +1,7 @@ + +public class C { + C ourC = + new C( + new C() + ); +} \ No newline at end of file diff --git a/java/java-tests/testData/psi/formatter/java/NullMethodParameter.java b/java/java-tests/testData/psi/formatter/java/NullMethodParameter.java new file mode 100644 index 000000000000..63e463570c57 --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/NullMethodParameter.java @@ -0,0 +1,4 @@ +class C { +public static final C1 ourC = +new C2(new C3(),null,new C4(),new C5(),new C6(),new C7()); +} diff --git a/java/java-tests/testData/psi/formatter/java/NullMethodParameter_after.java b/java/java-tests/testData/psi/formatter/java/NullMethodParameter_after.java new file mode 100644 index 000000000000..aae489a8c70d --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/NullMethodParameter_after.java @@ -0,0 +1,10 @@ + +class C { + public static final C1 ourC = + new C2(new C3(), + null, + new C4(), + new C5(), + new C6(), + new C7()); +} diff --git a/java/java-tests/testData/psi/formatter/java/ParametersAlignment.java b/java/java-tests/testData/psi/formatter/java/ParametersAlignment.java new file mode 100644 index 000000000000..f6772a695e68 --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/ParametersAlignment.java @@ -0,0 +1,12 @@ +class Foo{ + void foo() { + final IndentInfo indentProperty = Formatter.getInstance().getWhiteSpaceBefore(new PsiBasedFormattingModel(element.getContainingFile(), + settings), + CodeFormatterFacade.createBlock(element.getContainingFile(), + settings), + settings, + indentOptions, + child2.getTextRange(), + false); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/psi/formatter/java/ParametersAlignment_after.java b/java/java-tests/testData/psi/formatter/java/ParametersAlignment_after.java new file mode 100644 index 000000000000..0e0dee8f9cf8 --- /dev/null +++ b/java/java-tests/testData/psi/formatter/java/ParametersAlignment_after.java @@ -0,0 +1,12 @@ +class Foo { + void foo() { + final IndentInfo indentProperty = Formatter.getInstance().getWhiteSpaceBefore(new PsiBasedFormattingModel(element.getContainingFile(), + settings), + CodeFormatterFacade.createBlock(element.getContainingFile(), + settings), + settings, + indentOptions, + child2.getTextRange(), + false); + } +} \ No newline at end of file