From 4289f26b6a3f20df6d055b8675aefe49ed09dbad Mon Sep 17 00:00:00 2001 From: Oliver Burn Date: Sun, 1 Dec 2002 04:50:08 +0000 Subject: [PATCH] The problem with so many tests, is that fundamental refactorings can take time. That is not a repeat. --- .../checkstyle/InnerAssignmentCheckTest.java | 4 +- .../checkstyle/JavadocMethodCheckTest.java | 50 +++++++-------- .../checkstyle/JavadocTypeCheckTest.java | 62 +++++++++---------- .../checkstyle/JavadocVariableCheckTest.java | 24 +++---- 4 files changed, 70 insertions(+), 70 deletions(-) diff --git a/src/tests/com/puppycrawl/tools/checkstyle/InnerAssignmentCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/InnerAssignmentCheckTest.java index 3f169d196..759ff632b 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/InnerAssignmentCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/InnerAssignmentCheckTest.java @@ -7,8 +7,8 @@ public class InnerAssignmentCheckTest { public void testIt() throws Exception { - final CheckConfiguration checkConfig = new CheckConfiguration(); - checkConfig.setClassname(InnerAssignmentCheck.class.getName()); + final DefaultConfiguration checkConfig = + createCheckConfig(InnerAssignmentCheck.class); final Checker c = createChecker(checkConfig); final String fname = getPath("InputSemantic.java"); final String[] expected = { diff --git a/src/tests/com/puppycrawl/tools/checkstyle/JavadocMethodCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/JavadocMethodCheckTest.java index fc8575be4..735c06e27 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/JavadocMethodCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/JavadocMethodCheckTest.java @@ -10,8 +10,8 @@ public class JavadocMethodCheckTest public void testTags() throws Exception { - final CheckConfiguration checkConfig = new CheckConfiguration(); - checkConfig.setClassname(JavadocMethodCheck.class.getName()); + final DefaultConfiguration checkConfig = + createCheckConfig(JavadocMethodCheck.class); final Checker c = createChecker(checkConfig); final String fname = getPath("InputTags.java"); final String[] expected = { @@ -45,9 +45,9 @@ public class JavadocMethodCheckTest public void testTagsWithResolver() throws Exception { - final CheckConfiguration checkConfig = new CheckConfiguration(); - checkConfig.setClassname(JavadocMethodCheck.class.getName()); - checkConfig.addProperty("checkUnusedThrows", "true"); + final DefaultConfiguration checkConfig = + createCheckConfig(JavadocMethodCheck.class); + checkConfig.addAttribute("checkUnusedThrows", "true"); final Checker c = createChecker(checkConfig); final String fname = getPath("InputTags.java"); final String[] expected = { @@ -79,8 +79,8 @@ public class JavadocMethodCheckTest public void testStrictJavadoc() throws Exception { - final CheckConfiguration checkConfig = new CheckConfiguration(); - checkConfig.setClassname(JavadocMethodCheck.class.getName()); + final DefaultConfiguration checkConfig = + createCheckConfig(JavadocMethodCheck.class); final Checker c = createChecker(checkConfig); final String fname = getPath("InputPublicOnly.java"); final String[] expected = { @@ -104,9 +104,9 @@ public class JavadocMethodCheckTest public void testNoJavadoc() throws Exception { - final CheckConfiguration checkConfig = new CheckConfiguration(); - checkConfig.setClassname(JavadocMethodCheck.class.getName()); - checkConfig.addProperty("scope", Scope.NOTHING.getName()); + final DefaultConfiguration checkConfig = + createCheckConfig(JavadocMethodCheck.class); + checkConfig.addAttribute("scope", Scope.NOTHING.getName()); final Checker c = createChecker(checkConfig); final String fname = getPath("InputPublicOnly.java"); final String[] expected = { @@ -119,9 +119,9 @@ public class JavadocMethodCheckTest throws Exception { - final CheckConfiguration checkConfig = new CheckConfiguration(); - checkConfig.setClassname(JavadocMethodCheck.class.getName()); - checkConfig.addProperty("scope", Scope.PROTECTED.getName()); + final DefaultConfiguration checkConfig = + createCheckConfig(JavadocMethodCheck.class); + checkConfig.addAttribute("scope", Scope.PROTECTED.getName()); final Checker c = createChecker(checkConfig); final String fname = getPath("InputPublicOnly.java"); final String[] expected = { @@ -137,9 +137,9 @@ public class JavadocMethodCheckTest public void testScopeInnerInterfacesPublic() throws Exception { - final CheckConfiguration checkConfig = new CheckConfiguration(); - checkConfig.setClassname(JavadocMethodCheck.class.getName()); - checkConfig.addProperty("scope", Scope.PUBLIC.getName()); + final DefaultConfiguration checkConfig = + createCheckConfig(JavadocMethodCheck.class); + checkConfig.addAttribute("scope", Scope.PUBLIC.getName()); final Checker c = createChecker(checkConfig); final String fname = getPath("InputScopeInnerInterfaces.java"); final String[] expected = { @@ -152,9 +152,9 @@ public class JavadocMethodCheckTest public void testScopeAnonInnerPrivate() throws Exception { - final CheckConfiguration checkConfig = new CheckConfiguration(); - checkConfig.setClassname(JavadocMethodCheck.class.getName()); - checkConfig.addProperty("scope", Scope.PRIVATE.getName()); + final DefaultConfiguration checkConfig = + createCheckConfig(JavadocMethodCheck.class); + checkConfig.addAttribute("scope", Scope.PRIVATE.getName()); final Checker c = createChecker(checkConfig); final String fname = getPath("InputScopeAnonInner.java"); final String[] expected = { @@ -165,9 +165,9 @@ public class JavadocMethodCheckTest public void testScopeAnonInnerAnonInner() throws Exception { - final CheckConfiguration checkConfig = new CheckConfiguration(); - checkConfig.setClassname(JavadocMethodCheck.class.getName()); - checkConfig.addProperty("scope", Scope.ANONINNER.getName()); + final DefaultConfiguration checkConfig = + createCheckConfig(JavadocMethodCheck.class); + checkConfig.addAttribute("scope", Scope.ANONINNER.getName()); final Checker c = createChecker(checkConfig); final String fname = getPath("InputScopeAnonInner.java"); final String[] expected = { @@ -181,9 +181,9 @@ public class JavadocMethodCheckTest public void testScopeAnonInnerWithResolver() throws Exception { - final CheckConfiguration checkConfig = new CheckConfiguration(); - checkConfig.setClassname(JavadocMethodCheck.class.getName()); - checkConfig.addProperty("checkUnusedThrows", "true"); + final DefaultConfiguration checkConfig = + createCheckConfig(JavadocMethodCheck.class); + checkConfig.addAttribute("checkUnusedThrows", "true"); final Checker c = createChecker(checkConfig); final String fname = getPath("InputScopeAnonInner.java"); final String[] expected = { diff --git a/src/tests/com/puppycrawl/tools/checkstyle/JavadocTypeCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/JavadocTypeCheckTest.java index 2d4312350..2a7d7b039 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/JavadocTypeCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/JavadocTypeCheckTest.java @@ -15,8 +15,8 @@ public class JavadocTypeCheckTest extends BaseCheckTestCase { public void testTags() throws Exception { - final CheckConfiguration checkConfig = new CheckConfiguration(); - checkConfig.setClassname(JavadocTypeCheck.class.getName()); + final DefaultConfiguration checkConfig = + createCheckConfig(JavadocTypeCheck.class); final Checker c = createChecker(checkConfig); final String fname = getPath("InputTags.java"); final String[] expected = @@ -28,8 +28,8 @@ public class JavadocTypeCheckTest extends BaseCheckTestCase public void testInner() throws Exception { - final CheckConfiguration checkConfig = new CheckConfiguration(); - checkConfig.setClassname(JavadocTypeCheck.class.getName()); + final DefaultConfiguration checkConfig = + createCheckConfig(JavadocTypeCheck.class); final Checker c = createChecker(checkConfig); final String fname = getPath("InputInner.java"); final String[] expected = @@ -43,8 +43,8 @@ public class JavadocTypeCheckTest extends BaseCheckTestCase public void testStrict() throws Exception { - final CheckConfiguration checkConfig = new CheckConfiguration(); - checkConfig.setClassname(JavadocTypeCheck.class.getName()); + final DefaultConfiguration checkConfig = + createCheckConfig(JavadocTypeCheck.class); final Checker c = createChecker(checkConfig); final String fname = getPath("InputPublicOnly.java"); final String[] expected = @@ -59,9 +59,9 @@ public class JavadocTypeCheckTest extends BaseCheckTestCase public void testProtected() throws Exception { - final CheckConfiguration checkConfig = new CheckConfiguration(); - checkConfig.setClassname(JavadocTypeCheck.class.getName()); - checkConfig.addProperty("scope", Scope.PROTECTED.getName()); + final DefaultConfiguration checkConfig = + createCheckConfig(JavadocTypeCheck.class); + checkConfig.addAttribute("scope", Scope.PROTECTED.getName()); final Checker c = createChecker(checkConfig); final String fname = getPath("InputPublicOnly.java"); final String[] expected = @@ -73,9 +73,9 @@ public class JavadocTypeCheckTest extends BaseCheckTestCase public void testPublic() throws Exception { - final CheckConfiguration checkConfig = new CheckConfiguration(); - checkConfig.setClassname(JavadocTypeCheck.class.getName()); - checkConfig.addProperty("scope", Scope.PUBLIC.getName()); + final DefaultConfiguration checkConfig = + createCheckConfig(JavadocTypeCheck.class); + checkConfig.addAttribute("scope", Scope.PUBLIC.getName()); final Checker c = createChecker(checkConfig); final String fname = getPath("InputScopeInnerInterfaces.java"); final String[] expected = @@ -88,9 +88,9 @@ public class JavadocTypeCheckTest extends BaseCheckTestCase public void testProtest() throws Exception { - final CheckConfiguration checkConfig = new CheckConfiguration(); - checkConfig.setClassname(JavadocTypeCheck.class.getName()); - checkConfig.addProperty("scope", Scope.PROTECTED.getName()); + final DefaultConfiguration checkConfig = + createCheckConfig(JavadocTypeCheck.class); + checkConfig.addAttribute("scope", Scope.PROTECTED.getName()); final Checker c = createChecker(checkConfig); final String fname = getPath("InputScopeInnerInterfaces.java"); final String[] expected = @@ -104,9 +104,9 @@ public class JavadocTypeCheckTest extends BaseCheckTestCase public void testPkg() throws Exception { - final CheckConfiguration checkConfig = new CheckConfiguration(); - checkConfig.setClassname(JavadocTypeCheck.class.getName()); - checkConfig.addProperty( + final DefaultConfiguration checkConfig = + createCheckConfig(JavadocTypeCheck.class); + checkConfig.addAttribute( "scope", Scope.getInstance("package").getName()); final Checker c = createChecker(checkConfig); @@ -122,9 +122,9 @@ public class JavadocTypeCheckTest extends BaseCheckTestCase public void testEclipse() throws Exception { - final CheckConfiguration checkConfig = new CheckConfiguration(); - checkConfig.setClassname(JavadocTypeCheck.class.getName()); - checkConfig.addProperty( + final DefaultConfiguration checkConfig = + createCheckConfig(JavadocTypeCheck.class); + checkConfig.addAttribute( "scope", Scope.getInstance("public").getName()); final Checker c = createChecker(checkConfig); @@ -138,8 +138,8 @@ public class JavadocTypeCheckTest extends BaseCheckTestCase public void testAts() throws Exception { - final CheckConfiguration checkConfig = new CheckConfiguration(); - checkConfig.setClassname(JavadocTypeCheck.class.getName()); + final DefaultConfiguration checkConfig = + createCheckConfig(JavadocTypeCheck.class); final Checker c = createChecker(checkConfig); final String fname = getPath("InputWhitespace.java"); final String[] expected = @@ -152,10 +152,10 @@ public class JavadocTypeCheckTest extends BaseCheckTestCase public void testNoAuthor() throws Exception { - final CheckConfiguration checkConfig = new CheckConfiguration(); - checkConfig.setClassname(JavadocTypeCheck.class.getName()); - checkConfig.addProperty("allowNoAuthor", "false"); - checkConfig.addProperty("requireVersion", "false"); + final DefaultConfiguration checkConfig = + createCheckConfig(JavadocTypeCheck.class); + checkConfig.addAttribute("allowNoAuthor", "false"); + checkConfig.addAttribute("requireVersion", "false"); final Checker c = createChecker(checkConfig); final String fname = getPath("InputJavadoc.java"); @@ -168,10 +168,10 @@ public class JavadocTypeCheckTest extends BaseCheckTestCase public void testNoVersion() throws Exception { - final CheckConfiguration checkConfig = new CheckConfiguration(); - checkConfig.setClassname(JavadocTypeCheck.class.getName()); - checkConfig.addProperty("allowNoAuthor", "true"); - checkConfig.addProperty("requireVersion", "true"); + final DefaultConfiguration checkConfig = + createCheckConfig(JavadocTypeCheck.class); + checkConfig.addAttribute("allowNoAuthor", "true"); + checkConfig.addAttribute("requireVersion", "true"); final Checker c = createChecker(checkConfig); final String fname = getPath("InputJavadoc.java"); diff --git a/src/tests/com/puppycrawl/tools/checkstyle/JavadocVariableCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/JavadocVariableCheckTest.java index dd9f8b64f..991634878 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/JavadocVariableCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/JavadocVariableCheckTest.java @@ -10,8 +10,8 @@ public class JavadocVariableCheckTest public void testDefault() throws Exception { - final CheckConfiguration checkConfig = new CheckConfiguration(); - checkConfig.setClassname(JavadocVariableCheck.class.getName()); + final DefaultConfiguration checkConfig = + createCheckConfig(JavadocVariableCheck.class); final Checker c = createChecker(checkConfig); final String fname = getPath("InputTags.java"); final String[] expected = { @@ -23,8 +23,8 @@ public class JavadocVariableCheckTest public void testAnother() throws Exception { - final CheckConfiguration checkConfig = new CheckConfiguration(); - checkConfig.setClassname(JavadocVariableCheck.class.getName()); + final DefaultConfiguration checkConfig = + createCheckConfig(JavadocVariableCheck.class); final Checker c = createChecker(checkConfig); final String fname = getPath("InputInner.java"); final String[] expected = { @@ -38,9 +38,9 @@ public class JavadocVariableCheckTest public void testAnother2() throws Exception { - final CheckConfiguration checkConfig = new CheckConfiguration(); - checkConfig.setClassname(JavadocVariableCheck.class.getName()); - checkConfig.addProperty("scope", Scope.PUBLIC.getName()); + final DefaultConfiguration checkConfig = + createCheckConfig(JavadocVariableCheck.class); + checkConfig.addAttribute("scope", Scope.PUBLIC.getName()); final Checker c = createChecker(checkConfig); final String fname = getPath("InputInner.java"); final String[] expected = { @@ -51,8 +51,8 @@ public class JavadocVariableCheckTest public void testAnother3() throws Exception { - final CheckConfiguration checkConfig = new CheckConfiguration(); - checkConfig.setClassname(JavadocVariableCheck.class.getName()); + final DefaultConfiguration checkConfig = + createCheckConfig(JavadocVariableCheck.class); final Checker c = createChecker(checkConfig); final String fname = getPath("InputPublicOnly.java"); final String[] expected = { @@ -69,9 +69,9 @@ public class JavadocVariableCheckTest public void testAnother4() throws Exception { - final CheckConfiguration checkConfig = new CheckConfiguration(); - checkConfig.setClassname(JavadocVariableCheck.class.getName()); - checkConfig.addProperty("scope", Scope.PUBLIC.getName()); + final DefaultConfiguration checkConfig = + createCheckConfig(JavadocVariableCheck.class); + checkConfig.addAttribute("scope", Scope.PUBLIC.getName()); final Checker c = createChecker(checkConfig); final String fname = getPath("InputPublicOnly.java"); final String[] expected = {