TouchInstinct
/
checkstyle
306
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed tests to handle CatchOption

This commit is contained in:
Oliver Burn 2002-05-26 12:55:29 +00:00
parent 3d0256c50f
commit 3f6653f424
2 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/tests/com/puppycrawl/tools/checkstyle/CheckerTest.java
View File

@ -87,7 +87,7 @@ public class CheckerTest
{
mConfig.setIgnoreCastWhitespace(false);
mConfig.setParenPadOption(PadOption.NOSPACE);
mConfig.setAllowEmptyCatch(true);
mConfig.setCatchBlock(CatchBlockOption.IGNORE);
final Checker c = createChecker();
final String filepath = getPath("InputWhitespace.java");
assertNotNull(c);
@ -158,7 +158,7 @@ public class CheckerTest
{
mConfig.setIgnoreCastWhitespace(true);
mConfig.setParenPadOption(PadOption.IGNORE);
mConfig.setAllowEmptyCatch(true);
mConfig.setCatchBlock(CatchBlockOption.IGNORE);
final Checker c = createChecker();
final String filepath = getPath("InputWhitespace.java");
assertNotNull(c);
@ -223,7 +223,7 @@ public class CheckerTest
throws Exception
{
mConfig.setIgnoreWhitespace(true);
mConfig.setAllowEmptyCatch(true);
mConfig.setCatchBlock(CatchBlockOption.IGNORE);
final Checker c = createChecker();
final String filepath = getPath("InputWhitespace.java");
assertNotNull(c);
@ -764,15 +764,38 @@ public class CheckerTest
throws Exception
{
mConfig.setJavadocScope(Scope.NOTHING);
mConfig.setCatchBlock(CatchBlockOption.STMT);
final Checker c = createChecker();
final String filepath = getPath("InputSemantic.java");
assertNotNull(c);
final String[] expected = {
filepath + ":15:21: Avoid instantiation of java.lang.Boolean",
filepath + ":20:21: Avoid instantiation of java.lang.Boolean",
filepath + ":26:21: Avoid instantiation of java.lang.Boolean",
filepath + ":34:9: Empty catch block.",
filepath + ":36:9: Empty catch block.",
filepath + ":26:16: Avoid instantiation of java.lang.Boolean",
filepath + ":34:65: Must have at least one statement.",
filepath + ":36:41: Must have at least one statement.",
filepath + ":53:38: Must have at least one statement.",
filepath + ":54:52: Must have at least one statement.",
filepath + ":55:45: Must have at least one statement.",
};
verify(c, filepath, expected);
}
public void testSemantic2()
throws Exception
{
mConfig.setJavadocScope(Scope.NOTHING);
mConfig.setCatchBlock(CatchBlockOption.TEXT);
final Checker c = createChecker();
final String filepath = getPath("InputSemantic.java");
assertNotNull(c);
final String[] expected = {
filepath + ":15:21: Avoid instantiation of java.lang.Boolean",
filepath + ":20:21: Avoid instantiation of java.lang.Boolean",
filepath + ":26:16: Avoid instantiation of java.lang.Boolean",
filepath + ":34:65: Empty catch block.",
filepath + ":54:52: Empty catch block.",
filepath + ":55:45: Empty catch block.",
};
verify(c, filepath, expected);
}

11
src/tests/com/puppycrawl/tools/checkstyle/InputSemantic.java
View File

@ -23,7 +23,7 @@ class InputSemantic
/** fully qualified Boolean instantiation in a method. **/
Boolean getBoolean()
{
Boolean b = new java.lang.Boolean(true);
return new java.lang.Boolean(true);
}
void exHandlerTest()
@ -42,13 +42,16 @@ class InputSemantic
// can never happen, semicolon makes checkstyle happy
// this is a workaround for above problem
}
catch (ArrayIndexOutOfBoundsException ex) {
catch (NegativeArraySizeException ex) {
{
}
// can never happen, empty compound statement is another workaround
}
catch (RuntimeException handledException) {
System.out.println(handledException.getMessage);
catch (UnsupportedOperationException handledException) {
System.out.println(handledException.getMessage());
}
catch (SecurityException ex) { /* hello */ }
catch (StringIndexOutOfBoundsException ex) {}
catch (IllegalArgumentException ex) { }
}
}