Make enum constant alignment configurable

3 files changed, 57 insertions, 48 deletions

diff --git a/javaparser-testing/src/test/java/com/github/javaparser/printer/PrettyPrinterTest.java b/javaparser-testing/src/test/java/com/github/javaparser/printer/PrettyPrinterTest.java
index c5f51daf6..18d8cc4bb 100644
--- a/javaparser-testing/src/test/java/com/github/javaparser/printer/PrettyPrinterTest.java
+++ b/javaparser-testing/src/test/java/com/github/javaparser/printer/PrettyPrinterTest.java
@@ -28,6 +28,7 @@ import com.github.javaparser.ast.body.FieldDeclaration;
 import com.github.javaparser.ast.expr.VariableDeclarationExpr;
 import org.junit.Test;
 
+import static com.github.javaparser.utils.TestUtils.assertEqualsNoEol;
 import static org.junit.Assert.assertEquals;
 
 public class PrettyPrinterTest {
@@ -87,92 +88,103 @@ public class PrettyPrinterTest {
     }
 
     @Test
-    public void printUseTestVisitor(){
+    public void printUseTestVisitor() {
         String code;
         code = "class A { void foo(){ int a, b[]; }}";
         assertEquals("test", prettyPrintConfigurable(code));
     }
-    
+
     @Test
     public void prettyColumnAlignParameters_enabled() {
         PrettyPrinterConfiguration config = new PrettyPrinterConfiguration();
         config.setIndent("\t");
         config.setColumnAlignParameters(true);
-        
+
         final String EOL = config.getEndOfLineCharacter();
-        
+
         String code = "class Example { void foo(Object arg0,Object arg1){ myMethod(1, 2, 3, 5, Object.class); } }";
-        String expected = "class Example {" + EOL + 
-                "" + EOL + 
-                "\tvoid foo(Object arg0, Object arg1) {" + EOL + 
-                "\t\tmyMethod(1," + EOL + 
-                "\t\t         2," + EOL + 
-                "\t\t         3," + EOL + 
-                "\t\t         5," + EOL + 
-                "\t\t         Object.class);" + EOL + 
-                "\t}" + EOL + 
-                "}" + EOL + 
+        String expected = "class Example {" + EOL +
+                "" + EOL +
+                "\tvoid foo(Object arg0, Object arg1) {" + EOL +
+                "\t\tmyMethod(1," + EOL +
+                "\t\t         2," + EOL +
+                "\t\t         3," + EOL +
+                "\t\t         5," + EOL +
+                "\t\t         Object.class);" + EOL +
+                "\t}" + EOL +
+                "}" + EOL +
                 "";
-        
+
         assertEquals(expected, new PrettyPrinter(config).print(JavaParser.parse(code)));
     }
-    
+
     @Test
     public void prettyColumnAlignParameters_disabled() {
         PrettyPrinterConfiguration config = new PrettyPrinterConfiguration();
         final String EOL = config.getEndOfLineCharacter();
-        
+
         String code = "class Example { void foo(Object arg0,Object arg1){ myMethod(1, 2, 3, 5, Object.class); } }";
-        String expected = "class Example {" + EOL + 
-                "" + EOL + 
-                "    void foo(Object arg0, Object arg1) {" + EOL + 
-                "        myMethod(1, 2, 3, 5, Object.class);" + EOL + 
-                "    }" + EOL + 
-                "}" + EOL + 
+        String expected = "class Example {" + EOL +
+                "" + EOL +
+                "    void foo(Object arg0, Object arg1) {" + EOL +
+                "        myMethod(1, 2, 3, 5, Object.class);" + EOL +
+                "    }" + EOL +
+                "}" + EOL +
                 "";
-        
+
         assertEquals(expected, new PrettyPrinter(config).print(JavaParser.parse(code)));
     }
-    
+
     @Test
     public void prettyAlignMethodCallChains_enabled() {
         PrettyPrinterConfiguration config = new PrettyPrinterConfiguration();
         config.setIndent("\t");
         config.setColumnAlignFirstMethodChain(true);
-        
+
         final String EOL = config.getEndOfLineCharacter();
-        
+
         String code = "class Example { void foo() { IntStream.range(0, 10).filter(x -> x % 2 == 0).map(x -> x * IntStream.of(1,3,5,1).sum()).forEach(System.out::println); } }";
-        String expected = "class Example {" + EOL + 
-                "" + EOL + 
-                "\tvoid foo() {" + EOL + 
-                "\t\tIntStream.range(0, 10)" + EOL + 
-                "\t\t         .filter(x -> x % 2 == 0)" + EOL + 
-                "\t\t         .map(x -> x * IntStream.of(1, 3, 5, 1)" + EOL + 
-                "\t\t                                .sum())" + EOL + 
-                "\t\t         .forEach(System.out::println);" + EOL + 
-                "\t}" + EOL + 
-                "}" + EOL + 
+        String expected = "class Example {" + EOL +
+                "" + EOL +
+                "\tvoid foo() {" + EOL +
+                "\t\tIntStream.range(0, 10)" + EOL +
+                "\t\t         .filter(x -> x % 2 == 0)" + EOL +
+                "\t\t         .map(x -> x * IntStream.of(1, 3, 5, 1)" + EOL +
+                "\t\t                                .sum())" + EOL +
+                "\t\t         .forEach(System.out::println);" + EOL +
+                "\t}" + EOL +
+                "}" + EOL +
                 "";
 
         assertEquals(expected, new PrettyPrinter(config).print(JavaParser.parse(code)));
     }
-    
+
     @Test
     public void prettyAlignMethodCallChains_disabled() {
         PrettyPrinterConfiguration config = new PrettyPrinterConfiguration();
         final String EOL = config.getEndOfLineCharacter();
-        
+
         String code = "class Example { void foo() { IntStream.range(0, 10).filter(x -> x % 2 == 0).map(x -> x * IntStream.of(1,3,5,1).sum()).forEach(System.out::println); } }";
-        String expected = "class Example {" + EOL + 
-                "" + EOL + 
-                "    void foo() {" + EOL + 
-                "        IntStream.range(0, 10).filter(x -> x % 2 == 0).map(x -> x * IntStream.of(1, 3, 5, 1).sum()).forEach(System.out::println);" + EOL + 
-                "    }" + EOL + 
-                "}" + EOL + 
+        String expected = "class Example {" + EOL +
+                "" + EOL +
+                "    void foo() {" + EOL +
+                "        IntStream.range(0, 10).filter(x -> x % 2 == 0).map(x -> x * IntStream.of(1, 3, 5, 1).sum()).forEach(System.out::println);" + EOL +
+                "    }" + EOL +
+                "}" + EOL +
                 "";
 
         assertEquals(expected, new PrettyPrinter(config).print(JavaParser.parse(code)));
     }
 
+    @Test
+    public void enumConstantsHorizontally() {
+        CompilationUnit cu = JavaParser.parse("enum X{A, B, C, D, E}");
+        assertEqualsNoEol("enum X {\n\n    A, B, C, D, E\n}\n", new PrettyPrinter().print(cu));
+    }
+
+    @Test
+    public void enumConstantsVertically() {
+        CompilationUnit cu = JavaParser.parse("enum X{A, B, C, D, E, F}");
+        assertEqualsNoEol("enum X {\n\n    A,\n    B,\n    C,\n    D,\n    E,\n    F\n}\n", new PrettyPrinter().print(cu));
+    }
 }
diff --git a/javaparser-testing/src/test/resources/com/github/javaparser/bdd/pretty_printing_java_concepts.story b/javaparser-testing/src/test/resources/com/github/javaparser/bdd/pretty_printing_java_concepts.story
index 1adc46afd..2b7af19c1 100644
--- a/javaparser-testing/src/test/resources/com/github/javaparser/bdd/pretty_printing_java_concepts.story
+++ b/javaparser-testing/src/test/resources/com/github/javaparser/bdd/pretty_printing_java_concepts.story
@@ -128,7 +128,6 @@ public class JavaConcepts<T extends List<int[]>, X> extends Base implements Seri
         f;
 
         public enum Sexo_ implements Serializable, Cloneable {
-
         }
 
         private Sexo() {
diff --git a/javaparser-testing/src/test/resources/com/github/javaparser/bdd/pretty_printing_scenarios.story b/javaparser-testing/src/test/resources/com/github/javaparser/bdd/pretty_printing_scenarios.story
index abc666aa9..5450cb0de 100644
--- a/javaparser-testing/src/test/resources/com/github/javaparser/bdd/pretty_printing_scenarios.story
+++ b/javaparser-testing/src/test/resources/com/github/javaparser/bdd/pretty_printing_scenarios.story
@@ -131,7 +131,6 @@ Then it is printed as:
 package test;
 
 enum XYZ {
-
 }
 
 Scenario: An enum without fields has no () on its members
@@ -426,7 +425,6 @@ When the class is parsed by the Java parser
 Then it is printed as:
 @C
 enum Abc {
-
 }
 
 Scenario: Annotations are supported on classes (issue 436 is the commented part)