diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/cpd/VfTokenizer.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/cpd/VfTokenizer.java index 2b145145fb..7c7f8386ec 100644 --- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/cpd/VfTokenizer.java +++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/cpd/VfTokenizer.java @@ -12,8 +12,8 @@ import org.apache.commons.io.IOUtils; import net.sourceforge.pmd.lang.LanguageRegistry; import net.sourceforge.pmd.lang.LanguageVersionHandler; import net.sourceforge.pmd.lang.TokenManager; -import net.sourceforge.pmd.lang.vf.ast.Token; import net.sourceforge.pmd.lang.vf.VfLanguageModule; +import net.sourceforge.pmd.lang.vf.ast.Token; import net.sourceforge.pmd.util.IOUtil; /** diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTAttribute.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTAttribute.java index f2380f2d6b..838301b43d 100644 --- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTAttribute.java +++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTAttribute.java @@ -5,9 +5,6 @@ package net.sourceforge.pmd.lang.vf.ast; -import net.sourceforge.pmd.lang.vf.ast.VfParser; -import net.sourceforge.pmd.lang.vf.ast.VfParserVisitor; - public class ASTAttribute extends AbstractVFNode { private String name; diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTAttributeValue.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTAttributeValue.java index 0b7407d8ce..70a2129af0 100644 --- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTAttributeValue.java +++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTAttributeValue.java @@ -5,9 +5,6 @@ package net.sourceforge.pmd.lang.vf.ast; -import net.sourceforge.pmd.lang.vf.ast.VfParser; -import net.sourceforge.pmd.lang.vf.ast.VfParserVisitor; - public class ASTAttributeValue extends AbstractVFNode { public ASTAttributeValue(int id) { super(id); diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTCData.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTCData.java index 0239fe44d2..341f9bd74f 100644 --- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTCData.java +++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTCData.java @@ -5,9 +5,6 @@ package net.sourceforge.pmd.lang.vf.ast; -import net.sourceforge.pmd.lang.vf.ast.VfParser; -import net.sourceforge.pmd.lang.vf.ast.VfParserVisitor; - public class ASTCData extends AbstractVFNode { public ASTCData(int id) { super(id); diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTCommentTag.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTCommentTag.java index f1ddec86ec..b0bafdff77 100644 --- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTCommentTag.java +++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTCommentTag.java @@ -5,9 +5,6 @@ package net.sourceforge.pmd.lang.vf.ast; -import net.sourceforge.pmd.lang.vf.ast.VfParser; -import net.sourceforge.pmd.lang.vf.ast.VfParserVisitor; - public class ASTCommentTag extends AbstractVFNode { public ASTCommentTag(int id) { super(id); diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTCompilationUnit.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTCompilationUnit.java index adda5f8196..2c58d140e7 100644 --- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTCompilationUnit.java +++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTCompilationUnit.java @@ -6,8 +6,6 @@ package net.sourceforge.pmd.lang.vf.ast; import net.sourceforge.pmd.lang.ast.RootNode; -import net.sourceforge.pmd.lang.vf.ast.VfParser; -import net.sourceforge.pmd.lang.vf.ast.VfParserVisitor; public class ASTCompilationUnit extends AbstractVFNode implements RootNode { public ASTCompilationUnit(int id) { diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTDeclaration.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTDeclaration.java index d7b8f37c15..bf95d52e80 100644 --- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTDeclaration.java +++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTDeclaration.java @@ -5,9 +5,6 @@ package net.sourceforge.pmd.lang.vf.ast; -import net.sourceforge.pmd.lang.vf.ast.VfParser; -import net.sourceforge.pmd.lang.vf.ast.VfParserVisitor; - public class ASTDeclaration extends AbstractVFNode { private String name; diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTDoctypeDeclaration.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTDoctypeDeclaration.java index 7234f44995..c8d053669c 100644 --- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTDoctypeDeclaration.java +++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTDoctypeDeclaration.java @@ -5,9 +5,6 @@ package net.sourceforge.pmd.lang.vf.ast; -import net.sourceforge.pmd.lang.vf.ast.VfParser; -import net.sourceforge.pmd.lang.vf.ast.VfParserVisitor; - public class ASTDoctypeDeclaration extends AbstractVFNode { /** diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTDoctypeExternalId.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTDoctypeExternalId.java index 26c33221a4..50404c5463 100644 --- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTDoctypeExternalId.java +++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTDoctypeExternalId.java @@ -5,9 +5,6 @@ package net.sourceforge.pmd.lang.vf.ast; -import net.sourceforge.pmd.lang.vf.ast.VfParser; -import net.sourceforge.pmd.lang.vf.ast.VfParserVisitor; - public class ASTDoctypeExternalId extends AbstractVFNode { /** diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTElExpression.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTElExpression.java index 3bbdab2212..395f528219 100644 --- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTElExpression.java +++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTElExpression.java @@ -5,9 +5,6 @@ package net.sourceforge.pmd.lang.vf.ast; -import net.sourceforge.pmd.lang.vf.ast.VfParser; -import net.sourceforge.pmd.lang.vf.ast.VfParserVisitor; - public class ASTElExpression extends AbstractVFNode { public ASTElExpression(int id) { super(id); diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTElement.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTElement.java index 1ab8fefacd..d736a44614 100644 --- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTElement.java +++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTElement.java @@ -5,9 +5,6 @@ package net.sourceforge.pmd.lang.vf.ast; -import net.sourceforge.pmd.lang.vf.ast.VfParser; -import net.sourceforge.pmd.lang.vf.ast.VfParserVisitor; - public class ASTElement extends AbstractVFNode { /** diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTHtmlScript.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTHtmlScript.java index 084feb5f2b..d85331eb80 100644 --- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTHtmlScript.java +++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTHtmlScript.java @@ -6,9 +6,6 @@ package net.sourceforge.pmd.lang.vf.ast; -import net.sourceforge.pmd.lang.vf.ast.VfParser; -import net.sourceforge.pmd.lang.vf.ast.VfParserVisitor; - public class ASTHtmlScript extends AbstractVFNode { public ASTHtmlScript(int id) { super(id); diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTText.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTText.java index 10fc9e00f6..bcdd4ef45a 100644 --- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTText.java +++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTText.java @@ -5,9 +5,6 @@ package net.sourceforge.pmd.lang.vf.ast; -import net.sourceforge.pmd.lang.vf.ast.VfParser; -import net.sourceforge.pmd.lang.vf.ast.VfParserVisitor; - public class ASTText extends AbstractVFNode { public ASTText(int id) { super(id); diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTUnparsedText.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTUnparsedText.java index 1084c9fbeb..54df865a90 100644 --- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTUnparsedText.java +++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTUnparsedText.java @@ -5,9 +5,6 @@ package net.sourceforge.pmd.lang.vf.ast; -import net.sourceforge.pmd.lang.vf.ast.VfParser; -import net.sourceforge.pmd.lang.vf.ast.VfParserVisitor; - public class ASTUnparsedText extends AbstractVFNode { public ASTUnparsedText(int id) { super(id); diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/AbstractVFNode.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/AbstractVFNode.java index c252ff5435..00b8c3d880 100644 --- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/AbstractVFNode.java +++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/AbstractVFNode.java @@ -5,9 +5,6 @@ package net.sourceforge.pmd.lang.vf.ast; import net.sourceforge.pmd.lang.ast.AbstractNode; -import net.sourceforge.pmd.lang.vf.ast.VfParser; -import net.sourceforge.pmd.lang.vf.ast.VfParserTreeConstants; -import net.sourceforge.pmd.lang.vf.ast.VfParserVisitor; public class AbstractVFNode extends AbstractNode implements VfNode { diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/SyntaxErrorException.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/SyntaxErrorException.java index ab291d15dc..d24a971234 100644 --- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/SyntaxErrorException.java +++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/SyntaxErrorException.java @@ -4,8 +4,6 @@ package net.sourceforge.pmd.lang.vf.ast; -import net.sourceforge.pmd.lang.vf.ast.ParseException; - /** * Exception indicating that a syntactic error has been found. * diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/VfNode.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/VfNode.java index 5f4a02b005..b8cdadea5a 100644 --- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/VfNode.java +++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/VfNode.java @@ -5,7 +5,6 @@ package net.sourceforge.pmd.lang.vf.ast; import net.sourceforge.pmd.lang.ast.Node; -import net.sourceforge.pmd.lang.vf.ast.VfParserVisitor; public interface VfNode extends Node { /** diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/VfParserVisitorAdapter.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/VfParserVisitorAdapter.java index 6940daa0aa..daaec95a02 100644 --- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/VfParserVisitorAdapter.java +++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/VfParserVisitorAdapter.java @@ -4,8 +4,6 @@ package net.sourceforge.pmd.lang.vf.ast; -import net.sourceforge.pmd.lang.vf.ast.VfParserVisitor; - public class VfParserVisitorAdapter implements VfParserVisitor { public Object visit(VfNode node, Object data) { diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/rule/AbstractVfRule.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/rule/AbstractVfRule.java index c8c11b3095..f0fadabf54 100644 --- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/rule/AbstractVfRule.java +++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/rule/AbstractVfRule.java @@ -9,7 +9,6 @@ import java.util.List; import net.sourceforge.pmd.RuleContext; import net.sourceforge.pmd.lang.LanguageRegistry; import net.sourceforge.pmd.lang.ast.Node; -import net.sourceforge.pmd.lang.vf.ast.VfParserVisitor; import net.sourceforge.pmd.lang.rule.AbstractRule; import net.sourceforge.pmd.lang.rule.ImmutableLanguage; import net.sourceforge.pmd.lang.vf.VfLanguageModule; @@ -27,6 +26,7 @@ import net.sourceforge.pmd.lang.vf.ast.ASTHtmlScript; import net.sourceforge.pmd.lang.vf.ast.ASTText; import net.sourceforge.pmd.lang.vf.ast.ASTUnparsedText; import net.sourceforge.pmd.lang.vf.ast.VfNode; +import net.sourceforge.pmd.lang.vf.ast.VfParserVisitor; public abstract class AbstractVfRule extends AbstractRule implements VfParserVisitor, ImmutableLanguage { diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/rule/VfRuleChainVisitor.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/rule/VfRuleChainVisitor.java index 3edc2bfdd3..edbee28caa 100644 --- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/rule/VfRuleChainVisitor.java +++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/rule/VfRuleChainVisitor.java @@ -9,11 +9,11 @@ import java.util.List; import net.sourceforge.pmd.Rule; import net.sourceforge.pmd.RuleContext; import net.sourceforge.pmd.lang.ast.Node; -import net.sourceforge.pmd.lang.vf.ast.VfParserVisitor; import net.sourceforge.pmd.lang.rule.AbstractRuleChainVisitor; import net.sourceforge.pmd.lang.rule.XPathRule; import net.sourceforge.pmd.lang.vf.ast.ASTCompilationUnit; import net.sourceforge.pmd.lang.vf.ast.VfNode; +import net.sourceforge.pmd.lang.vf.ast.VfParserVisitor; import net.sourceforge.pmd.lang.vf.ast.VfParserVisitorAdapter; public class VfRuleChainVisitor extends AbstractRuleChainVisitor { diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/rule/security/VfUnescapeElRule.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/rule/security/VfUnescapeElRule.java index ef2330b0f6..927c2540aa 100644 --- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/rule/security/VfUnescapeElRule.java +++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/rule/security/VfUnescapeElRule.java @@ -20,9 +20,15 @@ import net.sourceforge.pmd.lang.vf.rule.AbstractVfRule; */ public class VfUnescapeElRule extends AbstractVfRule { + private static final String APEX_PARAM = "apex:param"; private static final String VALUE = "value"; + private static final String ITEM_VALUE = "itemValue"; private static final String ESCAPE = "escape"; - private static final String APEX_OUTPUT_TEXT = "apex:outputText"; + private static final String ITEM_ESCAPED = "itemEscaped"; + private static final String APEX_OUTPUT_TEXT = "apex:outputtext"; + private static final String APEX_PAGE_MESSAGE = "apex:pagemessage"; + private static final String APEX_PAGE_MESSAGES = "apex:pagemessages"; + private static final String APEX_SELECT_OPTION = "apex:selectoption "; private static final String FALSE = "false"; @Override @@ -33,7 +39,7 @@ public class VfUnescapeElRule extends AbstractVfRule { @Override public Object visit(ASTElement node, Object data) { - if (node.getName().equalsIgnoreCase(APEX_OUTPUT_TEXT)) { + if (doesTagSupportEscaping(node)) { final List attributes = node.findChildrenOfType(ASTAttribute.class); boolean isUnescaped = false; boolean isEL = false; @@ -44,6 +50,7 @@ public class VfUnescapeElRule extends AbstractVfRule { String name = attr.getName(); switch (name) { case ESCAPE: + case ITEM_ESCAPED: final ASTUnparsedText text = attr.getFirstDescendantOfType(ASTUnparsedText.class); if (text != null) { if (text.getImage().equalsIgnoreCase(FALSE)) { @@ -52,6 +59,7 @@ public class VfUnescapeElRule extends AbstractVfRule { } break; case VALUE: + case ITEM_VALUE: final ASTElExpression elInVal = attr.getFirstDescendantOfType(ASTElExpression.class); if (elInVal != null) { isEL = true; @@ -86,10 +94,27 @@ public class VfUnescapeElRule extends AbstractVfRule { return super.visit(node, data); } + private boolean doesTagSupportEscaping(ASTElement node) { + if (node.getName() == null) { + return false; + } + + switch (node.getName().toLowerCase()) { // vf is case insensitive? + case APEX_OUTPUT_TEXT: + case APEX_PAGE_MESSAGE: + case APEX_PAGE_MESSAGES: + case APEX_SELECT_OPTION: + return true; + default: + return false; + } + + } + private boolean hasAnyEL(ASTElement node) { final List innerElements = node.findChildrenOfType(ASTElement.class); for (ASTElement element : innerElements) { - if (element.getName().equalsIgnoreCase("apex:param")) { + if (element.getName().equalsIgnoreCase(APEX_PARAM)) { final List innerAttributes = element.findChildrenOfType(ASTAttribute.class); for (ASTAttribute attrib : innerAttributes) { final ASTElExpression elInVal = attrib.getFirstDescendantOfType(ASTElExpression.class); diff --git a/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/VfParserTest.java b/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/VfParserTest.java index 614f82d189..ceb1953dea 100644 --- a/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/VfParserTest.java +++ b/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/VfParserTest.java @@ -13,7 +13,6 @@ import net.sourceforge.pmd.lang.LanguageRegistry; import net.sourceforge.pmd.lang.LanguageVersionHandler; import net.sourceforge.pmd.lang.Parser; import net.sourceforge.pmd.lang.ast.Node; -import net.sourceforge.pmd.lang.vf.VfLanguageModule; /** * @author sergey.gorbaty @@ -23,19 +22,16 @@ public class VfParserTest { @Test public void testSingleDoubleQuoteAndEL() { - Node node = parse( - "${!yes}"); + Node node = parse("${!yes}"); Assert.assertNotNull(node); } - @Test public void testSingleDoubleQuote() { - Node node = parse( - "${yes}"); + Node node = parse("${yes}"); Assert.assertNotNull(node); } - + private Node parse(String code) { LanguageVersionHandler jspLang = LanguageRegistry.getLanguage(VfLanguageModule.NAME).getDefaultVersion() .getLanguageVersionHandler(); diff --git a/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/ast/AbstractVfNodesTest.java b/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/ast/AbstractVfNodesTest.java index e98191e3ae..97a5319bd7 100644 --- a/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/ast/AbstractVfNodesTest.java +++ b/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/ast/AbstractVfNodesTest.java @@ -12,8 +12,6 @@ import java.util.Set; import net.sourceforge.pmd.lang.ast.JavaCharStream; import net.sourceforge.pmd.lang.ast.Node; -import net.sourceforge.pmd.lang.vf.ast.VfNode; -import net.sourceforge.pmd.lang.vf.ast.VfParser; public abstract class AbstractVfNodesTest { diff --git a/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/ast/OpenTagRegisterTest.java b/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/ast/OpenTagRegisterTest.java index ebdb5280d2..1d4ea12f04 100644 --- a/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/ast/OpenTagRegisterTest.java +++ b/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/ast/OpenTagRegisterTest.java @@ -10,9 +10,6 @@ import static org.junit.Assert.assertTrue; import org.junit.Before; import org.junit.Test; -import net.sourceforge.pmd.lang.vf.ast.ASTElement; -import net.sourceforge.pmd.lang.vf.ast.OpenTagRegister; - public class OpenTagRegisterTest { private OpenTagRegister tagList; @@ -112,7 +109,8 @@ public class OpenTagRegisterTest { } /** - * <a> <x> <a> <b> <b> </z> </a> </x> + * <a> <x> <a> <b> <b> </z> </a> + * </x> */ @Test public void openedIsolatedTag() { diff --git a/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/ast/VfDocStyleTest.java b/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/ast/VfDocStyleTest.java index 4b0e6aafc4..bcb1d5679b 100644 --- a/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/ast/VfDocStyleTest.java +++ b/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/ast/VfDocStyleTest.java @@ -19,17 +19,6 @@ import org.junit.Ignore; import org.junit.Test; import net.sourceforge.pmd.lang.ast.Node; -import net.sourceforge.pmd.lang.vf.ast.ASTAttribute; -import net.sourceforge.pmd.lang.vf.ast.ASTAttributeValue; -import net.sourceforge.pmd.lang.vf.ast.ASTCData; -import net.sourceforge.pmd.lang.vf.ast.ASTCommentTag; -import net.sourceforge.pmd.lang.vf.ast.ASTDoctypeDeclaration; -import net.sourceforge.pmd.lang.vf.ast.ASTDoctypeExternalId; -import net.sourceforge.pmd.lang.vf.ast.ASTElExpression; -import net.sourceforge.pmd.lang.vf.ast.ASTElement; -import net.sourceforge.pmd.lang.vf.ast.ASTHtmlScript; -import net.sourceforge.pmd.lang.vf.ast.ASTText; -import net.sourceforge.pmd.lang.vf.ast.VfNode; /** * Test parsing of a VF in document style, by checking the generated AST. diff --git a/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/ast/VfPageStyleTest.java b/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/ast/VfPageStyleTest.java index 96a8d7d3f3..9c979d9e0a 100644 --- a/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/ast/VfPageStyleTest.java +++ b/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/ast/VfPageStyleTest.java @@ -5,10 +5,10 @@ package net.sourceforge.pmd.lang.vf.ast; import static org.junit.Assert.assertEquals; -import java.util.Set; -import org.junit.Test; -import net.sourceforge.pmd.lang.vf.ast.ASTElExpression; +import java.util.Set; + +import org.junit.Test; public class VfPageStyleTest extends AbstractVfNodesTest {