diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ParserCornersTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ParserCornersTest.java index 4659ab80d8..383fe67561 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ParserCornersTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ParserCornersTest.java @@ -15,31 +15,22 @@ import net.sourceforge.pmd.lang.java.ParserTst; import org.apache.commons.io.IOUtils; import org.junit.Test; - public class ParserCornersTest extends ParserTst { /** - * #1107 PMD 5.0.4 couldn't parse call of parent outer java class method from inner class - * @throws Exception any error + * #1107 PMD 5.0.4 couldn't parse call of parent outer java class method + * from inner class + * + * @throws Exception + * any error */ @Test public void testInnerOuterClass() throws Exception { - parseJava17("/**\n" + - " * @author azagorulko\n" + - " *\n" + - " */\n" + - "public class TestInnerClassCallsOuterParent {\n" + - "\n" + - " public void test() {\n" + - " new Runnable() {\n" + - " @Override\n" + - " public void run() {\n" + - " TestInnerClassCallsOuterParent.super.toString();\n" + - " }\n" + - " };\n" + - " }\n" + - "}\n" - ); + parseJava17("/**\n" + " * @author azagorulko\n" + " *\n" + " */\n" + + "public class TestInnerClassCallsOuterParent {\n" + "\n" + " public void test() {\n" + + " new Runnable() {\n" + " @Override\n" + " public void run() {\n" + + " TestInnerClassCallsOuterParent.super.toString();\n" + " }\n" + + " };\n" + " }\n" + "}\n"); } @Test @@ -51,84 +42,69 @@ public class ParserCornersTest extends ParserTst { public final void testCastLookaheadProblem() throws Throwable { parseJava14(CAST_LOOKAHEAD_PROBLEM); } - + /** - * Tests a specific generic notation for calling methods. - * See: https://jira.codehaus.org/browse/MPMD-139 + * Tests a specific generic notation for calling methods. See: + * https://jira.codehaus.org/browse/MPMD-139 */ @Test public void testGenericsProblem() { - parseJava15(GENERICS_PROBLEM); - parseJava17(GENERICS_PROBLEM); + parseJava15(GENERICS_PROBLEM); + parseJava17(GENERICS_PROBLEM); } - + @Test public void testParsersCases() { - String test15 = readAsString("/net/sourceforge/pmd/ast/ParserCornerCases.java"); - parseJava15(test15); - - String test17 = readAsString("/net/sourceforge/pmd/ast/ParserCornerCases17.java"); - parseJava17(test17); - - String test18 = readAsString("/net/sourceforge/pmd/ast/ParserCornerCases18.java"); - parseJava18(test18); + String test15 = readAsString("/net/sourceforge/pmd/ast/ParserCornerCases.java"); + parseJava15(test15); + + String test17 = readAsString("/net/sourceforge/pmd/ast/ParserCornerCases17.java"); + parseJava17(test17); + + String test18 = readAsString("/net/sourceforge/pmd/ast/ParserCornerCases18.java"); + parseJava18(test18); } @Test public void testMultipleExceptionCatching() { - String code = "public class Foo { public void bar() { " - + "try { System.out.println(); } catch (RuntimeException | IOException e) {} } }"; - try { - parseJava15(code); - fail("Expected exception"); - } catch (ParseException e) { - assertEquals("Line 1, Column 94: Cannot catch multiple exceptions when running in JDK inferior to 1.7 mode!", e.getMessage()); - } + String code = "public class Foo { public void bar() { " + + "try { System.out.println(); } catch (RuntimeException | IOException e) {} } }"; + try { + parseJava15(code); + fail("Expected exception"); + } catch (ParseException e) { + assertEquals( + "Line 1, Column 94: Cannot catch multiple exceptions when running in JDK inferior to 1.7 mode!", + e.getMessage()); + } - try { - parseJava17(code); - // no exception expected - } catch (ParseException e) { - fail(); - } + try { + parseJava17(code); + // no exception expected + } catch (ParseException e) { + fail(); + } } private String readAsString(String resource) { - InputStream in = ParserCornersTest.class.getResourceAsStream(resource); - try { - return IOUtils.toString(in); - } catch (IOException e) { - throw new RuntimeException(e); - } finally { - IOUtils.closeQuietly(in); - } + InputStream in = ParserCornersTest.class.getResourceAsStream(resource); + try { + return IOUtils.toString(in); + } catch (IOException e) { + throw new RuntimeException(e); + } finally { + IOUtils.closeQuietly(in); + } } - - private static final String GENERICS_PROBLEM = - "public class Test {" + PMD.EOL + - " public void test() {" + PMD.EOL + - " String o = super. doStuff(\"\");" + PMD.EOL + - " }" + PMD.EOL + - "}"; - private static final String ABSTRACT_METHOD_LEVEL_CLASS_DECL = - "public class Test {" + PMD.EOL + - " void bar() {" + PMD.EOL + - " abstract class X { public abstract void f(); }" + PMD.EOL + - " class Y extends X { public void f() {" + PMD.EOL + - " new Y().f();" + PMD.EOL + - " }}" + PMD.EOL + - " }" + PMD.EOL + - "}"; + private static final String GENERICS_PROBLEM = "public class Test {" + PMD.EOL + " public void test() {" + PMD.EOL + + " String o = super. doStuff(\"\");" + PMD.EOL + " }" + PMD.EOL + "}"; - private static final String CAST_LOOKAHEAD_PROBLEM = - "public class BadClass {" + PMD.EOL + - " public Class foo() {" + PMD.EOL + - " return (byte[].class);" + PMD.EOL + - " }" + PMD.EOL + - "}"; + private static final String ABSTRACT_METHOD_LEVEL_CLASS_DECL = "public class Test {" + PMD.EOL + " void bar() {" + + PMD.EOL + " abstract class X { public abstract void f(); }" + PMD.EOL + + " class Y extends X { public void f() {" + PMD.EOL + " new Y().f();" + PMD.EOL + " }}" + PMD.EOL + + " }" + PMD.EOL + "}"; - public static junit.framework.Test suite() { - return new junit.framework.JUnit4TestAdapter(ParserCornersTest.class); - } + private static final String CAST_LOOKAHEAD_PROBLEM = "public class BadClass {" + PMD.EOL + " public Class foo() {" + + PMD.EOL + " return (byte[].class);" + PMD.EOL + " }" + PMD.EOL + "}"; }