diff --git a/java/java-tests/testData/psi/formatter/java/SCR11296.java b/java/java-tests/testData/psi/formatter/java/SCR11296.java
new file mode 100644
index 000000000000..f3f3d4a8a87c
--- /dev/null
+++ b/java/java-tests/testData/psi/formatter/java/SCR11296.java
@@ -0,0 +1,17 @@
+class A {
+/**
+ * The <code>String</code> class represents character strings. All
+ * string literals in Java programs, such as <code>"abc"</code>, are
+ * implemented as instances of this class.
+ *
+ * Some text after empty line
+ *
+ * @author  Lee Boynton
+ * @author  Arthur van Hoff
+ * @version 1.152, 02/01/03
+ * @since   JDK1.0
+ */
+void foo() {
+
+}
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/SCR11296_after.java b/java/java-tests/testData/psi/formatter/java/SCR11296_after.java
new file mode 100644
index 000000000000..502dc50d6e03
--- /dev/null
+++ b/java/java-tests/testData/psi/formatter/java/SCR11296_after.java
@@ -0,0 +1,17 @@
+class A {
+    /**
+     * The <code>String</code> class represents
+     * character strings. All string literals in Java
+     * programs, such as <code>"abc"</code>, are
+     * implemented as instances of this class.
+     * Some text after empty line
+     *
+     * @author Lee Boynton
+     * @author Arthur van Hoff
+     * @version 1.152, 02/01/03
+     * @since JDK1.0
+     */
+    void foo() {
+
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/SCR114.java b/java/java-tests/testData/psi/formatter/java/SCR114.java
new file mode 100644
index 000000000000..d53aa5065968
--- /dev/null
+++ b/java/java-tests/testData/psi/formatter/java/SCR114.java
@@ -0,0 +1,11 @@
+class Foo{
+    void foo() {
+try
+{
+   //whatever
+}
+catch(Exception ex)
+{
+}    
+    }
+}
diff --git a/java/java-tests/testData/psi/formatter/java/SCR114_after.java b/java/java-tests/testData/psi/formatter/java/SCR114_after.java
new file mode 100644
index 000000000000..272e7c4cbb41
--- /dev/null
+++ b/java/java-tests/testData/psi/formatter/java/SCR114_after.java
@@ -0,0 +1,12 @@
+
+class Foo {
+    void foo() {
+        try
+        {
+            //whatever
+        }
+        catch (Exception ex)
+        {
+        }
+    }
+}
diff --git a/java/java-tests/testData/psi/formatter/java/SCR11799.java b/java/java-tests/testData/psi/formatter/java/SCR11799.java
new file mode 100644
index 000000000000..e03ec173791d
--- /dev/null
+++ b/java/java-tests/testData/psi/formatter/java/SCR11799.java
@@ -0,0 +1,72 @@
+package br.com.vivo.torpedeiro.pull.impl;
+
+import javax.sql.DataSource;
+import org.springframework.jdbc.core.JdbcTemplate;
+import br.com.vivo.torpedeiro.pull.MensagemPull;
+import br.com.vivo.torpedeiro.pull.PullDAO;
+
+/**
+ * Implementa? padr?de {@link PullDAO} que realiza todas as opera?s utilizando SQL atrav?de um {@link
+ * JdbcTemplate} do Spring Framework.
+ *
+ * @author Marcus Brito
+ */
+public class PullDAOJdbcTemplate implements PullDAO
+{
+    private static final int STATUS_INICIAL = -7;
+
+    private JdbcTemplate template;
+
+    public String buscarURLProvedor(String provedor)
+    {
+        String sql = "SELECT url FROM pull_url WHERE provedor = ?";
+        return (String) template.queryForObject(sql, new Object[]{provedor}, String.class);
+    }
+
+    public Long inserirMensagemHistorico(MensagemPull mensagem)
+    {
+        String sql = "" +
+            "INSERT INTO pull_historico (\n" +
+            "    id_log,\n" +
+            "    provedor,\n" +
+            "    origem,\n" +
+            "    destino,\n" +
+            "    msg_originada,\n" +
+            "    cod_erro,\n" +
+            "    dt_recepcao\n" +
+            ") VALUES (?, ?, ?, ?, ?, ?, sysdate)";
+
+        Long id = buscarProximoID();
+
+        template.update(sql, new Object[]{id, mensagem.getCodigoProvedor(),
+                mensagem.getMensagemOriginal().getOrigem(), mensagem.getMensagemOriginal().getDestino(),
+                mensagem.getMensagemOriginal().getMensagem(), STATUS_INICIAL});
+
+        return id;
+    }
+
+    public void atualizarMensagemHistorico(Long id, int status, String mensagem)
+    {
+        String sql = "" +
+            "UPDATE pull_historico\n" +
+            "   SET cod_erro     = ?,\n" +
+            "       msg_recebida = ?,\n" +
+            "       dt_resposta  = SYSDATE\n" +
+            " WHERE id_log       = ?";
+
+        template.update(sql, new Object[]{status, mensagem, id});
+    }
+
+    private long buscarProximoID()
+    {
+        return template.queryForLong("SELECT seq_id_log.nextval FROM dual");
+    }
+
+    /**
+     * @param ds O DataSource utilizado para acesso ao banco de dados.
+     */
+    public void setDataSource(DataSource ds)
+    {
+        this.template = new JdbcTemplate(ds);
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/SCR11799_after.java b/java/java-tests/testData/psi/formatter/java/SCR11799_after.java
new file mode 100644
index 000000000000..f1bafa68a688
--- /dev/null
+++ b/java/java-tests/testData/psi/formatter/java/SCR11799_after.java
@@ -0,0 +1,73 @@
+package br.com.vivo.torpedeiro.pull.impl;
+
+import javax.sql.DataSource;
+
+import org.springframework.jdbc.core.JdbcTemplate;
+import br.com.vivo.torpedeiro.pull.MensagemPull;
+import br.com.vivo.torpedeiro.pull.PullDAO;
+
+/**
+ * Implementa? padr?de {@link PullDAO} que realiza todas as opera?s utilizando SQL atrav?de um {@link
+ * JdbcTemplate} do Spring Framework.
+ *
+ * @author Marcus Brito
+ */
+public class PullDAOJdbcTemplate implements PullDAO
+{
+    private static final int STATUS_INICIAL = -7;
+
+    private JdbcTemplate template;
+
+    public String buscarURLProvedor(String provedor)
+    {
+        String sql = "SELECT url FROM pull_url WHERE provedor = ?";
+        return (String) template.queryForObject(sql, new Object[]{provedor}, String.class);
+    }
+
+    public Long inserirMensagemHistorico(MensagemPull mensagem)
+    {
+        String sql = "" +
+            "INSERT INTO pull_historico (\n" +
+            "    id_log,\n" +
+            "    provedor,\n" +
+            "    origem,\n" +
+            "    destino,\n" +
+            "    msg_originada,\n" +
+            "    cod_erro,\n" +
+            "    dt_recepcao\n" +
+            ") VALUES (?, ?, ?, ?, ?, ?, sysdate)";
+
+        Long id = buscarProximoID();
+
+        template.update(sql, new Object[]{id, mensagem.getCodigoProvedor(),
+            mensagem.getMensagemOriginal().getOrigem(), mensagem.getMensagemOriginal().getDestino(),
+            mensagem.getMensagemOriginal().getMensagem(), STATUS_INICIAL});
+
+        return id;
+    }
+
+    public void atualizarMensagemHistorico(Long id, int status, String mensagem)
+    {
+        String sql = "" +
+            "UPDATE pull_historico\n" +
+            "   SET cod_erro     = ?,\n" +
+            "       msg_recebida = ?,\n" +
+            "       dt_resposta  = SYSDATE\n" +
+            " WHERE id_log       = ?";
+
+        template.update(sql, new Object[]{status, mensagem, id});
+    }
+
+    private long buscarProximoID()
+    {
+        return template.queryForLong("SELECT seq_id_log.nextval FROM dual");
+    }
+
+    /**
+     * @param ds O DataSource utilizado para acesso ao banco de dados.
+     */
+    public void setDataSource(DataSource ds)
+    {
+        this.template = new JdbcTemplate(ds);
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/SCR259.java b/java/java-tests/testData/psi/formatter/java/SCR259.java
new file mode 100644
index 000000000000..b376526ad8ee
--- /dev/null
+++ b/java/java-tests/testData/psi/formatter/java/SCR259.java
@@ -0,0 +1,6 @@
+class Foo {
+    void foo(){
+      if (a)
+        foo();
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/SCR259_after.java b/java/java-tests/testData/psi/formatter/java/SCR259_after.java
new file mode 100644
index 000000000000..86be36791a76
--- /dev/null
+++ b/java/java-tests/testData/psi/formatter/java/SCR259_after.java
@@ -0,0 +1,7 @@
+class Foo {
+    void foo(){
+        if (a) {
+            foo();
+        }
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/SCR260.java b/java/java-tests/testData/psi/formatter/java/SCR260.java
new file mode 100644
index 000000000000..719bd5798d22
--- /dev/null
+++ b/java/java-tests/testData/psi/formatter/java/SCR260.java
@@ -0,0 +1,16 @@
+class TestFormat
+{
+  public void test(boolean isA, boolean isB, boolean isC) {
+    if (isA)
+    // doSomethingElse(1)
+      doSomething(1);
+    else if (isB)
+    // doSomethingElse(2)
+      doSomething(2);
+    else if (isC)
+    // doSomethingElse(3)
+      doSomething(3);
+
+  }
+
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/SCR260_after.java b/java/java-tests/testData/psi/formatter/java/SCR260_after.java
new file mode 100644
index 000000000000..3842cce49c4a
--- /dev/null
+++ b/java/java-tests/testData/psi/formatter/java/SCR260_after.java
@@ -0,0 +1,20 @@
+
+class TestFormat {
+    public void test(boolean isA, boolean isB, boolean isC) {
+        if (isA)
+        // doSomethingElse(1)
+        {
+            doSomething(1);
+        } else if (isB)
+        // doSomethingElse(2)
+        {
+            doSomething(2);
+        } else if (isC)
+        // doSomethingElse(3)
+        {
+            doSomething(3);
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/SCR279.java b/java/java-tests/testData/psi/formatter/java/SCR279.java
new file mode 100644
index 000000000000..e6f10bb45b46
--- /dev/null
+++ b/java/java-tests/testData/psi/formatter/java/SCR279.java
@@ -0,0 +1,6 @@
+class Foo {
+    void foo(){
+        if (AAA == BBB ||
+            CCC) continue;
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/SCR279_after.java b/java/java-tests/testData/psi/formatter/java/SCR279_after.java
new file mode 100644
index 000000000000..e0fd810605b4
--- /dev/null
+++ b/java/java-tests/testData/psi/formatter/java/SCR279_after.java
@@ -0,0 +1,7 @@
+
+class Foo {
+    void foo() {
+        if (AAA == BBB ||
+            CCC) continue;
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/SCR395.java b/java/java-tests/testData/psi/formatter/java/SCR395.java
new file mode 100644
index 000000000000..420f7532c0c0
--- /dev/null
+++ b/java/java-tests/testData/psi/formatter/java/SCR395.java
@@ -0,0 +1,5 @@
+public class Y implements X {
+    public void doSomething() // this does something
+    { 
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/SCR395_after.java b/java/java-tests/testData/psi/formatter/java/SCR395_after.java
new file mode 100644
index 000000000000..9f2a75e3ba71
--- /dev/null
+++ b/java/java-tests/testData/psi/formatter/java/SCR395_after.java
@@ -0,0 +1,6 @@
+
+public class Y implements X {
+    public void doSomething() // this does something
+    {
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/SCR429.java b/java/java-tests/testData/psi/formatter/java/SCR429.java
new file mode 100644
index 000000000000..f78358543a6e
--- /dev/null
+++ b/java/java-tests/testData/psi/formatter/java/SCR429.java
@@ -0,0 +1,32 @@
+class Foo {
+
+
+
+
+
+
+    void foo() {
+
+
+
+
+
+        int i = 0;
+
+
+
+
+
+        int j = 0;
+
+
+
+
+
+    }
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/SCR429_after.java b/java/java-tests/testData/psi/formatter/java/SCR429_after.java
new file mode 100644
index 000000000000..3957716c28a5
--- /dev/null
+++ b/java/java-tests/testData/psi/formatter/java/SCR429_after.java
@@ -0,0 +1,17 @@
+
+class Foo {
+
+
+    void foo() {
+
+
+        int i = 0;
+
+
+        int j = 0;
+
+
+    }
+
+
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/SCR501.java b/java/java-tests/testData/psi/formatter/java/SCR501.java
new file mode 100644
index 000000000000..d1cb7b9ef0e0
--- /dev/null
+++ b/java/java-tests/testData/psi/formatter/java/SCR501.java
@@ -0,0 +1,13 @@
+class A {
+//comment1
+void method()
+//comment2
+{
+if (a)
+//comment3
+{
+//comment4
+}
+//comment5
+}
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/SCR501_after.java b/java/java-tests/testData/psi/formatter/java/SCR501_after.java
new file mode 100644
index 000000000000..afcbd97dc473
--- /dev/null
+++ b/java/java-tests/testData/psi/formatter/java/SCR501_after.java
@@ -0,0 +1,13 @@
+class A {
+    //comment1
+    void method()
+//comment2
+    {
+        if (a)
+//comment3
+        {
+//comment4
+        }
+//comment5
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/SCR548.java b/java/java-tests/testData/psi/formatter/java/SCR548.java
new file mode 100644
index 000000000000..b3d85fb810da
--- /dev/null
+++ b/java/java-tests/testData/psi/formatter/java/SCR548.java
@@ -0,0 +1,9 @@
+
+class Foo {
+  public void foo(){
+    return _status == EnhancedMemberOrderStatus.EDITING
+|| _status == EnhancedMemberOrderStatus.RESUMING
+|| _status == EnhancedMemberOrderStatus.OPEN; 
+
+  }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/SCR548_after.java b/java/java-tests/testData/psi/formatter/java/SCR548_after.java
new file mode 100644
index 000000000000..63faf41c679c
--- /dev/null
+++ b/java/java-tests/testData/psi/formatter/java/SCR548_after.java
@@ -0,0 +1,9 @@
+
+class Foo {
+    public void foo() {
+        return _status == EnhancedMemberOrderStatus.EDITING
+          || _status == EnhancedMemberOrderStatus.RESUMING
+          || _status == EnhancedMemberOrderStatus.OPEN;
+
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/SCR879.java b/java/java-tests/testData/psi/formatter/java/SCR879.java
new file mode 100644
index 000000000000..911081f66525
--- /dev/null
+++ b/java/java-tests/testData/psi/formatter/java/SCR879.java
@@ -0,0 +1,23 @@
+class A {
+void foo(){
+switch (x)
+{
+
+case 0:
+{ // don't want the brace indented
+
+break;
+}
+
+
+case 1:
+{
+
+break;
+}
+
+
+} 
+
+}
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/SCR879_after.java b/java/java-tests/testData/psi/formatter/java/SCR879_after.java
new file mode 100644
index 000000000000..1f427302786c
--- /dev/null
+++ b/java/java-tests/testData/psi/formatter/java/SCR879_after.java
@@ -0,0 +1,23 @@
+class A {
+    void foo() {
+        switch (x)
+        {
+
+            case 0:
+            { // don't want the brace indented
+
+                break;
+            }
+
+
+            case 1:
+            {
+
+                break;
+            }
+
+
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/SCR915.java b/java/java-tests/testData/psi/formatter/java/SCR915.java
new file mode 100644
index 000000000000..29a5d664bab5
--- /dev/null
+++ b/java/java-tests/testData/psi/formatter/java/SCR915.java
@@ -0,0 +1,6 @@
+class A{
+    {
+        y = x++ + 6;
+        y = 6 + ++x;
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/SCR915_after.java b/java/java-tests/testData/psi/formatter/java/SCR915_after.java
new file mode 100644
index 000000000000..ec7a6fef67e9
--- /dev/null
+++ b/java/java-tests/testData/psi/formatter/java/SCR915_after.java
@@ -0,0 +1,7 @@
+
+class A {
+    {
+        y = x+++6;
+        y = 6+ ++x;
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/SCR970.java b/java/java-tests/testData/psi/formatter/java/SCR970.java
new file mode 100644
index 000000000000..8fbbce14c95e
--- /dev/null
+++ b/java/java-tests/testData/psi/formatter/java/SCR970.java
@@ -0,0 +1,5 @@
+class Foo {
+    void foo(int a, int b, int c, int d) throws Exception, RuntimeException{
+
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/SCR970_after.java b/java/java-tests/testData/psi/formatter/java/SCR970_after.java
new file mode 100644
index 000000000000..e3c33021e928
--- /dev/null
+++ b/java/java-tests/testData/psi/formatter/java/SCR970_after.java
@@ -0,0 +1,6 @@
+class Foo {
+    void foo(int a, int b, int c, int d)
+            throws Exception, RuntimeException {
+
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/Spaces.java b/java/java-tests/testData/psi/formatter/java/Spaces.java
new file mode 100644
index 000000000000..0b01c32a7f83
--- /dev/null
+++ b/java/java-tests/testData/psi/formatter/java/Spaces.java
@@ -0,0 +1,9 @@
+class Foo{
+    void foo(int i,int j){
+        for(int i=0;i<1;i++){
+
+        }
+        if(a){}
+        foo(1,2);
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/SpacesBeforeLBrace.java b/java/java-tests/testData/psi/formatter/java/SpacesBeforeLBrace.java
new file mode 100644
index 000000000000..cb12c6446805
--- /dev/null
+++ b/java/java-tests/testData/psi/formatter/java/SpacesBeforeLBrace.java
@@ -0,0 +1,37 @@
+class Foo{
+    void foo(){
+        if (a){
+
+        } else{
+
+        }
+        while (a){
+
+        }
+        for (int i = 0; i < 10; i++){
+
+        }
+
+        do{
+
+        } while (true);
+
+        switch (a){
+            default:
+                return;
+        }
+        try{
+
+        } catch (E e){
+
+        } finally{
+
+        }
+
+        synchronized (this){
+
+        }
+
+        int[] i = new int[]{1, 2, 3};
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/SpacesBeforeLBrace_after.java b/java/java-tests/testData/psi/formatter/java/SpacesBeforeLBrace_after.java
new file mode 100644
index 000000000000..428701c8bcb5
--- /dev/null
+++ b/java/java-tests/testData/psi/formatter/java/SpacesBeforeLBrace_after.java
@@ -0,0 +1,37 @@
+class Foo {
+    void foo() {
+        if (a) {
+
+        } else {
+
+        }
+        while (a) {
+
+        }
+        for (int i = 0; i < 10; i++) {
+
+        }
+
+        do {
+
+        } while (true);
+
+        switch (a) {
+            default:
+                return;
+        }
+        try {
+
+        } catch (E e) {
+
+        } finally {
+
+        }
+
+        synchronized (this) {
+
+        }
+
+        int[] i = new int[] {1, 2, 3};
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/Spaces_after.java b/java/java-tests/testData/psi/formatter/java/Spaces_after.java
new file mode 100644
index 000000000000..27449e4e4912
--- /dev/null
+++ b/java/java-tests/testData/psi/formatter/java/Spaces_after.java
@@ -0,0 +1,10 @@
+class Foo {
+    void foo ( int i, int j ) {
+        for ( int i = 0; i < 1; i++ ) {
+
+        }
+        if ( a ) {
+        }
+        foo ( 1, 2 );
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/Switch.java b/java/java-tests/testData/psi/formatter/java/Switch.java
new file mode 100644
index 000000000000..2557d36708ef
--- /dev/null
+++ b/java/java-tests/testData/psi/formatter/java/Switch.java
@@ -0,0 +1,11 @@
+class Foo{
+    void foo(){
+                switch (a) {
+                    case 0:
+                           doCase0();
+                           break;
+                    default:
+                           doDefault();
+                    }    
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/Switch_after.java b/java/java-tests/testData/psi/formatter/java/Switch_after.java
new file mode 100644
index 000000000000..f1169fee6284
--- /dev/null
+++ b/java/java-tests/testData/psi/formatter/java/Switch_after.java
@@ -0,0 +1,12 @@
+
+class Foo {
+    void foo() {
+        switch (a) {
+            case 0:
+                doCase0();
+                break;
+            default:
+                doDefault();
+        }
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/SynchronizedBlock.java b/java/java-tests/testData/psi/formatter/java/SynchronizedBlock.java
new file mode 100644
index 000000000000..18191b984fb8
--- /dev/null
+++ b/java/java-tests/testData/psi/formatter/java/SynchronizedBlock.java
@@ -0,0 +1,9 @@
+class Foo{
+public void foo(){
+LOG.bar();
+synchronized (this){
+bar();
+bar();
+}
+}
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/SynchronizedBlock_after.java b/java/java-tests/testData/psi/formatter/java/SynchronizedBlock_after.java
new file mode 100644
index 000000000000..5222097e194c
--- /dev/null
+++ b/java/java-tests/testData/psi/formatter/java/SynchronizedBlock_after.java
@@ -0,0 +1,10 @@
+
+class Foo {
+    public void foo() {
+        LOG.bar();
+        synchronized(this){
+            bar();
+            bar();
+        }
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/TernaryExpression.java b/java/java-tests/testData/psi/formatter/java/TernaryExpression.java
new file mode 100644
index 000000000000..4fd04bc42b10
--- /dev/null
+++ b/java/java-tests/testData/psi/formatter/java/TernaryExpression.java
@@ -0,0 +1,8 @@
+class Foo{
+    void foo(){
+                    int someVariable = a ?
+                                         x :
+                                         y;
+
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/TernaryExpression_DoNotAlign_after.java b/java/java-tests/testData/psi/formatter/java/TernaryExpression_DoNotAlign_after.java
new file mode 100644
index 000000000000..7c19c36f204e
--- /dev/null
+++ b/java/java-tests/testData/psi/formatter/java/TernaryExpression_DoNotAlign_after.java
@@ -0,0 +1,9 @@
+
+class Foo {
+    void foo() {
+        int someVariable = a ?
+                x :
+                y;
+
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/TernaryExpression_after.java b/java/java-tests/testData/psi/formatter/java/TernaryExpression_after.java
new file mode 100644
index 000000000000..316d8ef1280b
--- /dev/null
+++ b/java/java-tests/testData/psi/formatter/java/TernaryExpression_after.java
@@ -0,0 +1,9 @@
+
+class Foo {
+    void foo() {
+        int someVariable = a ?
+                           x :
+                           y;
+
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/TryCatch.java b/java/java-tests/testData/psi/formatter/java/TryCatch.java
new file mode 100644
index 000000000000..81de34969789
--- /dev/null
+++ b/java/java-tests/testData/psi/formatter/java/TryCatch.java
@@ -0,0 +1,16 @@
+ class C{
+ void method(){
+  try {
+  } catch (Exception e){
+  int i=0;
+ } catch (Exception e){
+ int i=0;
+ }catch (Exception e){
+ int i=0;
+ }catch (Exception e){
+ int i=0;
+ }catch (Exception e){
+ int i=0;
+ }
+ }
+ }
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/TryCatch_after.java b/java/java-tests/testData/psi/formatter/java/TryCatch_after.java
new file mode 100644
index 000000000000..0c5d701c81d9
--- /dev/null
+++ b/java/java-tests/testData/psi/formatter/java/TryCatch_after.java
@@ -0,0 +1,16 @@
+ class C{
+ void method(){
+  try {
+  } catch (Exception e) {
+      int i = 0;
+  } catch (Exception e){
+ int i=0;
+ }catch (Exception e){
+ int i=0;
+ }catch (Exception e){
+ int i=0;
+ }catch (Exception e){
+ int i=0;
+ }
+ }
+ }
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/WrapAssertion.java b/java/java-tests/testData/psi/formatter/java/WrapAssertion.java
new file mode 100644
index 000000000000..9f7cfd982a52
--- /dev/null
+++ b/java/java-tests/testData/psi/formatter/java/WrapAssertion.java
@@ -0,0 +1,5 @@
+class Foo{
+    public void foo(){
+        assertEquals(map.get(new File("C:\\PerforceTest1\\created2.txt")), );
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/WrapAssertion_after.java b/java/java-tests/testData/psi/formatter/java/WrapAssertion_after.java
new file mode 100644
index 000000000000..1426b88ed006
--- /dev/null
+++ b/java/java-tests/testData/psi/formatter/java/WrapAssertion_after.java
@@ -0,0 +1,6 @@
+
+class Foo {
+    public void foo() {
+        assertEquals(map.get(new File("C:\\PerforceTest1\\created2.txt")), );
+    }
+}
\ No newline at end of file