From 39274e2f6974f1bb599426f89be198f4eefab16f Mon Sep 17 00:00:00 2001 From: Romain Pelisse Date: Wed, 27 Aug 2008 18:44:57 +0000 Subject: [PATCH] Refactoring unit test to match new package layout. nb: If you have altered,in the last couple of week, some of the unit test just refactored, please do not hesitate to double check my modifications (i don't entirely trust svn, neither should you :) ) git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@6412 51baf565-9d33-0410-a72c-fc3788e3496d --- pmd/etc/changelog.txt | 2 - .../java/rule}/DynamicRuleTest.java | 2 +- .../java/rule}/ScratchpadRulesTest.java | 42 +-- .../java/rule}/UselessAssignmentRuleTest.java | 2 +- .../java/rule}/XPathRuleTest.java | 12 +- .../java/rule}/basic/BasicRulesTest.java | 2 +- ...DecimalLiteralsInBigDecimalConstructor.xml | 0 .../basic/xml/AvoidMultipleUnaryOperators.xml | 144 ++++----- .../java/rule}/basic/xml/AvoidThreadGroup.xml | 0 .../rule}/basic/xml/AvoidUsingHardCodedIP.xml | 0 .../rule}/basic/xml/AvoidUsingOctalValues.xml | 0 .../basic/xml/BigIntegerInstantiation.xml | 0 .../rule}/basic/xml/BooleanInstantiation.xml | 0 .../java/rule}/basic/xml/BrokenNullCheck.xml | 2 +- .../java/rule}/basic/xml/CheckResultSet.xml | 0 .../java/rule}/basic/xml/CheckSkipResult.xml | 206 ++++++------ .../xml/ClassCastExceptionWithToArray.xml | 0 .../basic/xml/CollapsibleIfStatements.xml | 2 +- .../rule}/basic/xml/DoubleCheckedLocking.xml | 0 .../java/rule}/basic/xml/ExtendsObject.xml | 66 ++-- .../basic/xml/ForLoopShouldBeWhileLoop.xml | 0 .../rule}/basic/xml/JumbledIncrementer.xml | 0 .../rule}/basic/xml/MisplacedNullCheck.xml | 0 .../xml/OverrideBothEqualsAndHashcode.xml | 0 .../basic/xml/ReturnFromFinallyBlock.xml | 0 .../basic/xml/UnconditionalIfStatement.xml | 0 .../java/rule}/braces/BracesRulesTest.java | 2 +- .../braces/xml/ForLoopsMustUseBraces.xml | 2 +- .../braces/xml/IfElseStmtsMustUseBraces.xml | 2 +- .../rule}/braces/xml/IfStmtsMustUseBraces.xml | 2 +- .../braces/xml/WhileLoopsMustUseBraces.xml | 2 +- .../java/rule}/clone/CloneRulesTest.java | 2 +- .../xml/CloneMethodMustImplementCloneable.xml | 2 +- .../CloneThrowsCloneNotSupportedException.xml | 2 +- .../clone/xml/ProperCloneImplementation.xml | 2 +- .../rule}/codesize/CodesizeRulesTest.java | 2 +- .../codesize/CyclomaticComplexityTest.java | 15 +- .../rule/codesize/NPathComplexityTest.java | 43 +++ .../codesize/xml/CyclomaticComplexity.xml | 2 +- .../codesize/xml/ExcessiveClassLength.xml | 2 +- .../codesize/xml/ExcessiveMethodLength.xml | 2 +- .../codesize/xml/ExcessiveParameterList.xml | 2 +- .../codesize/xml/ExcessivePublicCount.xml | 0 .../rule}/codesize/xml/NPathComplexity.xml | 2 +- .../codesize/xml/NcssConstructorCount.xml | 2 +- .../rule}/codesize/xml/NcssMethodCount.xml | 2 +- .../java/rule}/codesize/xml/NcssTypeCount.xml | 2 +- .../java/rule}/codesize/xml/TooManyFields.xml | 2 +- .../rule}/codesize/xml/TooManyMethods.xml | 2 +- .../controversial/ControversialRulesTest.java | 2 +- .../controversial/xml/AssignmentInOperand.xml | 0 .../xml/AtLeastOneConstructor.xml | 0 .../xml/AvoidFinalLocalVariable.xml | 0 .../xml/AvoidPrefixingMethodParameters.xml | 0 .../xml/AvoidUsingNativeCode.xml | 2 +- .../controversial/xml/AvoidUsingShortType.xml | 0 .../controversial/xml/AvoidUsingVolatile.xml | 0 .../controversial/xml/BooleanInversion.xml | 2 +- .../xml/CallSuperInConstructor.xml | 0 .../xml/DataflowAnomalyAnalysis.xml | 0 .../controversial/xml/DefaultPackage.xml | 0 .../DoNotCallGarbageCollectionExplicitly.xml | 0 .../rule}/controversial/xml/DontImportSun.xml | 0 .../controversial/xml/NullAssignment.xml | 2 +- .../xml/OneDeclarationPerLine.xml | 0 .../rule}/controversial/xml/OnlyOneReturn.xml | 2 +- .../xml/SuspiciousOctalEscape.xml | 0 .../xml/UnnecessaryConstructor.xml | 0 .../xml/UnnecessaryParentheses.xml | 0 .../rule}/coupling/CouplingRulesTest.java | 2 +- .../coupling/xml/CouplingBetweenObjects.xml | 0 .../rule}/coupling/xml/ExcessiveImports.xml | 0 .../java/rule}/coupling/xml/LooseCoupling.xml | 2 +- .../coupling/xml/LoosePackageCoupling.xml | 292 ++++++++--------- .../design/ConfusingTernaryRuleTest.java | 2 +- ...ConstructorCallsOverridableMethodTest.java | 2 +- .../java/rule}/design/DesignRulesTest.java | 2 +- .../rule}/design/TooManyHttpFilterTest.java | 2 +- .../UncommentedEmptyConstructorRuleTest.java | 2 +- .../UncommentedEmptyMethodRuleTest.java | 2 +- .../AbstractClassWithoutAbstractMethod.xml | 0 .../xml/AbstractClassWithoutAnyMethod.xml | 2 +- .../design/xml/AccessorClassGeneration.xml | 0 .../design/xml/AssignmentToNonFinalStatic.xml | 2 +- .../design/xml/AvoidConstantsInterface.xml | 2 +- .../design/xml/AvoidDeeplyNestedIfStmts.xml | 0 .../AvoidInstanceofChecksInCatchClause.xml | 2 +- .../xml/AvoidProtectedFieldInFinalClass.xml | 2 +- .../design/xml/AvoidReassigningParameters.xml | 0 .../xml/AvoidSynchronizedAtMethodLevel.xml | 0 .../java/rule}/design/xml/BadComparison.xml | 0 ...thOnlyPrivateConstructorsShouldBeFinal.xml | 0 .../java/rule}/design/xml/CloseResource.xml | 2 +- .../design/xml/CompareObjectsWithEquals.xml | 0 .../rule}/design/xml/ConfusingTernary.xml | 2 +- .../xml/ConstructorCallsOverridableMethod.xml | 0 .../xml/DefaultLabelNotLastInSwitchStmt.xml | 0 ...yMethodInAbstractClassShouldBeAbstract.xml | 0 .../java/rule}/design/xml/EqualsNull.xml | 0 .../design/xml/FinalFieldCouldBeStatic.xml | 0 .../rule}/design/xml/IdempotentOperations.xml | 0 .../java/rule}/design/xml/ImmutableField.xml | 2 +- .../design/xml/InstantiationToGetClass.xml | 0 .../java/rule}/design/xml/LogicInversion.xml | 126 ++++---- .../rule}/design/xml/MissingBreakInSwitch.xml | 0 ...ngStaticMethodInNonInstantiatableClass.xml | 0 .../xml/NonCaseLabelInSwitchStatement.xml | 0 .../rule}/design/xml/NonStaticInitializer.xml | 0 .../design/xml/NonThreadSafeSingleton.xml | 2 +- .../design/xml/OptimizableToArrayCall.xml | 0 .../PositionLiteralsFirstInComparisons.xml | 2 +- .../design/xml/PositionalIteratorRule.xml | 2 +- .../rule}/design/xml/PreserveStackTrace.xml | 2 +- .../xml/ReturnEmptyArrayRatherThanNull.xml | 0 .../xml/SimpleDateFormatNeedsLocale.xml | 0 .../design/xml/SimplifyBooleanExpressions.xml | 0 .../design/xml/SimplifyBooleanReturns.xml | 0 .../rule}/design/xml/SimplifyConditional.xml | 0 .../java/rule}/design/xml/SingularField.xml | 0 .../java/rule}/design/xml/SwitchDensity.xml | 2 +- .../xml/SwitchStmtsShouldHaveDefault.xml | 0 .../xml/TooFewBranchesForASwitchStatement.xml | 2 +- .../rule}/design/xml/TooManyHttpFilter.xml | 2 +- .../xml/UncommentedEmptyConstructor.xml | 0 .../design/xml/UncommentedEmptyMethod.xml | 0 .../xml/UnnecessaryLocalBeforeReturn.xml | 2 +- .../xml/UnsynchronizedStaticDateFormatter.xml | 2 +- .../rule}/design/xml/UseCollectionIsEmpty.xml | 2 +- .../xml/UseLocaleWithCaseConversions.xml | 0 .../xml/UseNotifyAllInsteadOfNotify.xml | 0 .../java/rule}/design/xml/UseSingleton.xml | 2 +- .../java/rule}/design/xml/UseVarargs.xml | 126 ++++---- .../java/rule}/empty/EmptyRulesTest.java | 2 +- .../java/rule}/empty/xml/EmptyCatchBlock.xml | 0 .../rule}/empty/xml/EmptyFinallyBlock.xml | 0 .../java/rule}/empty/xml/EmptyIfStmt.xml | 0 .../java/rule}/empty/xml/EmptyInitializer.xml | 98 +++--- .../rule}/empty/xml/EmptyStatementBlock.xml | 86 ++--- .../empty/xml/EmptyStatementNotInLoop.xml | 2 +- .../empty/xml/EmptyStaticInitializer.xml | 0 .../rule}/empty/xml/EmptySwitchStatements.xml | 0 .../empty/xml/EmptySynchronizedBlock.xml | 0 .../java/rule}/empty/xml/EmptyTryBlock.xml | 0 .../java/rule}/empty/xml/EmptyWhileStmt.xml | 0 .../rule}/finalizers/FinalizersRulesTest.java | 2 +- .../finalizers/xml/AvoidCallingFinalize.xml | 2 +- .../rule}/finalizers/xml/EmptyFinalizer.xml | 0 .../xml/FinalizeDoesNotCallSuperFinalize.xml | 2 +- .../xml/FinalizeOnlyCallsSuperFinalize.xml | 2 +- .../finalizers/xml/FinalizeOverloaded.xml | 2 +- .../xml/FinalizeShouldBeProtected.xml | 0 .../java/rule}/imports/ImportsRulesTest.java | 2 +- .../rule}/imports/xml/DontImportJavaLang.xml | 2 +- .../rule}/imports/xml/DuplicateImports.xml | 2 +- .../imports/xml/ImportFromSamePackage.xml | 2 +- .../imports/xml/TooManyStaticImports.xml | 2 +- .../java/rule}/imports/xml/UnusedImports.xml | 2 +- .../java/rule}/j2ee/J2EERulesTest.java | 2 +- .../rule}/j2ee/xml/DoNotCallSystemExit.xml | 0 .../java/rule}/j2ee/xml/DoNotUseThreads.xml | 0 .../j2ee/xml/LocalHomeNamingConvention.xml | 2 +- .../LocalInterfaceSessionNamingConvention.xml | 2 +- .../xml/MDBAndSessionBeanNamingConvention.xml | 2 +- .../xml/RemoteInterfaceNamingConvention.xml | 2 +- ...RemoteSessionInterfaceNamingConvention.xml | 2 +- .../j2ee/xml/StaticEJBFieldShouldBeFinal.xml | 2 +- .../rule}/j2ee/xml/UseProperClassLoader.xml | 2 +- .../rule}/javabeans/JavabeansRulesTest.java | 2 +- .../xml/BeanMembersShouldSerialize.xml | 2 +- .../javabeans/xml/MissingSerialVersionUID.xml | 2 +- .../java/rule}/junit/JunitRulesTest.java | 2 +- .../JUnitAssertionsShouldIncludeMessage.xml | 2 +- .../java/rule}/junit/xml/JUnitSpelling.xml | 2 +- .../java/rule}/junit/xml/JUnitStaticSuite.xml | 2 +- .../xml/JUnitTestsShouldIncludeAssert.xml | 2 +- .../junit/xml/SimplifyBooleanAssertion.xml | 2 +- .../junit/xml/TestClassWithoutTestCases.xml | 0 .../junit/xml/UnnecessaryBooleanAssertion.xml | 2 +- .../UseAssertEqualsInsteadOfAssertTrue.xml | 2 +- .../xml/UseAssertNullInsteadOfAssertTrue.xml | 2 +- .../xml/UseAssertSameInsteadOfAssertTrue.xml | 2 +- .../LoggingJakartaCommonsRulesTest.java | 2 +- .../xml/ProperLogger.xml | 2 +- .../xml/UseCorrectExceptionLogging.xml | 2 +- .../loggingjava/LoggingJavaRulesTest.java | 2 +- .../loggingjava/xml/AvoidPrintStackTrace.xml | 2 +- .../xml/LoggerIsNotStaticFinal.xml | 2 +- .../loggingjava/xml/MoreThanOneLogger.xml | 2 +- .../rule}/loggingjava/xml/SystemPrintln.xml | 2 +- .../rule}/migrating/MigratingRulesTest.java | 2 +- .../migrating/xml/AvoidAssertAsIdentifier.xml | 2 +- .../migrating/xml/AvoidEnumAsIdentifier.xml | 2 +- .../rule}/migrating/xml/ByteInstantiation.xml | 2 +- .../migrating/xml/IntegerInstantiation.xml | 2 +- .../JUnit4SuitesShouldUseSuiteAnnotation.xml | 2 +- .../JUnit4TestShouldUseAfterAnnotation.xml | 2 +- .../JUnit4TestShouldUseBeforeAnnotation.xml | 2 +- .../xml/JUnit4TestShouldUseTestAnnotation.xml | 2 +- .../rule}/migrating/xml/JUnitUseExpected.xml | 2 +- .../rule}/migrating/xml/LongInstantiation.xml | 2 +- .../xml/ReplaceEnumerationWithIterator.xml | 2 +- .../migrating/xml/ReplaceHashtableWithMap.xml | 2 +- .../migrating/xml/ReplaceVectorWithList.xml | 2 +- .../migrating/xml/ShortInstantiation.xml | 2 +- .../java/rule}/naming/NamingRulesTest.java | 2 +- .../java/rule}/naming/xml/AbstractNaming.xml | 0 .../rule}/naming/xml/AvoidDollarSigns.xml | 0 .../xml/AvoidFieldNameMatchingMethodName.xml | 0 .../xml/AvoidFieldNameMatchingTypeName.xml | 0 .../rule}/naming/xml/BooleanGetMethodName.xml | 0 .../naming/xml/ClassNamingConventions.xml | 0 .../java/rule}/naming/xml/LongVariable.xml | 0 .../naming/xml/MethodNamingConventions.xml | 0 .../MethodWithSameNameAsEnclosingClass.xml | 0 .../naming/xml/MisleadingVariableName.xml | 0 .../java/rule}/naming/xml/NoPackage.xml | 0 .../java/rule}/naming/xml/PackageCase.xml | 0 .../java/rule}/naming/xml/ShortClassName.xml | 0 .../java/rule}/naming/xml/ShortMethodName.xml | 0 .../java/rule}/naming/xml/ShortVariable.xml | 0 .../xml/SuspiciousConstantFieldName.xml | 0 .../naming/xml/SuspiciousEqualsMethodName.xml | 0 .../xml/SuspiciousHashcodeMethodName.xml | 0 .../naming/xml/VariableNamingConventions.xml | 0 .../optimizations/OptimizationsRulesTest.java | 2 +- .../optimizations/xml/AddEmptyString.xml | 0 .../optimizations/xml/AvoidArrayLoops.xml | 2 +- .../xml/AvoidInstantiatingObjectsInLoops.xml | 18 +- .../xml/LocalVariableCouldBeFinal.xml | 2 +- .../xml/MethodArgumentCouldBeFinal.xml | 2 +- .../optimizations/xml/SimplifyStartsWith.xml | 0 .../xml/UnnecessaryWrapperObjectCreation.xml | 0 .../xml/UseArrayListInsteadOfVector.xml | 0 .../optimizations/xml/UseArraysAsList.xml | 2 +- .../xml/UseStringBufferForStringAppends.xml | 2 +- .../StrictExceptionRulesTest.java | 2 +- .../strictexception/xml/AvoidCatchingNPE.xml | 2 +- .../xml/AvoidCatchingThrowable.xml | 2 +- .../xml/AvoidRethrowingException.xml | 2 +- .../xml/AvoidThrowingNullPointerException.xml | 2 +- .../xml/AvoidThrowingRawExceptionTypes.xml | 2 +- .../xml/DoNotExtendJavaLangError.xml | 2 +- .../xml/DoNotThrowExceptionInFinally.xml | 2 +- .../xml/ExceptionAsFlowControl.xml | 2 +- .../xml/SignatureDeclareThrowsException.xml | 2 +- .../AvoidDuplicateLiteralsRuleTest.java | 5 +- .../java/rule}/strings/StringsRulesTest.java | 2 +- .../strings/xml/AppendCharacterWithChar.xml | 2 +- .../strings/xml/AvoidDuplicateLiterals.xml | 2 +- .../strings/xml/AvoidStringBufferField.xml | 2 +- .../strings/xml/ConsecutiveLiteralAppends.xml | 0 .../xml/InefficientEmptyStringCheck.xml | 2 +- .../xml/InefficientStringBuffering.xml | 2 +- .../InsufficientStringBufferDeclaration.xml | 2 +- .../xml/StringBufferInstantiationWithChar.xml | 2 +- .../rule}/strings/xml/StringInstantiation.xml | 2 +- .../java/rule}/strings/xml/StringToString.xml | 2 +- .../strings/xml/UnnecessaryCaseChange.xml | 0 .../strings/xml/UseEqualsToCompareStrings.xml | 0 .../java/rule}/strings/xml/UseIndexOfChar.xml | 2 +- .../strings/xml/UseStringBufferLength.xml | 2 +- .../strings/xml/UselessStringValueOf.xml | 2 +- .../rule}/sunsecure/SunSecureRulesTest.java | 2 +- .../sunsecure/xml/ArrayIsStoredDirectly.xml | 2 +- .../xml/MethodReturnsInternalArray.xml | 2 +- ...CloneMethodMustImplementCloneableTest.java | 4 +- .../typeresolution/LooseCouplingTest.java | 2 +- .../SignatureDeclareThrowsExceptionTest.java | 2 +- .../typeresolution/UnusedImportsTest.java | 2 +- .../xml/CloneMethodMustImplementCloneable.xml | 8 +- .../typeresolution/xml/LooseCoupling.xml | 2 +- .../rule/typeresolution/xml/MyInterface.java | 11 + .../rule/typeresolution/xml/MyTestCase.java | 12 + .../xml/SignatureDeclareThrowsException.xml | 294 +++++++++--------- .../typeresolution/xml/UnusedImports.xml | 0 .../rule}/unusedcode/UnusedCodeRulesTest.java | 2 +- .../unusedcode/xml/UnusedFormalParameter.xml | 0 .../unusedcode/xml/UnusedLocalVariable.xml | 0 .../rule}/unusedcode/xml/UnusedModifier.xml | 0 .../unusedcode/xml/UnusedPrivateField.xml | 0 .../unusedcode/xml/UnusedPrivateMethod.xml | 0 .../useless/UnusedNullCheckInEqualsTest.java | 2 +- .../java/rule}/useless/UselessRulesTest.java | 2 +- .../xml/UnnecessaryConversionTemporary.xml | 0 .../useless/xml/UnnecessaryFinalModifier.xml | 0 .../rule}/useless/xml/UnnecessaryReturn.xml | 0 .../useless/xml/UnusedNullCheckInEquals.xml | 0 .../xml/UselessOperationOnImmutable.xml | 0 .../useless/xml/UselessOverridingMethod.xml | 14 - .../rule}/useless/xml/UselessParentheses.xml | 258 +++++++-------- .../java/rule}/xml/UselessAssignment.xml | 0 .../jsp/ast/AbstractJspNodesTst.java | 2 +- .../{ => lang}/jsp/ast/JspDocStyleTest.java | 2 +- .../{ => lang}/jsp/ast/JspPageStyleTest.java | 2 +- .../{ => lang}/jsp/ast/XPathJspRuleTest.java | 18 +- .../rule}/DontNestJsfInJstlIterationTest.java | 2 +- .../jsp/rule}/DuplicateJspImportTest.java | 2 +- .../rule}/IframeMissingSrcAttributeTest.java | 2 +- .../jsp/rule}/JspEncodingTest.java | 2 +- .../jsp/rule}/NoClassAttributeTest.java | 2 +- .../jsp/rule}/NoHtmlCommentsTest.java | 2 +- .../rule}/NoInlineStyleInformationTest.java | 2 +- .../jsp/rule}/NoJspForwardTest.java | 2 +- .../jsp/rule}/NoLongScriptsTest.java | 2 +- .../jsp/rule}/NoScriptletsTest.java | 2 +- .../rule}/xml/DontNestJsfInJstlIteration.xml | 2 +- .../jsp/rule}/xml/DuplicateJspImports.xml | 2 +- .../rule}/xml/IframeMissingSrcAttribute.xml | 2 +- .../jsp/rule}/xml/JspEncoding.xml | 2 +- .../jsp/rule}/xml/NoClassAttribute.xml | 2 +- .../jsp/rule}/xml/NoHtmlComments.xml | 2 +- .../rule}/xml/NoInlineStyleInformation.xml | 2 +- .../jsp/rule}/xml/NoJspForward.xml | 2 +- .../jsp/rule}/xml/NoLongScripts.xml | 2 +- .../jsp/rule}/xml/NoScriptlets.xml | 2 +- .../rules/codesize/NPathComplexityTest.java | 45 --- .../rules/typeresolution/xml/MyInterface.java | 5 - .../rules/typeresolution/xml/MyTestCase.java | 7 - 318 files changed, 1139 insertions(+), 1172 deletions(-) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/DynamicRuleTest.java (98%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/ScratchpadRulesTest.java (88%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/UselessAssignmentRuleTest.java (91%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/XPathRuleTest.java (81%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/basic/BasicRulesTest.java (96%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/basic/xml/AvoidDecimalLiteralsInBigDecimalConstructor.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/basic/xml/AvoidMultipleUnaryOperators.xml (95%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/basic/xml/AvoidThreadGroup.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/basic/xml/AvoidUsingHardCodedIP.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/basic/xml/AvoidUsingOctalValues.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/basic/xml/BigIntegerInstantiation.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/basic/xml/BooleanInstantiation.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/basic/xml/BrokenNullCheck.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/basic/xml/CheckResultSet.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/basic/xml/CheckSkipResult.xml (95%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/basic/xml/ClassCastExceptionWithToArray.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/basic/xml/CollapsibleIfStatements.xml (98%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/basic/xml/DoubleCheckedLocking.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/basic/xml/ExtendsObject.xml (94%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/basic/xml/ForLoopShouldBeWhileLoop.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/basic/xml/JumbledIncrementer.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/basic/xml/MisplacedNullCheck.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/basic/xml/OverrideBothEqualsAndHashcode.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/basic/xml/ReturnFromFinallyBlock.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/basic/xml/UnconditionalIfStatement.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/braces/BracesRulesTest.java (90%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/braces/xml/ForLoopsMustUseBraces.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/braces/xml/IfElseStmtsMustUseBraces.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/braces/xml/IfStmtsMustUseBraces.xml (98%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/braces/xml/WhileLoopsMustUseBraces.xml (97%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/clone/CloneRulesTest.java (90%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/clone/xml/CloneMethodMustImplementCloneable.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/clone/xml/CloneThrowsCloneNotSupportedException.xml (98%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/clone/xml/ProperCloneImplementation.xml (98%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/codesize/CodesizeRulesTest.java (93%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/codesize/CyclomaticComplexityTest.java (79%) create mode 100644 pmd/regress/test/net/sourceforge/pmd/lang/java/rule/codesize/NPathComplexityTest.java rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/codesize/xml/CyclomaticComplexity.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/codesize/xml/ExcessiveClassLength.xml (98%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/codesize/xml/ExcessiveMethodLength.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/codesize/xml/ExcessiveParameterList.xml (98%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/codesize/xml/ExcessivePublicCount.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/codesize/xml/NPathComplexity.xml (98%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/codesize/xml/NcssConstructorCount.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/codesize/xml/NcssMethodCount.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/codesize/xml/NcssTypeCount.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/codesize/xml/TooManyFields.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/codesize/xml/TooManyMethods.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/controversial/ControversialRulesTest.java (96%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/controversial/xml/AssignmentInOperand.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/controversial/xml/AtLeastOneConstructor.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/controversial/xml/AvoidFinalLocalVariable.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/controversial/xml/AvoidPrefixingMethodParameters.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/controversial/xml/AvoidUsingNativeCode.xml (98%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/controversial/xml/AvoidUsingShortType.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/controversial/xml/AvoidUsingVolatile.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/controversial/xml/BooleanInversion.xml (98%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/controversial/xml/CallSuperInConstructor.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/controversial/xml/DataflowAnomalyAnalysis.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/controversial/xml/DefaultPackage.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/controversial/xml/DoNotCallGarbageCollectionExplicitly.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/controversial/xml/DontImportSun.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/controversial/xml/NullAssignment.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/controversial/xml/OneDeclarationPerLine.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/controversial/xml/OnlyOneReturn.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/controversial/xml/SuspiciousOctalEscape.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/controversial/xml/UnnecessaryConstructor.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/controversial/xml/UnnecessaryParentheses.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/coupling/CouplingRulesTest.java (90%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/coupling/xml/CouplingBetweenObjects.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/coupling/xml/ExcessiveImports.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/coupling/xml/LooseCoupling.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/coupling/xml/LoosePackageCoupling.xml (96%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/ConfusingTernaryRuleTest.java (98%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/ConstructorCallsOverridableMethodTest.java (90%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/DesignRulesTest.java (98%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/TooManyHttpFilterTest.java (93%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/UncommentedEmptyConstructorRuleTest.java (97%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/UncommentedEmptyMethodRuleTest.java (90%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/AbstractClassWithoutAbstractMethod.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/AbstractClassWithoutAnyMethod.xml (98%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/AccessorClassGeneration.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/AssignmentToNonFinalStatic.xml (97%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/AvoidConstantsInterface.xml (97%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/AvoidDeeplyNestedIfStmts.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/AvoidInstanceofChecksInCatchClause.xml (98%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/AvoidProtectedFieldInFinalClass.xml (98%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/AvoidReassigningParameters.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/AvoidSynchronizedAtMethodLevel.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/BadComparison.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/ClassWithOnlyPrivateConstructorsShouldBeFinal.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/CloseResource.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/CompareObjectsWithEquals.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/ConfusingTernary.xml (98%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/ConstructorCallsOverridableMethod.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/DefaultLabelNotLastInSwitchStmt.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/EmptyMethodInAbstractClassShouldBeAbstract.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/EqualsNull.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/FinalFieldCouldBeStatic.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/IdempotentOperations.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/ImmutableField.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/InstantiationToGetClass.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/LogicInversion.xml (94%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/MissingBreakInSwitch.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/MissingStaticMethodInNonInstantiatableClass.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/NonCaseLabelInSwitchStatement.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/NonStaticInitializer.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/NonThreadSafeSingleton.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/OptimizableToArrayCall.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/PositionLiteralsFirstInComparisons.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/PositionalIteratorRule.xml (98%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/PreserveStackTrace.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/ReturnEmptyArrayRatherThanNull.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/SimpleDateFormatNeedsLocale.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/SimplifyBooleanExpressions.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/SimplifyBooleanReturns.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/SimplifyConditional.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/SingularField.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/SwitchDensity.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/SwitchStmtsShouldHaveDefault.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/TooFewBranchesForASwitchStatement.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/TooManyHttpFilter.xml (98%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/UncommentedEmptyConstructor.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/UncommentedEmptyMethod.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/UnnecessaryLocalBeforeReturn.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/UnsynchronizedStaticDateFormatter.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/UseCollectionIsEmpty.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/UseLocaleWithCaseConversions.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/UseNotifyAllInsteadOfNotify.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/UseSingleton.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/design/xml/UseVarargs.xml (95%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/empty/EmptyRulesTest.java (94%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/empty/xml/EmptyCatchBlock.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/empty/xml/EmptyFinallyBlock.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/empty/xml/EmptyIfStmt.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/empty/xml/EmptyInitializer.xml (94%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/empty/xml/EmptyStatementBlock.xml (94%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/empty/xml/EmptyStatementNotInLoop.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/empty/xml/EmptyStaticInitializer.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/empty/xml/EmptySwitchStatements.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/empty/xml/EmptySynchronizedBlock.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/empty/xml/EmptyTryBlock.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/empty/xml/EmptyWhileStmt.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/finalizers/FinalizersRulesTest.java (92%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/finalizers/xml/AvoidCallingFinalize.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/finalizers/xml/EmptyFinalizer.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/finalizers/xml/FinalizeDoesNotCallSuperFinalize.xml (98%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/finalizers/xml/FinalizeOnlyCallsSuperFinalize.xml (97%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/finalizers/xml/FinalizeOverloaded.xml (97%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/finalizers/xml/FinalizeShouldBeProtected.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/imports/ImportsRulesTest.java (91%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/imports/xml/DontImportJavaLang.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/imports/xml/DuplicateImports.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/imports/xml/ImportFromSamePackage.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/imports/xml/TooManyStaticImports.xml (98%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/imports/xml/UnusedImports.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/j2ee/J2EERulesTest.java (93%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/j2ee/xml/DoNotCallSystemExit.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/j2ee/xml/DoNotUseThreads.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/j2ee/xml/LocalHomeNamingConvention.xml (97%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/j2ee/xml/LocalInterfaceSessionNamingConvention.xml (97%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/j2ee/xml/MDBAndSessionBeanNamingConvention.xml (98%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/j2ee/xml/RemoteInterfaceNamingConvention.xml (98%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/j2ee/xml/RemoteSessionInterfaceNamingConvention.xml (97%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/j2ee/xml/StaticEJBFieldShouldBeFinal.xml (98%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/j2ee/xml/UseProperClassLoader.xml (97%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/javabeans/JavabeansRulesTest.java (88%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/javabeans/xml/BeanMembersShouldSerialize.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/javabeans/xml/MissingSerialVersionUID.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/junit/JunitRulesTest.java (94%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/junit/xml/JUnitAssertionsShouldIncludeMessage.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/junit/xml/JUnitSpelling.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/junit/xml/JUnitStaticSuite.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/junit/xml/JUnitTestsShouldIncludeAssert.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/junit/xml/SimplifyBooleanAssertion.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/junit/xml/TestClassWithoutTestCases.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/junit/xml/UnnecessaryBooleanAssertion.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/junit/xml/UseAssertEqualsInsteadOfAssertTrue.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/junit/xml/UseAssertNullInsteadOfAssertTrue.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/junit/xml/UseAssertSameInsteadOfAssertTrue.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/loggingjakartacommons/LoggingJakartaCommonsRulesTest.java (87%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/loggingjakartacommons/xml/ProperLogger.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/loggingjakartacommons/xml/UseCorrectExceptionLogging.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/loggingjava/LoggingJavaRulesTest.java (90%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/loggingjava/xml/AvoidPrintStackTrace.xml (97%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/loggingjava/xml/LoggerIsNotStaticFinal.xml (98%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/loggingjava/xml/MoreThanOneLogger.xml (98%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/loggingjava/xml/SystemPrintln.xml (98%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/migrating/MigratingRulesTest.java (95%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/migrating/xml/AvoidAssertAsIdentifier.xml (96%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/migrating/xml/AvoidEnumAsIdentifier.xml (96%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/migrating/xml/ByteInstantiation.xml (97%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/migrating/xml/IntegerInstantiation.xml (97%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/migrating/xml/JUnit4SuitesShouldUseSuiteAnnotation.xml (98%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/migrating/xml/JUnit4TestShouldUseAfterAnnotation.xml (98%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/migrating/xml/JUnit4TestShouldUseBeforeAnnotation.xml (98%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/migrating/xml/JUnit4TestShouldUseTestAnnotation.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/migrating/xml/JUnitUseExpected.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/migrating/xml/LongInstantiation.xml (97%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/migrating/xml/ReplaceEnumerationWithIterator.xml (96%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/migrating/xml/ReplaceHashtableWithMap.xml (97%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/migrating/xml/ReplaceVectorWithList.xml (97%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/migrating/xml/ShortInstantiation.xml (97%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/naming/NamingRulesTest.java (95%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/naming/xml/AbstractNaming.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/naming/xml/AvoidDollarSigns.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/naming/xml/AvoidFieldNameMatchingMethodName.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/naming/xml/AvoidFieldNameMatchingTypeName.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/naming/xml/BooleanGetMethodName.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/naming/xml/ClassNamingConventions.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/naming/xml/LongVariable.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/naming/xml/MethodNamingConventions.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/naming/xml/MethodWithSameNameAsEnclosingClass.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/naming/xml/MisleadingVariableName.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/naming/xml/NoPackage.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/naming/xml/PackageCase.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/naming/xml/ShortClassName.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/naming/xml/ShortMethodName.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/naming/xml/ShortVariable.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/naming/xml/SuspiciousConstantFieldName.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/naming/xml/SuspiciousEqualsMethodName.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/naming/xml/SuspiciousHashcodeMethodName.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/naming/xml/VariableNamingConventions.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/optimizations/OptimizationsRulesTest.java (93%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/optimizations/xml/AddEmptyString.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/optimizations/xml/AvoidArrayLoops.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/optimizations/xml/AvoidInstantiatingObjectsInLoops.xml (85%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/optimizations/xml/LocalVariableCouldBeFinal.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/optimizations/xml/MethodArgumentCouldBeFinal.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/optimizations/xml/SimplifyStartsWith.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/optimizations/xml/UnnecessaryWrapperObjectCreation.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/optimizations/xml/UseArrayListInsteadOfVector.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/optimizations/xml/UseArraysAsList.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/optimizations/xml/UseStringBufferForStringAppends.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/strictexception/StrictExceptionRulesTest.java (93%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/strictexception/xml/AvoidCatchingNPE.xml (98%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/strictexception/xml/AvoidCatchingThrowable.xml (97%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/strictexception/xml/AvoidRethrowingException.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/strictexception/xml/AvoidThrowingNullPointerException.xml (96%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/strictexception/xml/AvoidThrowingRawExceptionTypes.xml (98%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/strictexception/xml/DoNotExtendJavaLangError.xml (98%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/strictexception/xml/DoNotThrowExceptionInFinally.xml (97%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/strictexception/xml/ExceptionAsFlowControl.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/strictexception/xml/SignatureDeclareThrowsException.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/strings/AvoidDuplicateLiteralsRuleTest.java (92%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/strings/StringsRulesTest.java (95%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/strings/xml/AppendCharacterWithChar.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/strings/xml/AvoidDuplicateLiterals.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/strings/xml/AvoidStringBufferField.xml (96%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/strings/xml/ConsecutiveLiteralAppends.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/strings/xml/InefficientEmptyStringCheck.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/strings/xml/InefficientStringBuffering.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/strings/xml/InsufficientStringBufferDeclaration.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/strings/xml/StringBufferInstantiationWithChar.xml (97%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/strings/xml/StringInstantiation.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/strings/xml/StringToString.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/strings/xml/UnnecessaryCaseChange.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/strings/xml/UseEqualsToCompareStrings.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/strings/xml/UseIndexOfChar.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/strings/xml/UseStringBufferLength.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/strings/xml/UselessStringValueOf.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/sunsecure/SunSecureRulesTest.java (88%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/sunsecure/xml/ArrayIsStoredDirectly.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/sunsecure/xml/MethodReturnsInternalArray.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/typeresolution/CloneMethodMustImplementCloneableTest.java (77%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/typeresolution/LooseCouplingTest.java (88%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/typeresolution/SignatureDeclareThrowsExceptionTest.java (87%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/typeresolution/UnusedImportsTest.java (88%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/typeresolution/xml/CloneMethodMustImplementCloneable.xml (94%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/typeresolution/xml/LooseCoupling.xml (99%) create mode 100644 pmd/regress/test/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/MyInterface.java create mode 100644 pmd/regress/test/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/MyTestCase.java rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/typeresolution/xml/SignatureDeclareThrowsException.xml (84%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/typeresolution/xml/UnusedImports.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/unusedcode/UnusedCodeRulesTest.java (91%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/unusedcode/xml/UnusedFormalParameter.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/unusedcode/xml/UnusedLocalVariable.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/unusedcode/xml/UnusedModifier.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/unusedcode/xml/UnusedPrivateField.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/unusedcode/xml/UnusedPrivateMethod.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/useless/UnusedNullCheckInEqualsTest.java (95%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/useless/UselessRulesTest.java (93%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/useless/xml/UnnecessaryConversionTemporary.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/useless/xml/UnnecessaryFinalModifier.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/useless/xml/UnnecessaryReturn.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/useless/xml/UnusedNullCheckInEquals.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/useless/xml/UselessOperationOnImmutable.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/useless/xml/UselessOverridingMethod.xml (94%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/useless/xml/UselessParentheses.xml (95%) rename pmd/regress/test/net/sourceforge/pmd/{rules => lang/java/rule}/xml/UselessAssignment.xml (100%) rename pmd/regress/test/net/sourceforge/pmd/{ => lang}/jsp/ast/AbstractJspNodesTst.java (97%) rename pmd/regress/test/net/sourceforge/pmd/{ => lang}/jsp/ast/JspDocStyleTest.java (99%) rename pmd/regress/test/net/sourceforge/pmd/{ => lang}/jsp/ast/JspPageStyleTest.java (99%) rename pmd/regress/test/net/sourceforge/pmd/{ => lang}/jsp/ast/XPathJspRuleTest.java (80%) rename pmd/regress/test/net/sourceforge/pmd/{jsp/rules => lang/jsp/rule}/DontNestJsfInJstlIterationTest.java (92%) rename pmd/regress/test/net/sourceforge/pmd/{jsp/rules => lang/jsp/rule}/DuplicateJspImportTest.java (89%) rename pmd/regress/test/net/sourceforge/pmd/{jsp/rules => lang/jsp/rule}/IframeMissingSrcAttributeTest.java (89%) rename pmd/regress/test/net/sourceforge/pmd/{jsp/rules => lang/jsp/rule}/JspEncodingTest.java (88%) rename pmd/regress/test/net/sourceforge/pmd/{jsp/rules => lang/jsp/rule}/NoClassAttributeTest.java (89%) rename pmd/regress/test/net/sourceforge/pmd/{jsp/rules => lang/jsp/rule}/NoHtmlCommentsTest.java (88%) rename pmd/regress/test/net/sourceforge/pmd/{jsp/rules => lang/jsp/rule}/NoInlineStyleInformationTest.java (89%) rename pmd/regress/test/net/sourceforge/pmd/{jsp/rules => lang/jsp/rule}/NoJspForwardTest.java (91%) rename pmd/regress/test/net/sourceforge/pmd/{jsp/rules => lang/jsp/rule}/NoLongScriptsTest.java (88%) rename pmd/regress/test/net/sourceforge/pmd/{jsp/rules => lang/jsp/rule}/NoScriptletsTest.java (91%) rename pmd/regress/test/net/sourceforge/pmd/{jsp/rules => lang/jsp/rule}/xml/DontNestJsfInJstlIteration.xml (96%) rename pmd/regress/test/net/sourceforge/pmd/{jsp/rules => lang/jsp/rule}/xml/DuplicateJspImports.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{jsp/rules => lang/jsp/rule}/xml/IframeMissingSrcAttribute.xml (98%) rename pmd/regress/test/net/sourceforge/pmd/{jsp/rules => lang/jsp/rule}/xml/JspEncoding.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{jsp/rules => lang/jsp/rule}/xml/NoClassAttribute.xml (97%) rename pmd/regress/test/net/sourceforge/pmd/{jsp/rules => lang/jsp/rule}/xml/NoHtmlComments.xml (98%) rename pmd/regress/test/net/sourceforge/pmd/{jsp/rules => lang/jsp/rule}/xml/NoInlineStyleInformation.xml (98%) rename pmd/regress/test/net/sourceforge/pmd/{jsp/rules => lang/jsp/rule}/xml/NoJspForward.xml (96%) rename pmd/regress/test/net/sourceforge/pmd/{jsp/rules => lang/jsp/rule}/xml/NoLongScripts.xml (99%) rename pmd/regress/test/net/sourceforge/pmd/{jsp/rules => lang/jsp/rule}/xml/NoScriptlets.xml (98%) delete mode 100644 pmd/regress/test/net/sourceforge/pmd/rules/codesize/NPathComplexityTest.java delete mode 100644 pmd/regress/test/net/sourceforge/pmd/rules/typeresolution/xml/MyInterface.java delete mode 100644 pmd/regress/test/net/sourceforge/pmd/rules/typeresolution/xml/MyTestCase.java diff --git a/pmd/etc/changelog.txt b/pmd/etc/changelog.txt index 8d86e25cde..fc52ff58ee 100644 --- a/pmd/etc/changelog.txt +++ b/pmd/etc/changelog.txt @@ -19,8 +19,6 @@ TODO - Release blockers - Must implement before this release can be finished some logic. o Do we have a rule to style check for multiple declarations and chained assignments? (e.g. int a, b; int a = b = x;) - o Need to refactor the regression test packages to reflect new packaging. - (assigned to rpelisse). o Remove the type resolution specific rules. Merge these back into the standard rules. In general, a Rule should use TR when it can, and fall back on non-TR approach otherwise. No need for separate Rules for TR/non-TR. diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/DynamicRuleTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/DynamicRuleTest.java similarity index 98% rename from pmd/regress/test/net/sourceforge/pmd/rules/DynamicRuleTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/DynamicRuleTest.java index 48482cafb2..a3355e0fbd 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/DynamicRuleTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/DynamicRuleTest.java @@ -1,7 +1,7 @@ /** * BSD-style license; for more info see http://pmd.sourceforge.net/license.html */ -package test.net.sourceforge.pmd.rules; +package test.net.sourceforge.pmd.lang.java.rule; import net.sourceforge.pmd.Rule; import net.sourceforge.pmd.RuleSet; diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/ScratchpadRulesTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/ScratchpadRulesTest.java similarity index 88% rename from pmd/regress/test/net/sourceforge/pmd/rules/ScratchpadRulesTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/ScratchpadRulesTest.java index 54bbba1d32..8f6db4c333 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/ScratchpadRulesTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/ScratchpadRulesTest.java @@ -1,21 +1,21 @@ -/** - * BSD-style license; for more info see http://pmd.sourceforge.net/license.html - */ -package test.net.sourceforge.pmd.rules; - -import org.junit.Before; - -import test.net.sourceforge.pmd.testframework.SimpleAggregatorTst; - -public class ScratchpadRulesTest extends SimpleAggregatorTst { - - @Before - public void setUp() { - //addRule("scratchpad", "rulename"); - } - - public static junit.framework.Test suite() { - return new junit.framework.JUnit4TestAdapter(ScratchpadRulesTest.class); - } - -} +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ +package test.net.sourceforge.pmd.lang.java.rule; + +import org.junit.Before; + +import test.net.sourceforge.pmd.testframework.SimpleAggregatorTst; + +public class ScratchpadRulesTest extends SimpleAggregatorTst { + + @Before + public void setUp() { + //addRule("scratchpad", "rulename"); + } + + public static junit.framework.Test suite() { + return new junit.framework.JUnit4TestAdapter(ScratchpadRulesTest.class); + } + +} diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/UselessAssignmentRuleTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/UselessAssignmentRuleTest.java similarity index 91% rename from pmd/regress/test/net/sourceforge/pmd/rules/UselessAssignmentRuleTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/UselessAssignmentRuleTest.java index 205b5749b0..457799206a 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/UselessAssignmentRuleTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/UselessAssignmentRuleTest.java @@ -1,7 +1,7 @@ /** * BSD-style license; for more info see http://pmd.sourceforge.net/license.html */ -package test.net.sourceforge.pmd.rules; +package test.net.sourceforge.pmd.lang.java.rule; import org.junit.Before; diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/XPathRuleTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/XPathRuleTest.java similarity index 81% rename from pmd/regress/test/net/sourceforge/pmd/rules/XPathRuleTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/XPathRuleTest.java index cd7dbeb902..df92c8e2b8 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/XPathRuleTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/XPathRuleTest.java @@ -1,4 +1,4 @@ -package test.net.sourceforge.pmd.rules; +package test.net.sourceforge.pmd.lang.java.rule; import static org.junit.Assert.assertEquals; @@ -33,8 +33,7 @@ import test.net.sourceforge.pmd.testframework.RuleTst; @Test public void testPluginname() throws Throwable { Rule rule = new XPathRule(); - // rule.addProperty("xpath", "//VariableDeclaratorId[string-length(@Image) < 3]"); - rule.setProperty(XPathRule.XPATH_DESCRIPTOR, "//VariableDeclaratorId[string-length(@Image) < 3]"); + rule.addProperty("xpath", "//VariableDeclaratorId[string-length(@Image) < 3]"); rule.setMessage("{0}"); rule.addProperty("pluginname", "true"); PMD p = new PMD(); @@ -45,15 +44,14 @@ import test.net.sourceforge.pmd.testframework.RuleTst; RuleSet rules = new RuleSet(); rules.addRule(rule); p.processFile(new StringReader(TEST1), new RuleSets(rules), ctx); - RuleViolation rv = report.iterator().next(); + RuleViolation rv = (RuleViolation) report.iterator().next(); assertEquals("a", rv.getDescription()); } @Test public void testVariables() throws Throwable { Rule rule = new XPathRule(); - // rule.addProperty("xpath", "//VariableDeclaratorId[@Image=$var]"); - rule.setProperty(XPathRule.XPATH_DESCRIPTOR, "//VariableDeclaratorId[@Image=$var]"); + rule.addProperty("xpath", "//VariableDeclaratorId[@Image=$var]"); rule.setMessage("Avoid vars"); rule.addProperty("var", "fiddle"); PMD p = new PMD(); @@ -64,7 +62,7 @@ import test.net.sourceforge.pmd.testframework.RuleTst; RuleSet rules = new RuleSet(); rules.addRule(rule); p.processFile(new StringReader(TEST2), new RuleSets(rules), ctx); - RuleViolation rv = report.iterator().next(); + RuleViolation rv = (RuleViolation) report.iterator().next(); assertEquals(3, rv.getBeginLine()); } diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/basic/BasicRulesTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/BasicRulesTest.java similarity index 96% rename from pmd/regress/test/net/sourceforge/pmd/rules/basic/BasicRulesTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/BasicRulesTest.java index 7251969567..e838c500db 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/basic/BasicRulesTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/BasicRulesTest.java @@ -1,7 +1,7 @@ /** * BSD-style license; for more info see http://pmd.sourceforge.net/license.html */ -package test.net.sourceforge.pmd.rules.basic; +package test.net.sourceforge.pmd.lang.java.rule.basic; import org.junit.Before; diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/AvoidDecimalLiteralsInBigDecimalConstructor.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/xml/AvoidDecimalLiteralsInBigDecimalConstructor.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/AvoidDecimalLiteralsInBigDecimalConstructor.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/xml/AvoidDecimalLiteralsInBigDecimalConstructor.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/AvoidMultipleUnaryOperators.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/xml/AvoidMultipleUnaryOperators.xml similarity index 95% rename from pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/AvoidMultipleUnaryOperators.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/xml/AvoidMultipleUnaryOperators.xml index 540203ae4d..02f69eddb7 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/AvoidMultipleUnaryOperators.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/xml/AvoidMultipleUnaryOperators.xml @@ -1,72 +1,72 @@ - - - - - 4 - - - - - 8 - - - - - 8 - - - - - 9 - - - - - 4 - - - + + + + + 4 + + + + + 8 + + + + + 8 + + + + + 9 + + + + + 4 + + + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/AvoidThreadGroup.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/xml/AvoidThreadGroup.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/AvoidThreadGroup.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/xml/AvoidThreadGroup.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/AvoidUsingHardCodedIP.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/xml/AvoidUsingHardCodedIP.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/AvoidUsingHardCodedIP.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/xml/AvoidUsingHardCodedIP.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/AvoidUsingOctalValues.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/xml/AvoidUsingOctalValues.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/AvoidUsingOctalValues.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/xml/AvoidUsingOctalValues.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/BigIntegerInstantiation.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/xml/BigIntegerInstantiation.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/BigIntegerInstantiation.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/xml/BigIntegerInstantiation.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/BooleanInstantiation.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/xml/BooleanInstantiation.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/BooleanInstantiation.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/xml/BooleanInstantiation.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/BrokenNullCheck.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/xml/BrokenNullCheck.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/BrokenNullCheck.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/xml/BrokenNullCheck.xml index 37f64334fc..708a751a91 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/BrokenNullCheck.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/xml/BrokenNullCheck.xml @@ -197,4 +197,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/CheckResultSet.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/xml/CheckResultSet.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/CheckResultSet.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/xml/CheckResultSet.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/CheckSkipResult.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/xml/CheckSkipResult.xml similarity index 95% rename from pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/CheckSkipResult.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/xml/CheckSkipResult.xml index 2d5e7b88bc..30177c3580 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/CheckSkipResult.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/xml/CheckSkipResult.xml @@ -1,103 +1,103 @@ - - - - - 1 - - - - - 1 - - - - - 0 - - - - - 0 - - - - - 0 - - - \ No newline at end of file + + + + + 1 + + + + + 1 + + + + + 0 + + + + + 0 + + + + + 0 + + + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/ClassCastExceptionWithToArray.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/xml/ClassCastExceptionWithToArray.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/ClassCastExceptionWithToArray.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/xml/ClassCastExceptionWithToArray.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/CollapsibleIfStatements.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/xml/CollapsibleIfStatements.xml similarity index 98% rename from pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/CollapsibleIfStatements.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/xml/CollapsibleIfStatements.xml index 4e55e35d2a..1f2030d7dd 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/CollapsibleIfStatements.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/xml/CollapsibleIfStatements.xml @@ -50,4 +50,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/DoubleCheckedLocking.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/xml/DoubleCheckedLocking.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/DoubleCheckedLocking.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/xml/DoubleCheckedLocking.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/ExtendsObject.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/xml/ExtendsObject.xml similarity index 94% rename from pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/ExtendsObject.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/xml/ExtendsObject.xml index 2cd4451a33..eeaaa290e9 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/ExtendsObject.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/xml/ExtendsObject.xml @@ -1,33 +1,33 @@ - - - - - 1 - - - - - 0 - - - - - 0 - - - \ No newline at end of file + + + + + 1 + + + + + 0 + + + + + 0 + + + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/ForLoopShouldBeWhileLoop.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/xml/ForLoopShouldBeWhileLoop.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/ForLoopShouldBeWhileLoop.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/xml/ForLoopShouldBeWhileLoop.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/JumbledIncrementer.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/xml/JumbledIncrementer.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/JumbledIncrementer.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/xml/JumbledIncrementer.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/MisplacedNullCheck.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/xml/MisplacedNullCheck.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/MisplacedNullCheck.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/xml/MisplacedNullCheck.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/OverrideBothEqualsAndHashcode.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/xml/OverrideBothEqualsAndHashcode.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/OverrideBothEqualsAndHashcode.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/xml/OverrideBothEqualsAndHashcode.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/ReturnFromFinallyBlock.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/xml/ReturnFromFinallyBlock.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/ReturnFromFinallyBlock.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/xml/ReturnFromFinallyBlock.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/UnconditionalIfStatement.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/xml/UnconditionalIfStatement.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/UnconditionalIfStatement.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/basic/xml/UnconditionalIfStatement.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/braces/BracesRulesTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/braces/BracesRulesTest.java similarity index 90% rename from pmd/regress/test/net/sourceforge/pmd/rules/braces/BracesRulesTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/braces/BracesRulesTest.java index 55fbc4f710..7e8d76c2df 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/braces/BracesRulesTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/braces/BracesRulesTest.java @@ -1,4 +1,4 @@ -package test.net.sourceforge.pmd.rules.braces; +package test.net.sourceforge.pmd.lang.java.rule.braces; import org.junit.Before; diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/braces/xml/ForLoopsMustUseBraces.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/braces/xml/ForLoopsMustUseBraces.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/braces/xml/ForLoopsMustUseBraces.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/braces/xml/ForLoopsMustUseBraces.xml index 315f0a3655..b65a3426ee 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/braces/xml/ForLoopsMustUseBraces.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/braces/xml/ForLoopsMustUseBraces.xml @@ -71,4 +71,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/braces/xml/IfElseStmtsMustUseBraces.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/braces/xml/IfElseStmtsMustUseBraces.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/braces/xml/IfElseStmtsMustUseBraces.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/braces/xml/IfElseStmtsMustUseBraces.xml index b54ca9a2f6..931b1cbc92 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/braces/xml/IfElseStmtsMustUseBraces.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/braces/xml/IfElseStmtsMustUseBraces.xml @@ -122,4 +122,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/braces/xml/IfStmtsMustUseBraces.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/braces/xml/IfStmtsMustUseBraces.xml similarity index 98% rename from pmd/regress/test/net/sourceforge/pmd/rules/braces/xml/IfStmtsMustUseBraces.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/braces/xml/IfStmtsMustUseBraces.xml index 39cf696d15..323fdbb950 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/braces/xml/IfStmtsMustUseBraces.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/braces/xml/IfStmtsMustUseBraces.xml @@ -43,4 +43,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/braces/xml/WhileLoopsMustUseBraces.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/braces/xml/WhileLoopsMustUseBraces.xml similarity index 97% rename from pmd/regress/test/net/sourceforge/pmd/rules/braces/xml/WhileLoopsMustUseBraces.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/braces/xml/WhileLoopsMustUseBraces.xml index 350085d296..a84ff150be 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/braces/xml/WhileLoopsMustUseBraces.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/braces/xml/WhileLoopsMustUseBraces.xml @@ -31,4 +31,4 @@ public class WhileLoopsNeedBraces2 { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/clone/CloneRulesTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/clone/CloneRulesTest.java similarity index 90% rename from pmd/regress/test/net/sourceforge/pmd/rules/clone/CloneRulesTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/clone/CloneRulesTest.java index 72ed4c2a9b..0b72d55409 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/clone/CloneRulesTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/clone/CloneRulesTest.java @@ -1,4 +1,4 @@ -package test.net.sourceforge.pmd.rules.clone; +package test.net.sourceforge.pmd.lang.java.rule.clone; import org.junit.Before; diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/clone/xml/CloneMethodMustImplementCloneable.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/clone/xml/CloneMethodMustImplementCloneable.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/clone/xml/CloneMethodMustImplementCloneable.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/clone/xml/CloneMethodMustImplementCloneable.xml index 8c3c65d57b..be2985b91b 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/clone/xml/CloneMethodMustImplementCloneable.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/clone/xml/CloneMethodMustImplementCloneable.xml @@ -83,4 +83,4 @@ throw new CloneNotSupportedException(); } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/clone/xml/CloneThrowsCloneNotSupportedException.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/clone/xml/CloneThrowsCloneNotSupportedException.xml similarity index 98% rename from pmd/regress/test/net/sourceforge/pmd/rules/clone/xml/CloneThrowsCloneNotSupportedException.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/clone/xml/CloneThrowsCloneNotSupportedException.xml index dca9f3b9ea..e3245eca9b 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/clone/xml/CloneThrowsCloneNotSupportedException.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/clone/xml/CloneThrowsCloneNotSupportedException.xml @@ -49,4 +49,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/clone/xml/ProperCloneImplementation.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/clone/xml/ProperCloneImplementation.xml similarity index 98% rename from pmd/regress/test/net/sourceforge/pmd/rules/clone/xml/ProperCloneImplementation.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/clone/xml/ProperCloneImplementation.xml index d196d2593c..a6e6354914 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/clone/xml/ProperCloneImplementation.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/clone/xml/ProperCloneImplementation.xml @@ -54,4 +54,4 @@ public class Bar { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/codesize/CodesizeRulesTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/codesize/CodesizeRulesTest.java similarity index 93% rename from pmd/regress/test/net/sourceforge/pmd/rules/codesize/CodesizeRulesTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/codesize/CodesizeRulesTest.java index b2c3b82225..c08532ec4e 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/codesize/CodesizeRulesTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/codesize/CodesizeRulesTest.java @@ -1,4 +1,4 @@ -package test.net.sourceforge.pmd.rules.codesize; +package test.net.sourceforge.pmd.lang.java.rule.codesize; import org.junit.Before; diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/codesize/CyclomaticComplexityTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/codesize/CyclomaticComplexityTest.java similarity index 79% rename from pmd/regress/test/net/sourceforge/pmd/rules/codesize/CyclomaticComplexityTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/codesize/CyclomaticComplexityTest.java index 4d0c50c6d2..ae4390253e 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/codesize/CyclomaticComplexityTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/codesize/CyclomaticComplexityTest.java @@ -1,14 +1,13 @@ /** * BSD-style license; for more info see http://pmd.sourceforge.net/license.html */ -package test.net.sourceforge.pmd.rules.codesize; +package test.net.sourceforge.pmd.lang.java.rule.codesize; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import net.sourceforge.pmd.Report; import net.sourceforge.pmd.Rule; import net.sourceforge.pmd.RuleViolation; -import net.sourceforge.pmd.lang.java.rule.codesize.CyclomaticComplexityRule; import org.junit.Before; import org.junit.Test; @@ -19,13 +18,9 @@ import test.net.sourceforge.pmd.testframework.TestDescriptor; import java.util.Iterator; public class CyclomaticComplexityTest extends RuleTst { - private Rule rule; private TestDescriptor[] tests; - private static final Integer ONE = Integer.valueOf(1); - private static final Integer TEN = Integer.valueOf(10); - @Before public void setUp() { rule = findRule("codesize", "CyclomaticComplexity"); tests = extractTestsFromXml(rule); @@ -33,7 +28,7 @@ import java.util.Iterator; @Test public void testOneMethod() throws Throwable { - rule.setProperty(CyclomaticComplexityRule.REPORT_LEVEL_DESCRIPTOR, ONE); + rule.addProperty("reportLevel", "1"); Report report = new Report(); runTestFromString(tests[0].getCode(), rule, report); Iterator i = report.iterator(); @@ -43,7 +38,7 @@ import java.util.Iterator; @Test public void testNastyComplicatedMethod() throws Throwable { - rule.setProperty(CyclomaticComplexityRule.REPORT_LEVEL_DESCRIPTOR, TEN); + rule.addProperty("reportLevel", "10"); Report report = new Report(); runTestFromString(tests[1].getCode(), rule, report); Iterator i = report.iterator(); @@ -53,7 +48,7 @@ import java.util.Iterator; @Test public void testConstructor() throws Throwable { - rule.setProperty(CyclomaticComplexityRule.REPORT_LEVEL_DESCRIPTOR, ONE); + rule.addProperty("reportLevel", "1"); Report report = new Report(); runTestFromString(tests[2].getCode(), rule, report); Iterator i = report.iterator(); @@ -63,7 +58,7 @@ import java.util.Iterator; @Test public void testLessComplicatedThanReportLevel() throws Throwable { - rule.setProperty(CyclomaticComplexityRule.REPORT_LEVEL_DESCRIPTOR, TEN); + rule.addProperty("reportLevel", "10"); Report report = new Report(); runTestFromString(tests[0].getCode(), rule, report); assertEquals(0, report.size()); diff --git a/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/codesize/NPathComplexityTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/codesize/NPathComplexityTest.java new file mode 100644 index 0000000000..919f0e71c7 --- /dev/null +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/codesize/NPathComplexityTest.java @@ -0,0 +1,43 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ +package test.net.sourceforge.pmd.lang.java.rule.codesize; + +import static org.junit.Assert.assertEquals; + +import java.util.Iterator; + +import net.sourceforge.pmd.Report; +import net.sourceforge.pmd.Rule; +import net.sourceforge.pmd.RuleViolation; + +import org.junit.Before; +import org.junit.Test; + +import test.net.sourceforge.pmd.testframework.RuleTst; +import test.net.sourceforge.pmd.testframework.TestDescriptor; + +public class NPathComplexityTest extends RuleTst { + private Rule rule; + private TestDescriptor[] tests; + + @Before + public void setUp() { + rule = findRule("codesize", "NPathComplexity"); + tests = extractTestsFromXml(rule); + } + + @Test + public void testViolationMessage() throws Throwable { + rule.addProperty("minimum", "1"); + Report report = new Report(); + runTestFromString(tests[0].getCode(), rule, report); + Iterator i = report.iterator(); + RuleViolation rv = (RuleViolation) i.next(); + assertEquals("correct violation message", "The method bar() has an NPath complexity of 2", rv.getDescription()); + } + + public static junit.framework.Test suite() { + return new junit.framework.JUnit4TestAdapter(NPathComplexityTest.class); + } +} diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/codesize/xml/CyclomaticComplexity.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/codesize/xml/CyclomaticComplexity.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/codesize/xml/CyclomaticComplexity.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/codesize/xml/CyclomaticComplexity.xml index 876f91005c..2900eb3fdf 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/codesize/xml/CyclomaticComplexity.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/codesize/xml/CyclomaticComplexity.xml @@ -117,4 +117,4 @@ Testing default value of showClassMethods and showClassesComplexity 2 - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/codesize/xml/ExcessiveClassLength.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/codesize/xml/ExcessiveClassLength.xml similarity index 98% rename from pmd/regress/test/net/sourceforge/pmd/rules/codesize/xml/ExcessiveClassLength.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/codesize/xml/ExcessiveClassLength.xml index b12c367be2..bc1bbdabc1 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/codesize/xml/ExcessiveClassLength.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/codesize/xml/ExcessiveClassLength.xml @@ -46,4 +46,4 @@ long class - changed minimum 0 - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/codesize/xml/ExcessiveMethodLength.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/codesize/xml/ExcessiveMethodLength.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/codesize/xml/ExcessiveMethodLength.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/codesize/xml/ExcessiveMethodLength.xml index 457f0ad16b..d9605032fd 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/codesize/xml/ExcessiveMethodLength.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/codesize/xml/ExcessiveMethodLength.xml @@ -96,4 +96,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/codesize/xml/ExcessiveParameterList.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/codesize/xml/ExcessiveParameterList.xml similarity index 98% rename from pmd/regress/test/net/sourceforge/pmd/rules/codesize/xml/ExcessiveParameterList.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/codesize/xml/ExcessiveParameterList.xml index f517fbd61b..41ccf2a321 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/codesize/xml/ExcessiveParameterList.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/codesize/xml/ExcessiveParameterList.xml @@ -25,4 +25,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/codesize/xml/ExcessivePublicCount.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/codesize/xml/ExcessivePublicCount.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/codesize/xml/ExcessivePublicCount.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/codesize/xml/ExcessivePublicCount.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/codesize/xml/NPathComplexity.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/codesize/xml/NPathComplexity.xml similarity index 98% rename from pmd/regress/test/net/sourceforge/pmd/rules/codesize/xml/NPathComplexity.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/codesize/xml/NPathComplexity.xml index 8605cca885..98cf228805 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/codesize/xml/NPathComplexity.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/codesize/xml/NPathComplexity.xml @@ -39,4 +39,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/codesize/xml/NcssConstructorCount.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/codesize/xml/NcssConstructorCount.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/codesize/xml/NcssConstructorCount.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/codesize/xml/NcssConstructorCount.xml index 513ef4445f..c083990cb0 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/codesize/xml/NcssConstructorCount.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/codesize/xml/NcssConstructorCount.xml @@ -80,4 +80,4 @@ long method - changed minimum 0 - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/codesize/xml/NcssMethodCount.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/codesize/xml/NcssMethodCount.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/codesize/xml/NcssMethodCount.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/codesize/xml/NcssMethodCount.xml index 662c5e3bb4..4857381768 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/codesize/xml/NcssMethodCount.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/codesize/xml/NcssMethodCount.xml @@ -80,4 +80,4 @@ long method - changed minimum 0 - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/codesize/xml/NcssTypeCount.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/codesize/xml/NcssTypeCount.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/codesize/xml/NcssTypeCount.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/codesize/xml/NcssTypeCount.xml index 69b0ea8ddc..6cae6e7095 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/codesize/xml/NcssTypeCount.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/codesize/xml/NcssTypeCount.xml @@ -80,4 +80,4 @@ long method - changed minimum 0 - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/codesize/xml/TooManyFields.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/codesize/xml/TooManyFields.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/codesize/xml/TooManyFields.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/codesize/xml/TooManyFields.xml index 9fa5142967..66d1e60e7d 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/codesize/xml/TooManyFields.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/codesize/xml/TooManyFields.xml @@ -200,4 +200,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/codesize/xml/TooManyMethods.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/codesize/xml/TooManyMethods.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/codesize/xml/TooManyMethods.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/codesize/xml/TooManyMethods.xml index ef5524bd41..1d9eff0c48 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/codesize/xml/TooManyMethods.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/codesize/xml/TooManyMethods.xml @@ -83,4 +83,4 @@ public class Foo - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/controversial/ControversialRulesTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/controversial/ControversialRulesTest.java similarity index 96% rename from pmd/regress/test/net/sourceforge/pmd/rules/controversial/ControversialRulesTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/controversial/ControversialRulesTest.java index e76f20da15..5dab241137 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/controversial/ControversialRulesTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/controversial/ControversialRulesTest.java @@ -1,4 +1,4 @@ -package test.net.sourceforge.pmd.rules.controversial; +package test.net.sourceforge.pmd.lang.java.rule.controversial; import org.junit.Before; diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/controversial/xml/AssignmentInOperand.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/controversial/xml/AssignmentInOperand.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/controversial/xml/AssignmentInOperand.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/controversial/xml/AssignmentInOperand.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/controversial/xml/AtLeastOneConstructor.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/controversial/xml/AtLeastOneConstructor.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/controversial/xml/AtLeastOneConstructor.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/controversial/xml/AtLeastOneConstructor.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/controversial/xml/AvoidFinalLocalVariable.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/controversial/xml/AvoidFinalLocalVariable.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/controversial/xml/AvoidFinalLocalVariable.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/controversial/xml/AvoidFinalLocalVariable.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/controversial/xml/AvoidPrefixingMethodParameters.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/controversial/xml/AvoidPrefixingMethodParameters.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/controversial/xml/AvoidPrefixingMethodParameters.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/controversial/xml/AvoidPrefixingMethodParameters.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/controversial/xml/AvoidUsingNativeCode.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/controversial/xml/AvoidUsingNativeCode.xml similarity index 98% rename from pmd/regress/test/net/sourceforge/pmd/rules/controversial/xml/AvoidUsingNativeCode.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/controversial/xml/AvoidUsingNativeCode.xml index f85f91e3db..03d626acda 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/controversial/xml/AvoidUsingNativeCode.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/controversial/xml/AvoidUsingNativeCode.xml @@ -23,4 +23,4 @@ Basic test case : using native code ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/controversial/xml/AvoidUsingShortType.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/controversial/xml/AvoidUsingShortType.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/controversial/xml/AvoidUsingShortType.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/controversial/xml/AvoidUsingShortType.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/controversial/xml/AvoidUsingVolatile.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/controversial/xml/AvoidUsingVolatile.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/controversial/xml/AvoidUsingVolatile.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/controversial/xml/AvoidUsingVolatile.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/controversial/xml/BooleanInversion.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/controversial/xml/BooleanInversion.xml similarity index 98% rename from pmd/regress/test/net/sourceforge/pmd/rules/controversial/xml/BooleanInversion.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/controversial/xml/BooleanInversion.xml index b3c90631e9..a61a9d915d 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/controversial/xml/BooleanInversion.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/controversial/xml/BooleanInversion.xml @@ -45,4 +45,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/controversial/xml/CallSuperInConstructor.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/controversial/xml/CallSuperInConstructor.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/controversial/xml/CallSuperInConstructor.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/controversial/xml/CallSuperInConstructor.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/controversial/xml/DataflowAnomalyAnalysis.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/controversial/xml/DataflowAnomalyAnalysis.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/controversial/xml/DataflowAnomalyAnalysis.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/controversial/xml/DataflowAnomalyAnalysis.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/controversial/xml/DefaultPackage.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/controversial/xml/DefaultPackage.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/controversial/xml/DefaultPackage.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/controversial/xml/DefaultPackage.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/controversial/xml/DoNotCallGarbageCollectionExplicitly.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/controversial/xml/DoNotCallGarbageCollectionExplicitly.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/controversial/xml/DoNotCallGarbageCollectionExplicitly.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/controversial/xml/DoNotCallGarbageCollectionExplicitly.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/controversial/xml/DontImportSun.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/controversial/xml/DontImportSun.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/controversial/xml/DontImportSun.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/controversial/xml/DontImportSun.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/controversial/xml/NullAssignment.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/controversial/xml/NullAssignment.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/controversial/xml/NullAssignment.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/controversial/xml/NullAssignment.xml index 5094ec04a9..902130c602 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/controversial/xml/NullAssignment.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/controversial/xml/NullAssignment.xml @@ -113,4 +113,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/controversial/xml/OneDeclarationPerLine.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/controversial/xml/OneDeclarationPerLine.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/controversial/xml/OneDeclarationPerLine.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/controversial/xml/OneDeclarationPerLine.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/controversial/xml/OnlyOneReturn.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/controversial/xml/OnlyOneReturn.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/controversial/xml/OnlyOneReturn.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/controversial/xml/OnlyOneReturn.xml index 09879cdd32..578e1a5f5b 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/controversial/xml/OnlyOneReturn.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/controversial/xml/OnlyOneReturn.xml @@ -94,4 +94,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/controversial/xml/SuspiciousOctalEscape.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/controversial/xml/SuspiciousOctalEscape.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/controversial/xml/SuspiciousOctalEscape.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/controversial/xml/SuspiciousOctalEscape.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/controversial/xml/UnnecessaryConstructor.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/controversial/xml/UnnecessaryConstructor.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/controversial/xml/UnnecessaryConstructor.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/controversial/xml/UnnecessaryConstructor.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/controversial/xml/UnnecessaryParentheses.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/controversial/xml/UnnecessaryParentheses.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/controversial/xml/UnnecessaryParentheses.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/controversial/xml/UnnecessaryParentheses.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/coupling/CouplingRulesTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/coupling/CouplingRulesTest.java similarity index 90% rename from pmd/regress/test/net/sourceforge/pmd/rules/coupling/CouplingRulesTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/coupling/CouplingRulesTest.java index 19135f4b1e..782906d49c 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/coupling/CouplingRulesTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/coupling/CouplingRulesTest.java @@ -1,4 +1,4 @@ -package test.net.sourceforge.pmd.rules.coupling; +package test.net.sourceforge.pmd.lang.java.rule.coupling; import org.junit.Before; diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/coupling/xml/CouplingBetweenObjects.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/coupling/xml/CouplingBetweenObjects.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/coupling/xml/CouplingBetweenObjects.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/coupling/xml/CouplingBetweenObjects.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/coupling/xml/ExcessiveImports.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/coupling/xml/ExcessiveImports.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/coupling/xml/ExcessiveImports.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/coupling/xml/ExcessiveImports.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/coupling/xml/LooseCoupling.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/coupling/xml/LooseCoupling.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/coupling/xml/LooseCoupling.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/coupling/xml/LooseCoupling.xml index c28a5936df..e8d00fde9a 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/coupling/xml/LooseCoupling.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/coupling/xml/LooseCoupling.xml @@ -124,4 +124,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/coupling/xml/LoosePackageCoupling.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/coupling/xml/LoosePackageCoupling.xml similarity index 96% rename from pmd/regress/test/net/sourceforge/pmd/rules/coupling/xml/LoosePackageCoupling.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/coupling/xml/LoosePackageCoupling.xml index fd0425eea2..1a25d4da83 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/coupling/xml/LoosePackageCoupling.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/coupling/xml/LoosePackageCoupling.xml @@ -1,148 +1,148 @@ - - - - - - - default package: nothing configured, ok - - 0 - - - - default package: unused package, ok - 0 - nothing.used - - nothing.used.AClass - - - - - - default package: single package w/ exception, ok - - 0 - - some.other.package2 - - - some.other.package2.Class4 - - - - - - default package: single package w/o exception, bad - - 1 - - some.other.package2 - - - - - - default package: nested package w/o exception, bad - - 4 - - some.other.package1 - - - - - - default package: nested package w/ exception, bad - - 1 - - some.other.package1 - - - some.other.package1.Class1,some.other.package1.subpackage1.Class2,some.other.package1.subpackage2.Class3 - - - - - - some package: nothing configured, ok - - 0 - - - - some package: unused package, ok - 0 - nothing.used - - nothing.used.AClass - - - - - - some package: single package w/ exception, ok - - 0 - - some.other.package2 - - - some.other.package2.Class4 - - - - - - some package: single package w/o exception, bad - - 1 - - some.other.package2 - - - - - - some package: nested package w/o exception, but in same package, ok - - 0 - - some.other.package1 - - - - - - some package: nested package and sub-package, with different exceptions, bad - - 2 - - some.other.package1,some.other.package1.subpackage2,some.other.package1.subpackage3,some.other.package2 - - - some.other.package1.Class1,some.other.package1.subpackage2.Class3 - - - + + + + + + + default package: nothing configured, ok + + 0 + + + + default package: unused package, ok + 0 + nothing.used + + nothing.used.AClass + + + + + + default package: single package w/ exception, ok + + 0 + + some.other.package2 + + + some.other.package2.Class4 + + + + + + default package: single package w/o exception, bad + + 1 + + some.other.package2 + + + + + + default package: nested package w/o exception, bad + + 4 + + some.other.package1 + + + + + + default package: nested package w/ exception, bad + + 1 + + some.other.package1 + + + some.other.package1.Class1,some.other.package1.subpackage1.Class2,some.other.package1.subpackage2.Class3 + + + + + + some package: nothing configured, ok + + 0 + + + + some package: unused package, ok + 0 + nothing.used + + nothing.used.AClass + + + + + + some package: single package w/ exception, ok + + 0 + + some.other.package2 + + + some.other.package2.Class4 + + + + + + some package: single package w/o exception, bad + + 1 + + some.other.package2 + + + + + + some package: nested package w/o exception, but in same package, ok + + 0 + + some.other.package1 + + + + + + some package: nested package and sub-package, with different exceptions, bad + + 2 + + some.other.package1,some.other.package1.subpackage2,some.other.package1.subpackage3,some.other.package2 + + + some.other.package1.Class1,some.other.package1.subpackage2.Class3 + + + - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/ConfusingTernaryRuleTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/ConfusingTernaryRuleTest.java similarity index 98% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/ConfusingTernaryRuleTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/ConfusingTernaryRuleTest.java index 8d57abec76..b9ec4ea83b 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/design/ConfusingTernaryRuleTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/ConfusingTernaryRuleTest.java @@ -1,4 +1,4 @@ -package test.net.sourceforge.pmd.rules.design; +package test.net.sourceforge.pmd.lang.java.rule.design; import org.junit.Before; diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/ConstructorCallsOverridableMethodTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/ConstructorCallsOverridableMethodTest.java similarity index 90% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/ConstructorCallsOverridableMethodTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/ConstructorCallsOverridableMethodTest.java index 79a40999f2..e44f989c19 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/design/ConstructorCallsOverridableMethodTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/ConstructorCallsOverridableMethodTest.java @@ -1,7 +1,7 @@ /** * BSD-style license; for more info see http://pmd.sourceforge.net/license.html */ -package test.net.sourceforge.pmd.rules.design; +package test.net.sourceforge.pmd.lang.java.rule.design; import org.junit.Before; diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/DesignRulesTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/DesignRulesTest.java similarity index 98% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/DesignRulesTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/DesignRulesTest.java index bc92e76c5f..5b7ac999e7 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/design/DesignRulesTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/DesignRulesTest.java @@ -1,4 +1,4 @@ -package test.net.sourceforge.pmd.rules.design; +package test.net.sourceforge.pmd.lang.java.rule.design; import org.junit.Before; diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/TooManyHttpFilterTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/TooManyHttpFilterTest.java similarity index 93% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/TooManyHttpFilterTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/TooManyHttpFilterTest.java index b2caeee637..2aeda2e792 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/design/TooManyHttpFilterTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/TooManyHttpFilterTest.java @@ -1,7 +1,7 @@ /** * BSD-style license; for more info see http://pmd.sourceforge.net/license.html */ -package test.net.sourceforge.pmd.rules.design; +package test.net.sourceforge.pmd.lang.java.rule.design; import org.junit.Before; import org.junit.Test; diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/UncommentedEmptyConstructorRuleTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/UncommentedEmptyConstructorRuleTest.java similarity index 97% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/UncommentedEmptyConstructorRuleTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/UncommentedEmptyConstructorRuleTest.java index 005d696f98..e28ec1bdb9 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/design/UncommentedEmptyConstructorRuleTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/UncommentedEmptyConstructorRuleTest.java @@ -2,7 +2,7 @@ /** * BSD-style license; for more info see http://pmd.sourceforge.net/license.html */ - package test.net.sourceforge.pmd.rules.design; + package test.net.sourceforge.pmd.lang.java.rule.design; import org.junit.Before; import org.junit.Test; diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/UncommentedEmptyMethodRuleTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/UncommentedEmptyMethodRuleTest.java similarity index 90% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/UncommentedEmptyMethodRuleTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/UncommentedEmptyMethodRuleTest.java index 1bdd4ab6b7..a8ec3c83d3 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/design/UncommentedEmptyMethodRuleTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/UncommentedEmptyMethodRuleTest.java @@ -1,7 +1,7 @@ /** * BSD-style license; for more info see http://pmd.sourceforge.net/license.html */ -package test.net.sourceforge.pmd.rules.design; +package test.net.sourceforge.pmd.lang.java.rule.design; import org.junit.Before; diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/AbstractClassWithoutAbstractMethod.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/AbstractClassWithoutAbstractMethod.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/AbstractClassWithoutAbstractMethod.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/AbstractClassWithoutAbstractMethod.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/AbstractClassWithoutAnyMethod.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/AbstractClassWithoutAnyMethod.xml similarity index 98% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/AbstractClassWithoutAnyMethod.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/AbstractClassWithoutAnyMethod.xml index dc124eed6e..5442255b6d 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/AbstractClassWithoutAnyMethod.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/AbstractClassWithoutAnyMethod.xml @@ -51,4 +51,4 @@ public abstract class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/AccessorClassGeneration.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/AccessorClassGeneration.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/AccessorClassGeneration.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/AccessorClassGeneration.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/AssignmentToNonFinalStatic.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/AssignmentToNonFinalStatic.xml similarity index 97% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/AssignmentToNonFinalStatic.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/AssignmentToNonFinalStatic.xml index 0853af00a3..ac5654f3ab 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/AssignmentToNonFinalStatic.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/AssignmentToNonFinalStatic.xml @@ -28,4 +28,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/AvoidConstantsInterface.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidConstantsInterface.xml similarity index 97% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/AvoidConstantsInterface.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidConstantsInterface.xml index f5ded5e8fb..6a8874b672 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/AvoidConstantsInterface.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidConstantsInterface.xml @@ -24,4 +24,4 @@ public interface Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/AvoidDeeplyNestedIfStmts.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidDeeplyNestedIfStmts.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/AvoidDeeplyNestedIfStmts.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidDeeplyNestedIfStmts.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/AvoidInstanceofChecksInCatchClause.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidInstanceofChecksInCatchClause.xml similarity index 98% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/AvoidInstanceofChecksInCatchClause.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidInstanceofChecksInCatchClause.xml index bc0218c31f..0e88126283 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/AvoidInstanceofChecksInCatchClause.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidInstanceofChecksInCatchClause.xml @@ -33,4 +33,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/AvoidProtectedFieldInFinalClass.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidProtectedFieldInFinalClass.xml similarity index 98% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/AvoidProtectedFieldInFinalClass.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidProtectedFieldInFinalClass.xml index a133b6e608..b35c127705 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/AvoidProtectedFieldInFinalClass.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidProtectedFieldInFinalClass.xml @@ -44,4 +44,4 @@ public final class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/AvoidReassigningParameters.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidReassigningParameters.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/AvoidReassigningParameters.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidReassigningParameters.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/AvoidSynchronizedAtMethodLevel.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidSynchronizedAtMethodLevel.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/AvoidSynchronizedAtMethodLevel.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidSynchronizedAtMethodLevel.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/BadComparison.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/BadComparison.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/BadComparison.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/BadComparison.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/ClassWithOnlyPrivateConstructorsShouldBeFinal.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/ClassWithOnlyPrivateConstructorsShouldBeFinal.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/ClassWithOnlyPrivateConstructorsShouldBeFinal.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/ClassWithOnlyPrivateConstructorsShouldBeFinal.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/CloseResource.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/CloseResource.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/CloseResource.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/CloseResource.xml index 9fdd886e7c..a7b8fca51b 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/CloseResource.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/CloseResource.xml @@ -267,4 +267,4 @@ public class Foo { - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/CompareObjectsWithEquals.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/CompareObjectsWithEquals.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/CompareObjectsWithEquals.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/CompareObjectsWithEquals.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/ConfusingTernary.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/ConfusingTernary.xml similarity index 98% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/ConfusingTernary.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/ConfusingTernary.xml index 290d5076e4..4bfe9ac60a 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/ConfusingTernary.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/ConfusingTernary.xml @@ -56,4 +56,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/ConstructorCallsOverridableMethod.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/ConstructorCallsOverridableMethod.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/ConstructorCallsOverridableMethod.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/ConstructorCallsOverridableMethod.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/DefaultLabelNotLastInSwitchStmt.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/DefaultLabelNotLastInSwitchStmt.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/DefaultLabelNotLastInSwitchStmt.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/DefaultLabelNotLastInSwitchStmt.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/EmptyMethodInAbstractClassShouldBeAbstract.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/EmptyMethodInAbstractClassShouldBeAbstract.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/EmptyMethodInAbstractClassShouldBeAbstract.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/EmptyMethodInAbstractClassShouldBeAbstract.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/EqualsNull.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/EqualsNull.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/EqualsNull.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/EqualsNull.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/FinalFieldCouldBeStatic.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/FinalFieldCouldBeStatic.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/FinalFieldCouldBeStatic.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/FinalFieldCouldBeStatic.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/IdempotentOperations.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/IdempotentOperations.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/IdempotentOperations.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/IdempotentOperations.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/ImmutableField.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/ImmutableField.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/ImmutableField.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/ImmutableField.xml index dfb58c3340..5b6629d8e9 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/ImmutableField.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/ImmutableField.xml @@ -310,4 +310,4 @@ public class MyClass { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/InstantiationToGetClass.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/InstantiationToGetClass.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/InstantiationToGetClass.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/InstantiationToGetClass.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/LogicInversion.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/LogicInversion.xml similarity index 94% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/LogicInversion.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/LogicInversion.xml index 0ea66ee6e1..bfb0439134 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/LogicInversion.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/LogicInversion.xml @@ -1,63 +1,63 @@ - - - - - 1 - - - - - 1 - - - - - 0 - - - - - 0 - 0) - return x; - return 0; - } -} - ]]> - - \ No newline at end of file + + + + + 1 + + + + + 1 + + + + + 0 + + + + + 0 + 0) + return x; + return 0; + } +} + ]]> + + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/MissingBreakInSwitch.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/MissingBreakInSwitch.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/MissingBreakInSwitch.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/MissingBreakInSwitch.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/MissingStaticMethodInNonInstantiatableClass.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/MissingStaticMethodInNonInstantiatableClass.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/MissingStaticMethodInNonInstantiatableClass.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/MissingStaticMethodInNonInstantiatableClass.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/NonCaseLabelInSwitchStatement.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/NonCaseLabelInSwitchStatement.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/NonCaseLabelInSwitchStatement.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/NonCaseLabelInSwitchStatement.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/NonStaticInitializer.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/NonStaticInitializer.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/NonStaticInitializer.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/NonStaticInitializer.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/NonThreadSafeSingleton.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/NonThreadSafeSingleton.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/NonThreadSafeSingleton.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/NonThreadSafeSingleton.xml index 466d4d5f95..3f0d9eec99 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/NonThreadSafeSingleton.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/NonThreadSafeSingleton.xml @@ -133,4 +133,4 @@ this.bar = FOO; } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/OptimizableToArrayCall.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/OptimizableToArrayCall.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/OptimizableToArrayCall.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/OptimizableToArrayCall.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/PositionLiteralsFirstInComparisons.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/PositionLiteralsFirstInComparisons.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/PositionLiteralsFirstInComparisons.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/PositionLiteralsFirstInComparisons.xml index 1193ced9c2..e5821e7386 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/PositionLiteralsFirstInComparisons.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/PositionLiteralsFirstInComparisons.xml @@ -77,4 +77,4 @@ public class Foo ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/PositionalIteratorRule.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/PositionalIteratorRule.xml similarity index 98% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/PositionalIteratorRule.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/PositionalIteratorRule.xml index 02da077381..5a3fccc297 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/PositionalIteratorRule.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/PositionalIteratorRule.xml @@ -53,4 +53,4 @@ public class PositionalIterator3 { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/PreserveStackTrace.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/PreserveStackTrace.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/PreserveStackTrace.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/PreserveStackTrace.xml index 9729d12aee..149c07e2ea 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/PreserveStackTrace.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/PreserveStackTrace.xml @@ -385,4 +385,4 @@ public class Foo { ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/ReturnEmptyArrayRatherThanNull.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/ReturnEmptyArrayRatherThanNull.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/ReturnEmptyArrayRatherThanNull.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/ReturnEmptyArrayRatherThanNull.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/SimpleDateFormatNeedsLocale.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/SimpleDateFormatNeedsLocale.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/SimpleDateFormatNeedsLocale.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/SimpleDateFormatNeedsLocale.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/SimplifyBooleanExpressions.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/SimplifyBooleanExpressions.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/SimplifyBooleanExpressions.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/SimplifyBooleanExpressions.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/SimplifyBooleanReturns.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/SimplifyBooleanReturns.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/SimplifyBooleanReturns.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/SimplifyBooleanReturns.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/SimplifyConditional.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/SimplifyConditional.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/SimplifyConditional.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/SimplifyConditional.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/SingularField.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/SingularField.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/SingularField.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/SingularField.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/SwitchDensity.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/SwitchDensity.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/SwitchDensity.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/SwitchDensity.xml index 2118991389..f6b872f6a2 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/SwitchDensity.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/SwitchDensity.xml @@ -72,4 +72,4 @@ public class SwitchDensity3 { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/SwitchStmtsShouldHaveDefault.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/SwitchStmtsShouldHaveDefault.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/SwitchStmtsShouldHaveDefault.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/SwitchStmtsShouldHaveDefault.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/TooFewBranchesForASwitchStatement.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/TooFewBranchesForASwitchStatement.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/TooFewBranchesForASwitchStatement.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/TooFewBranchesForASwitchStatement.xml index f9860b5829..2614cb8bb6 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/TooFewBranchesForASwitchStatement.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/TooFewBranchesForASwitchStatement.xml @@ -69,4 +69,4 @@ public class ValidSwitch { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/TooManyHttpFilter.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/TooManyHttpFilter.xml similarity index 98% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/TooManyHttpFilter.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/TooManyHttpFilter.xml index 9cdba91f0c..e47bd102ac 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/TooManyHttpFilter.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/TooManyHttpFilter.xml @@ -24,4 +24,4 @@ public class FooFilter implements Filter { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/UncommentedEmptyConstructor.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/UncommentedEmptyConstructor.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/UncommentedEmptyConstructor.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/UncommentedEmptyConstructor.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/UncommentedEmptyMethod.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/UncommentedEmptyMethod.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/UncommentedEmptyMethod.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/UncommentedEmptyMethod.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/UnnecessaryLocalBeforeReturn.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/UnnecessaryLocalBeforeReturn.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/UnnecessaryLocalBeforeReturn.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/UnnecessaryLocalBeforeReturn.xml index 102878fb1f..ac3ae07dcf 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/UnnecessaryLocalBeforeReturn.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/UnnecessaryLocalBeforeReturn.xml @@ -65,4 +65,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/UnsynchronizedStaticDateFormatter.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/UnsynchronizedStaticDateFormatter.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/UnsynchronizedStaticDateFormatter.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/UnsynchronizedStaticDateFormatter.xml index b4c2eee8dc..0aeb4bf023 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/UnsynchronizedStaticDateFormatter.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/UnsynchronizedStaticDateFormatter.xml @@ -85,4 +85,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/UseCollectionIsEmpty.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/UseCollectionIsEmpty.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/UseCollectionIsEmpty.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/UseCollectionIsEmpty.xml index 51b98e5c6a..cb2d184a30 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/UseCollectionIsEmpty.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/UseCollectionIsEmpty.xml @@ -162,4 +162,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/UseLocaleWithCaseConversions.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/UseLocaleWithCaseConversions.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/UseLocaleWithCaseConversions.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/UseLocaleWithCaseConversions.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/UseNotifyAllInsteadOfNotify.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/UseNotifyAllInsteadOfNotify.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/UseNotifyAllInsteadOfNotify.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/UseNotifyAllInsteadOfNotify.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/UseSingleton.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/UseSingleton.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/UseSingleton.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/UseSingleton.xml index 9e3a95a673..db045d5cae 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/UseSingleton.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/UseSingleton.xml @@ -116,4 +116,4 @@ public class FooTest { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/UseVarargs.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/UseVarargs.xml similarity index 95% rename from pmd/regress/test/net/sourceforge/pmd/rules/design/xml/UseVarargs.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/UseVarargs.xml index 6b8629faf2..2e976caf41 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/design/xml/UseVarargs.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/UseVarargs.xml @@ -1,63 +1,63 @@ - - - - - 1 - - - - - 1 - - - - - 0 - - - - - 0 - - - - - 0 - - - \ No newline at end of file + + + + + 1 + + + + + 1 + + + + + 0 + + + + + 0 + + + + + 0 + + + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/empty/EmptyRulesTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/empty/EmptyRulesTest.java similarity index 94% rename from pmd/regress/test/net/sourceforge/pmd/rules/empty/EmptyRulesTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/empty/EmptyRulesTest.java index 890b267592..13faaa7de4 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/empty/EmptyRulesTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/empty/EmptyRulesTest.java @@ -1,7 +1,7 @@ /** * BSD-style license; for more info see http://pmd.sourceforge.net/license.html */ -package test.net.sourceforge.pmd.rules.empty; +package test.net.sourceforge.pmd.lang.java.rule.empty; import org.junit.Before; diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/empty/xml/EmptyCatchBlock.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyCatchBlock.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/empty/xml/EmptyCatchBlock.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyCatchBlock.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/empty/xml/EmptyFinallyBlock.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyFinallyBlock.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/empty/xml/EmptyFinallyBlock.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyFinallyBlock.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/empty/xml/EmptyIfStmt.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyIfStmt.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/empty/xml/EmptyIfStmt.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyIfStmt.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/empty/xml/EmptyInitializer.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyInitializer.xml similarity index 94% rename from pmd/regress/test/net/sourceforge/pmd/rules/empty/xml/EmptyInitializer.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyInitializer.xml index 9579c6edcf..a3bebc2d71 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/empty/xml/EmptyInitializer.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyInitializer.xml @@ -1,49 +1,49 @@ - - - - - 1 - - - - - 1 - - - - - 0 - - - - - 0 - - - \ No newline at end of file + + + + + 1 + + + + + 1 + + + + + 0 + + + + + 0 + + + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/empty/xml/EmptyStatementBlock.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyStatementBlock.xml similarity index 94% rename from pmd/regress/test/net/sourceforge/pmd/rules/empty/xml/EmptyStatementBlock.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyStatementBlock.xml index b5bb45f819..4aa0e69e8e 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/empty/xml/EmptyStatementBlock.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyStatementBlock.xml @@ -1,43 +1,43 @@ - - - - - 1 - - - - - 0 - - - - - 0 - - - \ No newline at end of file + + + + + 1 + + + + + 0 + + + + + 0 + + + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/empty/xml/EmptyStatementNotInLoop.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyStatementNotInLoop.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/empty/xml/EmptyStatementNotInLoop.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyStatementNotInLoop.xml index 5952ee84a4..d8f339273d 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/empty/xml/EmptyStatementNotInLoop.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyStatementNotInLoop.xml @@ -65,4 +65,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/empty/xml/EmptyStaticInitializer.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyStaticInitializer.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/empty/xml/EmptyStaticInitializer.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyStaticInitializer.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/empty/xml/EmptySwitchStatements.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptySwitchStatements.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/empty/xml/EmptySwitchStatements.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptySwitchStatements.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/empty/xml/EmptySynchronizedBlock.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptySynchronizedBlock.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/empty/xml/EmptySynchronizedBlock.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptySynchronizedBlock.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/empty/xml/EmptyTryBlock.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyTryBlock.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/empty/xml/EmptyTryBlock.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyTryBlock.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/empty/xml/EmptyWhileStmt.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyWhileStmt.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/empty/xml/EmptyWhileStmt.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyWhileStmt.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/finalizers/FinalizersRulesTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/finalizers/FinalizersRulesTest.java similarity index 92% rename from pmd/regress/test/net/sourceforge/pmd/rules/finalizers/FinalizersRulesTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/finalizers/FinalizersRulesTest.java index a397328a90..f0b92eb803 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/finalizers/FinalizersRulesTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/finalizers/FinalizersRulesTest.java @@ -1,4 +1,4 @@ -package test.net.sourceforge.pmd.rules.finalizers; +package test.net.sourceforge.pmd.lang.java.rule.finalizers; import org.junit.Before; diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/finalizers/xml/AvoidCallingFinalize.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/finalizers/xml/AvoidCallingFinalize.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/finalizers/xml/AvoidCallingFinalize.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/finalizers/xml/AvoidCallingFinalize.xml index 2b70825557..a452039d14 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/finalizers/xml/AvoidCallingFinalize.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/finalizers/xml/AvoidCallingFinalize.xml @@ -82,4 +82,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/finalizers/xml/EmptyFinalizer.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/finalizers/xml/EmptyFinalizer.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/finalizers/xml/EmptyFinalizer.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/finalizers/xml/EmptyFinalizer.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/finalizers/xml/FinalizeDoesNotCallSuperFinalize.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/finalizers/xml/FinalizeDoesNotCallSuperFinalize.xml similarity index 98% rename from pmd/regress/test/net/sourceforge/pmd/rules/finalizers/xml/FinalizeDoesNotCallSuperFinalize.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/finalizers/xml/FinalizeDoesNotCallSuperFinalize.xml index a8f530c1e4..71cf219ce2 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/finalizers/xml/FinalizeDoesNotCallSuperFinalize.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/finalizers/xml/FinalizeDoesNotCallSuperFinalize.xml @@ -58,4 +58,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/finalizers/xml/FinalizeOnlyCallsSuperFinalize.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/finalizers/xml/FinalizeOnlyCallsSuperFinalize.xml similarity index 97% rename from pmd/regress/test/net/sourceforge/pmd/rules/finalizers/xml/FinalizeOnlyCallsSuperFinalize.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/finalizers/xml/FinalizeOnlyCallsSuperFinalize.xml index 34a15863bf..1429679f6f 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/finalizers/xml/FinalizeOnlyCallsSuperFinalize.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/finalizers/xml/FinalizeOnlyCallsSuperFinalize.xml @@ -27,4 +27,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/finalizers/xml/FinalizeOverloaded.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/finalizers/xml/FinalizeOverloaded.xml similarity index 97% rename from pmd/regress/test/net/sourceforge/pmd/rules/finalizers/xml/FinalizeOverloaded.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/finalizers/xml/FinalizeOverloaded.xml index ae1f4be412..177df4c756 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/finalizers/xml/FinalizeOverloaded.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/finalizers/xml/FinalizeOverloaded.xml @@ -24,4 +24,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/finalizers/xml/FinalizeShouldBeProtected.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/finalizers/xml/FinalizeShouldBeProtected.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/finalizers/xml/FinalizeShouldBeProtected.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/finalizers/xml/FinalizeShouldBeProtected.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/imports/ImportsRulesTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/imports/ImportsRulesTest.java similarity index 91% rename from pmd/regress/test/net/sourceforge/pmd/rules/imports/ImportsRulesTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/imports/ImportsRulesTest.java index 388cfb4549..c996f2d6c2 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/imports/ImportsRulesTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/imports/ImportsRulesTest.java @@ -1,4 +1,4 @@ -package test.net.sourceforge.pmd.rules.imports; +package test.net.sourceforge.pmd.lang.java.rule.imports; import org.junit.Before; diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/imports/xml/DontImportJavaLang.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/imports/xml/DontImportJavaLang.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/imports/xml/DontImportJavaLang.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/imports/xml/DontImportJavaLang.xml index 8c58f8f797..f9948248cc 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/imports/xml/DontImportJavaLang.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/imports/xml/DontImportJavaLang.xml @@ -55,4 +55,4 @@ import java.lang.Thread.UncaughtExceptionHandler; public class Foo {} ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/imports/xml/DuplicateImports.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/imports/xml/DuplicateImports.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/imports/xml/DuplicateImports.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/imports/xml/DuplicateImports.xml index 88d5424bd7..1177db6838 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/imports/xml/DuplicateImports.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/imports/xml/DuplicateImports.xml @@ -78,4 +78,4 @@ class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/imports/xml/ImportFromSamePackage.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/imports/xml/ImportFromSamePackage.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/imports/xml/ImportFromSamePackage.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/imports/xml/ImportFromSamePackage.xml index f1e14fdcfc..1e6dec2f61 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/imports/xml/ImportFromSamePackage.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/imports/xml/ImportFromSamePackage.xml @@ -75,4 +75,4 @@ import foo.bar.*; public class Baz{} ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/imports/xml/TooManyStaticImports.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/imports/xml/TooManyStaticImports.xml similarity index 98% rename from pmd/regress/test/net/sourceforge/pmd/rules/imports/xml/TooManyStaticImports.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/imports/xml/TooManyStaticImports.xml index ffa5d21b35..670c9cc067 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/imports/xml/TooManyStaticImports.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/imports/xml/TooManyStaticImports.xml @@ -42,4 +42,4 @@ import static Pete; //Ok public class AllTheBeatles {} ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/imports/xml/UnusedImports.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/imports/xml/UnusedImports.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/imports/xml/UnusedImports.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/imports/xml/UnusedImports.xml index 4352c76e20..6d28f59c43 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/imports/xml/UnusedImports.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/imports/xml/UnusedImports.xml @@ -204,4 +204,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/j2ee/J2EERulesTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/j2ee/J2EERulesTest.java similarity index 93% rename from pmd/regress/test/net/sourceforge/pmd/rules/j2ee/J2EERulesTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/j2ee/J2EERulesTest.java index 230e6fafb1..18b5b6ecc0 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/j2ee/J2EERulesTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/j2ee/J2EERulesTest.java @@ -1,4 +1,4 @@ -package test.net.sourceforge.pmd.rules.j2ee; +package test.net.sourceforge.pmd.lang.java.rule.j2ee; import org.junit.Before; diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/j2ee/xml/DoNotCallSystemExit.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/j2ee/xml/DoNotCallSystemExit.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/j2ee/xml/DoNotCallSystemExit.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/j2ee/xml/DoNotCallSystemExit.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/j2ee/xml/DoNotUseThreads.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/j2ee/xml/DoNotUseThreads.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/j2ee/xml/DoNotUseThreads.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/j2ee/xml/DoNotUseThreads.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/j2ee/xml/LocalHomeNamingConvention.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/j2ee/xml/LocalHomeNamingConvention.xml similarity index 97% rename from pmd/regress/test/net/sourceforge/pmd/rules/j2ee/xml/LocalHomeNamingConvention.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/j2ee/xml/LocalHomeNamingConvention.xml index 04bd4cb2f4..d2df97bfc2 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/j2ee/xml/LocalHomeNamingConvention.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/j2ee/xml/LocalHomeNamingConvention.xml @@ -18,4 +18,4 @@ Good suffix public interface MyBeautifulLocalHome extends javax.ejb.EJBLocalHome {} ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/j2ee/xml/LocalInterfaceSessionNamingConvention.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/j2ee/xml/LocalInterfaceSessionNamingConvention.xml similarity index 97% rename from pmd/regress/test/net/sourceforge/pmd/rules/j2ee/xml/LocalInterfaceSessionNamingConvention.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/j2ee/xml/LocalInterfaceSessionNamingConvention.xml index 5b152009dd..7b46a2fcc2 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/j2ee/xml/LocalInterfaceSessionNamingConvention.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/j2ee/xml/LocalInterfaceSessionNamingConvention.xml @@ -18,4 +18,4 @@ Good suffix public interface MyLocal extends javax.ejb.EJBLocalObject {} ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/j2ee/xml/MDBAndSessionBeanNamingConvention.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/j2ee/xml/MDBAndSessionBeanNamingConvention.xml similarity index 98% rename from pmd/regress/test/net/sourceforge/pmd/rules/j2ee/xml/MDBAndSessionBeanNamingConvention.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/j2ee/xml/MDBAndSessionBeanNamingConvention.xml index 98a8be443d..f4c2728062 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/j2ee/xml/MDBAndSessionBeanNamingConvention.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/j2ee/xml/MDBAndSessionBeanNamingConvention.xml @@ -36,4 +36,4 @@ Good MessageDrivenBean name public class SomeBean implements MessageDrivenBean {} ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/j2ee/xml/RemoteInterfaceNamingConvention.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/j2ee/xml/RemoteInterfaceNamingConvention.xml similarity index 98% rename from pmd/regress/test/net/sourceforge/pmd/rules/j2ee/xml/RemoteInterfaceNamingConvention.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/j2ee/xml/RemoteInterfaceNamingConvention.xml index fd3f3bbc7f..b1e67fc663 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/j2ee/xml/RemoteInterfaceNamingConvention.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/j2ee/xml/RemoteInterfaceNamingConvention.xml @@ -36,4 +36,4 @@ Good suffix public interface GoodName extends javax.ejb.EJBObject {} ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/j2ee/xml/RemoteSessionInterfaceNamingConvention.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/j2ee/xml/RemoteSessionInterfaceNamingConvention.xml similarity index 97% rename from pmd/regress/test/net/sourceforge/pmd/rules/j2ee/xml/RemoteSessionInterfaceNamingConvention.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/j2ee/xml/RemoteSessionInterfaceNamingConvention.xml index e7e40680d2..fdf120a2d1 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/j2ee/xml/RemoteSessionInterfaceNamingConvention.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/j2ee/xml/RemoteSessionInterfaceNamingConvention.xml @@ -18,4 +18,4 @@ Good EJBHome name public interface MyBeautifulHome extends javax.ejb.EJBHome {} ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/j2ee/xml/StaticEJBFieldShouldBeFinal.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/j2ee/xml/StaticEJBFieldShouldBeFinal.xml similarity index 98% rename from pmd/regress/test/net/sourceforge/pmd/rules/j2ee/xml/StaticEJBFieldShouldBeFinal.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/j2ee/xml/StaticEJBFieldShouldBeFinal.xml index eecb39580c..a9693caa57 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/j2ee/xml/StaticEJBFieldShouldBeFinal.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/j2ee/xml/StaticEJBFieldShouldBeFinal.xml @@ -24,4 +24,4 @@ public class SomeEJB extends EJBObject implements EJBLocalHome { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/j2ee/xml/UseProperClassLoader.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/j2ee/xml/UseProperClassLoader.xml similarity index 97% rename from pmd/regress/test/net/sourceforge/pmd/rules/j2ee/xml/UseProperClassLoader.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/j2ee/xml/UseProperClassLoader.xml index ea43c6908f..92797fc114 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/j2ee/xml/UseProperClassLoader.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/j2ee/xml/UseProperClassLoader.xml @@ -22,4 +22,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/javabeans/JavabeansRulesTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/javabeans/JavabeansRulesTest.java similarity index 88% rename from pmd/regress/test/net/sourceforge/pmd/rules/javabeans/JavabeansRulesTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/javabeans/JavabeansRulesTest.java index e527996d65..cd50005066 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/javabeans/JavabeansRulesTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/javabeans/JavabeansRulesTest.java @@ -1,4 +1,4 @@ -package test.net.sourceforge.pmd.rules.javabeans; +package test.net.sourceforge.pmd.lang.java.rule.javabeans; import org.junit.Before; diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/javabeans/xml/BeanMembersShouldSerialize.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/javabeans/xml/BeanMembersShouldSerialize.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/javabeans/xml/BeanMembersShouldSerialize.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/javabeans/xml/BeanMembersShouldSerialize.xml index 3d7ffb98fd..0586178e1c 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/javabeans/xml/BeanMembersShouldSerialize.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/javabeans/xml/BeanMembersShouldSerialize.xml @@ -158,4 +158,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/javabeans/xml/MissingSerialVersionUID.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/javabeans/xml/MissingSerialVersionUID.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/javabeans/xml/MissingSerialVersionUID.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/javabeans/xml/MissingSerialVersionUID.xml index c8873bba51..2feca6e663 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/javabeans/xml/MissingSerialVersionUID.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/javabeans/xml/MissingSerialVersionUID.xml @@ -85,4 +85,4 @@ public class Foo implements Serializable { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/junit/JunitRulesTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/junit/JunitRulesTest.java similarity index 94% rename from pmd/regress/test/net/sourceforge/pmd/rules/junit/JunitRulesTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/junit/JunitRulesTest.java index d339fe24a3..3e9efb93b4 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/junit/JunitRulesTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/junit/JunitRulesTest.java @@ -1,4 +1,4 @@ -package test.net.sourceforge.pmd.rules.junit; +package test.net.sourceforge.pmd.lang.java.rule.junit; import org.junit.Before; diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/junit/xml/JUnitAssertionsShouldIncludeMessage.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitAssertionsShouldIncludeMessage.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/junit/xml/JUnitAssertionsShouldIncludeMessage.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitAssertionsShouldIncludeMessage.xml index 721662a9a3..840166469a 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/junit/xml/JUnitAssertionsShouldIncludeMessage.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitAssertionsShouldIncludeMessage.xml @@ -210,4 +210,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/junit/xml/JUnitSpelling.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitSpelling.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/junit/xml/JUnitSpelling.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitSpelling.xml index eeb46ecce7..446c34afeb 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/junit/xml/JUnitSpelling.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitSpelling.xml @@ -76,4 +76,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/junit/xml/JUnitStaticSuite.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitStaticSuite.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/junit/xml/JUnitStaticSuite.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitStaticSuite.xml index ab45ea1c42..6fff67e034 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/junit/xml/JUnitStaticSuite.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitStaticSuite.xml @@ -59,4 +59,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/junit/xml/JUnitTestsShouldIncludeAssert.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitTestsShouldIncludeAssert.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/junit/xml/JUnitTestsShouldIncludeAssert.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitTestsShouldIncludeAssert.xml index 8f712b65b9..5f77b2d752 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/junit/xml/JUnitTestsShouldIncludeAssert.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitTestsShouldIncludeAssert.xml @@ -223,4 +223,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/junit/xml/SimplifyBooleanAssertion.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/junit/xml/SimplifyBooleanAssertion.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/junit/xml/SimplifyBooleanAssertion.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/junit/xml/SimplifyBooleanAssertion.xml index be54f2374c..d095634167 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/junit/xml/SimplifyBooleanAssertion.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/junit/xml/SimplifyBooleanAssertion.xml @@ -76,4 +76,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/junit/xml/TestClassWithoutTestCases.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/junit/xml/TestClassWithoutTestCases.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/junit/xml/TestClassWithoutTestCases.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/junit/xml/TestClassWithoutTestCases.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/junit/xml/UnnecessaryBooleanAssertion.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/junit/xml/UnnecessaryBooleanAssertion.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/junit/xml/UnnecessaryBooleanAssertion.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/junit/xml/UnnecessaryBooleanAssertion.xml index 397adcd2b9..24f18d9f6c 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/junit/xml/UnnecessaryBooleanAssertion.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/junit/xml/UnnecessaryBooleanAssertion.xml @@ -115,4 +115,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/junit/xml/UseAssertEqualsInsteadOfAssertTrue.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/junit/xml/UseAssertEqualsInsteadOfAssertTrue.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/junit/xml/UseAssertEqualsInsteadOfAssertTrue.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/junit/xml/UseAssertEqualsInsteadOfAssertTrue.xml index 5a9fb8f9c6..28ff689003 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/junit/xml/UseAssertEqualsInsteadOfAssertTrue.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/junit/xml/UseAssertEqualsInsteadOfAssertTrue.xml @@ -70,4 +70,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/junit/xml/UseAssertNullInsteadOfAssertTrue.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/junit/xml/UseAssertNullInsteadOfAssertTrue.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/junit/xml/UseAssertNullInsteadOfAssertTrue.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/junit/xml/UseAssertNullInsteadOfAssertTrue.xml index 74e95487bf..b7587f50de 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/junit/xml/UseAssertNullInsteadOfAssertTrue.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/junit/xml/UseAssertNullInsteadOfAssertTrue.xml @@ -70,4 +70,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/junit/xml/UseAssertSameInsteadOfAssertTrue.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/junit/xml/UseAssertSameInsteadOfAssertTrue.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/junit/xml/UseAssertSameInsteadOfAssertTrue.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/junit/xml/UseAssertSameInsteadOfAssertTrue.xml index e5c0e9f52d..ae4c881928 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/junit/xml/UseAssertSameInsteadOfAssertTrue.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/junit/xml/UseAssertSameInsteadOfAssertTrue.xml @@ -113,4 +113,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/loggingjakartacommons/LoggingJakartaCommonsRulesTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/loggingjakartacommons/LoggingJakartaCommonsRulesTest.java similarity index 87% rename from pmd/regress/test/net/sourceforge/pmd/rules/loggingjakartacommons/LoggingJakartaCommonsRulesTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/loggingjakartacommons/LoggingJakartaCommonsRulesTest.java index da8a9a8d53..5a392163bf 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/loggingjakartacommons/LoggingJakartaCommonsRulesTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/loggingjakartacommons/LoggingJakartaCommonsRulesTest.java @@ -1,4 +1,4 @@ -package test.net.sourceforge.pmd.rules.loggingjakartacommons; +package test.net.sourceforge.pmd.lang.java.rule.loggingjakartacommons; import org.junit.Before; diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/loggingjakartacommons/xml/ProperLogger.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/loggingjakartacommons/xml/ProperLogger.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/loggingjakartacommons/xml/ProperLogger.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/loggingjakartacommons/xml/ProperLogger.xml index 761428aab9..920a64e015 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/loggingjakartacommons/xml/ProperLogger.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/loggingjakartacommons/xml/ProperLogger.xml @@ -63,4 +63,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/loggingjakartacommons/xml/UseCorrectExceptionLogging.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/loggingjakartacommons/xml/UseCorrectExceptionLogging.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/loggingjakartacommons/xml/UseCorrectExceptionLogging.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/loggingjakartacommons/xml/UseCorrectExceptionLogging.xml index c0edbdd053..62e28051c6 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/loggingjakartacommons/xml/UseCorrectExceptionLogging.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/loggingjakartacommons/xml/UseCorrectExceptionLogging.xml @@ -87,4 +87,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/loggingjava/LoggingJavaRulesTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/loggingjava/LoggingJavaRulesTest.java similarity index 90% rename from pmd/regress/test/net/sourceforge/pmd/rules/loggingjava/LoggingJavaRulesTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/loggingjava/LoggingJavaRulesTest.java index 708f2f723f..21b600204e 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/loggingjava/LoggingJavaRulesTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/loggingjava/LoggingJavaRulesTest.java @@ -1,4 +1,4 @@ -package test.net.sourceforge.pmd.rules.loggingjava; +package test.net.sourceforge.pmd.lang.java.rule.loggingjava; import org.junit.Before; diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/loggingjava/xml/AvoidPrintStackTrace.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/loggingjava/xml/AvoidPrintStackTrace.xml similarity index 97% rename from pmd/regress/test/net/sourceforge/pmd/rules/loggingjava/xml/AvoidPrintStackTrace.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/loggingjava/xml/AvoidPrintStackTrace.xml index c4061e8fea..b34a7737f1 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/loggingjava/xml/AvoidPrintStackTrace.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/loggingjava/xml/AvoidPrintStackTrace.xml @@ -30,4 +30,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/loggingjava/xml/LoggerIsNotStaticFinal.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/loggingjava/xml/LoggerIsNotStaticFinal.xml similarity index 98% rename from pmd/regress/test/net/sourceforge/pmd/rules/loggingjava/xml/LoggerIsNotStaticFinal.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/loggingjava/xml/LoggerIsNotStaticFinal.xml index 608a0ebb4c..e0239bef12 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/loggingjava/xml/LoggerIsNotStaticFinal.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/loggingjava/xml/LoggerIsNotStaticFinal.xml @@ -51,4 +51,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/loggingjava/xml/MoreThanOneLogger.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/loggingjava/xml/MoreThanOneLogger.xml similarity index 98% rename from pmd/regress/test/net/sourceforge/pmd/rules/loggingjava/xml/MoreThanOneLogger.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/loggingjava/xml/MoreThanOneLogger.xml index 5e50b87a11..336f52ae1f 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/loggingjava/xml/MoreThanOneLogger.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/loggingjava/xml/MoreThanOneLogger.xml @@ -51,4 +51,4 @@ public @interface Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/loggingjava/xml/SystemPrintln.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/loggingjava/xml/SystemPrintln.xml similarity index 98% rename from pmd/regress/test/net/sourceforge/pmd/rules/loggingjava/xml/SystemPrintln.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/loggingjava/xml/SystemPrintln.xml index 02e3ab8f11..046a37245d 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/loggingjava/xml/SystemPrintln.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/loggingjava/xml/SystemPrintln.xml @@ -43,4 +43,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/migrating/MigratingRulesTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/migrating/MigratingRulesTest.java similarity index 95% rename from pmd/regress/test/net/sourceforge/pmd/rules/migrating/MigratingRulesTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/migrating/MigratingRulesTest.java index 5e28d49d8e..c28ff0636c 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/migrating/MigratingRulesTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/migrating/MigratingRulesTest.java @@ -1,4 +1,4 @@ -package test.net.sourceforge.pmd.rules.migrating; +package test.net.sourceforge.pmd.lang.java.rule.migrating; import org.junit.Before; diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/migrating/xml/AvoidAssertAsIdentifier.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/migrating/xml/AvoidAssertAsIdentifier.xml similarity index 96% rename from pmd/regress/test/net/sourceforge/pmd/rules/migrating/xml/AvoidAssertAsIdentifier.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/migrating/xml/AvoidAssertAsIdentifier.xml index be122fef91..dfca4e86c5 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/migrating/xml/AvoidAssertAsIdentifier.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/migrating/xml/AvoidAssertAsIdentifier.xml @@ -14,4 +14,4 @@ public class Foo { ]]> java 1.3 - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/migrating/xml/AvoidEnumAsIdentifier.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/migrating/xml/AvoidEnumAsIdentifier.xml similarity index 96% rename from pmd/regress/test/net/sourceforge/pmd/rules/migrating/xml/AvoidEnumAsIdentifier.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/migrating/xml/AvoidEnumAsIdentifier.xml index d9fb806a2e..2587dc4139 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/migrating/xml/AvoidEnumAsIdentifier.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/migrating/xml/AvoidEnumAsIdentifier.xml @@ -14,4 +14,4 @@ public class Foo { ]]> java 1.4 - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/migrating/xml/ByteInstantiation.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/migrating/xml/ByteInstantiation.xml similarity index 97% rename from pmd/regress/test/net/sourceforge/pmd/rules/migrating/xml/ByteInstantiation.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/migrating/xml/ByteInstantiation.xml index 1a3f297af7..aaeb247955 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/migrating/xml/ByteInstantiation.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/migrating/xml/ByteInstantiation.xml @@ -26,4 +26,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/migrating/xml/IntegerInstantiation.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/migrating/xml/IntegerInstantiation.xml similarity index 97% rename from pmd/regress/test/net/sourceforge/pmd/rules/migrating/xml/IntegerInstantiation.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/migrating/xml/IntegerInstantiation.xml index 8e423605ad..1a6f4c7b5f 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/migrating/xml/IntegerInstantiation.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/migrating/xml/IntegerInstantiation.xml @@ -22,4 +22,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/migrating/xml/JUnit4SuitesShouldUseSuiteAnnotation.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/migrating/xml/JUnit4SuitesShouldUseSuiteAnnotation.xml similarity index 98% rename from pmd/regress/test/net/sourceforge/pmd/rules/migrating/xml/JUnit4SuitesShouldUseSuiteAnnotation.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/migrating/xml/JUnit4SuitesShouldUseSuiteAnnotation.xml index 43561f0868..5f0a3519de 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/migrating/xml/JUnit4SuitesShouldUseSuiteAnnotation.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/migrating/xml/JUnit4SuitesShouldUseSuiteAnnotation.xml @@ -48,4 +48,4 @@ public class Foo extends TestCase{ } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/migrating/xml/JUnit4TestShouldUseAfterAnnotation.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/migrating/xml/JUnit4TestShouldUseAfterAnnotation.xml similarity index 98% rename from pmd/regress/test/net/sourceforge/pmd/rules/migrating/xml/JUnit4TestShouldUseAfterAnnotation.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/migrating/xml/JUnit4TestShouldUseAfterAnnotation.xml index 7ab7c54aa3..38e40b9fe0 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/migrating/xml/JUnit4TestShouldUseAfterAnnotation.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/migrating/xml/JUnit4TestShouldUseAfterAnnotation.xml @@ -47,4 +47,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/migrating/xml/JUnit4TestShouldUseBeforeAnnotation.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/migrating/xml/JUnit4TestShouldUseBeforeAnnotation.xml similarity index 98% rename from pmd/regress/test/net/sourceforge/pmd/rules/migrating/xml/JUnit4TestShouldUseBeforeAnnotation.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/migrating/xml/JUnit4TestShouldUseBeforeAnnotation.xml index 3a8045331e..eaa5b2822e 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/migrating/xml/JUnit4TestShouldUseBeforeAnnotation.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/migrating/xml/JUnit4TestShouldUseBeforeAnnotation.xml @@ -47,4 +47,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/migrating/xml/JUnit4TestShouldUseTestAnnotation.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/migrating/xml/JUnit4TestShouldUseTestAnnotation.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/migrating/xml/JUnit4TestShouldUseTestAnnotation.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/migrating/xml/JUnit4TestShouldUseTestAnnotation.xml index e227ab77c9..dd96f70b20 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/migrating/xml/JUnit4TestShouldUseTestAnnotation.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/migrating/xml/JUnit4TestShouldUseTestAnnotation.xml @@ -67,4 +67,4 @@ public class Foo extends TestCase{ } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/migrating/xml/JUnitUseExpected.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/migrating/xml/JUnitUseExpected.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/migrating/xml/JUnitUseExpected.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/migrating/xml/JUnitUseExpected.xml index 22d3f44bf9..f62b265827 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/migrating/xml/JUnitUseExpected.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/migrating/xml/JUnitUseExpected.xml @@ -137,4 +137,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/migrating/xml/LongInstantiation.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/migrating/xml/LongInstantiation.xml similarity index 97% rename from pmd/regress/test/net/sourceforge/pmd/rules/migrating/xml/LongInstantiation.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/migrating/xml/LongInstantiation.xml index 79b7caf6e9..981766a34f 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/migrating/xml/LongInstantiation.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/migrating/xml/LongInstantiation.xml @@ -26,4 +26,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/migrating/xml/ReplaceEnumerationWithIterator.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/migrating/xml/ReplaceEnumerationWithIterator.xml similarity index 96% rename from pmd/regress/test/net/sourceforge/pmd/rules/migrating/xml/ReplaceEnumerationWithIterator.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/migrating/xml/ReplaceEnumerationWithIterator.xml index d1afc9c454..3c4061f07c 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/migrating/xml/ReplaceEnumerationWithIterator.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/migrating/xml/ReplaceEnumerationWithIterator.xml @@ -16,4 +16,4 @@ public class Foo implements Enumeration { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/migrating/xml/ReplaceHashtableWithMap.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/migrating/xml/ReplaceHashtableWithMap.xml similarity index 97% rename from pmd/regress/test/net/sourceforge/pmd/rules/migrating/xml/ReplaceHashtableWithMap.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/migrating/xml/ReplaceHashtableWithMap.xml index efc76ef6cf..aa5cb68300 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/migrating/xml/ReplaceHashtableWithMap.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/migrating/xml/ReplaceHashtableWithMap.xml @@ -25,4 +25,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/migrating/xml/ReplaceVectorWithList.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/migrating/xml/ReplaceVectorWithList.xml similarity index 97% rename from pmd/regress/test/net/sourceforge/pmd/rules/migrating/xml/ReplaceVectorWithList.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/migrating/xml/ReplaceVectorWithList.xml index 76b5ef9e08..1bf0111169 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/migrating/xml/ReplaceVectorWithList.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/migrating/xml/ReplaceVectorWithList.xml @@ -25,4 +25,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/migrating/xml/ShortInstantiation.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/migrating/xml/ShortInstantiation.xml similarity index 97% rename from pmd/regress/test/net/sourceforge/pmd/rules/migrating/xml/ShortInstantiation.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/migrating/xml/ShortInstantiation.xml index 1da9349f0c..8025807c52 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/migrating/xml/ShortInstantiation.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/migrating/xml/ShortInstantiation.xml @@ -26,4 +26,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/naming/NamingRulesTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/NamingRulesTest.java similarity index 95% rename from pmd/regress/test/net/sourceforge/pmd/rules/naming/NamingRulesTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/NamingRulesTest.java index 7bbcb536ec..1c695d5c92 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/naming/NamingRulesTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/NamingRulesTest.java @@ -1,4 +1,4 @@ -package test.net.sourceforge.pmd.rules.naming; +package test.net.sourceforge.pmd.lang.java.rule.naming; import org.junit.Before; diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/naming/xml/AbstractNaming.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/xml/AbstractNaming.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/naming/xml/AbstractNaming.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/xml/AbstractNaming.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/naming/xml/AvoidDollarSigns.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/xml/AvoidDollarSigns.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/naming/xml/AvoidDollarSigns.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/xml/AvoidDollarSigns.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/naming/xml/AvoidFieldNameMatchingMethodName.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/xml/AvoidFieldNameMatchingMethodName.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/naming/xml/AvoidFieldNameMatchingMethodName.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/xml/AvoidFieldNameMatchingMethodName.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/naming/xml/AvoidFieldNameMatchingTypeName.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/xml/AvoidFieldNameMatchingTypeName.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/naming/xml/AvoidFieldNameMatchingTypeName.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/xml/AvoidFieldNameMatchingTypeName.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/naming/xml/BooleanGetMethodName.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/xml/BooleanGetMethodName.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/naming/xml/BooleanGetMethodName.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/xml/BooleanGetMethodName.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/naming/xml/ClassNamingConventions.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/xml/ClassNamingConventions.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/naming/xml/ClassNamingConventions.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/xml/ClassNamingConventions.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/naming/xml/LongVariable.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/xml/LongVariable.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/naming/xml/LongVariable.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/xml/LongVariable.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/naming/xml/MethodNamingConventions.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/xml/MethodNamingConventions.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/naming/xml/MethodNamingConventions.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/xml/MethodNamingConventions.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/naming/xml/MethodWithSameNameAsEnclosingClass.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/xml/MethodWithSameNameAsEnclosingClass.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/naming/xml/MethodWithSameNameAsEnclosingClass.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/xml/MethodWithSameNameAsEnclosingClass.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/naming/xml/MisleadingVariableName.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/xml/MisleadingVariableName.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/naming/xml/MisleadingVariableName.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/xml/MisleadingVariableName.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/naming/xml/NoPackage.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/xml/NoPackage.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/naming/xml/NoPackage.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/xml/NoPackage.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/naming/xml/PackageCase.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/xml/PackageCase.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/naming/xml/PackageCase.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/xml/PackageCase.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/naming/xml/ShortClassName.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/xml/ShortClassName.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/naming/xml/ShortClassName.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/xml/ShortClassName.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/naming/xml/ShortMethodName.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/xml/ShortMethodName.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/naming/xml/ShortMethodName.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/xml/ShortMethodName.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/naming/xml/ShortVariable.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/xml/ShortVariable.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/naming/xml/ShortVariable.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/xml/ShortVariable.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/naming/xml/SuspiciousConstantFieldName.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/xml/SuspiciousConstantFieldName.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/naming/xml/SuspiciousConstantFieldName.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/xml/SuspiciousConstantFieldName.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/naming/xml/SuspiciousEqualsMethodName.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/xml/SuspiciousEqualsMethodName.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/naming/xml/SuspiciousEqualsMethodName.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/xml/SuspiciousEqualsMethodName.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/naming/xml/SuspiciousHashcodeMethodName.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/xml/SuspiciousHashcodeMethodName.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/naming/xml/SuspiciousHashcodeMethodName.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/xml/SuspiciousHashcodeMethodName.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/naming/xml/VariableNamingConventions.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/xml/VariableNamingConventions.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/naming/xml/VariableNamingConventions.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/naming/xml/VariableNamingConventions.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/optimizations/OptimizationsRulesTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/optimizations/OptimizationsRulesTest.java similarity index 93% rename from pmd/regress/test/net/sourceforge/pmd/rules/optimizations/OptimizationsRulesTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/optimizations/OptimizationsRulesTest.java index 6b56182818..22b288ef17 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/optimizations/OptimizationsRulesTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/optimizations/OptimizationsRulesTest.java @@ -1,4 +1,4 @@ -package test.net.sourceforge.pmd.rules.optimizations; +package test.net.sourceforge.pmd.lang.java.rule.optimizations; import org.junit.Before; diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/optimizations/xml/AddEmptyString.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/optimizations/xml/AddEmptyString.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/optimizations/xml/AddEmptyString.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/optimizations/xml/AddEmptyString.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/optimizations/xml/AvoidArrayLoops.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/optimizations/xml/AvoidArrayLoops.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/optimizations/xml/AvoidArrayLoops.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/optimizations/xml/AvoidArrayLoops.xml index e648f99915..3aa1737611 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/optimizations/xml/AvoidArrayLoops.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/optimizations/xml/AvoidArrayLoops.xml @@ -123,4 +123,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/optimizations/xml/AvoidInstantiatingObjectsInLoops.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/optimizations/xml/AvoidInstantiatingObjectsInLoops.xml similarity index 85% rename from pmd/regress/test/net/sourceforge/pmd/rules/optimizations/xml/AvoidInstantiatingObjectsInLoops.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/optimizations/xml/AvoidInstantiatingObjectsInLoops.xml index 8d3d1a0554..e29f6a685d 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/optimizations/xml/AvoidInstantiatingObjectsInLoops.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/optimizations/xml/AvoidInstantiatingObjectsInLoops.xml @@ -88,22 +88,6 @@ public class Foo { return new String(); } } -} - ]]> - - - - 0 - @@ -127,4 +111,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/optimizations/xml/LocalVariableCouldBeFinal.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/optimizations/xml/LocalVariableCouldBeFinal.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/optimizations/xml/LocalVariableCouldBeFinal.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/optimizations/xml/LocalVariableCouldBeFinal.xml index 8e829a2d26..0b9e37da21 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/optimizations/xml/LocalVariableCouldBeFinal.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/optimizations/xml/LocalVariableCouldBeFinal.xml @@ -128,4 +128,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/optimizations/xml/MethodArgumentCouldBeFinal.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/optimizations/xml/MethodArgumentCouldBeFinal.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/optimizations/xml/MethodArgumentCouldBeFinal.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/optimizations/xml/MethodArgumentCouldBeFinal.xml index 475c1fa61c..7bf63bb346 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/optimizations/xml/MethodArgumentCouldBeFinal.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/optimizations/xml/MethodArgumentCouldBeFinal.xml @@ -167,4 +167,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/optimizations/xml/SimplifyStartsWith.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/optimizations/xml/SimplifyStartsWith.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/optimizations/xml/SimplifyStartsWith.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/optimizations/xml/SimplifyStartsWith.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/optimizations/xml/UnnecessaryWrapperObjectCreation.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/optimizations/xml/UnnecessaryWrapperObjectCreation.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/optimizations/xml/UnnecessaryWrapperObjectCreation.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/optimizations/xml/UnnecessaryWrapperObjectCreation.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/optimizations/xml/UseArrayListInsteadOfVector.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/optimizations/xml/UseArrayListInsteadOfVector.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/optimizations/xml/UseArrayListInsteadOfVector.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/optimizations/xml/UseArrayListInsteadOfVector.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/optimizations/xml/UseArraysAsList.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/optimizations/xml/UseArraysAsList.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/optimizations/xml/UseArraysAsList.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/optimizations/xml/UseArraysAsList.xml index 0a2fa264ad..7171ff08a7 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/optimizations/xml/UseArraysAsList.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/optimizations/xml/UseArraysAsList.xml @@ -85,4 +85,4 @@ public class Bar { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/optimizations/xml/UseStringBufferForStringAppends.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/optimizations/xml/UseStringBufferForStringAppends.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/optimizations/xml/UseStringBufferForStringAppends.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/optimizations/xml/UseStringBufferForStringAppends.xml index cc710634b2..456b05cd6e 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/optimizations/xml/UseStringBufferForStringAppends.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/optimizations/xml/UseStringBufferForStringAppends.xml @@ -134,4 +134,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/strictexception/StrictExceptionRulesTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strictexception/StrictExceptionRulesTest.java similarity index 93% rename from pmd/regress/test/net/sourceforge/pmd/rules/strictexception/StrictExceptionRulesTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strictexception/StrictExceptionRulesTest.java index 99a96c2385..0e1fb48473 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/strictexception/StrictExceptionRulesTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strictexception/StrictExceptionRulesTest.java @@ -1,4 +1,4 @@ -package test.net.sourceforge.pmd.rules.strictexception; +package test.net.sourceforge.pmd.lang.java.rule.strictexception; import org.junit.Before; diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/strictexception/xml/AvoidCatchingNPE.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strictexception/xml/AvoidCatchingNPE.xml similarity index 98% rename from pmd/regress/test/net/sourceforge/pmd/rules/strictexception/xml/AvoidCatchingNPE.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strictexception/xml/AvoidCatchingNPE.xml index 519a9ef717..0e669fdc2f 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/strictexception/xml/AvoidCatchingNPE.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strictexception/xml/AvoidCatchingNPE.xml @@ -43,4 +43,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/strictexception/xml/AvoidCatchingThrowable.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strictexception/xml/AvoidCatchingThrowable.xml similarity index 97% rename from pmd/regress/test/net/sourceforge/pmd/rules/strictexception/xml/AvoidCatchingThrowable.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strictexception/xml/AvoidCatchingThrowable.xml index 9dd20e701b..83599b26df 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/strictexception/xml/AvoidCatchingThrowable.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strictexception/xml/AvoidCatchingThrowable.xml @@ -26,4 +26,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/strictexception/xml/AvoidRethrowingException.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strictexception/xml/AvoidRethrowingException.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/strictexception/xml/AvoidRethrowingException.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strictexception/xml/AvoidRethrowingException.xml index 4928453f70..e5b89a1ad4 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/strictexception/xml/AvoidRethrowingException.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strictexception/xml/AvoidRethrowingException.xml @@ -68,4 +68,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/strictexception/xml/AvoidThrowingNullPointerException.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strictexception/xml/AvoidThrowingNullPointerException.xml similarity index 96% rename from pmd/regress/test/net/sourceforge/pmd/rules/strictexception/xml/AvoidThrowingNullPointerException.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strictexception/xml/AvoidThrowingNullPointerException.xml index efa2f4e253..421093e456 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/strictexception/xml/AvoidThrowingNullPointerException.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strictexception/xml/AvoidThrowingNullPointerException.xml @@ -13,4 +13,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/strictexception/xml/AvoidThrowingRawExceptionTypes.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strictexception/xml/AvoidThrowingRawExceptionTypes.xml similarity index 98% rename from pmd/regress/test/net/sourceforge/pmd/rules/strictexception/xml/AvoidThrowingRawExceptionTypes.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strictexception/xml/AvoidThrowingRawExceptionTypes.xml index 6f2b783055..f57c8c7594 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/strictexception/xml/AvoidThrowingRawExceptionTypes.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strictexception/xml/AvoidThrowingRawExceptionTypes.xml @@ -40,4 +40,4 @@ public class PmdTest { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/strictexception/xml/DoNotExtendJavaLangError.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strictexception/xml/DoNotExtendJavaLangError.xml similarity index 98% rename from pmd/regress/test/net/sourceforge/pmd/rules/strictexception/xml/DoNotExtendJavaLangError.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strictexception/xml/DoNotExtendJavaLangError.xml index 544fbfa21b..c8d94b2a6a 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/strictexception/xml/DoNotExtendJavaLangError.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strictexception/xml/DoNotExtendJavaLangError.xml @@ -30,4 +30,4 @@ public class Foo extends FooError { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/strictexception/xml/DoNotThrowExceptionInFinally.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strictexception/xml/DoNotThrowExceptionInFinally.xml similarity index 97% rename from pmd/regress/test/net/sourceforge/pmd/rules/strictexception/xml/DoNotThrowExceptionInFinally.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strictexception/xml/DoNotThrowExceptionInFinally.xml index b9723dfa1c..17ffe5ef72 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/strictexception/xml/DoNotThrowExceptionInFinally.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strictexception/xml/DoNotThrowExceptionInFinally.xml @@ -29,4 +29,4 @@ public class Foo ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/strictexception/xml/ExceptionAsFlowControl.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strictexception/xml/ExceptionAsFlowControl.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/strictexception/xml/ExceptionAsFlowControl.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strictexception/xml/ExceptionAsFlowControl.xml index 2260eb0202..1f2bb9f46c 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/strictexception/xml/ExceptionAsFlowControl.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strictexception/xml/ExceptionAsFlowControl.xml @@ -69,4 +69,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/strictexception/xml/SignatureDeclareThrowsException.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strictexception/xml/SignatureDeclareThrowsException.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/strictexception/xml/SignatureDeclareThrowsException.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strictexception/xml/SignatureDeclareThrowsException.xml index f94bf67cf0..8c5b3f4014 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/strictexception/xml/SignatureDeclareThrowsException.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strictexception/xml/SignatureDeclareThrowsException.xml @@ -80,4 +80,4 @@ public class FooTest { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/strings/AvoidDuplicateLiteralsRuleTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/AvoidDuplicateLiteralsRuleTest.java similarity index 92% rename from pmd/regress/test/net/sourceforge/pmd/rules/strings/AvoidDuplicateLiteralsRuleTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/AvoidDuplicateLiteralsRuleTest.java index cf66d6f6c0..c8d01bd0ff 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/strings/AvoidDuplicateLiteralsRuleTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/AvoidDuplicateLiteralsRuleTest.java @@ -1,7 +1,7 @@ /** * BSD-style license; for more info see http://pmd.sourceforge.net/license.html */ -package test.net.sourceforge.pmd.rules.strings; +package test.net.sourceforge.pmd.lang.java.rule.strings; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -19,8 +19,7 @@ import java.util.Set; @Test public void testAll() { Rule rule = findRule("strings", "AvoidDuplicateLiterals"); - // rule.addProperty("threshold", "2"); - rule.setProperty(AvoidDuplicateLiteralsRule.THRESHOLD, Integer.valueOf(2)); + rule.addProperty("threshold", "2"); runTests(rule); } diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/strings/StringsRulesTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/StringsRulesTest.java similarity index 95% rename from pmd/regress/test/net/sourceforge/pmd/rules/strings/StringsRulesTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/StringsRulesTest.java index 8b69f8852d..9df4a43392 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/strings/StringsRulesTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/StringsRulesTest.java @@ -1,4 +1,4 @@ -package test.net.sourceforge.pmd.rules.strings; +package test.net.sourceforge.pmd.lang.java.rule.strings; import org.junit.Before; diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/strings/xml/AppendCharacterWithChar.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/xml/AppendCharacterWithChar.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/strings/xml/AppendCharacterWithChar.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/xml/AppendCharacterWithChar.xml index ec4e631471..4a435e43cc 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/strings/xml/AppendCharacterWithChar.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/xml/AppendCharacterWithChar.xml @@ -145,4 +145,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/strings/xml/AvoidDuplicateLiterals.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/xml/AvoidDuplicateLiterals.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/strings/xml/AvoidDuplicateLiterals.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/xml/AvoidDuplicateLiterals.xml index d6c34fe8c2..8447105fa5 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/strings/xml/AvoidDuplicateLiterals.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/xml/AvoidDuplicateLiterals.xml @@ -123,4 +123,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/strings/xml/AvoidStringBufferField.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/xml/AvoidStringBufferField.xml similarity index 96% rename from pmd/regress/test/net/sourceforge/pmd/rules/strings/xml/AvoidStringBufferField.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/xml/AvoidStringBufferField.xml index e9f8557dfe..76bdb32d18 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/strings/xml/AvoidStringBufferField.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/xml/AvoidStringBufferField.xml @@ -13,4 +13,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/strings/xml/ConsecutiveLiteralAppends.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/xml/ConsecutiveLiteralAppends.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/strings/xml/ConsecutiveLiteralAppends.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/xml/ConsecutiveLiteralAppends.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/strings/xml/InefficientEmptyStringCheck.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/xml/InefficientEmptyStringCheck.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/strings/xml/InefficientEmptyStringCheck.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/xml/InefficientEmptyStringCheck.xml index c7bcb7e548..e9605f5469 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/strings/xml/InefficientEmptyStringCheck.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/xml/InefficientEmptyStringCheck.xml @@ -132,4 +132,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/strings/xml/InefficientStringBuffering.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/xml/InefficientStringBuffering.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/strings/xml/InefficientStringBuffering.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/xml/InefficientStringBuffering.xml index 37a9cb0fe3..de2d4cd20d 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/strings/xml/InefficientStringBuffering.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/xml/InefficientStringBuffering.xml @@ -346,4 +346,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/strings/xml/InsufficientStringBufferDeclaration.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/xml/InsufficientStringBufferDeclaration.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/strings/xml/InsufficientStringBufferDeclaration.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/xml/InsufficientStringBufferDeclaration.xml index 8790128737..2ba45e235b 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/strings/xml/InsufficientStringBufferDeclaration.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/xml/InsufficientStringBufferDeclaration.xml @@ -654,4 +654,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/strings/xml/StringBufferInstantiationWithChar.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/xml/StringBufferInstantiationWithChar.xml similarity index 97% rename from pmd/regress/test/net/sourceforge/pmd/rules/strings/xml/StringBufferInstantiationWithChar.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/xml/StringBufferInstantiationWithChar.xml index eaccd0b6fd..a1a3c6c003 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/strings/xml/StringBufferInstantiationWithChar.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/xml/StringBufferInstantiationWithChar.xml @@ -22,4 +22,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/strings/xml/StringInstantiation.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/xml/StringInstantiation.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/strings/xml/StringInstantiation.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/xml/StringInstantiation.xml index dac0491a89..1d64abcccf 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/strings/xml/StringInstantiation.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/xml/StringInstantiation.xml @@ -104,4 +104,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/strings/xml/StringToString.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/xml/StringToString.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/strings/xml/StringToString.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/xml/StringToString.xml index c66ad200f9..75a31929c8 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/strings/xml/StringToString.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/xml/StringToString.xml @@ -114,4 +114,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/strings/xml/UnnecessaryCaseChange.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/xml/UnnecessaryCaseChange.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/strings/xml/UnnecessaryCaseChange.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/xml/UnnecessaryCaseChange.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/strings/xml/UseEqualsToCompareStrings.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/xml/UseEqualsToCompareStrings.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/strings/xml/UseEqualsToCompareStrings.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/xml/UseEqualsToCompareStrings.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/strings/xml/UseIndexOfChar.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/xml/UseIndexOfChar.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/strings/xml/UseIndexOfChar.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/xml/UseIndexOfChar.xml index 71bb4c91ed..a9a7c01ca0 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/strings/xml/UseIndexOfChar.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/xml/UseIndexOfChar.xml @@ -84,4 +84,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/strings/xml/UseStringBufferLength.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/xml/UseStringBufferLength.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/strings/xml/UseStringBufferLength.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/xml/UseStringBufferLength.xml index b70dd97e91..aed03805b8 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/strings/xml/UseStringBufferLength.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/xml/UseStringBufferLength.xml @@ -82,4 +82,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/strings/xml/UselessStringValueOf.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/xml/UselessStringValueOf.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/strings/xml/UselessStringValueOf.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/xml/UselessStringValueOf.xml index 3cdeda93d6..7d4eb967d2 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/strings/xml/UselessStringValueOf.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/strings/xml/UselessStringValueOf.xml @@ -67,4 +67,4 @@ public static String bar17(int n) { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/sunsecure/SunSecureRulesTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/sunsecure/SunSecureRulesTest.java similarity index 88% rename from pmd/regress/test/net/sourceforge/pmd/rules/sunsecure/SunSecureRulesTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/sunsecure/SunSecureRulesTest.java index f4b01649f9..1a04c316b3 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/sunsecure/SunSecureRulesTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/sunsecure/SunSecureRulesTest.java @@ -1,4 +1,4 @@ -package test.net.sourceforge.pmd.rules.sunsecure; +package test.net.sourceforge.pmd.lang.java.rule.sunsecure; import org.junit.Before; diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/sunsecure/xml/ArrayIsStoredDirectly.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/sunsecure/xml/ArrayIsStoredDirectly.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/sunsecure/xml/ArrayIsStoredDirectly.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/sunsecure/xml/ArrayIsStoredDirectly.xml index fa461728e3..13560cc641 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/sunsecure/xml/ArrayIsStoredDirectly.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/sunsecure/xml/ArrayIsStoredDirectly.xml @@ -133,4 +133,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/sunsecure/xml/MethodReturnsInternalArray.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/sunsecure/xml/MethodReturnsInternalArray.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/sunsecure/xml/MethodReturnsInternalArray.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/sunsecure/xml/MethodReturnsInternalArray.xml index 5db63589b0..c85a45b48a 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/sunsecure/xml/MethodReturnsInternalArray.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/sunsecure/xml/MethodReturnsInternalArray.xml @@ -138,4 +138,4 @@ public interface Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/typeresolution/CloneMethodMustImplementCloneableTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/typeresolution/CloneMethodMustImplementCloneableTest.java similarity index 77% rename from pmd/regress/test/net/sourceforge/pmd/rules/typeresolution/CloneMethodMustImplementCloneableTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/typeresolution/CloneMethodMustImplementCloneableTest.java index 4add5ae414..1b1238e817 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/typeresolution/CloneMethodMustImplementCloneableTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/typeresolution/CloneMethodMustImplementCloneableTest.java @@ -1,7 +1,7 @@ /** * BSD-style license; for more info see http://pmd.sourceforge.net/license.html */ -package test.net.sourceforge.pmd.rules.typeresolution; +package test.net.sourceforge.pmd.lang.java.rule.typeresolution; import org.junit.Before; @@ -11,7 +11,7 @@ public class CloneMethodMustImplementCloneableTest extends SimpleAggregatorTst { @Before public void setUp() { - addRule("typeresolution", "CloneMethodMustImplementCloneable"); + // addRule("typeresolution", "CloneMethodMustImplementCloneable"); } public static junit.framework.Test suite() { diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/typeresolution/LooseCouplingTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/typeresolution/LooseCouplingTest.java similarity index 88% rename from pmd/regress/test/net/sourceforge/pmd/rules/typeresolution/LooseCouplingTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/typeresolution/LooseCouplingTest.java index fe0249d368..1222d36a61 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/typeresolution/LooseCouplingTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/typeresolution/LooseCouplingTest.java @@ -1,7 +1,7 @@ /** * BSD-style license; for more info see http://pmd.sourceforge.net/license.html */ -package test.net.sourceforge.pmd.rules.typeresolution; +package test.net.sourceforge.pmd.lang.java.rule.typeresolution; import org.junit.Before; diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/typeresolution/SignatureDeclareThrowsExceptionTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/typeresolution/SignatureDeclareThrowsExceptionTest.java similarity index 87% rename from pmd/regress/test/net/sourceforge/pmd/rules/typeresolution/SignatureDeclareThrowsExceptionTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/typeresolution/SignatureDeclareThrowsExceptionTest.java index 8a85695fc1..be24189482 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/typeresolution/SignatureDeclareThrowsExceptionTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/typeresolution/SignatureDeclareThrowsExceptionTest.java @@ -1,4 +1,4 @@ -package test.net.sourceforge.pmd.rules.typeresolution; +package test.net.sourceforge.pmd.lang.java.rule.typeresolution; import org.junit.Before; diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/typeresolution/UnusedImportsTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/typeresolution/UnusedImportsTest.java similarity index 88% rename from pmd/regress/test/net/sourceforge/pmd/rules/typeresolution/UnusedImportsTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/typeresolution/UnusedImportsTest.java index 29952ea170..4cd5a63278 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/typeresolution/UnusedImportsTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/typeresolution/UnusedImportsTest.java @@ -1,7 +1,7 @@ /** * BSD-style license; for more info see http://pmd.sourceforge.net/license.html */ -package test.net.sourceforge.pmd.rules.typeresolution; +package test.net.sourceforge.pmd.lang.java.rule.typeresolution; import org.junit.Before; diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/typeresolution/xml/CloneMethodMustImplementCloneable.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/CloneMethodMustImplementCloneable.xml similarity index 94% rename from pmd/regress/test/net/sourceforge/pmd/rules/typeresolution/xml/CloneMethodMustImplementCloneable.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/CloneMethodMustImplementCloneable.xml index 7020c7ed64..4db83ad3b8 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/typeresolution/xml/CloneMethodMustImplementCloneable.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/CloneMethodMustImplementCloneable.xml @@ -63,7 +63,7 @@ ok, implements interface in same package which extends Cloneable ]]> 0 0 0 @@ -161,4 +161,4 @@ public enum Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/typeresolution/xml/LooseCoupling.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/LooseCoupling.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/rules/typeresolution/xml/LooseCoupling.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/LooseCoupling.xml index cb24f7a518..819ff5c042 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/typeresolution/xml/LooseCoupling.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/LooseCoupling.xml @@ -145,4 +145,4 @@ public class Foo { } ]]> - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/MyInterface.java b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/MyInterface.java new file mode 100644 index 0000000000..69131e3c78 --- /dev/null +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/MyInterface.java @@ -0,0 +1,11 @@ +package test.net.sourceforge.pmd.lang.java.rule.typeresolution.xml; + + +/** + * Warning, this class ARE not useless. + * It is used by the some of regression + * tests. + */ +public interface MyInterface extends Cloneable { + +} diff --git a/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/MyTestCase.java b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/MyTestCase.java new file mode 100644 index 0000000000..771a28bcf9 --- /dev/null +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/MyTestCase.java @@ -0,0 +1,12 @@ +package test.net.sourceforge.pmd.lang.java.rule.typeresolution.xml; + +import junit.framework.TestCase; + +/** + * Warning, this class ARE not useless. + * It is used by the some of regression + * tests. + */ +public class MyTestCase extends TestCase { + +} diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/typeresolution/xml/SignatureDeclareThrowsException.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/SignatureDeclareThrowsException.xml similarity index 84% rename from pmd/regress/test/net/sourceforge/pmd/rules/typeresolution/xml/SignatureDeclareThrowsException.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/SignatureDeclareThrowsException.xml index a696851fd2..59f780ea11 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/typeresolution/xml/SignatureDeclareThrowsException.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/SignatureDeclareThrowsException.xml @@ -1,148 +1,146 @@ - - - - - 1 - - - - - 0 - - - - - 1 - - - - - 0 - - - - - 0 - - - - - 1 - - - - - true - 0 - - - - - 0 - - - - - 0 - - - - - 0 - - - - - 0 - - - - - 0 - Bar foo() { /* blah */} -} - ]]> - java 1.5 - - \ No newline at end of file + + + + + 1 + + + + + 0 + + + + + 1 + + + + + 0 + + + + + 0 + + + + + 1 + + + + + true + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + Bar foo() { /* blah */} +} + ]]> + java 1.5 + + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/typeresolution/xml/UnusedImports.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/UnusedImports.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/typeresolution/xml/UnusedImports.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/UnusedImports.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/unusedcode/UnusedCodeRulesTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/unusedcode/UnusedCodeRulesTest.java similarity index 91% rename from pmd/regress/test/net/sourceforge/pmd/rules/unusedcode/UnusedCodeRulesTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/unusedcode/UnusedCodeRulesTest.java index 4796e3fd97..9cbf7af806 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/unusedcode/UnusedCodeRulesTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/unusedcode/UnusedCodeRulesTest.java @@ -1,4 +1,4 @@ -package test.net.sourceforge.pmd.rules.unusedcode; +package test.net.sourceforge.pmd.lang.java.rule.unusedcode; import org.junit.Before; diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/unusedcode/xml/UnusedFormalParameter.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/unusedcode/xml/UnusedFormalParameter.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/unusedcode/xml/UnusedFormalParameter.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/unusedcode/xml/UnusedFormalParameter.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/unusedcode/xml/UnusedLocalVariable.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/unusedcode/xml/UnusedLocalVariable.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/unusedcode/xml/UnusedLocalVariable.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/unusedcode/xml/UnusedLocalVariable.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/unusedcode/xml/UnusedModifier.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/unusedcode/xml/UnusedModifier.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/unusedcode/xml/UnusedModifier.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/unusedcode/xml/UnusedModifier.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/unusedcode/xml/UnusedPrivateField.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/unusedcode/xml/UnusedPrivateField.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/unusedcode/xml/UnusedPrivateField.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/unusedcode/xml/UnusedPrivateField.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/unusedcode/xml/UnusedPrivateMethod.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/unusedcode/xml/UnusedPrivateMethod.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/unusedcode/xml/UnusedPrivateMethod.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/unusedcode/xml/UnusedPrivateMethod.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/useless/UnusedNullCheckInEqualsTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/useless/UnusedNullCheckInEqualsTest.java similarity index 95% rename from pmd/regress/test/net/sourceforge/pmd/rules/useless/UnusedNullCheckInEqualsTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/useless/UnusedNullCheckInEqualsTest.java index 09797af7f3..d9e8840276 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/useless/UnusedNullCheckInEqualsTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/useless/UnusedNullCheckInEqualsTest.java @@ -1,7 +1,7 @@ /** * BSD-style license; for more info see http://pmd.sourceforge.net/license.html */ -package test.net.sourceforge.pmd.rules.useless; +package test.net.sourceforge.pmd.lang.java.rule.useless; import net.sourceforge.pmd.PMD; import net.sourceforge.pmd.Rule; diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/useless/UselessRulesTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/useless/UselessRulesTest.java similarity index 93% rename from pmd/regress/test/net/sourceforge/pmd/rules/useless/UselessRulesTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/useless/UselessRulesTest.java index 974439db04..3669b87558 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/useless/UselessRulesTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/useless/UselessRulesTest.java @@ -1,7 +1,7 @@ /** * BSD-style license; for more info see http://pmd.sourceforge.net/license.html */ -package test.net.sourceforge.pmd.rules.useless; +package test.net.sourceforge.pmd.lang.java.rule.useless; import org.junit.Before; diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/useless/xml/UnnecessaryConversionTemporary.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/useless/xml/UnnecessaryConversionTemporary.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/useless/xml/UnnecessaryConversionTemporary.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/useless/xml/UnnecessaryConversionTemporary.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/useless/xml/UnnecessaryFinalModifier.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/useless/xml/UnnecessaryFinalModifier.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/useless/xml/UnnecessaryFinalModifier.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/useless/xml/UnnecessaryFinalModifier.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/useless/xml/UnnecessaryReturn.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/useless/xml/UnnecessaryReturn.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/useless/xml/UnnecessaryReturn.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/useless/xml/UnnecessaryReturn.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/useless/xml/UnusedNullCheckInEquals.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/useless/xml/UnusedNullCheckInEquals.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/useless/xml/UnusedNullCheckInEquals.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/useless/xml/UnusedNullCheckInEquals.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/useless/xml/UselessOperationOnImmutable.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/useless/xml/UselessOperationOnImmutable.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/useless/xml/UselessOperationOnImmutable.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/useless/xml/UselessOperationOnImmutable.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/useless/xml/UselessOverridingMethod.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/useless/xml/UselessOverridingMethod.xml similarity index 94% rename from pmd/regress/test/net/sourceforge/pmd/rules/useless/xml/UselessOverridingMethod.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/useless/xml/UselessOverridingMethod.xml index e61caae460..31fec5b345 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/useless/xml/UselessOverridingMethod.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/useless/xml/UselessOverridingMethod.xml @@ -229,20 +229,6 @@ public class Foo extends Bar public Object clone() throws CloneNotSupportedException { return super.clone(); } -} - ]]> - - - - 1 - diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/useless/xml/UselessParentheses.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/useless/xml/UselessParentheses.xml similarity index 95% rename from pmd/regress/test/net/sourceforge/pmd/rules/useless/xml/UselessParentheses.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/useless/xml/UselessParentheses.xml index dd48926a8c..6fcc0c8c03 100644 --- a/pmd/regress/test/net/sourceforge/pmd/rules/useless/xml/UselessParentheses.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/useless/xml/UselessParentheses.xml @@ -1,129 +1,129 @@ - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 0 - - - - - 0 - - - - - 0 - + + + + 1 + + + + + 1 + + + + + 1 + + + + + 1 + + + + + 0 + + + + + 0 + + + + + 0 + - - - - 1 - - - - - 4 - + + + + 1 + + + + + 4 + = 0) @@ -136,7 +136,7 @@ public class Foo { node.getBeginColumn()) - 1; } -} - ]]> - - \ No newline at end of file +} + ]]> + + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/xml/UselessAssignment.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/xml/UselessAssignment.xml similarity index 100% rename from pmd/regress/test/net/sourceforge/pmd/rules/xml/UselessAssignment.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/java/rule/xml/UselessAssignment.xml diff --git a/pmd/regress/test/net/sourceforge/pmd/jsp/ast/AbstractJspNodesTst.java b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/ast/AbstractJspNodesTst.java similarity index 97% rename from pmd/regress/test/net/sourceforge/pmd/jsp/ast/AbstractJspNodesTst.java rename to pmd/regress/test/net/sourceforge/pmd/lang/jsp/ast/AbstractJspNodesTst.java index 3aab17cc2f..807799cd2e 100644 --- a/pmd/regress/test/net/sourceforge/pmd/jsp/ast/AbstractJspNodesTst.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/ast/AbstractJspNodesTst.java @@ -1,4 +1,4 @@ -package test.net.sourceforge.pmd.jsp.ast; +package test.net.sourceforge.pmd.lang.jsp.ast; import static org.junit.Assert.assertEquals; diff --git a/pmd/regress/test/net/sourceforge/pmd/jsp/ast/JspDocStyleTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/ast/JspDocStyleTest.java similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/jsp/ast/JspDocStyleTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/jsp/ast/JspDocStyleTest.java index 125ee380e8..35e865793c 100644 --- a/pmd/regress/test/net/sourceforge/pmd/jsp/ast/JspDocStyleTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/ast/JspDocStyleTest.java @@ -1,4 +1,4 @@ -package test.net.sourceforge.pmd.jsp.ast; +package test.net.sourceforge.pmd.lang.jsp.ast; import static org.junit.Assert.assertEquals; diff --git a/pmd/regress/test/net/sourceforge/pmd/jsp/ast/JspPageStyleTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/ast/JspPageStyleTest.java similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/jsp/ast/JspPageStyleTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/jsp/ast/JspPageStyleTest.java index ee702ec74d..282f36fa9a 100644 --- a/pmd/regress/test/net/sourceforge/pmd/jsp/ast/JspPageStyleTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/ast/JspPageStyleTest.java @@ -1,4 +1,4 @@ -package test.net.sourceforge.pmd.jsp.ast; +package test.net.sourceforge.pmd.lang.jsp.ast; import static org.junit.Assert.assertEquals; import net.sourceforge.pmd.lang.jsp.ast.ASTElExpression; import net.sourceforge.pmd.lang.jsp.ast.ASTJspComment; diff --git a/pmd/regress/test/net/sourceforge/pmd/jsp/ast/XPathJspRuleTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/ast/XPathJspRuleTest.java similarity index 80% rename from pmd/regress/test/net/sourceforge/pmd/jsp/ast/XPathJspRuleTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/jsp/ast/XPathJspRuleTest.java index 4204999ac3..f454cd2c94 100644 --- a/pmd/regress/test/net/sourceforge/pmd/jsp/ast/XPathJspRuleTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/ast/XPathJspRuleTest.java @@ -1,4 +1,4 @@ -package test.net.sourceforge.pmd.jsp.ast; +package test.net.sourceforge.pmd.lang.jsp.ast; import static org.junit.Assert.assertEquals; @@ -21,11 +21,6 @@ import test.net.sourceforge.pmd.testframework.RuleTst; public class XPathJspRuleTest extends RuleTst { - - private static final String MATCH = "
"; - - private static final String XPATH_EXPRESSION = "//Element [@Name='hr']"; - /** * Test matching a XPath expression against a JSP source. * @@ -34,8 +29,7 @@ public class XPathJspRuleTest extends RuleTst { @Test public void testExpressionMatching() throws Throwable { Rule rule = new XPathRule(); - // rule.addProperty("xpath", XPATH_EXPRESSION); - rule.setProperty(XPathRule.XPATH_DESCRIPTOR, XPATH_EXPRESSION); + rule.addProperty("xpath", XPATH_EXPRESSION); rule.setMessage("Test"); RuleSet rules = new RuleSet(); rules.addRule(rule); @@ -53,10 +47,16 @@ public class XPathJspRuleTest extends RuleTst { assertEquals("One violation expected!", 1, report.size()); - RuleViolation rv = report.iterator().next(); + RuleViolation rv = (RuleViolation) report.iterator().next(); assertEquals(1, rv.getBeginLine()); } + private static final String MATCH + = "
"; + + private static final String XPATH_EXPRESSION + = "//Element [@Name='hr']"; + public static junit.framework.Test suite() { return new junit.framework.JUnit4TestAdapter(XPathJspRuleTest.class); } diff --git a/pmd/regress/test/net/sourceforge/pmd/jsp/rules/DontNestJsfInJstlIterationTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/DontNestJsfInJstlIterationTest.java similarity index 92% rename from pmd/regress/test/net/sourceforge/pmd/jsp/rules/DontNestJsfInJstlIterationTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/DontNestJsfInJstlIterationTest.java index d3aa278455..12a71fc2e3 100644 --- a/pmd/regress/test/net/sourceforge/pmd/jsp/rules/DontNestJsfInJstlIterationTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/DontNestJsfInJstlIterationTest.java @@ -1,4 +1,4 @@ -package test.net.sourceforge.pmd.jsp.rules; +package test.net.sourceforge.pmd.lang.jsp.rule; import org.junit.Before; diff --git a/pmd/regress/test/net/sourceforge/pmd/jsp/rules/DuplicateJspImportTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/DuplicateJspImportTest.java similarity index 89% rename from pmd/regress/test/net/sourceforge/pmd/jsp/rules/DuplicateJspImportTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/DuplicateJspImportTest.java index becf8be095..ab18fdcaed 100644 --- a/pmd/regress/test/net/sourceforge/pmd/jsp/rules/DuplicateJspImportTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/DuplicateJspImportTest.java @@ -1,4 +1,4 @@ -package test.net.sourceforge.pmd.jsp.rules; +package test.net.sourceforge.pmd.lang.jsp.rule; import org.junit.Before; diff --git a/pmd/regress/test/net/sourceforge/pmd/jsp/rules/IframeMissingSrcAttributeTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/IframeMissingSrcAttributeTest.java similarity index 89% rename from pmd/regress/test/net/sourceforge/pmd/jsp/rules/IframeMissingSrcAttributeTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/IframeMissingSrcAttributeTest.java index e565f1fd6c..dc63680441 100644 --- a/pmd/regress/test/net/sourceforge/pmd/jsp/rules/IframeMissingSrcAttributeTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/IframeMissingSrcAttributeTest.java @@ -1,4 +1,4 @@ -package test.net.sourceforge.pmd.jsp.rules; +package test.net.sourceforge.pmd.lang.jsp.rule; import org.junit.Before; diff --git a/pmd/regress/test/net/sourceforge/pmd/jsp/rules/JspEncodingTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/JspEncodingTest.java similarity index 88% rename from pmd/regress/test/net/sourceforge/pmd/jsp/rules/JspEncodingTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/JspEncodingTest.java index d1313c68a5..0b758d8abf 100644 --- a/pmd/regress/test/net/sourceforge/pmd/jsp/rules/JspEncodingTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/JspEncodingTest.java @@ -1,4 +1,4 @@ -package test.net.sourceforge.pmd.jsp.rules; +package test.net.sourceforge.pmd.lang.jsp.rule; import org.junit.Before; diff --git a/pmd/regress/test/net/sourceforge/pmd/jsp/rules/NoClassAttributeTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/NoClassAttributeTest.java similarity index 89% rename from pmd/regress/test/net/sourceforge/pmd/jsp/rules/NoClassAttributeTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/NoClassAttributeTest.java index 86c03a486a..f91c5c115c 100644 --- a/pmd/regress/test/net/sourceforge/pmd/jsp/rules/NoClassAttributeTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/NoClassAttributeTest.java @@ -1,5 +1,5 @@ - package test.net.sourceforge.pmd.jsp.rules; + package test.net.sourceforge.pmd.lang.jsp.rule; import org.junit.Before; diff --git a/pmd/regress/test/net/sourceforge/pmd/jsp/rules/NoHtmlCommentsTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/NoHtmlCommentsTest.java similarity index 88% rename from pmd/regress/test/net/sourceforge/pmd/jsp/rules/NoHtmlCommentsTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/NoHtmlCommentsTest.java index 43e745e684..1fd637648e 100644 --- a/pmd/regress/test/net/sourceforge/pmd/jsp/rules/NoHtmlCommentsTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/NoHtmlCommentsTest.java @@ -1,4 +1,4 @@ -package test.net.sourceforge.pmd.jsp.rules; +package test.net.sourceforge.pmd.lang.jsp.rule; import org.junit.Before; diff --git a/pmd/regress/test/net/sourceforge/pmd/jsp/rules/NoInlineStyleInformationTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/NoInlineStyleInformationTest.java similarity index 89% rename from pmd/regress/test/net/sourceforge/pmd/jsp/rules/NoInlineStyleInformationTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/NoInlineStyleInformationTest.java index 1fb35195f1..3b217f0ced 100644 --- a/pmd/regress/test/net/sourceforge/pmd/jsp/rules/NoInlineStyleInformationTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/NoInlineStyleInformationTest.java @@ -1,4 +1,4 @@ -package test.net.sourceforge.pmd.jsp.rules; +package test.net.sourceforge.pmd.lang.jsp.rule; import org.junit.Before; diff --git a/pmd/regress/test/net/sourceforge/pmd/jsp/rules/NoJspForwardTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/NoJspForwardTest.java similarity index 91% rename from pmd/regress/test/net/sourceforge/pmd/jsp/rules/NoJspForwardTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/NoJspForwardTest.java index 227762109d..54fc057ea2 100644 --- a/pmd/regress/test/net/sourceforge/pmd/jsp/rules/NoJspForwardTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/NoJspForwardTest.java @@ -1,4 +1,4 @@ -package test.net.sourceforge.pmd.jsp.rules; +package test.net.sourceforge.pmd.lang.jsp.rule; import org.junit.Before; diff --git a/pmd/regress/test/net/sourceforge/pmd/jsp/rules/NoLongScriptsTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/NoLongScriptsTest.java similarity index 88% rename from pmd/regress/test/net/sourceforge/pmd/jsp/rules/NoLongScriptsTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/NoLongScriptsTest.java index a2fea2c71c..5d92c6450e 100644 --- a/pmd/regress/test/net/sourceforge/pmd/jsp/rules/NoLongScriptsTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/NoLongScriptsTest.java @@ -1,4 +1,4 @@ -package test.net.sourceforge.pmd.jsp.rules; +package test.net.sourceforge.pmd.lang.jsp.rule; import org.junit.Before; diff --git a/pmd/regress/test/net/sourceforge/pmd/jsp/rules/NoScriptletsTest.java b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/NoScriptletsTest.java similarity index 91% rename from pmd/regress/test/net/sourceforge/pmd/jsp/rules/NoScriptletsTest.java rename to pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/NoScriptletsTest.java index a7df86f0eb..ece84af10c 100644 --- a/pmd/regress/test/net/sourceforge/pmd/jsp/rules/NoScriptletsTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/NoScriptletsTest.java @@ -1,4 +1,4 @@ -package test.net.sourceforge.pmd.jsp.rules; +package test.net.sourceforge.pmd.lang.jsp.rule; import org.junit.Before; diff --git a/pmd/regress/test/net/sourceforge/pmd/jsp/rules/xml/DontNestJsfInJstlIteration.xml b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/xml/DontNestJsfInJstlIteration.xml similarity index 96% rename from pmd/regress/test/net/sourceforge/pmd/jsp/rules/xml/DontNestJsfInJstlIteration.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/xml/DontNestJsfInJstlIteration.xml index d2787f603c..1bf04b0525 100644 --- a/pmd/regress/test/net/sourceforge/pmd/jsp/rules/xml/DontNestJsfInJstlIteration.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/xml/DontNestJsfInJstlIteration.xml @@ -12,4 +12,4 @@ A violation. ]]> jsp - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/jsp/rules/xml/DuplicateJspImports.xml b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/xml/DuplicateJspImports.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/jsp/rules/xml/DuplicateJspImports.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/xml/DuplicateJspImports.xml index f4ae716932..b615c0e7f4 100644 --- a/pmd/regress/test/net/sourceforge/pmd/jsp/rules/xml/DuplicateJspImports.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/xml/DuplicateJspImports.xml @@ -60,4 +60,4 @@ Just 1 import ]]> jsp - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/jsp/rules/xml/IframeMissingSrcAttribute.xml b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/xml/IframeMissingSrcAttribute.xml similarity index 98% rename from pmd/regress/test/net/sourceforge/pmd/jsp/rules/xml/IframeMissingSrcAttribute.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/xml/IframeMissingSrcAttribute.xml index 8954109fa6..d5d9d90a97 100644 --- a/pmd/regress/test/net/sourceforge/pmd/jsp/rules/xml/IframeMissingSrcAttribute.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/xml/IframeMissingSrcAttribute.xml @@ -30,4 +30,4 @@ ]]> jsp - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/jsp/rules/xml/JspEncoding.xml b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/xml/JspEncoding.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/jsp/rules/xml/JspEncoding.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/xml/JspEncoding.xml index 78f5fbc7ee..a3140ac2d5 100644 --- a/pmd/regress/test/net/sourceforge/pmd/jsp/rules/xml/JspEncoding.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/xml/JspEncoding.xml @@ -64,4 +64,4 @@ Good meta header 2 ]]> jsp - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/jsp/rules/xml/NoClassAttribute.xml b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/xml/NoClassAttribute.xml similarity index 97% rename from pmd/regress/test/net/sourceforge/pmd/jsp/rules/xml/NoClassAttribute.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/xml/NoClassAttribute.xml index f04c102709..86437e25e4 100644 --- a/pmd/regress/test/net/sourceforge/pmd/jsp/rules/xml/NoClassAttribute.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/xml/NoClassAttribute.xml @@ -22,4 +22,4 @@ No scriptlets. ]]> jsp - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/jsp/rules/xml/NoHtmlComments.xml b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/xml/NoHtmlComments.xml similarity index 98% rename from pmd/regress/test/net/sourceforge/pmd/jsp/rules/xml/NoHtmlComments.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/xml/NoHtmlComments.xml index 13334b4bdf..295b4b0e67 100644 --- a/pmd/regress/test/net/sourceforge/pmd/jsp/rules/xml/NoHtmlComments.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/xml/NoHtmlComments.xml @@ -30,4 +30,4 @@ JSP Comments ]]> jsp - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/jsp/rules/xml/NoInlineStyleInformation.xml b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/xml/NoInlineStyleInformation.xml similarity index 98% rename from pmd/regress/test/net/sourceforge/pmd/jsp/rules/xml/NoInlineStyleInformation.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/xml/NoInlineStyleInformation.xml index 58661ac1bd..a56668adf0 100644 --- a/pmd/regress/test/net/sourceforge/pmd/jsp/rules/xml/NoInlineStyleInformation.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/xml/NoInlineStyleInformation.xml @@ -30,4 +30,4 @@ No violations. ]]> jsp - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/jsp/rules/xml/NoJspForward.xml b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/xml/NoJspForward.xml similarity index 96% rename from pmd/regress/test/net/sourceforge/pmd/jsp/rules/xml/NoJspForward.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/xml/NoJspForward.xml index 75eb65f2c8..ba8f560551 100644 --- a/pmd/regress/test/net/sourceforge/pmd/jsp/rules/xml/NoJspForward.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/xml/NoJspForward.xml @@ -10,4 +10,4 @@ A violation. ]]> jsp - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/jsp/rules/xml/NoLongScripts.xml b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/xml/NoLongScripts.xml similarity index 99% rename from pmd/regress/test/net/sourceforge/pmd/jsp/rules/xml/NoLongScripts.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/xml/NoLongScripts.xml index 1c854fb3a8..7241159879 100644 --- a/pmd/regress/test/net/sourceforge/pmd/jsp/rules/xml/NoLongScripts.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/xml/NoLongScripts.xml @@ -53,4 +53,4 @@ onload=calcDays; ]]> jsp - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/jsp/rules/xml/NoScriptlets.xml b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/xml/NoScriptlets.xml similarity index 98% rename from pmd/regress/test/net/sourceforge/pmd/jsp/rules/xml/NoScriptlets.xml rename to pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/xml/NoScriptlets.xml index 75cd97eaa0..546135b7e0 100644 --- a/pmd/regress/test/net/sourceforge/pmd/jsp/rules/xml/NoScriptlets.xml +++ b/pmd/regress/test/net/sourceforge/pmd/lang/jsp/rule/xml/NoScriptlets.xml @@ -27,4 +27,4 @@ No scriptlets. ]]> jsp - \ No newline at end of file + diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/codesize/NPathComplexityTest.java b/pmd/regress/test/net/sourceforge/pmd/rules/codesize/NPathComplexityTest.java deleted file mode 100644 index 17f5d4ee55..0000000000 --- a/pmd/regress/test/net/sourceforge/pmd/rules/codesize/NPathComplexityTest.java +++ /dev/null @@ -1,45 +0,0 @@ -/** - * BSD-style license; for more info see http://pmd.sourceforge.net/license.html - */ -package test.net.sourceforge.pmd.rules.codesize; - -import static org.junit.Assert.assertEquals; - -import java.util.Iterator; - -import net.sourceforge.pmd.Report; -import net.sourceforge.pmd.Rule; -import net.sourceforge.pmd.RuleViolation; -import net.sourceforge.pmd.lang.rule.stat.StatisticalRuleHelper; - -import org.junit.Before; -import org.junit.Test; - -import test.net.sourceforge.pmd.testframework.RuleTst; -import test.net.sourceforge.pmd.testframework.TestDescriptor; - -public class NPathComplexityTest extends RuleTst { - private Rule rule; - private TestDescriptor[] tests; - - @Before - public void setUp() { - rule = findRule("codesize", "NPathComplexity"); - tests = extractTestsFromXml(rule); - } - - @Test - public void testViolationMessage() throws Throwable { - // rule.addProperty("minimum", "1"); - rule.setProperty(StatisticalRuleHelper.MINIMUM_DESCRIPTOR, Integer.valueOf(1)); - Report report = new Report(); - runTestFromString(tests[0].getCode(), rule, report); - Iterator i = report.iterator(); - RuleViolation rv = (RuleViolation) i.next(); - assertEquals("correct violation message", "The method bar() has an NPath complexity of 2", rv.getDescription()); - } - - public static junit.framework.Test suite() { - return new junit.framework.JUnit4TestAdapter(NPathComplexityTest.class); - } -} diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/typeresolution/xml/MyInterface.java b/pmd/regress/test/net/sourceforge/pmd/rules/typeresolution/xml/MyInterface.java deleted file mode 100644 index 15d179d6f6..0000000000 --- a/pmd/regress/test/net/sourceforge/pmd/rules/typeresolution/xml/MyInterface.java +++ /dev/null @@ -1,5 +0,0 @@ -package test.net.sourceforge.pmd.rules.typeresolution.xml; - -public interface MyInterface extends Cloneable { - -} diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/typeresolution/xml/MyTestCase.java b/pmd/regress/test/net/sourceforge/pmd/rules/typeresolution/xml/MyTestCase.java deleted file mode 100644 index 346397153c..0000000000 --- a/pmd/regress/test/net/sourceforge/pmd/rules/typeresolution/xml/MyTestCase.java +++ /dev/null @@ -1,7 +0,0 @@ -package test.net.sourceforge.pmd.rules.typeresolution.xml; - -import junit.framework.TestCase; - -public class MyTestCase extends TestCase { - -}