diff options
author | rnveach <rveach02@gmail.com> | 2016-04-16 17:59:40 -0400 |
---|---|---|
committer | Roman Ivanov <ivanov-jr@mail.ru> | 2016-04-18 09:09:47 -0700 |
commit | f9ce38fba4428b1771dd0e405b450d3b8b46bae3 (patch) | |
tree | 6db3f128d048d4b821a0523c658bfe16e47ef2ea /src/test | |
parent | 62075f0a547d78635169a12964fbc0bec808df08 (diff) | |
download | checkstyle-f9ce38fba4428b1771dd0e405b450d3b8b46bae3.tar.gz |
Issue #3105: fixed errors in indentation input files
Diffstat (limited to 'src/test')
6 files changed, 12 insertions, 12 deletions
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputAnonymousClassInMethod.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputAnonymousClassInMethod.java index 1ae7240db..aafd4914e 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputAnonymousClassInMethod.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputAnonymousClassInMethod.java @@ -18,10 +18,10 @@ import java.io.FileFilter; //indent:0 exp:0 public class InputAnonymousClassInMethod { //indent:0 exp:0 private void walkDir(File dir, FileFilter fileFilter) { //indent:8 exp:2 warn walkDir( dir, new FileFilter() { //indent:16 exp:4 warn - @Override //indent:24 exp:8 warn + @Override //indent:24 exp:18,20,22 warn public boolean accept(File path) { //indent:24 exp:24 - return ( path.isDirectory() ); //indent:32 exp:12 warn - } //indent:24 exp:8 warn + return ( path.isDirectory() ); //indent:32 exp:20,22,24 warn + } //indent:24 exp:18,20,22 warn } ); //indent:16 exp:16 } //indent:8 exp:2 warn } //indent:0 exp:0 diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidAnonymousClassIndent.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidAnonymousClassIndent.java index 550803588..5e84c1e64 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidAnonymousClassIndent.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidAnonymousClassIndent.java @@ -25,7 +25,7 @@ public class InputInvalidAnonymousClassIndent { //indent:0 exp:0 return new Thread(); //indent:20 exp:20 } else { //indent:16 exp:16 return new Thread(); //indent:20 exp:20 - }}}); //indent:16 exp:17 warn + }}}); //indent:16 ioffset:1 exp:12,16 warn return; //indent:8 exp:8 } //indent:4 exp:4 } //indent:0 exp:0 diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidClassDefIndent.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidClassDefIndent.java index c5b5224a0..164070426 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidClassDefIndent.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidClassDefIndent.java @@ -134,7 +134,7 @@ final class InputValidClassDefIndent66 extends java.awt.event.MouseAdapter imple public void actionPerformed(ActionEvent e) { //indent:12 exp:12 } //indent:12 exp:12 - }); //indent:8 exp:10,14 warn + }); //indent:8 exp:10 warn new JButton().addActionListener(new ActionListener() //indent:8 exp:8 @@ -142,7 +142,7 @@ final class InputValidClassDefIndent66 extends java.awt.event.MouseAdapter imple public void actionPerformed(ActionEvent e) { //indent:12 exp:10 warn } //indent:12 exp:10 warn - }); //indent:6 exp:8,12 warn + }); //indent:6 exp:8 warn new JButton().addActionListener(new ActionListener() //indent:8 exp:8 diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidForIndent.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidForIndent.java index 492b4c18d..a8ef88bf6 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidForIndent.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidForIndent.java @@ -74,7 +74,7 @@ public class InputInvalidForIndent { //indent:0 exp:0 } //indent:8 exp:8 for (int i=0; i<10; i++) { //indent:8 exp:8 - System.getProperty("foo"); } //indent:12 exp:8 warn + System.getProperty("foo"); } //indent:12 ioffset:27 exp:8 warn for (int i=0; //indent:8 exp:8 i<10; i++ //indent:12 exp:>=12 diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidIfIndent.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidIfIndent.java index 100535b9d..b58081a60 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidIfIndent.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidIfIndent.java @@ -90,7 +90,7 @@ public class InputInvalidIfIndent { //indent:0 exp:0 if (test) //indent:9 exp:8 warn { //indent:9 exp:8 warn } else //indent:9 exp:8 warn - { //indent:7 exp:9 warn + { //indent:7 exp:8 warn } //indent:10 exp:8 warn // lcurly for if and else on same line -- mixed braces //indent:8 exp:8 @@ -230,7 +230,7 @@ System.getProperty("blah"); //indent:0 exp:12 warn } //indent:16 exp:16 if (test) { //indent:8 exp:8 - System.getProperty("blah"); } //indent:12 exp:8 warn + System.getProperty("blah"); } //indent:12 ioffset:28 exp:8 warn } //indent:4 exp:4 public void parenIfTest() { //indent:4 exp:4 @@ -248,7 +248,7 @@ System.getProperty("blah"); //indent:0 exp:12 warn } //indent:8 exp:8 if //indent:8 exp:8 - ( //indent:6 exp:8,12 warn + ( //indent:6 exp:8 warn test //indent:12 exp:12 ) { //indent:6 exp:8 warn System.getProperty("blah"); //indent:12 exp:12 diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidLabelWithWhileLoopIndent.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidLabelWithWhileLoopIndent.java index 79db51742..80b291063 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidLabelWithWhileLoopIndent.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidLabelWithWhileLoopIndent.java @@ -15,8 +15,8 @@ package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0 public class InputInvalidLabelWithWhileLoopIndent { //indent:0 exp:0 public InputInvalidLabelWithWhileLoopIndent() { //indent:4 exp:4 - LOOP://indent:9 exp:8 warn - while (true) { //indent:9 exp:8 warn + LOOP://indent:9 exp:4,8 warn + while (true) { //indent:9 exp:8,12 warn break LOOP; //indent:12 exp:13 warn } //indent:8 exp:8 } //indent:4 exp:4 |