Warning: the Check is very controversial and not that actual nowadays.
* *Examples of use: *
@@ -53,6 +55,19 @@ * </module> ** + *
Rationale:
+ *-
+ *
- + * The same notation/habit for C++ and Java (C++ have global methods, so having + * "this." do make sense in it to distinguish call of method of class + * instead of global). + * + *
- + * Non-IDE development (ease of refactoring, some clearness to distinguish + * static and non-static methods). + * + *
Limitations: Nothing is currently done about static variables
* or catch-blocks. Static methods invoked on a class name seem to be OK;
* both the class name and the method name have a DOT parent.
@@ -374,7 +389,8 @@
private AbstractFrame checkMethod(DetailAST ast) {
final AbstractFrame frame = findFrame(ast, true);
if (frame != null
- && ((ClassFrame) frame).hasInstanceMethod(ast)) {
+ && ((ClassFrame) frame).hasInstanceMethod(ast)
+ && !((ClassFrame) frame).hasStaticMethod(ast)) {
return frame;
}
return null;
@@ -478,12 +494,12 @@
return frameName;
}
- /** Check whether the frame contains a given name.
+ /** Check whether the frame contains a field or a variable with the given name.
* @param nameToFind the IDENT ast of the name we're looking for
* @return whether it was found
*/
- boolean contains(DetailAST nameToFind) {
- return containsName(varIdents, nameToFind);
+ boolean containsFieldOrVariable(DetailAST nameToFind) {
+ return containsFieldOrVariableDef(varIdents, nameToFind);
}
/** Check whether the frame contains a given name.
@@ -492,10 +508,10 @@
* @return whether it was found.
*/
protected AbstractFrame getIfContains(DetailAST nameToFind, boolean lookForMethod) {
- AbstractFrame frame;
+ final AbstractFrame frame;
if (!lookForMethod
- && contains(nameToFind)) {
+ && containsFieldOrVariable(nameToFind)) {
frame = this;
}
else {
@@ -512,7 +528,7 @@
* @return true if the set contains a declaration with the text of the specified
* IDENT ast and it is declared in a proper position.
*/
- protected boolean containsName(Set
+ * Implementation of a check that looks for a file name and/or path match (or
+ * mis-match) against specified patterns. It can also be used to verify files
+ * match specific naming patterns not covered by other checks (Ex: properties,
+ * xml, etc.).
+ *
+ * When customizing the check, the properties are applied in a specific order.
+ * The fileExtensions property first picks only files that match any of the
+ * specific extensions supplied. Once files are matched against the
+ * fileExtensions, the match property is then used in conjuction with the
+ * patterns to determine if the check is looking for a match or mis-match on
+ * those files. If the fileNamePattern is supplied, the matching is only applied
+ * to the fileNamePattern and not the folderPattern. If no fileNamePattern is
+ * supplied, then matching is applied to the folderPattern only and will result
+ * in all files in a folder to be reported on violations. If no folderPattern is
+ * supplied, then all folders that checkstyle finds are examined for violations.
+ * The ignoreFileNameExtensions property drops the file extension and applies
+ * the fileNamePattern only to the rest of file name. For example, if the file
+ * is named 'test.java' and this property is turned on, the pattern is only
+ * applied to 'test'.
+ *
+ * If this check is configured with no properties, then the default behavior of
+ * this check is to report file names with spaces in them. When at least one
+ * pattern property is supplied, the entire check is under the user's control to
+ * allow them to fully customize the behavior.
+ *
+ * It is recommended that if you create your own pattern, to also specify a
+ * custom error message. This allows the error message printed to be clear what
+ * the violation is, especially if multiple RegexpOnFilename checks are used.
+ * Argument 0 for the message populates the check's folderPattern. Argument 1
+ * for the message populates the check's fileNamePattern. The file name is not
+ * passed as an argument since it is part of CheckStyle's default error
+ * messages.
+ *
+ * Check have following options:
+ *
+ * To configure the check to report file names that contain a space:
+ *
+ * To configure the check to force picture files to not be 'gif':
+ *
+ * OR:
+ *
+ * To configure the check to only allow property and xml files to be located in
+ * the resource folder:
+ *
+ * To configure the check to only allow Java and XML files in your folders use
+ * the below.
+ *
+ * To configure the check to only allow Java and XML files only in your source
+ * folder and ignore any other folders:
+ *
+ * Note: 'folderPattern' must be specified if checkstyle is analyzing
+ * more than the normal source folder, like the 'bin' folder where class files
+ * can be located.
+ *
+ * To configure the check to only allow file names to be camel case:
+ *
+ *
+ *
+ *
+ *
+ * <module name="RegexpOnFilename"/>
+ *
+ *
+ * <module name="RegexpOnFilename">
+ * <property name="fileNamePattern" value="\\.gif$"/>
+ * </module>
+ *
+ *
+ * <module name="RegexpOnFilename">
+ * <property name="fileNamePattern" value="."/>
+ * <property name="fileExtensions" value="gif"/>
+ * </module>
+ *
+ *
+ *
+ * <module name="RegexpOnFilename">
+ * <property name="folderPattern"
+ * value="[\\/]src[\\/]\\w+[\\/]resources[\\/]"/>
+ * <property name="match" value="false"/>
+ * <property name="fileExtensions" value="properties, xml"/>
+ * </module>
+ *
+ *
+ *
+ * <module name="RegexpOnFilename">
+ * <property name="fileNamePattern" value="\\.(java|xml)$"/>
+ * <property name="match" value="false"/>
+ * </module>
+ *
+ *
+ * <module name="RegexpOnFilename">
+ * <property name="folderPattern" value="[\\/]src[\\/]"/>
+ * <property name="fileNamePattern" value="\\.(java|xml)$"/>
+ * <property name="match" value="false"/>
+ * </module>
+ *
+ *
+ * <module name="RegexpOnFilename">
+ * <property name="fileNamePattern"
+ * value="^([A-Z][a-z0-9]+\.?)+$"/>
+ * <property name="match" value="false"/>
+ * <property name="ignoreFileNameExtensions" value="true"/>
+ * </module>
+ *
+ *
+ * @author Richard Veach
+ */
+public class RegexpOnFilenameCheck extends AbstractFileSetCheck {
+ /**
+ * A key is pointing to the warning message text in "messages.properties"
+ * file.
+ */
+ public static final String MSG_MATCH = "regexp.filename.match";
+ /**
+ * A key is pointing to the warning message text in "messages.properties"
+ * file.
+ */
+ public static final String MSG_MISMATCH = "regexp.filename.mismatch";
+
+ /** Compiled regexp to match a folder. */
+ private Pattern folderPattern;
+ /** Compiled regexp to match a file. */
+ private Pattern fileNamePattern;
+ /** Whether to look for a file name match or mismatch. */
+ private boolean match = true;
+ /** Whether to ignore the file's extension when looking for matches. */
+ private boolean ignoreFileNameExtensions;
+
+ /**
+ * Setter for folder format.
+ *
+ * @param folderPattern format of folder.
+ * @throws org.apache.commons.beanutils.ConversionException if unable to
+ * create Pattern object.
+ */
+ public void setFolderPattern(String folderPattern) {
+ this.folderPattern = CommonUtils.createPattern(folderPattern);
+ }
+
+ /**
+ * Setter for file name format.
+ *
+ * @param fileNamePattern format of file.
+ * @throws org.apache.commons.beanutils.ConversionException if unable to
+ * create Pattern object.
+ */
+ public void setFileNamePattern(String fileNamePattern) {
+ this.fileNamePattern = CommonUtils.createPattern(fileNamePattern);
+ }
+
+ /**
+ * Sets whether the check should look for a file name match or mismatch.
+ *
+ * @param match check's option for matching file names.
+ */
+ public void setMatch(boolean match) {
+ this.match = match;
+ }
+
+ /**
+ * Sets whether file name matching should drop the file extension or not.
+ *
+ * @param ignoreFileNameExtensions check's option for ignoring file extension.
+ */
+ public void setIgnoreFileNameExtensions(boolean ignoreFileNameExtensions) {
+ this.ignoreFileNameExtensions = ignoreFileNameExtensions;
+ }
+
+ @Override
+ public void init() {
+ if (fileNamePattern == null && folderPattern == null) {
+ fileNamePattern = CommonUtils.createPattern("\\s");
+ }
+ }
+
+ @Override
+ protected void processFiltered(File file, List
@@ -33,21 +38,32 @@ * column, as specified in a suppression file. *
* @author Rick Giles + * @author liscju */ public class SuppressionFilter extends AutomaticBean implements Filter { + /** Filename of supression file. */ + private String file; + /** Tells whether config file existence is optional. */ + private boolean optional; /** Set of individual suppresses. */ private FilterSet filters = new FilterSet(); /** - * Loads the suppressions for a file. + * Sets name of the supression file. * @param fileName name of the suppressions file. - * @throws CheckstyleException if there is an error. */ - public void setFile(String fileName) - throws CheckstyleException { - filters = SuppressionsLoader.loadSuppressions(fileName); + public void setFile(String fileName) { + file = fileName; + } + + /** + * Sets whether config file existence is optional. + * @param optional tells if config file existence is optional. + */ + public void setOptional(boolean optional) { + this.optional = optional; } @Override @@ -71,4 +87,50 @@ public int hashCode() { return Objects.hash(filters); } + + @Override + protected void finishLocalSetup() throws CheckstyleException { + if (file != null) { + if (optional) { + if (suppressionSourceExists(file)) { + filters = SuppressionsLoader.loadSuppressions(file); + } + else { + filters = new FilterSet(); + } + } + else { + filters = SuppressionsLoader.loadSuppressions(file); + } + } + } + + /** + * Checks if suppression source with given fileName exists. + * @param fileName name of the suppressions file. + * @return true if suppression file exists, otherwise false + */ + private static boolean suppressionSourceExists(String fileName) { + boolean suppressionSourceExists = true; + InputStream sourceInput = null; + try { + final URI uriByFilename = CommonUtils.getUriByFilename(fileName); + final URL url = uriByFilename.toURL(); + sourceInput = url.openStream(); + } + catch (CheckstyleException | IOException ignored) { + suppressionSourceExists = false; + } + finally { + if (sourceInput != null) { + try { + sourceInput.close(); + } + catch (IOException ignored) { + suppressionSourceExists = false; + } + } + } + return suppressionSourceExists; + } } diff -Nru checkstyle-6.14.1/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoader.java checkstyle-6.15/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoader.java --- checkstyle-6.14.1/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoader.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoader.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWarningsFilter.java checkstyle-6.15/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWarningsFilter.java --- checkstyle-6.14.1/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWarningsFilter.java 2015-11-13 05:06:18.000000000 +0000 +++ checkstyle-6.15/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWarningsFilter.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -34,7 +34,6 @@ implements Filter { @Override public boolean accept(AuditEvent event) { - return !SuppressWarningsHolder.isSuppressed(event.getSourceName(), - event.getLine(), event.getColumn()); + return !SuppressWarningsHolder.isSuppressed(event); } } diff -Nru checkstyle-6.14.1/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.java checkstyle-6.15/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.java --- checkstyle-6.14.1/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -415,7 +415,13 @@ if (tagMatcher.find()) { match = true; } - else if (tagMessageRegexp != null) { + else if (tagMessageRegexp == null) { + if (event.getModuleId() != null) { + final Matcher idMatcher = tagCheckRegexp.matcher(event.getModuleId()); + match = idMatcher.find(); + } + } + else { final Matcher messageMatcher = tagMessageRegexp.matcher(event.getMessage()); match = messageMatcher.find(); } diff -Nru checkstyle-6.14.1/src/main/java/com/puppycrawl/tools/checkstyle/grammars/CommentListener.java checkstyle-6.15/src/main/java/com/puppycrawl/tools/checkstyle/grammars/CommentListener.java --- checkstyle-6.14.1/src/main/java/com/puppycrawl/tools/checkstyle/grammars/CommentListener.java 2015-11-13 05:06:18.000000000 +0000 +++ checkstyle-6.15/src/main/java/com/puppycrawl/tools/checkstyle/grammars/CommentListener.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/main/java/com/puppycrawl/tools/checkstyle/grammars/package-info.java checkstyle-6.15/src/main/java/com/puppycrawl/tools/checkstyle/grammars/package-info.java --- checkstyle-6.14.1/src/main/java/com/puppycrawl/tools/checkstyle/grammars/package-info.java 2015-11-13 05:06:18.000000000 +0000 +++ checkstyle-6.15/src/main/java/com/puppycrawl/tools/checkstyle/grammars/package-info.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/main/java/com/puppycrawl/tools/checkstyle/gui/BaseCellEditor.java checkstyle-6.15/src/main/java/com/puppycrawl/tools/checkstyle/gui/BaseCellEditor.java --- checkstyle-6.14.1/src/main/java/com/puppycrawl/tools/checkstyle/gui/BaseCellEditor.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/main/java/com/puppycrawl/tools/checkstyle/gui/BaseCellEditor.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/main/java/com/puppycrawl/tools/checkstyle/gui/CodeSelector.java checkstyle-6.15/src/main/java/com/puppycrawl/tools/checkstyle/gui/CodeSelector.java --- checkstyle-6.14.1/src/main/java/com/puppycrawl/tools/checkstyle/gui/CodeSelector.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/main/java/com/puppycrawl/tools/checkstyle/gui/CodeSelector.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -72,7 +72,6 @@ editor.requestFocusInWindow(); editor.setCaretPosition(start); editor.moveCaretPosition(end); - editor.transferFocusBackward(); } /** diff -Nru checkstyle-6.14.1/src/main/java/com/puppycrawl/tools/checkstyle/gui/JTreeTable.java checkstyle-6.15/src/main/java/com/puppycrawl/tools/checkstyle/gui/JTreeTable.java --- checkstyle-6.14.1/src/main/java/com/puppycrawl/tools/checkstyle/gui/JTreeTable.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/main/java/com/puppycrawl/tools/checkstyle/gui/JTreeTable.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -21,7 +21,9 @@ import java.awt.Component; import java.awt.Dimension; +import java.awt.FontMetrics; import java.awt.event.ActionEvent; +import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.EventObject; import java.util.List; @@ -37,6 +39,7 @@ import javax.swing.tree.TreePath; import com.google.common.collect.ImmutableList; +import com.google.common.primitives.Ints; import com.puppycrawl.tools.checkstyle.api.DetailAST; /** @@ -96,28 +99,79 @@ setRowHeight(getRowHeight()); } + setColumnsInitialWidth(); + final Action expand = new AbstractAction() { private static final long serialVersionUID = -5859674518660156121L; - @Override - public void actionPerformed(ActionEvent event) { - final TreePath selected = tree.getSelectionPath(); - final DetailAST ast = (DetailAST) selected.getLastPathComponent(); - new CodeSelector(ast, editor, linePositionMap).select(); - - if (tree.isExpanded(selected)) { - tree.collapsePath(selected); - } - else { - tree.expandPath(selected); - } - tree.setSelectionPath(selected); - } - }; + @Override + public void actionPerformed(ActionEvent event) { + doExpandByEnter(); + } + }; final KeyStroke stroke = KeyStroke.getKeyStroke("ENTER"); final String command = "expand/collapse"; getInputMap().put(stroke, command); getActionMap().put(command, expand); + + addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent event) { + if (event.getClickCount() == 2) { + makeCodeSelection(); + } + } + }); + } + + /** + * Do expansion of a tree node after pressing ENTER. + */ + private void doExpandByEnter() { + final TreePath selected = makeCodeSelection(); + + if (tree.isExpanded(selected)) { + tree.collapsePath(selected); + } + else { + tree.expandPath(selected); + } + tree.setSelectionPath(selected); + } + + /** + * Make selection of code in a text area. + * @return selected TreePath. + */ + private TreePath makeCodeSelection() { + final TreePath selected = tree.getSelectionPath(); + final DetailAST ast = (DetailAST) selected.getLastPathComponent(); + new CodeSelector(ast, editor, linePositionMap).select(); + return selected; + } + + /** + * Set initial value of width for columns in table. + */ + private void setColumnsInitialWidth() { + final FontMetrics fontMetrics = getFontMetrics(getFont()); + // Six character string to contain "Column" column. + final int widthOfSixCharacterString = fontMetrics.stringWidth("XXXXXX"); + // Padding must be added to width for columns to make them fully + // visible in table header. + final int padding = 10; + final int widthOfColumnContainingSixCharacterString = + widthOfSixCharacterString + padding; + getColumn("Line").setMaxWidth(widthOfColumnContainingSixCharacterString); + getColumn("Column").setMaxWidth(widthOfColumnContainingSixCharacterString); + final int preferredTreeColumnWidth = + Ints.checkedCast(Math.round(getPreferredSize().getWidth() * 0.6)); + getColumn("Tree").setPreferredWidth(preferredTreeColumnWidth); + // Twenty eight character string to contain "Type" column + final int widthOfTwentyEightCharacterString = + fontMetrics.stringWidth("XXXXXXXXXXXXXXXXXXXXXXXXXXXX"); + final int preferredTypeColumnWidth = widthOfTwentyEightCharacterString + padding; + getColumn("Type").setPreferredWidth(preferredTypeColumnWidth); } /** @@ -157,6 +211,8 @@ /** * Overridden to pass the new rowHeight to the tree. + * + * @param newRowHeight new row height */ @Override public final void setRowHeight(int newRowHeight) { @@ -223,6 +279,9 @@ *By returning false we are also enforcing the policy that
* the tree will never be editable (at least by a key sequence).
*
+ * @param event the event the editor should use to consider
+ * whether to begin editing or not
+ * @return true if editing can be started
* @see TableCellEditor
*/
@Override
diff -Nru checkstyle-6.14.1/src/main/java/com/puppycrawl/tools/checkstyle/gui/ListToTreeSelectionModelWrapper.java checkstyle-6.15/src/main/java/com/puppycrawl/tools/checkstyle/gui/ListToTreeSelectionModelWrapper.java
--- checkstyle-6.14.1/src/main/java/com/puppycrawl/tools/checkstyle/gui/ListToTreeSelectionModelWrapper.java 2015-12-26 15:05:48.000000000 +0000
+++ checkstyle-6.15/src/main/java/com/puppycrawl/tools/checkstyle/gui/ListToTreeSelectionModelWrapper.java 2016-01-30 23:19:28.000000000 +0000
@@ -1,6 +1,6 @@
////////////////////////////////////////////////////////////////////////////////
// checkstyle: Checks Java source code for adherence to a set of rules.
-// Copyright (C) 2001-2015 the original author or authors.
+// Copyright (C) 2001-2016 the original author or authors.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
diff -Nru checkstyle-6.14.1/src/main/java/com/puppycrawl/tools/checkstyle/gui/MainFrame.java checkstyle-6.15/src/main/java/com/puppycrawl/tools/checkstyle/gui/MainFrame.java
--- checkstyle-6.14.1/src/main/java/com/puppycrawl/tools/checkstyle/gui/MainFrame.java 1970-01-01 00:00:00.000000000 +0000
+++ checkstyle-6.15/src/main/java/com/puppycrawl/tools/checkstyle/gui/MainFrame.java 2016-01-30 23:19:28.000000000 +0000
@@ -0,0 +1,199 @@
+////////////////////////////////////////////////////////////////////////////////
+// checkstyle: Checks Java source code for adherence to a set of rules.
+// Copyright (C) 2001-2016 the original author or authors.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+////////////////////////////////////////////////////////////////////////////////
+
+package com.puppycrawl.tools.checkstyle.gui;
+
+import java.awt.BorderLayout;
+import java.awt.GridLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+import java.io.File;
+import java.io.IOException;
+
+import javax.swing.AbstractAction;
+import javax.swing.JButton;
+import javax.swing.JFileChooser;
+import javax.swing.JFrame;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JSplitPane;
+import javax.swing.JTextArea;
+import javax.swing.filechooser.FileFilter;
+
+import antlr.ANTLRException;
+import com.puppycrawl.tools.checkstyle.api.DetailAST;
+
+/**
+ * Displays information about a parse tree.
+ * The user can change the file that is parsed and displayed
+ * using a JFileChooser.
+ *
+ * @author Lars Kühne
+ * @author Vladislav Lisetskiy
+ */
+public class MainFrame extends JFrame {
+
+ private static final long serialVersionUID = 7970053543351871890L;
+ /** Checkstyle frame model. */
+ private final transient MainFrameModel model = new MainFrameModel();
+ /** Reload action. */
+ private final ReloadAction reloadAction = new ReloadAction();
+ /** Parse tree model. */
+ private transient ParseTreeTableModel parseTreeTableModel;
+ /** Code text area. */
+ private JTextArea textArea;
+ /** Tree table. */
+ private JTreeTable treeTable;
+
+ /** Create a new MainFrame. */
+ public MainFrame() {
+ createContent();
+ }
+
+ /** Create content of this MainFrame. */
+ private void createContent() {
+ setLayout(new BorderLayout());
+
+ textArea = new JTextArea(20, 15);
+ textArea.setEditable(false);
+ final JScrollPane textAreaScrollPane = new JScrollPane(textArea);
+
+ parseTreeTableModel = new ParseTreeTableModel(null);
+ treeTable = new JTreeTable(parseTreeTableModel);
+ treeTable.setEditor(textArea);
+ treeTable.setLinePositionMap(model.getLinesToPosition());
+ final JScrollPane treeTableScrollPane = new JScrollPane(treeTable);
+
+ final JSplitPane splitPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT, treeTableScrollPane,
+ textAreaScrollPane);
+ add(splitPane, BorderLayout.CENTER);
+ splitPane.setResizeWeight(0.7);
+
+ add(createButtonsPanel(), BorderLayout.PAGE_END);
+
+ pack();
+ }
+
+ /**
+ * Create buttons panel.
+ * @return buttons panel.
+ */
+ private JPanel createButtonsPanel() {
+ final JButton openFileButton = new JButton(new FileSelectionAction());
+ openFileButton.setMnemonic(KeyEvent.VK_S);
+ openFileButton.setText("Open File");
+
+ reloadAction.setEnabled(false);
+ final JButton reloadFileButton = new JButton(reloadAction);
+ reloadFileButton.setMnemonic(KeyEvent.VK_R);
+ reloadFileButton.setText("Reload File");
+
+ final JPanel buttonPanel = new JPanel();
+ buttonPanel.setLayout(new GridLayout(1, 2));
+ buttonPanel.add(openFileButton);
+ buttonPanel.add(reloadFileButton);
+
+ return buttonPanel;
+ }
+
+ /**
+ * Open file and load it.
+ * @param sourceFile the file to open.
+ */
+ public void openFile(File sourceFile) {
+ if (sourceFile != null) {
+ try {
+ setTitle("Checkstyle : " + sourceFile.getName());
+ final DetailAST parseTree = model.parseFile(sourceFile);
+ parseTreeTableModel.setParseTree(parseTree);
+ reloadAction.setEnabled(true);
+
+ final String[] sourceLines = model.getFileText(sourceFile).toLinesArray();
+
+ // clear for each new file
+ model.clearLinesToPosition();
+ // starts line counting at 1
+ model.addLineToPosition(0);
+
+ // clean the text area before inserting the lines of the new file
+ textArea.setText("");
+
+ // insert the contents of the file to the text area
+ for (final String element : sourceLines) {
+ model.addLineToPosition(textArea.getText().length());
+ textArea.append(element + System.lineSeparator());
+ }
+
+ treeTable.setLinePositionMap(model.getLinesToPosition());
+ }
+ catch (final IOException | ANTLRException ex) {
+ JOptionPane.showMessageDialog(this,
+ "Could not parse" + sourceFile + ": " + ex.getMessage());
+ }
+ }
+ }
+
+ /**
+ * Handler for file selection action events.
+ */
+ private class FileSelectionAction extends AbstractAction {
+ private static final long serialVersionUID = 1762396148873280589L;
+
+ @Override
+ public void actionPerformed(ActionEvent event) {
+ final JFileChooser fileChooser = new JFileChooser(model.getLastDirectory());
+ final FileFilter filter = new JavaFileFilter();
+ fileChooser.setFileFilter(filter);
+
+ final int returnCode = fileChooser.showOpenDialog(MainFrame.this);
+ if (returnCode == JFileChooser.APPROVE_OPTION) {
+ final File file = fileChooser.getSelectedFile();
+ openFile(file);
+ }
+ }
+ }
+
+ /**
+ * Handler for reload action events.
+ */
+ private class ReloadAction extends AbstractAction {
+ private static final long serialVersionUID = -890320994114628011L;
+
+ @Override
+ public void actionPerformed(ActionEvent event) {
+ openFile(model.getCurrentFile());
+ }
+ }
+
+ /**
+ * Filter for Java files.
+ */
+ private static class JavaFileFilter extends FileFilter {
+ @Override
+ public boolean accept(File file) {
+ return file.isDirectory() || file.getName().endsWith(".java");
+ }
+
+ @Override
+ public String getDescription() {
+ return "Java Source File";
+ }
+ }
+}
diff -Nru checkstyle-6.14.1/src/main/java/com/puppycrawl/tools/checkstyle/gui/MainFrameModel.java checkstyle-6.15/src/main/java/com/puppycrawl/tools/checkstyle/gui/MainFrameModel.java
--- checkstyle-6.14.1/src/main/java/com/puppycrawl/tools/checkstyle/gui/MainFrameModel.java 1970-01-01 00:00:00.000000000 +0000
+++ checkstyle-6.15/src/main/java/com/puppycrawl/tools/checkstyle/gui/MainFrameModel.java 2016-01-30 23:19:28.000000000 +0000
@@ -0,0 +1,113 @@
+////////////////////////////////////////////////////////////////////////////////
+// checkstyle: Checks Java source code for adherence to a set of rules.
+// Copyright (C) 2001-2016 the original author or authors.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+////////////////////////////////////////////////////////////////////////////////
+
+package com.puppycrawl.tools.checkstyle.gui;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import antlr.ANTLRException;
+
+import com.google.common.collect.ImmutableList;
+import com.puppycrawl.tools.checkstyle.TreeWalker;
+import com.puppycrawl.tools.checkstyle.api.DetailAST;
+import com.puppycrawl.tools.checkstyle.api.FileContents;
+import com.puppycrawl.tools.checkstyle.api.FileText;
+
+/**
+ * Model for checkstyle frame.
+ * @author Vladislav Lisetskiy
+ */
+public class MainFrameModel {
+
+ /** Lines to position map. */
+ private final Listwidth of this component
+ * @param h the new height of this component
*/
@Override
public void setBounds(int x, int y, int w, int h) {
@@ -104,6 +111,8 @@
/**
* Subclassed to translate the graphics such that the last visible
* row will be drawn at 0,0.
+ *
+ * @param graph the Graphics context in which to paint
*/
@Override
public void paint(Graphics graph) {
@@ -113,6 +122,16 @@
/**
* TreeCellRenderer method. Overridden to update the visible row.
+ *
+ * @param table the JTable that is asking the
+ * renderer to draw; can be null
+ * @param value the value of the cell to be rendered.
+ * @param isSelected true if the cell is to be rendered with the
+ * selection highlighted; otherwise false
+ * @param hasFocus if true, render cell appropriately.
+ * @param row the row index of the cell being drawn.
+ * @param column the column index of the cell being drawn
+ * @return The component used for drawing the cell.
* @see TableCellRenderer
*/
@Override
diff -Nru checkstyle-6.14.1/src/main/java/com/puppycrawl/tools/checkstyle/gui/TreeTableModelAdapter.java checkstyle-6.15/src/main/java/com/puppycrawl/tools/checkstyle/gui/TreeTableModelAdapter.java
--- checkstyle-6.14.1/src/main/java/com/puppycrawl/tools/checkstyle/gui/TreeTableModelAdapter.java 2015-12-26 15:05:48.000000000 +0000
+++ checkstyle-6.15/src/main/java/com/puppycrawl/tools/checkstyle/gui/TreeTableModelAdapter.java 2016-01-30 23:19:28.000000000 +0000
@@ -1,6 +1,6 @@
////////////////////////////////////////////////////////////////////////////////
// checkstyle: Checks Java source code for adherence to a set of rules.
-// Copyright (C) 2001-2015 the original author or authors.
+// Copyright (C) 2001-2016 the original author or authors.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
diff -Nru checkstyle-6.14.1/src/main/java/com/puppycrawl/tools/checkstyle/Main.java checkstyle-6.15/src/main/java/com/puppycrawl/tools/checkstyle/Main.java
--- checkstyle-6.14.1/src/main/java/com/puppycrawl/tools/checkstyle/Main.java 2015-12-26 15:05:48.000000000 +0000
+++ checkstyle-6.15/src/main/java/com/puppycrawl/tools/checkstyle/Main.java 2016-01-30 23:19:28.000000000 +0000
@@ -1,6 +1,6 @@
////////////////////////////////////////////////////////////////////////////////
// checkstyle: Checks Java source code for adherence to a set of rules.
-// Copyright (C) 2001-2015 the original author or authors.
+// Copyright (C) 2001-2016 the original author or authors.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@ -324,8 +324,8 @@
throws FileNotFoundException {
// setup the output stream
- OutputStream out;
- boolean closeOutputStream;
+ final OutputStream out;
+ final boolean closeOutputStream;
if (outputLocation == null) {
out = System.out;
closeOutputStream = false;
@@ -336,7 +336,7 @@
}
// setup a listener
- AuditListener listener;
+ final AuditListener listener;
if (XML_FORMAT_NAME.equals(format)) {
listener = new XMLLogger(out, closeOutputStream);
diff -Nru checkstyle-6.14.1/src/main/java/com/puppycrawl/tools/checkstyle/ModuleFactory.java checkstyle-6.15/src/main/java/com/puppycrawl/tools/checkstyle/ModuleFactory.java
--- checkstyle-6.14.1/src/main/java/com/puppycrawl/tools/checkstyle/ModuleFactory.java 2015-11-13 05:06:18.000000000 +0000
+++ checkstyle-6.15/src/main/java/com/puppycrawl/tools/checkstyle/ModuleFactory.java 2016-01-30 23:19:28.000000000 +0000
@@ -1,6 +1,6 @@
////////////////////////////////////////////////////////////////////////////////
// checkstyle: Checks Java source code for adherence to a set of rules.
-// Copyright (C) 2001-2015 the original author or authors.
+// Copyright (C) 2001-2016 the original author or authors.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
diff -Nru checkstyle-6.14.1/src/main/java/com/puppycrawl/tools/checkstyle/package-info.java checkstyle-6.15/src/main/java/com/puppycrawl/tools/checkstyle/package-info.java
--- checkstyle-6.14.1/src/main/java/com/puppycrawl/tools/checkstyle/package-info.java 2015-11-13 05:06:18.000000000 +0000
+++ checkstyle-6.15/src/main/java/com/puppycrawl/tools/checkstyle/package-info.java 2016-01-30 23:19:28.000000000 +0000
@@ -1,6 +1,6 @@
////////////////////////////////////////////////////////////////////////////////
// checkstyle: Checks Java source code for adherence to a set of rules.
-// Copyright (C) 2001-2015 the original author or authors.
+// Copyright (C) 2001-2016 the original author or authors.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
diff -Nru checkstyle-6.14.1/src/main/java/com/puppycrawl/tools/checkstyle/PackageNamesLoader.java checkstyle-6.15/src/main/java/com/puppycrawl/tools/checkstyle/PackageNamesLoader.java
--- checkstyle-6.14.1/src/main/java/com/puppycrawl/tools/checkstyle/PackageNamesLoader.java 2015-12-26 15:05:48.000000000 +0000
+++ checkstyle-6.15/src/main/java/com/puppycrawl/tools/checkstyle/PackageNamesLoader.java 2016-01-30 23:19:28.000000000 +0000
@@ -1,6 +1,6 @@
////////////////////////////////////////////////////////////////////////////////
// checkstyle: Checks Java source code for adherence to a set of rules.
-// Copyright (C) 2001-2015 the original author or authors.
+// Copyright (C) 2001-2016 the original author or authors.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
diff -Nru checkstyle-6.14.1/src/main/java/com/puppycrawl/tools/checkstyle/PackageObjectFactory.java checkstyle-6.15/src/main/java/com/puppycrawl/tools/checkstyle/PackageObjectFactory.java
--- checkstyle-6.14.1/src/main/java/com/puppycrawl/tools/checkstyle/PackageObjectFactory.java 2015-12-26 15:05:48.000000000 +0000
+++ checkstyle-6.15/src/main/java/com/puppycrawl/tools/checkstyle/PackageObjectFactory.java 2016-01-30 23:19:28.000000000 +0000
@@ -1,6 +1,6 @@
////////////////////////////////////////////////////////////////////////////////
// checkstyle: Checks Java source code for adherence to a set of rules.
-// Copyright (C) 2001-2015 the original author or authors.
+// Copyright (C) 2001-2016 the original author or authors.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
diff -Nru checkstyle-6.14.1/src/main/java/com/puppycrawl/tools/checkstyle/PropertiesExpander.java checkstyle-6.15/src/main/java/com/puppycrawl/tools/checkstyle/PropertiesExpander.java
--- checkstyle-6.14.1/src/main/java/com/puppycrawl/tools/checkstyle/PropertiesExpander.java 2015-11-13 05:06:18.000000000 +0000
+++ checkstyle-6.15/src/main/java/com/puppycrawl/tools/checkstyle/PropertiesExpander.java 2016-01-30 23:19:28.000000000 +0000
@@ -1,6 +1,6 @@
////////////////////////////////////////////////////////////////////////////////
// checkstyle: Checks Java source code for adherence to a set of rules.
-// Copyright (C) 2001-2015 the original author or authors.
+// Copyright (C) 2001-2016 the original author or authors.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
diff -Nru checkstyle-6.14.1/src/main/java/com/puppycrawl/tools/checkstyle/PropertyCacheFile.java checkstyle-6.15/src/main/java/com/puppycrawl/tools/checkstyle/PropertyCacheFile.java
--- checkstyle-6.14.1/src/main/java/com/puppycrawl/tools/checkstyle/PropertyCacheFile.java 2015-12-26 15:05:48.000000000 +0000
+++ checkstyle-6.15/src/main/java/com/puppycrawl/tools/checkstyle/PropertyCacheFile.java 2016-01-30 23:19:28.000000000 +0000
@@ -1,6 +1,6 @@
////////////////////////////////////////////////////////////////////////////////
// checkstyle: Checks Java source code for adherence to a set of rules.
-// Copyright (C) 2001-2015 the original author or authors.
+// Copyright (C) 2001-2016 the original author or authors.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
diff -Nru checkstyle-6.14.1/src/main/java/com/puppycrawl/tools/checkstyle/PropertyResolver.java checkstyle-6.15/src/main/java/com/puppycrawl/tools/checkstyle/PropertyResolver.java
--- checkstyle-6.14.1/src/main/java/com/puppycrawl/tools/checkstyle/PropertyResolver.java 2015-11-13 05:06:18.000000000 +0000
+++ checkstyle-6.15/src/main/java/com/puppycrawl/tools/checkstyle/PropertyResolver.java 2016-01-30 23:19:28.000000000 +0000
@@ -1,6 +1,6 @@
////////////////////////////////////////////////////////////////////////////////
// checkstyle: Checks Java source code for adherence to a set of rules.
-// Copyright (C) 2001-2015 the original author or authors.
+// Copyright (C) 2001-2016 the original author or authors.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
diff -Nru checkstyle-6.14.1/src/main/java/com/puppycrawl/tools/checkstyle/TreeWalker.java checkstyle-6.15/src/main/java/com/puppycrawl/tools/checkstyle/TreeWalker.java
--- checkstyle-6.14.1/src/main/java/com/puppycrawl/tools/checkstyle/TreeWalker.java 2015-12-26 15:05:48.000000000 +0000
+++ checkstyle-6.15/src/main/java/com/puppycrawl/tools/checkstyle/TreeWalker.java 2016-01-30 23:19:28.000000000 +0000
@@ -1,6 +1,6 @@
////////////////////////////////////////////////////////////////////////////////
// checkstyle: Checks Java source code for adherence to a set of rules.
-// Copyright (C) 2001-2015 the original author or authors.
+// Copyright (C) 2001-2016 the original author or authors.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@ -327,7 +327,7 @@
*/
private void notifyBegin(DetailAST rootAST, FileContents contents,
AstState astState) {
- Set
- a' {@link EntityEntry} (by way of {@link #;' "
+ "while parsing HTML_TAG"),
};
@@ -63,7 +68,7 @@
public void testCustomTag() throws Exception {
final DefaultConfiguration checkConfig = createCheckConfig(TempCheck.class);
final String[] expected = {
- "4: " + getCheckMessage(UNRECOGNIZED_ANTLR_ERROR_MESSAGE_KEY, 4, "null"),
+ "4: " + getCheckMessage(MSG_KEY_UNRECOGNIZED_ANTLR_ERROR, 4, "null"),
};
verify(checkConfig, getPath("InputCustomTag.java"), expected);
}
@@ -72,8 +77,8 @@
public void testParsingErrors() throws Exception {
final DefaultConfiguration checkConfig = createCheckConfig(TempCheck.class);
final String[] expected = {
- "4: " + getCheckMessage(JAVADOC_MISSED_HTML_CLOSE, 4, "unclosedTag"),
- "8: " + getCheckMessage(JAVADOC_WRONG_SINGLETON_TAG, 35, "img"),
+ "4: " + getCheckMessage(MSG_JAVADOC_MISSED_HTML_CLOSE, 4, "unclosedTag"),
+ "8: " + getCheckMessage(MSG_JAVADOC_WRONG_SINGLETON_TAG, 35, "img"),
};
verify(checkConfig, getPath("InputParsingErrors.java"), expected);
}
@@ -96,7 +101,7 @@
public void testAntlrError() throws Exception {
final DefaultConfiguration checkConfig = createCheckConfig(TempCheck.class);
final String[] expected = {
- "3: " + getCheckMessage(UNRECOGNIZED_ANTLR_ERROR_MESSAGE_KEY, 0, null),
+ "3: " + getCheckMessage(MSG_KEY_UNRECOGNIZED_ANTLR_ERROR, 0, null),
};
verify(checkConfig, getPath("InputTestInvalidAtSeeReference.java"), expected);
}
@@ -106,11 +111,11 @@
final DefaultConfiguration checkConfig = createCheckConfig(TempCheck.class);
final Map
", ast.getText()); + javadocsNumber++; + } + } } diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractTypeAwareCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractTypeAwareCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractTypeAwareCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractTypeAwareCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AtclauseOrderCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AtclauseOrderCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AtclauseOrderCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AtclauseOrderCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -571,4 +571,14 @@ }; verify(checkConfig, getPath("InputJavadocMethodIgnoreNameRegex.java"), expected); } + + @Test + public void testMethodsNotSkipWrittenJavadocs() throws Exception { + checkConfig.addAttribute("allowedAnnotations", "MyAnnotation"); + final String[] expected = { + "7:8: " + getCheckMessage(MSG_UNUSED_TAG, "@param", "BAD"), + "17:8: " + getCheckMessage(MSG_UNUSED_TAG, "@param", "BAD"), + }; + verify(checkConfig, getPath("InputJavadocMethodsNotSkipWritten.java"), expected); + } } diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocNodeImplTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocNodeImplTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocNodeImplTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocNodeImplTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocPackageCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocPackageCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocPackageCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocPackageCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocParagraphCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocParagraphCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocParagraphCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocParagraphCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -19,12 +19,12 @@ package com.puppycrawl.tools.checkstyle.checks.javadoc; -import static com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.EMPTY; -import static com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.EXTRA_HTML; -import static com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.INCOMPLETE_TAG; -import static com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.JAVADOC_MISSING; -import static com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.NO_PERIOD; -import static com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.UNCLOSED_HTML; +import static com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.MSG_EMPTY; +import static com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.MSG_EXTRA_HTML; +import static com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.MSG_INCOMPLETE_TAG; +import static com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.MSG_JAVADOC_MISSING; +import static com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.MSG_NO_PERIOD; +import static com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.MSG_UNCLOSED_HTML; import static org.junit.Assert.assertArrayEquals; import java.io.File; @@ -72,30 +72,32 @@ final DefaultConfiguration checkConfig = createCheckConfig(JavadocStyleCheck.class); final String[] expected = { - "20: " + getCheckMessage(NO_PERIOD), - "53: " + getCheckMessage(NO_PERIOD), - "63:11: " + getCheckMessage(UNCLOSED_HTML, "This guy is missing end of bold tag"), - "66:7: " + getCheckMessage(EXTRA_HTML, "Extra tag shouldn't be here"), - "68:19: " + getCheckMessage(UNCLOSED_HTML, " dummy."), - "74: " + getCheckMessage(NO_PERIOD), - "75:23: " + getCheckMessage(UNCLOSED_HTML, "should fail"), - "81: " + getCheckMessage(NO_PERIOD), - "82:31: " + getCheckMessage(UNCLOSED_HTML, "should fail"), - "88: " + getCheckMessage(NO_PERIOD), - "89:31: " + getCheckMessage(EXTRA_HTML, ""), - "90: " + getCheckMessage(INCOMPLETE_TAG, " * should fail <"), - "109:39: " + getCheckMessage(EXTRA_HTML, ""), - "186:8: " + getCheckMessage(UNCLOSED_HTML, ""), - "193: " + getCheckMessage(NO_PERIOD), - "238: " + getCheckMessage(NO_PERIOD), - "335:33: " + getCheckMessage(EXTRA_HTML, ""), - "361:37: " + getCheckMessage(UNCLOSED_HTML, "
"), - "372: " + getCheckMessage(NO_PERIOD), - "378:15: " + getCheckMessage(UNCLOSED_HTML, "Note: it's unterminated tag."), - "382: " + getCheckMessage(NO_PERIOD), - "386: " + getCheckMessage(NO_PERIOD), - "393: " + getCheckMessage(NO_PERIOD), - "405: " + getCheckMessage(NO_PERIOD), + "20: " + getCheckMessage(MSG_NO_PERIOD), + "53: " + getCheckMessage(MSG_NO_PERIOD), + "63:11: " + getCheckMessage(MSG_UNCLOSED_HTML, + "This guy is missing end of bold tag"), + "66:7: " + getCheckMessage(MSG_EXTRA_HTML, "Extra tag shouldn't be here"), + "68:19: " + getCheckMessage(MSG_UNCLOSED_HTML, ""), + "90: " + getCheckMessage(MSG_INCOMPLETE_TAG, " * should fail <"), + "205: " + getCheckMessage(MSG_EMPTY), + "211: " + getCheckMessage(MSG_EMPTY), + "230: " + getCheckMessage(MSG_EMPTY), + "238: " + getCheckMessage(MSG_NO_PERIOD), + "335:33: " + getCheckMessage(MSG_EXTRA_HTML, ""), + "382: " + getCheckMessage(MSG_NO_PERIOD), + "386: " + getCheckMessage(MSG_NO_PERIOD), }; verify(checkConfig, getPath("InputJavadocStyle.java"), expected); @@ -255,23 +259,23 @@ checkConfig.addAttribute("checkEmptyJavadoc", "true"); checkConfig.addAttribute("scope", "package"); final String[] expected = { - "74: " + getCheckMessage(NO_PERIOD), - "75:23: " + getCheckMessage(UNCLOSED_HTML, "should fail"), - "81: " + getCheckMessage(NO_PERIOD), - "82:31: " + getCheckMessage(UNCLOSED_HTML, "should fail"), - "88: " + getCheckMessage(NO_PERIOD), - "89:31: " + getCheckMessage(EXTRA_HTML, ""), - "90: " + getCheckMessage(INCOMPLETE_TAG, " * should fail <"), - "205: " + getCheckMessage(EMPTY), - "211: " + getCheckMessage(EMPTY), - "218: " + getCheckMessage(EMPTY), - "230: " + getCheckMessage(EMPTY), - "238: " + getCheckMessage(NO_PERIOD), - "335:33: " + getCheckMessage(EXTRA_HTML, ""), - "382: " + getCheckMessage(NO_PERIOD), - "386: " + getCheckMessage(NO_PERIOD), - "393: " + getCheckMessage(NO_PERIOD), - "405: " + getCheckMessage(NO_PERIOD), + "74: " + getCheckMessage(MSG_NO_PERIOD), + "75:23: " + getCheckMessage(MSG_UNCLOSED_HTML, "should fail"), + "81: " + getCheckMessage(MSG_NO_PERIOD), + "82:31: " + getCheckMessage(MSG_UNCLOSED_HTML, "should fail"), + "88: " + getCheckMessage(MSG_NO_PERIOD), + "89:31: " + getCheckMessage(MSG_EXTRA_HTML, ""), + "90: " + getCheckMessage(MSG_INCOMPLETE_TAG, " * should fail <"), + "205: " + getCheckMessage(MSG_EMPTY), + "211: " + getCheckMessage(MSG_EMPTY), + "218: " + getCheckMessage(MSG_EMPTY), + "230: " + getCheckMessage(MSG_EMPTY), + "238: " + getCheckMessage(MSG_NO_PERIOD), + "335:33: " + getCheckMessage(MSG_EXTRA_HTML, ""), + "382: " + getCheckMessage(MSG_NO_PERIOD), + "386: " + getCheckMessage(MSG_NO_PERIOD), + "393: " + getCheckMessage(MSG_NO_PERIOD), + "405: " + getCheckMessage(MSG_NO_PERIOD), }; verify(checkConfig, getPath("InputJavadocStyle.java"), expected); @@ -284,11 +288,11 @@ checkConfig.addAttribute("checkHtml", "false"); checkConfig.addAttribute("checkEmptyJavadoc", "true"); final String[] expected = { - "205: " + getCheckMessage(EMPTY), - "211: " + getCheckMessage(EMPTY), - "218: " + getCheckMessage(EMPTY), - "225: " + getCheckMessage(EMPTY), - "230: " + getCheckMessage(EMPTY), + "205: " + getCheckMessage(MSG_EMPTY), + "211: " + getCheckMessage(MSG_EMPTY), + "218: " + getCheckMessage(MSG_EMPTY), + "225: " + getCheckMessage(MSG_EMPTY), + "230: " + getCheckMessage(MSG_EMPTY), }; verify(checkConfig, getPath("InputJavadocStyle.java"), expected); @@ -302,21 +306,23 @@ checkConfig.addAttribute("scope", "private"); checkConfig.addAttribute("excludeScope", "protected"); final String[] expected = { - "20: " + getCheckMessage(NO_PERIOD), - "53: " + getCheckMessage(NO_PERIOD), - "63:11: " + getCheckMessage(UNCLOSED_HTML, "This guy is missing end of bold tag"), - "66:7: " + getCheckMessage(EXTRA_HTML, "Extra tag shouldn't be here"), - "68:19: " + getCheckMessage(UNCLOSED_HTML, "dummy."), + "74: " + getCheckMessage(MSG_NO_PERIOD), + "75:23: " + getCheckMessage(MSG_UNCLOSED_HTML, "should fail"), + "81: " + getCheckMessage(MSG_NO_PERIOD), + "82:31: " + getCheckMessage(MSG_UNCLOSED_HTML, "should fail"), + "88: " + getCheckMessage(MSG_NO_PERIOD), + "89:31: " + getCheckMessage(MSG_EXTRA_HTML, ""), + "90: " + getCheckMessage(MSG_INCOMPLETE_TAG, " * should fail <"), + "109:39: " + getCheckMessage(MSG_EXTRA_HTML, ""), + "186:8: " + getCheckMessage(MSG_UNCLOSED_HTML, ""), + "193: " + getCheckMessage(MSG_NO_PERIOD), + "238: " + getCheckMessage(MSG_NO_PERIOD), + "335:33: " + getCheckMessage(MSG_EXTRA_HTML, ""), + "361:37: " + getCheckMessage(MSG_UNCLOSED_HTML, "
"), + "372: " + getCheckMessage(MSG_NO_PERIOD), + "378:15: " + getCheckMessage(MSG_UNCLOSED_HTML, + "Note: it's unterminated tag."), + "382: " + getCheckMessage(MSG_NO_PERIOD), + "386: " + getCheckMessage(MSG_NO_PERIOD), + "393: " + getCheckMessage(MSG_NO_PERIOD), + "405: " + getCheckMessage(MSG_NO_PERIOD), }; verify(checkConfig, getPath("InputJavadocStyle.java"), expected); @@ -108,18 +110,18 @@ checkConfig.addAttribute("checkFirstSentence", "true"); checkConfig.addAttribute("checkHtml", "false"); final String[] expected = { - "20: " + getCheckMessage(NO_PERIOD), - "53: " + getCheckMessage(NO_PERIOD), - "74: " + getCheckMessage(NO_PERIOD), - "81: " + getCheckMessage(NO_PERIOD), - "88: " + getCheckMessage(NO_PERIOD), - "193: " + getCheckMessage(NO_PERIOD), - "238: " + getCheckMessage(NO_PERIOD), - "372: " + getCheckMessage(NO_PERIOD), - "382: " + getCheckMessage(NO_PERIOD), - "386: " + getCheckMessage(NO_PERIOD), - "393: " + getCheckMessage(NO_PERIOD), - "405: " + getCheckMessage(NO_PERIOD), + "20: " + getCheckMessage(MSG_NO_PERIOD), + "53: " + getCheckMessage(MSG_NO_PERIOD), + "74: " + getCheckMessage(MSG_NO_PERIOD), + "81: " + getCheckMessage(MSG_NO_PERIOD), + "88: " + getCheckMessage(MSG_NO_PERIOD), + "193: " + getCheckMessage(MSG_NO_PERIOD), + "238: " + getCheckMessage(MSG_NO_PERIOD), + "372: " + getCheckMessage(MSG_NO_PERIOD), + "382: " + getCheckMessage(MSG_NO_PERIOD), + "386: " + getCheckMessage(MSG_NO_PERIOD), + "393: " + getCheckMessage(MSG_NO_PERIOD), + "405: " + getCheckMessage(MSG_NO_PERIOD), }; verify(checkConfig, getPath("InputJavadocStyle.java"), expected); @@ -134,20 +136,20 @@ checkConfig.addAttribute("endOfSentenceFormat", "([.][ \t\n\r\f<])|([.]$)"); final String[] expected = { - "20: " + getCheckMessage(NO_PERIOD), - "32: " + getCheckMessage(NO_PERIOD), - "39: " + getCheckMessage(NO_PERIOD), - "53: " + getCheckMessage(NO_PERIOD), - "74: " + getCheckMessage(NO_PERIOD), - "81: " + getCheckMessage(NO_PERIOD), - "88: " + getCheckMessage(NO_PERIOD), - "193: " + getCheckMessage(NO_PERIOD), - "238: " + getCheckMessage(NO_PERIOD), - "372: " + getCheckMessage(NO_PERIOD), - "382: " + getCheckMessage(NO_PERIOD), - "386: " + getCheckMessage(NO_PERIOD), - "393: " + getCheckMessage(NO_PERIOD), - "405: " + getCheckMessage(NO_PERIOD), + "20: " + getCheckMessage(MSG_NO_PERIOD), + "32: " + getCheckMessage(MSG_NO_PERIOD), + "39: " + getCheckMessage(MSG_NO_PERIOD), + "53: " + getCheckMessage(MSG_NO_PERIOD), + "74: " + getCheckMessage(MSG_NO_PERIOD), + "81: " + getCheckMessage(MSG_NO_PERIOD), + "88: " + getCheckMessage(MSG_NO_PERIOD), + "193: " + getCheckMessage(MSG_NO_PERIOD), + "238: " + getCheckMessage(MSG_NO_PERIOD), + "372: " + getCheckMessage(MSG_NO_PERIOD), + "382: " + getCheckMessage(MSG_NO_PERIOD), + "386: " + getCheckMessage(MSG_NO_PERIOD), + "393: " + getCheckMessage(MSG_NO_PERIOD), + "405: " + getCheckMessage(MSG_NO_PERIOD), }; verify(checkConfig, getPath("InputJavadocStyle.java"), expected); @@ -159,18 +161,20 @@ checkConfig.addAttribute("checkFirstSentence", "false"); checkConfig.addAttribute("checkHtml", "true"); final String[] expected = { - "63:11: " + getCheckMessage(UNCLOSED_HTML, "This guy is missing end of bold tag"), - "66:7: " + getCheckMessage(EXTRA_HTML, "Extra tag shouldn't be here"), - "68:19: " + getCheckMessage(UNCLOSED_HTML, ""), - "90: " + getCheckMessage(INCOMPLETE_TAG, " * should fail <"), - "205: " + getCheckMessage(EMPTY), - "211: " + getCheckMessage(EMPTY), - "230: " + getCheckMessage(EMPTY), - "238: " + getCheckMessage(NO_PERIOD), - "335:33: " + getCheckMessage(EXTRA_HTML, ""), - "382: " + getCheckMessage(NO_PERIOD), - "386: " + getCheckMessage(NO_PERIOD), + "74: " + getCheckMessage(MSG_NO_PERIOD), + "75:23: " + getCheckMessage(MSG_UNCLOSED_HTML, "should fail"), + "88: " + getCheckMessage(MSG_NO_PERIOD), + "89:31: " + getCheckMessage(MSG_EXTRA_HTML, "dummy."), - "75:23: " + getCheckMessage(UNCLOSED_HTML, "should fail"), - "82:31: " + getCheckMessage(UNCLOSED_HTML, "should fail"), - "89:31: " + getCheckMessage(EXTRA_HTML, ""), - "90: " + getCheckMessage(INCOMPLETE_TAG, " * should fail <"), - "109:39: " + getCheckMessage(EXTRA_HTML, ""), - "186:8: " + getCheckMessage(UNCLOSED_HTML, ""), - "335:33: " + getCheckMessage(EXTRA_HTML, ""), - "361:37: " + getCheckMessage(UNCLOSED_HTML, "
"), - "378:15: " + getCheckMessage(UNCLOSED_HTML, "Note: it's unterminated tag."), + "63:11: " + getCheckMessage(MSG_UNCLOSED_HTML, + "This guy is missing end of bold tag"), + "66:7: " + getCheckMessage(MSG_EXTRA_HTML, "Extra tag shouldn't be here"), + "68:19: " + getCheckMessage(MSG_UNCLOSED_HTML, ""), + "90: " + getCheckMessage(MSG_INCOMPLETE_TAG, " * should fail <"), + "205: " + getCheckMessage(MSG_EMPTY), + "230: " + getCheckMessage(MSG_EMPTY), + "238: " + getCheckMessage(MSG_NO_PERIOD), + "335:33: " + getCheckMessage(MSG_EXTRA_HTML, ""), + "382: " + getCheckMessage(MSG_NO_PERIOD), + "386: " + getCheckMessage(MSG_NO_PERIOD), }; verify(checkConfig, getPath("InputJavadocStyle.java"), expected); @@ -228,18 +232,18 @@ checkConfig.addAttribute("checkEmptyJavadoc", "true"); checkConfig.addAttribute("scope", "protected"); final String[] expected = { - "74: " + getCheckMessage(NO_PERIOD), - "75:23: " + getCheckMessage(UNCLOSED_HTML, "should fail"), - "88: " + getCheckMessage(NO_PERIOD), - "89:31: " + getCheckMessage(EXTRA_HTML, "dummy."), + "75:23: " + getCheckMessage(MSG_UNCLOSED_HTML, "should fail"), + "82:31: " + getCheckMessage(MSG_UNCLOSED_HTML, "should fail"), + "89:31: " + getCheckMessage(MSG_EXTRA_HTML, ""), + "90: " + getCheckMessage(MSG_INCOMPLETE_TAG, " * should fail <"), + "109:39: " + getCheckMessage(MSG_EXTRA_HTML, ""), + "186:8: " + getCheckMessage(MSG_UNCLOSED_HTML, ""), + "335:33: " + getCheckMessage(MSG_EXTRA_HTML, ""), + "361:37: " + getCheckMessage(MSG_UNCLOSED_HTML, "
"), + "378:15: " + getCheckMessage(MSG_UNCLOSED_HTML, + "Note: it's unterminated tag."), }; verify(checkConfig, getPath("InputJavadocStyle.java"), expected); @@ -204,15 +208,15 @@ checkConfig.addAttribute("checkEmptyJavadoc", "true"); checkConfig.addAttribute("scope", "public"); final String[] expected = { - "88: " + getCheckMessage(NO_PERIOD), - "89:31: " + getCheckMessage(EXTRA_HTML, ""), - "90: " + getCheckMessage(INCOMPLETE_TAG, " * should fail <"), - "205: " + getCheckMessage(EMPTY), - "230: " + getCheckMessage(EMPTY), - "238: " + getCheckMessage(NO_PERIOD), - "335:33: " + getCheckMessage(EXTRA_HTML, ""), - "382: " + getCheckMessage(NO_PERIOD), - "386: " + getCheckMessage(NO_PERIOD), + "88: " + getCheckMessage(MSG_NO_PERIOD), + "89:31: " + getCheckMessage(MSG_EXTRA_HTML, "dummy."), - "81: " + getCheckMessage(NO_PERIOD), - "82:31: " + getCheckMessage(UNCLOSED_HTML, "should fail"), - "109:39: " + getCheckMessage(EXTRA_HTML, ""), - "186:8: " + getCheckMessage(UNCLOSED_HTML, ""), - "193: " + getCheckMessage(NO_PERIOD), - "361:37: " + getCheckMessage(UNCLOSED_HTML, "
"), - "372: " + getCheckMessage(NO_PERIOD), - "378:15: " + getCheckMessage(UNCLOSED_HTML, "Note: it's unterminated tag."), - "393: " + getCheckMessage(NO_PERIOD), - "405: " + getCheckMessage(NO_PERIOD), + "20: " + getCheckMessage(MSG_NO_PERIOD), + "53: " + getCheckMessage(MSG_NO_PERIOD), + "63:11: " + getCheckMessage(MSG_UNCLOSED_HTML, + "This guy is missing end of bold tag"), + "66:7: " + getCheckMessage(MSG_EXTRA_HTML, "Extra tag shouldn't be here"), + "68:19: " + getCheckMessage(MSG_UNCLOSED_HTML, "dummy."), + "81: " + getCheckMessage(MSG_NO_PERIOD), + "82:31: " + getCheckMessage(MSG_UNCLOSED_HTML, "should fail"), + "109:39: " + getCheckMessage(MSG_EXTRA_HTML, ""), + "186:8: " + getCheckMessage(MSG_UNCLOSED_HTML, ""), + "193: " + getCheckMessage(MSG_NO_PERIOD), + "361:37: " + getCheckMessage(MSG_UNCLOSED_HTML, "
"), + "372: " + getCheckMessage(MSG_NO_PERIOD), + "378:15: " + getCheckMessage(MSG_UNCLOSED_HTML, + "Note: it's unterminated tag."), + "393: " + getCheckMessage(MSG_NO_PERIOD), + "405: " + getCheckMessage(MSG_NO_PERIOD), }; verify(checkConfig, getPath("InputJavadocStyle.java"), expected); @@ -327,7 +333,7 @@ final DefaultConfiguration checkConfig = createCheckConfig(JavadocStyleCheck.class); final String[] expected = { - "1: " + getCheckMessage(NO_PERIOD), + "1: " + getCheckMessage(MSG_NO_PERIOD), }; verify(createChecker(checkConfig), @@ -341,7 +347,7 @@ final DefaultConfiguration checkConfig = createCheckConfig(JavadocStyleCheck.class); final String[] expected = { - "1: " + getCheckMessage(NO_PERIOD), + "1: " + getCheckMessage(MSG_NO_PERIOD), }; verify(createChecker(checkConfig), @@ -367,7 +373,7 @@ final DefaultConfiguration checkConfig = createCheckConfig(JavadocStyleCheck.class); final String[] expected = { - "1: " + getCheckMessage(JAVADOC_MISSING), + "1: " + getCheckMessage(MSG_JAVADOC_MISSING), }; verify(createChecker(checkConfig), @@ -396,8 +402,8 @@ checkConfig.addAttribute("checkEmptyJavadoc", "false"); checkConfig.addAttribute("checkHtml", "false"); final String[] expected = { - "88: " + getCheckMessage(NO_PERIOD), - "386: " + getCheckMessage(NO_PERIOD), + "88: " + getCheckMessage(MSG_NO_PERIOD), + "386: " + getCheckMessage(MSG_NO_PERIOD), }; verify(checkConfig, getPath("InputJavadocStyle.java"), expected); } diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagContinuationIndentationCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagContinuationIndentationCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagContinuationIndentationCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagContinuationIndentationCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagInfoTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagInfoTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagInfoTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagInfoTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -19,11 +19,11 @@ package com.puppycrawl.tools.checkstyle.checks.javadoc; -import static com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck.JAVADOC_MISSING; -import static com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck.MISSING_TAG; -import static com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck.TAG_FORMAT; -import static com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck.UNKNOWN_TAG; -import static com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck.UNUSED_TAG; +import static com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck.MSG_JAVADOC_MISSING; +import static com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck.MSG_MISSING_TAG; +import static com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck.MSG_TAG_FORMAT; +import static com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck.MSG_UNKNOWN_TAG; +import static com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck.MSG_UNUSED_TAG; import static org.junit.Assert.assertArrayEquals; import java.io.File; @@ -73,9 +73,9 @@ final DefaultConfiguration checkConfig = createCheckConfig(JavadocTypeCheck.class); final String[] expected = { - "8: " + getCheckMessage(JAVADOC_MISSING), - "302: " + getCheckMessage(JAVADOC_MISSING), - "327: " + getCheckMessage(JAVADOC_MISSING), + "8: " + getCheckMessage(MSG_JAVADOC_MISSING), + "302: " + getCheckMessage(MSG_JAVADOC_MISSING), + "327: " + getCheckMessage(MSG_JAVADOC_MISSING), }; verify(checkConfig, getPath("InputTags.java"), expected); } @@ -85,9 +85,9 @@ final DefaultConfiguration checkConfig = createCheckConfig(JavadocTypeCheck.class); final String[] expected = { - "14: " + getCheckMessage(JAVADOC_MISSING), - "21: " + getCheckMessage(JAVADOC_MISSING), - "27: " + getCheckMessage(JAVADOC_MISSING), + "14: " + getCheckMessage(MSG_JAVADOC_MISSING), + "21: " + getCheckMessage(MSG_JAVADOC_MISSING), + "27: " + getCheckMessage(MSG_JAVADOC_MISSING), }; verify(checkConfig, getPath("InputInner.java"), expected); } @@ -97,10 +97,10 @@ final DefaultConfiguration checkConfig = createCheckConfig(JavadocTypeCheck.class); final String[] expected = { - "7: " + getCheckMessage(JAVADOC_MISSING), - "9: " + getCheckMessage(JAVADOC_MISSING), - "14: " + getCheckMessage(JAVADOC_MISSING), - "34: " + getCheckMessage(JAVADOC_MISSING), + "7: " + getCheckMessage(MSG_JAVADOC_MISSING), + "9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "14: " + getCheckMessage(MSG_JAVADOC_MISSING), + "34: " + getCheckMessage(MSG_JAVADOC_MISSING), }; verify(checkConfig, getPath("InputPublicOnly.java"), expected); } @@ -111,7 +111,7 @@ createCheckConfig(JavadocTypeCheck.class); checkConfig.addAttribute("scope", Scope.PROTECTED.getName()); final String[] expected = { - "7: " + getCheckMessage(JAVADOC_MISSING), + "7: " + getCheckMessage(MSG_JAVADOC_MISSING), }; verify(checkConfig, getPath("InputPublicOnly.java"), expected); } @@ -122,8 +122,8 @@ createCheckConfig(JavadocTypeCheck.class); checkConfig.addAttribute("scope", Scope.PUBLIC.getName()); final String[] expected = { - "7: " + getCheckMessage(JAVADOC_MISSING), - "38: " + getCheckMessage(JAVADOC_MISSING), + "7: " + getCheckMessage(MSG_JAVADOC_MISSING), + "38: " + getCheckMessage(MSG_JAVADOC_MISSING), }; verify(checkConfig, getPath("InputScopeInnerInterfaces.java"), expected); } @@ -134,10 +134,10 @@ createCheckConfig(JavadocTypeCheck.class); checkConfig.addAttribute("scope", Scope.PROTECTED.getName()); final String[] expected = { - "7: " + getCheckMessage(JAVADOC_MISSING), - "29: " + getCheckMessage(JAVADOC_MISSING), - "38: " + getCheckMessage(JAVADOC_MISSING), - "65: " + getCheckMessage(JAVADOC_MISSING), + "7: " + getCheckMessage(MSG_JAVADOC_MISSING), + "29: " + getCheckMessage(MSG_JAVADOC_MISSING), + "38: " + getCheckMessage(MSG_JAVADOC_MISSING), + "65: " + getCheckMessage(MSG_JAVADOC_MISSING), }; verify(checkConfig, getPath("InputScopeInnerInterfaces.java"), expected); } @@ -150,9 +150,9 @@ "scope", Scope.getInstance("package").getName()); final String[] expected = { - "18: " + getCheckMessage(JAVADOC_MISSING), - "20: " + getCheckMessage(JAVADOC_MISSING), - "22: " + getCheckMessage(JAVADOC_MISSING), + "18: " + getCheckMessage(MSG_JAVADOC_MISSING), + "20: " + getCheckMessage(MSG_JAVADOC_MISSING), + "22: " + getCheckMessage(MSG_JAVADOC_MISSING), }; verify(checkConfig, getPath("InputScopeInnerClasses.java"), expected); } @@ -165,7 +165,7 @@ "scope", Scope.getInstance("public").getName()); final String[] expected = { - "18: " + getCheckMessage(JAVADOC_MISSING), + "18: " + getCheckMessage(MSG_JAVADOC_MISSING), }; verify(checkConfig, getPath("InputScopeInnerClasses.java"), expected); } @@ -176,7 +176,7 @@ createCheckConfig(JavadocTypeCheck.class); checkConfig.addAttribute("authorFormat", "\\S"); final String[] expected = { - "13: " + getCheckMessage(MISSING_TAG, "@author"), + "13: " + getCheckMessage(MSG_MISSING_TAG, "@author"), }; verify(checkConfig, getPath("InputWhitespace.java"), expected); } @@ -188,9 +188,9 @@ createCheckConfig(JavadocTypeCheck.class); checkConfig.addAttribute("authorFormat", "0*"); final String[] expected = { - "22: " + getCheckMessage(MISSING_TAG, "@author"), - "58: " + getCheckMessage(MISSING_TAG, "@author"), - "94: " + getCheckMessage(MISSING_TAG, "@author"), + "22: " + getCheckMessage(MSG_MISSING_TAG, "@author"), + "58: " + getCheckMessage(MSG_MISSING_TAG, "@author"), + "94: " + getCheckMessage(MSG_MISSING_TAG, "@author"), }; verify(checkConfig, getPath("InputJavadoc.java"), expected); } @@ -202,15 +202,15 @@ createCheckConfig(JavadocTypeCheck.class); checkConfig.addAttribute("authorFormat", "ABC"); final String[] expected = { - "13: " + getCheckMessage(TAG_FORMAT, "@author", "ABC"), - "22: " + getCheckMessage(MISSING_TAG, "@author"), - "31: " + getCheckMessage(TAG_FORMAT, "@author", "ABC"), - "49: " + getCheckMessage(TAG_FORMAT, "@author", "ABC"), - "58: " + getCheckMessage(MISSING_TAG, "@author"), - "67: " + getCheckMessage(TAG_FORMAT, "@author", "ABC"), - "85: " + getCheckMessage(TAG_FORMAT, "@author", "ABC"), - "94: " + getCheckMessage(MISSING_TAG, "@author"), - "103: " + getCheckMessage(TAG_FORMAT, "@author", "ABC"), + "13: " + getCheckMessage(MSG_TAG_FORMAT, "@author", "ABC"), + "22: " + getCheckMessage(MSG_MISSING_TAG, "@author"), + "31: " + getCheckMessage(MSG_TAG_FORMAT, "@author", "ABC"), + "49: " + getCheckMessage(MSG_TAG_FORMAT, "@author", "ABC"), + "58: " + getCheckMessage(MSG_MISSING_TAG, "@author"), + "67: " + getCheckMessage(MSG_TAG_FORMAT, "@author", "ABC"), + "85: " + getCheckMessage(MSG_TAG_FORMAT, "@author", "ABC"), + "94: " + getCheckMessage(MSG_MISSING_TAG, "@author"), + "103: " + getCheckMessage(MSG_TAG_FORMAT, "@author", "ABC"), }; verify(checkConfig, getPath("InputJavadoc.java"), expected); } @@ -222,7 +222,7 @@ createCheckConfig(JavadocTypeCheck.class); checkConfig.addAttribute("versionFormat", "\\S"); final String[] expected = { - "13: " + getCheckMessage(MISSING_TAG, "@version"), + "13: " + getCheckMessage(MSG_MISSING_TAG, "@version"), }; verify(checkConfig, getPath("InputWhitespace.java"), expected); } @@ -234,9 +234,9 @@ createCheckConfig(JavadocTypeCheck.class); checkConfig.addAttribute("versionFormat", "^\\p{Digit}+\\.\\p{Digit}+$"); final String[] expected = { - "22: " + getCheckMessage(MISSING_TAG, "@version"), - "58: " + getCheckMessage(MISSING_TAG, "@version"), - "94: " + getCheckMessage(MISSING_TAG, "@version"), + "22: " + getCheckMessage(MSG_MISSING_TAG, "@version"), + "58: " + getCheckMessage(MSG_MISSING_TAG, "@version"), + "94: " + getCheckMessage(MSG_MISSING_TAG, "@version"), }; verify(checkConfig, getPath("InputJavadoc.java"), expected); } @@ -248,18 +248,18 @@ createCheckConfig(JavadocTypeCheck.class); checkConfig.addAttribute("versionFormat", "\\$Revision.*\\$"); final String[] expected = { - "13: " + getCheckMessage(TAG_FORMAT, "@version", "\\$Revision.*\\$"), - "22: " + getCheckMessage(MISSING_TAG, "@version"), - "31: " + getCheckMessage(TAG_FORMAT, "@version", "\\$Revision.*\\$"), - "40: " + getCheckMessage(TAG_FORMAT, "@version", "\\$Revision.*\\$"), - "49: " + getCheckMessage(TAG_FORMAT, "@version", "\\$Revision.*\\$"), - "58: " + getCheckMessage(MISSING_TAG, "@version"), - "67: " + getCheckMessage(TAG_FORMAT, "@version", "\\$Revision.*\\$"), - "76: " + getCheckMessage(TAG_FORMAT, "@version", "\\$Revision.*\\$"), - "85: " + getCheckMessage(TAG_FORMAT, "@version", "\\$Revision.*\\$"), - "94: " + getCheckMessage(MISSING_TAG, "@version"), - "103: " + getCheckMessage(TAG_FORMAT, "@version", "\\$Revision.*\\$"), - "112: " + getCheckMessage(TAG_FORMAT, "@version", "\\$Revision.*\\$"), + "13: " + getCheckMessage(MSG_TAG_FORMAT, "@version", "\\$Revision.*\\$"), + "22: " + getCheckMessage(MSG_MISSING_TAG, "@version"), + "31: " + getCheckMessage(MSG_TAG_FORMAT, "@version", "\\$Revision.*\\$"), + "40: " + getCheckMessage(MSG_TAG_FORMAT, "@version", "\\$Revision.*\\$"), + "49: " + getCheckMessage(MSG_TAG_FORMAT, "@version", "\\$Revision.*\\$"), + "58: " + getCheckMessage(MSG_MISSING_TAG, "@version"), + "67: " + getCheckMessage(MSG_TAG_FORMAT, "@version", "\\$Revision.*\\$"), + "76: " + getCheckMessage(MSG_TAG_FORMAT, "@version", "\\$Revision.*\\$"), + "85: " + getCheckMessage(MSG_TAG_FORMAT, "@version", "\\$Revision.*\\$"), + "94: " + getCheckMessage(MSG_MISSING_TAG, "@version"), + "103: " + getCheckMessage(MSG_TAG_FORMAT, "@version", "\\$Revision.*\\$"), + "112: " + getCheckMessage(MSG_TAG_FORMAT, "@version", "\\$Revision.*\\$"), }; verify(checkConfig, getPath("InputJavadoc.java"), expected); } @@ -269,16 +269,16 @@ final DefaultConfiguration checkConfig = createCheckConfig(JavadocTypeCheck.class); final String[] expected = { - "3: " + getCheckMessage(JAVADOC_MISSING), - "15: " + getCheckMessage(JAVADOC_MISSING), - "27: " + getCheckMessage(JAVADOC_MISSING), - "39: " + getCheckMessage(JAVADOC_MISSING), - "52: " + getCheckMessage(JAVADOC_MISSING), - "63: " + getCheckMessage(JAVADOC_MISSING), - "75: " + getCheckMessage(JAVADOC_MISSING), - "87: " + getCheckMessage(JAVADOC_MISSING), - "99: " + getCheckMessage(JAVADOC_MISSING), - "111: " + getCheckMessage(JAVADOC_MISSING), + "3: " + getCheckMessage(MSG_JAVADOC_MISSING), + "15: " + getCheckMessage(MSG_JAVADOC_MISSING), + "27: " + getCheckMessage(MSG_JAVADOC_MISSING), + "39: " + getCheckMessage(MSG_JAVADOC_MISSING), + "52: " + getCheckMessage(MSG_JAVADOC_MISSING), + "63: " + getCheckMessage(MSG_JAVADOC_MISSING), + "75: " + getCheckMessage(MSG_JAVADOC_MISSING), + "87: " + getCheckMessage(MSG_JAVADOC_MISSING), + "99: " + getCheckMessage(MSG_JAVADOC_MISSING), + "111: " + getCheckMessage(MSG_JAVADOC_MISSING), }; verify(checkConfig, getPath("InputNoJavadoc.java"), @@ -291,7 +291,7 @@ createCheckConfig(JavadocTypeCheck.class); checkConfig.addAttribute("tokens", "INTERFACE_DEF"); final String[] expected = { - "4: " + getCheckMessage(JAVADOC_MISSING), + "4: " + getCheckMessage(MSG_JAVADOC_MISSING), }; verify(checkConfig, getPath("InputNoJavadocOnInterface.java"), expected); } @@ -302,8 +302,8 @@ createCheckConfig(JavadocTypeCheck.class); checkConfig.addAttribute("scope", Scope.PROTECTED.getName()); final String[] expected = { - "3: " + getCheckMessage(JAVADOC_MISSING), - "15: " + getCheckMessage(JAVADOC_MISSING), + "3: " + getCheckMessage(MSG_JAVADOC_MISSING), + "15: " + getCheckMessage(MSG_JAVADOC_MISSING), }; verify(checkConfig, getPath("InputNoJavadoc.java"), @@ -317,14 +317,14 @@ checkConfig.addAttribute("scope", Scope.PRIVATE.getName()); checkConfig.addAttribute("excludeScope", Scope.PROTECTED.getName()); final String[] expected = { - "27: " + getCheckMessage(JAVADOC_MISSING), - "39: " + getCheckMessage(JAVADOC_MISSING), - "52: " + getCheckMessage(JAVADOC_MISSING), - "63: " + getCheckMessage(JAVADOC_MISSING), - "75: " + getCheckMessage(JAVADOC_MISSING), - "87: " + getCheckMessage(JAVADOC_MISSING), - "99: " + getCheckMessage(JAVADOC_MISSING), - "111: " + getCheckMessage(JAVADOC_MISSING), + "27: " + getCheckMessage(MSG_JAVADOC_MISSING), + "39: " + getCheckMessage(MSG_JAVADOC_MISSING), + "52: " + getCheckMessage(MSG_JAVADOC_MISSING), + "63: " + getCheckMessage(MSG_JAVADOC_MISSING), + "75: " + getCheckMessage(MSG_JAVADOC_MISSING), + "87: " + getCheckMessage(MSG_JAVADOC_MISSING), + "99: " + getCheckMessage(MSG_JAVADOC_MISSING), + "111: " + getCheckMessage(MSG_JAVADOC_MISSING), }; verify(checkConfig, getPath("InputNoJavadoc.java"), @@ -336,10 +336,10 @@ final DefaultConfiguration checkConfig = createCheckConfig(JavadocTypeCheck.class); final String[] expected = { - "7:4: " + getCheckMessage(UNUSED_TAG, "@param", ""), - "11: " + getCheckMessage(MISSING_TAG, "@param "), - "44:8: " + getCheckMessage(UNUSED_TAG, "@param", " "), - "47: " + getCheckMessage(MISSING_TAG, "@param "), + "7:4: " + getCheckMessage(MSG_UNUSED_TAG, "@param", " "), + "11: " + getCheckMessage(MSG_MISSING_TAG, "@param "), + "44:8: " + getCheckMessage(MSG_UNUSED_TAG, "@param", " "), + "47: " + getCheckMessage(MSG_MISSING_TAG, "@param "), }; verify(checkConfig, getPath("InputTypeParamsTags.java"), expected); } @@ -350,8 +350,8 @@ createCheckConfig(JavadocTypeCheck.class); checkConfig.addAttribute("allowMissingParamTags", "true"); final String[] expected = { - "7:4: " + getCheckMessage(UNUSED_TAG, "@param", " "), - "44:8: " + getCheckMessage(UNUSED_TAG, "@param", " "), + "7:4: " + getCheckMessage(MSG_UNUSED_TAG, "@param", " "), + "44:8: " + getCheckMessage(MSG_UNUSED_TAG, "@param", " "), }; verify(checkConfig, getPath("InputTypeParamsTags.java"), expected); } @@ -361,7 +361,7 @@ final DefaultConfiguration checkConfig = createCheckConfig(JavadocTypeCheck.class); final String[] expected = { - "5:4: " + getCheckMessage(UNKNOWN_TAG, "mytag"), + "5:4: " + getCheckMessage(MSG_UNKNOWN_TAG, "mytag"), }; verify(checkConfig, getPath("InputBadTag.java"), diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocVariableCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocVariableCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocVariableCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocVariableCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -19,7 +19,7 @@ package com.puppycrawl.tools.checkstyle.checks.javadoc; -import static com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocVariableCheck.JAVADOC_MISSING; +import static com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocVariableCheck.MSG_JAVADOC_MISSING; import static org.junit.Assert.assertArrayEquals; import java.io.File; @@ -70,10 +70,10 @@ final DefaultConfiguration checkConfig = createCheckConfig(JavadocVariableCheck.class); final String[] expected = { - "11:5: " + getCheckMessage(JAVADOC_MISSING), - "304:5: " + getCheckMessage(JAVADOC_MISSING), - "311:5: " + getCheckMessage(JAVADOC_MISSING), - "330:5: " + getCheckMessage(JAVADOC_MISSING), + "11:5: " + getCheckMessage(MSG_JAVADOC_MISSING), + "304:5: " + getCheckMessage(MSG_JAVADOC_MISSING), + "311:5: " + getCheckMessage(MSG_JAVADOC_MISSING), + "330:5: " + getCheckMessage(MSG_JAVADOC_MISSING), }; verify(checkConfig, getPath("InputTags.java"), expected); } @@ -84,9 +84,9 @@ final DefaultConfiguration checkConfig = createCheckConfig(JavadocVariableCheck.class); final String[] expected = { - "17:9: " + getCheckMessage(JAVADOC_MISSING), - "24:9: " + getCheckMessage(JAVADOC_MISSING), - "30:13: " + getCheckMessage(JAVADOC_MISSING), + "17:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "24:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "30:13: " + getCheckMessage(MSG_JAVADOC_MISSING), }; verify(checkConfig, getPath("InputInner.java"), expected); } @@ -107,13 +107,13 @@ final DefaultConfiguration checkConfig = createCheckConfig(JavadocVariableCheck.class); final String[] expected = { - "11:9: " + getCheckMessage(JAVADOC_MISSING), - "16:13: " + getCheckMessage(JAVADOC_MISSING), - "36:9: " + getCheckMessage(JAVADOC_MISSING), - "43:5: " + getCheckMessage(JAVADOC_MISSING), - "44:5: " + getCheckMessage(JAVADOC_MISSING), - "45:5: " + getCheckMessage(JAVADOC_MISSING), - "46:5: " + getCheckMessage(JAVADOC_MISSING), + "11:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "16:13: " + getCheckMessage(MSG_JAVADOC_MISSING), + "36:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "43:5: " + getCheckMessage(MSG_JAVADOC_MISSING), + "44:5: " + getCheckMessage(MSG_JAVADOC_MISSING), + "45:5: " + getCheckMessage(MSG_JAVADOC_MISSING), + "46:5: " + getCheckMessage(MSG_JAVADOC_MISSING), }; verify(checkConfig, getPath("InputPublicOnly.java"), expected); } @@ -125,7 +125,7 @@ createCheckConfig(JavadocVariableCheck.class); checkConfig.addAttribute("scope", Scope.PUBLIC.getName()); final String[] expected = { - "46:5: " + getCheckMessage(JAVADOC_MISSING), + "46:5: " + getCheckMessage(MSG_JAVADOC_MISSING), }; verify(checkConfig, getPath("InputPublicOnly.java"), expected); } @@ -135,43 +135,43 @@ final DefaultConfiguration checkConfig = createCheckConfig(JavadocVariableCheck.class); final String[] expected = { - "5:5: " + getCheckMessage(JAVADOC_MISSING), - "6:5: " + getCheckMessage(JAVADOC_MISSING), - "7:5: " + getCheckMessage(JAVADOC_MISSING), - "8:5: " + getCheckMessage(JAVADOC_MISSING), - "16:9: " + getCheckMessage(JAVADOC_MISSING), - "17:9: " + getCheckMessage(JAVADOC_MISSING), - "18:9: " + getCheckMessage(JAVADOC_MISSING), - "19:9: " + getCheckMessage(JAVADOC_MISSING), - "28:9: " + getCheckMessage(JAVADOC_MISSING), - "29:9: " + getCheckMessage(JAVADOC_MISSING), - "30:9: " + getCheckMessage(JAVADOC_MISSING), - "31:9: " + getCheckMessage(JAVADOC_MISSING), - "40:9: " + getCheckMessage(JAVADOC_MISSING), - "41:9: " + getCheckMessage(JAVADOC_MISSING), - "42:9: " + getCheckMessage(JAVADOC_MISSING), - "43:9: " + getCheckMessage(JAVADOC_MISSING), - "53:5: " + getCheckMessage(JAVADOC_MISSING), - "54:5: " + getCheckMessage(JAVADOC_MISSING), - "55:5: " + getCheckMessage(JAVADOC_MISSING), - "56:5: " + getCheckMessage(JAVADOC_MISSING), - "64:9: " + getCheckMessage(JAVADOC_MISSING), - "65:9: " + getCheckMessage(JAVADOC_MISSING), - "66:9: " + getCheckMessage(JAVADOC_MISSING), - "67:9: " + getCheckMessage(JAVADOC_MISSING), - "76:9: " + getCheckMessage(JAVADOC_MISSING), - "77:9: " + getCheckMessage(JAVADOC_MISSING), - "78:9: " + getCheckMessage(JAVADOC_MISSING), - "79:9: " + getCheckMessage(JAVADOC_MISSING), - "88:9: " + getCheckMessage(JAVADOC_MISSING), - "89:9: " + getCheckMessage(JAVADOC_MISSING), - "90:9: " + getCheckMessage(JAVADOC_MISSING), - "91:9: " + getCheckMessage(JAVADOC_MISSING), - "100:9: " + getCheckMessage(JAVADOC_MISSING), - "101:9: " + getCheckMessage(JAVADOC_MISSING), - "102:9: " + getCheckMessage(JAVADOC_MISSING), - "103:9: " + getCheckMessage(JAVADOC_MISSING), - "113:9: " + getCheckMessage(JAVADOC_MISSING), + "5:5: " + getCheckMessage(MSG_JAVADOC_MISSING), + "6:5: " + getCheckMessage(MSG_JAVADOC_MISSING), + "7:5: " + getCheckMessage(MSG_JAVADOC_MISSING), + "8:5: " + getCheckMessage(MSG_JAVADOC_MISSING), + "16:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "17:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "18:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "19:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "28:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "29:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "30:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "31:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "40:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "41:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "42:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "43:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "53:5: " + getCheckMessage(MSG_JAVADOC_MISSING), + "54:5: " + getCheckMessage(MSG_JAVADOC_MISSING), + "55:5: " + getCheckMessage(MSG_JAVADOC_MISSING), + "56:5: " + getCheckMessage(MSG_JAVADOC_MISSING), + "64:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "65:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "66:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "67:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "76:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "77:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "78:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "79:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "88:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "89:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "90:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "91:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "100:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "101:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "102:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "103:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "113:9: " + getCheckMessage(MSG_JAVADOC_MISSING), }; verify(checkConfig, getPath("InputNoJavadoc.java"), @@ -184,10 +184,10 @@ createCheckConfig(JavadocVariableCheck.class); checkConfig.addAttribute("scope", Scope.PROTECTED.getName()); final String[] expected = { - "5:5: " + getCheckMessage(JAVADOC_MISSING), - "6:5: " + getCheckMessage(JAVADOC_MISSING), - "16:9: " + getCheckMessage(JAVADOC_MISSING), - "17:9: " + getCheckMessage(JAVADOC_MISSING), + "5:5: " + getCheckMessage(MSG_JAVADOC_MISSING), + "6:5: " + getCheckMessage(MSG_JAVADOC_MISSING), + "16:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "17:9: " + getCheckMessage(MSG_JAVADOC_MISSING), }; verify(checkConfig, getPath("InputNoJavadoc.java"), @@ -201,39 +201,39 @@ checkConfig.addAttribute("scope", Scope.PRIVATE.getName()); checkConfig.addAttribute("excludeScope", Scope.PROTECTED.getName()); final String[] expected = { - "7:5: " + getCheckMessage(JAVADOC_MISSING), - "8:5: " + getCheckMessage(JAVADOC_MISSING), - "18:9: " + getCheckMessage(JAVADOC_MISSING), - "19:9: " + getCheckMessage(JAVADOC_MISSING), - "28:9: " + getCheckMessage(JAVADOC_MISSING), - "29:9: " + getCheckMessage(JAVADOC_MISSING), - "30:9: " + getCheckMessage(JAVADOC_MISSING), - "31:9: " + getCheckMessage(JAVADOC_MISSING), - "40:9: " + getCheckMessage(JAVADOC_MISSING), - "41:9: " + getCheckMessage(JAVADOC_MISSING), - "42:9: " + getCheckMessage(JAVADOC_MISSING), - "43:9: " + getCheckMessage(JAVADOC_MISSING), - "53:5: " + getCheckMessage(JAVADOC_MISSING), - "54:5: " + getCheckMessage(JAVADOC_MISSING), - "55:5: " + getCheckMessage(JAVADOC_MISSING), - "56:5: " + getCheckMessage(JAVADOC_MISSING), - "64:9: " + getCheckMessage(JAVADOC_MISSING), - "65:9: " + getCheckMessage(JAVADOC_MISSING), - "66:9: " + getCheckMessage(JAVADOC_MISSING), - "67:9: " + getCheckMessage(JAVADOC_MISSING), - "76:9: " + getCheckMessage(JAVADOC_MISSING), - "77:9: " + getCheckMessage(JAVADOC_MISSING), - "78:9: " + getCheckMessage(JAVADOC_MISSING), - "79:9: " + getCheckMessage(JAVADOC_MISSING), - "88:9: " + getCheckMessage(JAVADOC_MISSING), - "89:9: " + getCheckMessage(JAVADOC_MISSING), - "90:9: " + getCheckMessage(JAVADOC_MISSING), - "91:9: " + getCheckMessage(JAVADOC_MISSING), - "100:9: " + getCheckMessage(JAVADOC_MISSING), - "101:9: " + getCheckMessage(JAVADOC_MISSING), - "102:9: " + getCheckMessage(JAVADOC_MISSING), - "103:9: " + getCheckMessage(JAVADOC_MISSING), - "113:9: " + getCheckMessage(JAVADOC_MISSING), + "7:5: " + getCheckMessage(MSG_JAVADOC_MISSING), + "8:5: " + getCheckMessage(MSG_JAVADOC_MISSING), + "18:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "19:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "28:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "29:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "30:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "31:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "40:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "41:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "42:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "43:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "53:5: " + getCheckMessage(MSG_JAVADOC_MISSING), + "54:5: " + getCheckMessage(MSG_JAVADOC_MISSING), + "55:5: " + getCheckMessage(MSG_JAVADOC_MISSING), + "56:5: " + getCheckMessage(MSG_JAVADOC_MISSING), + "64:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "65:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "66:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "67:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "76:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "77:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "78:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "79:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "88:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "89:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "90:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "91:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "100:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "101:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "102:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "103:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "113:9: " + getCheckMessage(MSG_JAVADOC_MISSING), }; verify(checkConfig, getPath("InputNoJavadoc.java"), @@ -247,42 +247,42 @@ createCheckConfig(JavadocVariableCheck.class); checkConfig.addAttribute("ignoreNamePattern", "log|logger"); final String[] expected = { - "5:5: " + getCheckMessage(JAVADOC_MISSING), - "6:5: " + getCheckMessage(JAVADOC_MISSING), - "7:5: " + getCheckMessage(JAVADOC_MISSING), - "8:5: " + getCheckMessage(JAVADOC_MISSING), - "16:9: " + getCheckMessage(JAVADOC_MISSING), - "17:9: " + getCheckMessage(JAVADOC_MISSING), - "18:9: " + getCheckMessage(JAVADOC_MISSING), - "19:9: " + getCheckMessage(JAVADOC_MISSING), - "28:9: " + getCheckMessage(JAVADOC_MISSING), - "29:9: " + getCheckMessage(JAVADOC_MISSING), - "30:9: " + getCheckMessage(JAVADOC_MISSING), - "31:9: " + getCheckMessage(JAVADOC_MISSING), - "40:9: " + getCheckMessage(JAVADOC_MISSING), - "41:9: " + getCheckMessage(JAVADOC_MISSING), - "42:9: " + getCheckMessage(JAVADOC_MISSING), - "43:9: " + getCheckMessage(JAVADOC_MISSING), - "53:5: " + getCheckMessage(JAVADOC_MISSING), - "54:5: " + getCheckMessage(JAVADOC_MISSING), - "55:5: " + getCheckMessage(JAVADOC_MISSING), - "56:5: " + getCheckMessage(JAVADOC_MISSING), - "64:9: " + getCheckMessage(JAVADOC_MISSING), - "65:9: " + getCheckMessage(JAVADOC_MISSING), - "66:9: " + getCheckMessage(JAVADOC_MISSING), - "67:9: " + getCheckMessage(JAVADOC_MISSING), - "76:9: " + getCheckMessage(JAVADOC_MISSING), - "77:9: " + getCheckMessage(JAVADOC_MISSING), - "78:9: " + getCheckMessage(JAVADOC_MISSING), - "79:9: " + getCheckMessage(JAVADOC_MISSING), - "88:9: " + getCheckMessage(JAVADOC_MISSING), - "89:9: " + getCheckMessage(JAVADOC_MISSING), - "90:9: " + getCheckMessage(JAVADOC_MISSING), - "91:9: " + getCheckMessage(JAVADOC_MISSING), - "100:9: " + getCheckMessage(JAVADOC_MISSING), - "101:9: " + getCheckMessage(JAVADOC_MISSING), - "102:9: " + getCheckMessage(JAVADOC_MISSING), - "103:9: " + getCheckMessage(JAVADOC_MISSING), + "5:5: " + getCheckMessage(MSG_JAVADOC_MISSING), + "6:5: " + getCheckMessage(MSG_JAVADOC_MISSING), + "7:5: " + getCheckMessage(MSG_JAVADOC_MISSING), + "8:5: " + getCheckMessage(MSG_JAVADOC_MISSING), + "16:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "17:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "18:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "19:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "28:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "29:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "30:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "31:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "40:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "41:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "42:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "43:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "53:5: " + getCheckMessage(MSG_JAVADOC_MISSING), + "54:5: " + getCheckMessage(MSG_JAVADOC_MISSING), + "55:5: " + getCheckMessage(MSG_JAVADOC_MISSING), + "56:5: " + getCheckMessage(MSG_JAVADOC_MISSING), + "64:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "65:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "66:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "67:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "76:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "77:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "78:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "79:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "88:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "89:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "90:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "91:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "100:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "101:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "102:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "103:9: " + getCheckMessage(MSG_JAVADOC_MISSING), }; verify(checkConfig, getPath("InputNoJavadoc.java"), @@ -296,43 +296,43 @@ createCheckConfig(JavadocVariableCheck.class); checkConfig.addAttribute("ignoreNamePattern", ""); final String[] expected = { - "5:5: " + getCheckMessage(JAVADOC_MISSING), - "6:5: " + getCheckMessage(JAVADOC_MISSING), - "7:5: " + getCheckMessage(JAVADOC_MISSING), - "8:5: " + getCheckMessage(JAVADOC_MISSING), - "16:9: " + getCheckMessage(JAVADOC_MISSING), - "17:9: " + getCheckMessage(JAVADOC_MISSING), - "18:9: " + getCheckMessage(JAVADOC_MISSING), - "19:9: " + getCheckMessage(JAVADOC_MISSING), - "28:9: " + getCheckMessage(JAVADOC_MISSING), - "29:9: " + getCheckMessage(JAVADOC_MISSING), - "30:9: " + getCheckMessage(JAVADOC_MISSING), - "31:9: " + getCheckMessage(JAVADOC_MISSING), - "40:9: " + getCheckMessage(JAVADOC_MISSING), - "41:9: " + getCheckMessage(JAVADOC_MISSING), - "42:9: " + getCheckMessage(JAVADOC_MISSING), - "43:9: " + getCheckMessage(JAVADOC_MISSING), - "53:5: " + getCheckMessage(JAVADOC_MISSING), - "54:5: " + getCheckMessage(JAVADOC_MISSING), - "55:5: " + getCheckMessage(JAVADOC_MISSING), - "56:5: " + getCheckMessage(JAVADOC_MISSING), - "64:9: " + getCheckMessage(JAVADOC_MISSING), - "65:9: " + getCheckMessage(JAVADOC_MISSING), - "66:9: " + getCheckMessage(JAVADOC_MISSING), - "67:9: " + getCheckMessage(JAVADOC_MISSING), - "76:9: " + getCheckMessage(JAVADOC_MISSING), - "77:9: " + getCheckMessage(JAVADOC_MISSING), - "78:9: " + getCheckMessage(JAVADOC_MISSING), - "79:9: " + getCheckMessage(JAVADOC_MISSING), - "88:9: " + getCheckMessage(JAVADOC_MISSING), - "89:9: " + getCheckMessage(JAVADOC_MISSING), - "90:9: " + getCheckMessage(JAVADOC_MISSING), - "91:9: " + getCheckMessage(JAVADOC_MISSING), - "100:9: " + getCheckMessage(JAVADOC_MISSING), - "101:9: " + getCheckMessage(JAVADOC_MISSING), - "102:9: " + getCheckMessage(JAVADOC_MISSING), - "103:9: " + getCheckMessage(JAVADOC_MISSING), - "113:9: " + getCheckMessage(JAVADOC_MISSING), + "5:5: " + getCheckMessage(MSG_JAVADOC_MISSING), + "6:5: " + getCheckMessage(MSG_JAVADOC_MISSING), + "7:5: " + getCheckMessage(MSG_JAVADOC_MISSING), + "8:5: " + getCheckMessage(MSG_JAVADOC_MISSING), + "16:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "17:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "18:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "19:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "28:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "29:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "30:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "31:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "40:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "41:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "42:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "43:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "53:5: " + getCheckMessage(MSG_JAVADOC_MISSING), + "54:5: " + getCheckMessage(MSG_JAVADOC_MISSING), + "55:5: " + getCheckMessage(MSG_JAVADOC_MISSING), + "56:5: " + getCheckMessage(MSG_JAVADOC_MISSING), + "64:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "65:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "66:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "67:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "76:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "77:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "78:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "79:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "88:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "89:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "90:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "91:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "100:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "101:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "102:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "103:9: " + getCheckMessage(MSG_JAVADOC_MISSING), + "113:9: " + getCheckMessage(MSG_JAVADOC_MISSING), }; verify(checkConfig, getPath("InputNoJavadoc.java"), diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/NonEmptyAtclauseDescriptionCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/NonEmptyAtclauseDescriptionCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/NonEmptyAtclauseDescriptionCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/NonEmptyAtclauseDescriptionCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SingleLineJavadocCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SingleLineJavadocCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SingleLineJavadocCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SingleLineJavadocCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -19,8 +19,8 @@ package com.puppycrawl.tools.checkstyle.checks.javadoc; -import static com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.SUMMARY_FIRST_SENTENCE; -import static com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.SUMMARY_JAVADOC; +import static com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.MSG_SUMMARY_FIRST_SENTENCE; +import static com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.MSG_SUMMARY_JAVADOC; import static org.junit.Assert.assertArrayEquals; import java.io.File; @@ -69,13 +69,13 @@ checkConfig.addAttribute("forbiddenSummaryFragments", "^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"); final String[] expected = { - "14: " + getCheckMessage(SUMMARY_FIRST_SENTENCE), - "37: " + getCheckMessage(SUMMARY_FIRST_SENTENCE), - "47: " + getCheckMessage(SUMMARY_JAVADOC), - "58: " + getCheckMessage(SUMMARY_JAVADOC), - "69: " + getCheckMessage(SUMMARY_FIRST_SENTENCE), - "83: " + getCheckMessage(SUMMARY_JAVADOC), - "103: " + getCheckMessage(SUMMARY_FIRST_SENTENCE), + "14: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE), + "37: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE), + "47: " + getCheckMessage(MSG_SUMMARY_JAVADOC), + "58: " + getCheckMessage(MSG_SUMMARY_JAVADOC), + "69: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE), + "83: " + getCheckMessage(MSG_SUMMARY_JAVADOC), + "103: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE), }; verify(checkConfig, getPath("InputIncorrectSummaryJavaDoc.java"), expected); } @@ -84,8 +84,8 @@ public void testPeriod() throws Exception { checkConfig.addAttribute("period", "_"); final String[] expected = { - "5: " + getCheckMessage(SUMMARY_FIRST_SENTENCE), - "10: " + getCheckMessage(SUMMARY_FIRST_SENTENCE), + "5: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE), + "10: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE), }; verify(checkConfig, getPath("InputSummaryJavadocPeriod.java"), expected); @@ -102,10 +102,10 @@ @Test public void testDefaultConfiguration() throws Exception { final String[] expected = { - "14: " + getCheckMessage(SUMMARY_FIRST_SENTENCE), - "37: " + getCheckMessage(SUMMARY_FIRST_SENTENCE), - "69: " + getCheckMessage(SUMMARY_FIRST_SENTENCE), - "103: " + getCheckMessage(SUMMARY_FIRST_SENTENCE), + "14: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE), + "37: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE), + "69: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE), + "103: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE), }; createChecker(checkConfig); diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/WriteTagCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/WriteTagCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/WriteTagCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/WriteTagCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -19,9 +19,9 @@ package com.puppycrawl.tools.checkstyle.checks.javadoc; -import static com.puppycrawl.tools.checkstyle.checks.javadoc.WriteTagCheck.MISSING_TAG; -import static com.puppycrawl.tools.checkstyle.checks.javadoc.WriteTagCheck.TAG_FORMAT; -import static com.puppycrawl.tools.checkstyle.checks.javadoc.WriteTagCheck.WRITE_TAG; +import static com.puppycrawl.tools.checkstyle.checks.javadoc.WriteTagCheck.MSG_MISSING_TAG; +import static com.puppycrawl.tools.checkstyle.checks.javadoc.WriteTagCheck.MSG_TAG_FORMAT; +import static com.puppycrawl.tools.checkstyle.checks.javadoc.WriteTagCheck.MSG_WRITE_TAG; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -72,7 +72,7 @@ checkConfig.addAttribute("tag", "@author"); checkConfig.addAttribute("tagFormat", "\\S"); final String[] expected = { - "10: " + getCheckMessage(WRITE_TAG, "@author", "Daniel Grenner"), + "10: " + getCheckMessage(MSG_WRITE_TAG, "@author", "Daniel Grenner"), }; verify(checkConfig, getPath("InputWriteTag.java"), expected); } @@ -81,7 +81,7 @@ public void testMissingFormat() throws Exception { checkConfig.addAttribute("tag", "@author"); final String[] expected = { - "10: " + getCheckMessage(WRITE_TAG, "@author", "Daniel Grenner"), + "10: " + getCheckMessage(MSG_WRITE_TAG, "@author", "Daniel Grenner"), }; verify(checkConfig, getPath("InputWriteTag.java"), expected); } @@ -91,7 +91,7 @@ checkConfig.addAttribute("tag", "@incomplete"); checkConfig.addAttribute("tagFormat", "\\S"); final String[] expected = { - "11: " + getCheckMessage(WRITE_TAG, "@incomplete", + "11: " + getCheckMessage(MSG_WRITE_TAG, "@incomplete", "This class needs more code..."), }; verify(checkConfig, getPath("InputWriteTag.java"), expected); @@ -102,8 +102,8 @@ checkConfig.addAttribute("tag", "@doubletag"); checkConfig.addAttribute("tagFormat", "\\S"); final String[] expected = { - "12: " + getCheckMessage(WRITE_TAG, "@doubletag", "first text"), - "13: " + getCheckMessage(WRITE_TAG, "@doubletag", "second text"), + "12: " + getCheckMessage(MSG_WRITE_TAG, "@doubletag", "first text"), + "13: " + getCheckMessage(MSG_WRITE_TAG, "@doubletag", "second text"), }; verify(checkConfig, getPath("InputWriteTag.java"), expected); } @@ -113,7 +113,7 @@ checkConfig.addAttribute("tag", "@emptytag"); checkConfig.addAttribute("tagFormat", ""); final String[] expected = { - "14: " + getCheckMessage(WRITE_TAG, "@emptytag", ""), + "14: " + getCheckMessage(MSG_WRITE_TAG, "@emptytag", ""), }; verify(checkConfig, getPath("InputWriteTag.java"), expected); } @@ -122,7 +122,7 @@ public void testMissingTag() throws Exception { checkConfig.addAttribute("tag", "@missingtag"); final String[] expected = { - "16: " + getCheckMessage(MISSING_TAG, "@missingtag"), + "16: " + getCheckMessage(MSG_MISSING_TAG, "@missingtag"), }; verify(checkConfig, getPath("InputWriteTag.java"), expected); } @@ -135,8 +135,8 @@ "INTERFACE_DEF, CLASS_DEF, METHOD_DEF, CTOR_DEF"); checkConfig.addAttribute("severity", "ignore"); final String[] expected = { - "19: " + getCheckMessage(WRITE_TAG, "@todo", "Add a constructor comment"), - "30: " + getCheckMessage(WRITE_TAG, "@todo", "Add a comment"), + "19: " + getCheckMessage(MSG_WRITE_TAG, "@todo", "Add a constructor comment"), + "30: " + getCheckMessage(MSG_WRITE_TAG, "@todo", "Add a comment"), }; verify(checkConfig, getPath("InputWriteTag.java"), expected); } @@ -147,7 +147,7 @@ checkConfig.addAttribute("tagFormat", "\\S"); checkConfig.addAttribute("severity", "ignore"); final String[] expected = { - "10: " + getCheckMessage(WRITE_TAG, "@author", "Daniel Grenner"), + "10: " + getCheckMessage(MSG_WRITE_TAG, "@author", "Daniel Grenner"), }; verify(checkConfig, getPath("InputWriteTag.java"), expected); } @@ -176,7 +176,7 @@ checkConfig.addAttribute("tag", "@author"); checkConfig.addAttribute("tagFormat", "ABC"); final String[] expected = { - "10: " + getCheckMessage(TAG_FORMAT, "@author", "ABC"), + "10: " + getCheckMessage(MSG_TAG_FORMAT, "@author", "ABC"), }; verify(checkConfig, getPath("InputWriteTag.java"), expected); } @@ -190,12 +190,12 @@ checkConfig.addAttribute("tokens", "ANNOTATION_DEF, ENUM_DEF, ANNOTATION_FIELD_DEF, ENUM_CONSTANT_DEF"); final String[] expected = { - "9: " + getCheckMessage(WRITE_TAG, "@incomplete", "This enum needs more code..."), - "13: " + getCheckMessage(WRITE_TAG, "@incomplete", + "9: " + getCheckMessage(MSG_WRITE_TAG, "@incomplete", "This enum needs more code..."), + "13: " + getCheckMessage(MSG_WRITE_TAG, "@incomplete", "This enum constant needs more code..."), - "19: " + getCheckMessage(WRITE_TAG, "@incomplete", + "19: " + getCheckMessage(MSG_WRITE_TAG, "@incomplete", "This annotation needs more code..."), - "23: " + getCheckMessage(WRITE_TAG, "@incomplete", + "23: " + getCheckMessage(MSG_WRITE_TAG, "@incomplete", "This annotation field needs more code..."), }; verify(checkConfig, getPath("InputWriteTag2.java"), expected); diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/BooleanExpressionComplexityCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/BooleanExpressionComplexityCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/BooleanExpressionComplexityCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/BooleanExpressionComplexityCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassDataAbstractionCouplingCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassDataAbstractionCouplingCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassDataAbstractionCouplingCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassDataAbstractionCouplingCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/CyclomaticComplexityCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/CyclomaticComplexityCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/CyclomaticComplexityCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/CyclomaticComplexityCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/modifier/ModifierOrderCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/modifier/ModifierOrderCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/modifier/ModifierOrderCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/modifier/ModifierOrderCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/modifier/RedundantModifierCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/modifier/RedundantModifierCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/modifier/RedundantModifierCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/modifier/RedundantModifierCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractClassNameCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractClassNameCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractClassNameCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractClassNameCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -19,8 +19,8 @@ package com.puppycrawl.tools.checkstyle.checks.naming; -import static com.puppycrawl.tools.checkstyle.checks.naming.AbstractClassNameCheck.ILLEGAL_ABSTRACT_CLASS_NAME; -import static com.puppycrawl.tools.checkstyle.checks.naming.AbstractClassNameCheck.NO_ABSTRACT_CLASS_MODIFIER; +import static com.puppycrawl.tools.checkstyle.checks.naming.AbstractClassNameCheck.MSG_ILLEGAL_ABSTRACT_CLASS_NAME; +import static com.puppycrawl.tools.checkstyle.checks.naming.AbstractClassNameCheck.MSG_NO_ABSTRACT_CLASS_MODIFIER; import java.io.File; import java.io.IOException; @@ -49,10 +49,11 @@ final String pattern = "^Abstract.+$"; final String[] expected = { - "3:1: " + getCheckMessage(ILLEGAL_ABSTRACT_CLASS_NAME, "InputAbstractClassName", + "3:1: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "InputAbstractClassName", pattern), - "6:1: " + getCheckMessage(ILLEGAL_ABSTRACT_CLASS_NAME, "NonAbstractClassName", pattern), - "10:5: " + getCheckMessage(ILLEGAL_ABSTRACT_CLASS_NAME, "NonAbstractInnerClass", + "6:1: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "NonAbstractClassName", + pattern), + "10:5: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "NonAbstractInnerClass", pattern), }; @@ -69,10 +70,11 @@ checkConfig.addAttribute("format", pattern); final String[] expected = { - "3:1: " + getCheckMessage(ILLEGAL_ABSTRACT_CLASS_NAME, "InputAbstractClassName", + "3:1: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "InputAbstractClassName", + pattern), + "9:1: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "AbstractClassOther", pattern), - "9:1: " + getCheckMessage(ILLEGAL_ABSTRACT_CLASS_NAME, "AbstractClassOther", pattern), - "21:1: " + getCheckMessage(ILLEGAL_ABSTRACT_CLASS_NAME, "AbstractClassName2", + "21:1: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "AbstractClassName2", pattern), }; @@ -86,8 +88,8 @@ checkConfig.addAttribute("ignoreModifier", "false"); final String[] expected = { - "18:1: " + getCheckMessage(NO_ABSTRACT_CLASS_MODIFIER, "AbstractClass"), - "22:5: " + getCheckMessage(NO_ABSTRACT_CLASS_MODIFIER, "AbstractInnerClass"), + "18:1: " + getCheckMessage(MSG_NO_ABSTRACT_CLASS_MODIFIER, "AbstractClass"), + "22:5: " + getCheckMessage(MSG_NO_ABSTRACT_CLASS_MODIFIER, "AbstractInnerClass"), }; verify(checkConfig, getPath("InputAbstractClassName.java"), expected); @@ -102,13 +104,14 @@ final String pattern = "^Abstract.+$"; final String[] expected = { - "3:1: " + getCheckMessage(ILLEGAL_ABSTRACT_CLASS_NAME, "InputAbstractClassName", + "3:1: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "InputAbstractClassName", + pattern), + "6:1: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "NonAbstractClassName", pattern), - "6:1: " + getCheckMessage(ILLEGAL_ABSTRACT_CLASS_NAME, "NonAbstractClassName", pattern), - "10:5: " + getCheckMessage(ILLEGAL_ABSTRACT_CLASS_NAME, "NonAbstractInnerClass", + "10:5: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "NonAbstractInnerClass", pattern), - "18:1: " + getCheckMessage(NO_ABSTRACT_CLASS_MODIFIER, "AbstractClass"), - "22:5: " + getCheckMessage(NO_ABSTRACT_CLASS_MODIFIER, "AbstractInnerClass"), + "18:1: " + getCheckMessage(MSG_NO_ABSTRACT_CLASS_MODIFIER, "AbstractClass"), + "22:5: " + getCheckMessage(MSG_NO_ABSTRACT_CLASS_MODIFIER, "AbstractInnerClass"), }; verify(checkConfig, getPath("InputAbstractClassName.java"), expected); @@ -119,7 +122,7 @@ final DefaultConfiguration checkConfig = createCheckConfig(AbstractClassNameCheck.class); final String[] expected = { - "9:5: " + getCheckMessage(NO_ABSTRACT_CLASS_MODIFIER, "AbstractClass"), + "9:5: " + getCheckMessage(MSG_NO_ABSTRACT_CLASS_MODIFIER, "AbstractClass"), }; verify(checkConfig, getPath("InputAbstractClassNameFormerFalsePositive.java"), expected); diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/CatchParameterNameCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/CatchParameterNameCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/CatchParameterNameCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/CatchParameterNameCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/ClassTypeParameterNameCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/ClassTypeParameterNameCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/ClassTypeParameterNameCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/ClassTypeParameterNameCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/ConstantNameCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/ConstantNameCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/ConstantNameCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/ConstantNameCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/InterfaceTypeParameterNameCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/InterfaceTypeParameterNameCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/InterfaceTypeParameterNameCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/InterfaceTypeParameterNameCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/LocalFinalVariableNameCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/LocalFinalVariableNameCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/LocalFinalVariableNameCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/LocalFinalVariableNameCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/LocalVariableNameCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/LocalVariableNameCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/LocalVariableNameCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/LocalVariableNameCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/MemberNameCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/MemberNameCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/MemberNameCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/MemberNameCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodNameCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodNameCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodNameCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodNameCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodTypeParameterNameCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodTypeParameterNameCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodTypeParameterNameCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodTypeParameterNameCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/PackageNameCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/PackageNameCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/PackageNameCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/PackageNameCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/ParameterNameCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/ParameterNameCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/ParameterNameCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/ParameterNameCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/StaticVariableNameCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/StaticVariableNameCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/StaticVariableNameCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/StaticVariableNameCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/TypeNameCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/TypeNameCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/TypeNameCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/TypeNameCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/NewlineAtEndOfFileCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/NewlineAtEndOfFileCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/NewlineAtEndOfFileCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/NewlineAtEndOfFileCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/OuterTypeFilenameCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/OuterTypeFilenameCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/OuterTypeFilenameCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/OuterTypeFilenameCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -19,6 +19,7 @@ package com.puppycrawl.tools.checkstyle.checks; +import static com.puppycrawl.tools.checkstyle.checks.OuterTypeFilenameCheck.MSG_KEY; import static org.junit.Assert.assertArrayEquals; import java.io.File; @@ -108,7 +109,7 @@ public void testWrongDefault() throws Exception { final DefaultConfiguration checkConfig = createCheckConfig(OuterTypeFilenameCheck.class); final String[] expected = { - "4: " + getCheckMessage("type.file.mismatch"), + "4: " + getCheckMessage(MSG_KEY), }; verify(checkConfig, getPath("InputOuterTypeFilename5.java"), expected); } diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpMultilineCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpMultilineCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpMultilineCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpMultilineCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -19,10 +19,10 @@ package com.puppycrawl.tools.checkstyle.checks.regexp; -import static com.puppycrawl.tools.checkstyle.checks.regexp.MultilineDetector.EMPTY; -import static com.puppycrawl.tools.checkstyle.checks.regexp.MultilineDetector.REGEXP_EXCEEDED; -import static com.puppycrawl.tools.checkstyle.checks.regexp.MultilineDetector.REGEXP_MINIMUM; -import static com.puppycrawl.tools.checkstyle.checks.regexp.MultilineDetector.STACKOVERFLOW; +import static com.puppycrawl.tools.checkstyle.checks.regexp.MultilineDetector.MSG_EMPTY; +import static com.puppycrawl.tools.checkstyle.checks.regexp.MultilineDetector.MSG_REGEXP_EXCEEDED; +import static com.puppycrawl.tools.checkstyle.checks.regexp.MultilineDetector.MSG_REGEXP_MINIMUM; +import static com.puppycrawl.tools.checkstyle.checks.regexp.MultilineDetector.MSG_STACKOVERFLOW; import java.io.File; import java.io.IOException; @@ -60,7 +60,7 @@ final String illegal = "System\\.(out)|(err)\\.print(ln)?\\("; checkConfig.addAttribute("format", illegal); final String[] expected = { - "69: " + getCheckMessage(REGEXP_EXCEEDED, illegal), + "69: " + getCheckMessage(MSG_REGEXP_EXCEEDED, illegal), }; verify(checkConfig, getPath("InputSemantic.java"), expected); } @@ -84,7 +84,7 @@ checkConfig.addAttribute("format", illegal); checkConfig.addAttribute("ignoreCase", "true"); final String[] expected = { - "69: " + getCheckMessage(REGEXP_EXCEEDED, illegal), + "69: " + getCheckMessage(MSG_REGEXP_EXCEEDED, illegal), }; verify(checkConfig, getPath("InputSemantic.java"), expected); } @@ -103,9 +103,9 @@ final String illegal = "^import"; checkConfig.addAttribute("format", illegal); final String[] expected = { - "7: " + getCheckMessage(REGEXP_EXCEEDED, illegal), - "8: " + getCheckMessage(REGEXP_EXCEEDED, illegal), - "9: " + getCheckMessage(REGEXP_EXCEEDED, illegal), + "7: " + getCheckMessage(MSG_REGEXP_EXCEEDED, illegal), + "8: " + getCheckMessage(MSG_REGEXP_EXCEEDED, illegal), + "9: " + getCheckMessage(MSG_REGEXP_EXCEEDED, illegal), }; verify(checkConfig, getPath("InputSemantic.java"), expected); } @@ -116,8 +116,8 @@ checkConfig.addAttribute("format", illegal); checkConfig.addAttribute("maximum", "0"); final String[] expected = { - "1: " + getCheckMessage(REGEXP_EXCEEDED, illegal), - "3: " + getCheckMessage(REGEXP_EXCEEDED, illegal), + "1: " + getCheckMessage(MSG_REGEXP_EXCEEDED, illegal), + "3: " + getCheckMessage(MSG_REGEXP_EXCEEDED, illegal), }; final File file = temporaryFolder.newFile(); @@ -136,7 +136,7 @@ public void testEmptyFormat() throws Exception { checkConfig.addAttribute("format", null); final String[] expected = { - "0: " + getCheckMessage(EMPTY), + "0: " + getCheckMessage(MSG_EMPTY), }; verify(checkConfig, getPath("InputSemantic.java"), expected); } @@ -147,7 +147,7 @@ checkConfig.addAttribute("format", "(x|y)*"); final String[] expected = { - "0: " + getCheckMessage(STACKOVERFLOW), + "0: " + getCheckMessage(MSG_STACKOVERFLOW), }; final File file = temporaryFolder.newFile(); @@ -162,7 +162,7 @@ checkConfig.addAttribute("format", illegal); checkConfig.addAttribute("minimum", "5"); final String[] expected = { - "0: " + getCheckMessage(REGEXP_MINIMUM, "5", illegal), + "0: " + getCheckMessage(MSG_REGEXP_MINIMUM, "5", illegal), }; final File file = temporaryFolder.newFile(); diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpOnFilenameCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpOnFilenameCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpOnFilenameCheckTest.java 1970-01-01 00:00:00.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpOnFilenameCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -0,0 +1,241 @@ +//////////////////////////////////////////////////////////////////////////////// +// checkstyle: Checks Java source code for adherence to a set of rules. +// Copyright (C) 2001-2016 the original author or authors. +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//////////////////////////////////////////////////////////////////////////////// + +package com.puppycrawl.tools.checkstyle.checks.regexp; + +import static com.puppycrawl.tools.checkstyle.checks.regexp.RegexpOnFilenameCheck.MSG_MATCH; +import static com.puppycrawl.tools.checkstyle.checks.regexp.RegexpOnFilenameCheck.MSG_MISMATCH; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + +import java.io.File; +import java.io.IOException; + +import org.apache.commons.lang3.ArrayUtils; +import org.junit.Test; + +import com.puppycrawl.tools.checkstyle.BaseFileSetCheckTestSupport; +import com.puppycrawl.tools.checkstyle.DefaultConfiguration; +import com.puppycrawl.tools.checkstyle.api.CheckstyleException; + +public class RegexpOnFilenameCheckTest extends BaseFileSetCheckTestSupport { + @Override + protected String getPath(String filename) throws IOException { + return super.getPath("checks" + File.separator + "regexp" + File.separator + filename); + } + + @Test + public void testDefaultConfigurationOnValidInput() throws Exception { + final DefaultConfiguration checkConfig = createCheckConfig(RegexpOnFilenameCheck.class); + verify(checkConfig, getPath("InputSemantic.java"), ArrayUtils.EMPTY_STRING_ARRAY); + } + + @Test + public void testDefaultProperties() throws Exception { + final DefaultConfiguration checkConfig = createCheckConfig(RegexpOnFilenameCheck.class); + final String path = getPath("Input Space.properties"); + final String[] expected = { + "0: " + getCheckMessage(MSG_MATCH, "", "\\s"), + }; + verify(checkConfig, path, expected); + } + + @Test + public void testMatchFileMatches() throws Exception { + final DefaultConfiguration checkConfig = createCheckConfig(RegexpOnFilenameCheck.class); + checkConfig.addAttribute("match", "true"); + checkConfig.addAttribute("fileNamePattern", ".*\\.java"); + final String path = getPath("InputSemantic.java"); + final String[] expected = { + "0: " + getCheckMessage(MSG_MATCH, "", ".*\\.java"), + }; + verify(checkConfig, path, expected); + } + + @Test + public void testMatchFileNotMatches() throws Exception { + final DefaultConfiguration checkConfig = createCheckConfig(RegexpOnFilenameCheck.class); + checkConfig.addAttribute("match", "true"); + checkConfig.addAttribute("fileNamePattern", "BAD.*"); + verify(checkConfig, getPath("InputSemantic.java"), ArrayUtils.EMPTY_STRING_ARRAY); + } + + @Test + public void testNotMatchFileMatches() throws Exception { + final DefaultConfiguration checkConfig = createCheckConfig(RegexpOnFilenameCheck.class); + checkConfig.addAttribute("match", "false"); + checkConfig.addAttribute("fileNamePattern", ".*\\.properties"); + final String path = getPath("InputSemantic.java"); + final String[] expected = { + "0: " + getCheckMessage(MSG_MISMATCH, "", ".*\\.properties"), + }; + verify(checkConfig, path, expected); + } + + @Test + public void testNotMatchFileNotMatches() throws Exception { + final DefaultConfiguration checkConfig = createCheckConfig(RegexpOnFilenameCheck.class); + checkConfig.addAttribute("match", "false"); + checkConfig.addAttribute("fileNamePattern", ".*\\.java"); + verify(checkConfig, getPath("InputSemantic.java"), ArrayUtils.EMPTY_STRING_ARRAY); + } + + @Test + public void testMatchFolderMatches() throws Exception { + final DefaultConfiguration checkConfig = createCheckConfig(RegexpOnFilenameCheck.class); + checkConfig.addAttribute("match", "true"); + checkConfig.addAttribute("folderPattern", ".*[\\\\/]resources[\\\\/].*"); + final String path = getPath("InputSemantic.java"); + final String[] expected = { + "0: " + getCheckMessage(MSG_MATCH, ".*[\\\\/]resources[\\\\/].*", ""), + }; + verify(checkConfig, path, expected); + } + + @Test + public void testMatchFolderNotMatches() throws Exception { + final DefaultConfiguration checkConfig = createCheckConfig(RegexpOnFilenameCheck.class); + checkConfig.addAttribute("match", "true"); + checkConfig.addAttribute("folderPattern", "BAD.*"); + verify(checkConfig, getPath("InputSemantic.java"), ArrayUtils.EMPTY_STRING_ARRAY); + } + + @Test + public void testNotMatchFolderMatches() throws Exception { + final DefaultConfiguration checkConfig = createCheckConfig(RegexpOnFilenameCheck.class); + checkConfig.addAttribute("match", "false"); + checkConfig.addAttribute("folderPattern", ".*[\\\\/]gov[\\\\/].*"); + final String path = getPath("InputSemantic.java"); + final String[] expected = { + "0: " + getCheckMessage(MSG_MISMATCH, ".*[\\\\/]gov[\\\\/].*", ""), + }; + verify(checkConfig, path, expected); + } + + @Test + public void testNotMatchFolderNotMatches() throws Exception { + final DefaultConfiguration checkConfig = createCheckConfig(RegexpOnFilenameCheck.class); + checkConfig.addAttribute("match", "false"); + checkConfig.addAttribute("folderPattern", ".*[\\\\/]resources[\\\\/].*"); + verify(checkConfig, getPath("InputSemantic.java"), ArrayUtils.EMPTY_STRING_ARRAY); + } + + @Test + public void testMatchFolderAndFileMatches() throws Exception { + final DefaultConfiguration checkConfig = createCheckConfig(RegexpOnFilenameCheck.class); + checkConfig.addAttribute("match", "true"); + checkConfig.addAttribute("folderPattern", ".*[\\\\/]resources[\\\\/].*"); + checkConfig.addAttribute("fileNamePattern", ".*\\.java"); + final String path = getPath("InputSemantic.java"); + final String[] expected = { + "0: " + getCheckMessage(MSG_MATCH, ".*[\\\\/]resources[\\\\/].*", ".*\\.java"), + }; + verify(checkConfig, path, expected); + } + + @Test + public void testMatchFolderAndFileNotMatchesBoth() throws Exception { + final DefaultConfiguration checkConfig = createCheckConfig(RegexpOnFilenameCheck.class); + checkConfig.addAttribute("match", "true"); + checkConfig.addAttribute("folderPattern", "BAD.*"); + checkConfig.addAttribute("fileNamePattern", ".*\\.properties"); + verify(checkConfig, getPath("InputSemantic.java"), ArrayUtils.EMPTY_STRING_ARRAY); + } + + @Test + public void testMatchFolderAndFileNotMatchesFile() throws Exception { + final DefaultConfiguration checkConfig = createCheckConfig(RegexpOnFilenameCheck.class); + checkConfig.addAttribute("match", "true"); + checkConfig.addAttribute("folderPattern", ".*[\\\\/]resources[\\\\/].*"); + checkConfig.addAttribute("fileNamePattern", ".*\\.properties"); + verify(checkConfig, getPath("InputSemantic.java"), ArrayUtils.EMPTY_STRING_ARRAY); + } + + @Test + public void testMatchFolderAndFileNotMatchesFolder() throws Exception { + final DefaultConfiguration checkConfig = createCheckConfig(RegexpOnFilenameCheck.class); + checkConfig.addAttribute("match", "true"); + checkConfig.addAttribute("folderPattern", "BAD.*"); + checkConfig.addAttribute("fileNamePattern", ".*\\.java"); + verify(checkConfig, getPath("InputSemantic.java"), ArrayUtils.EMPTY_STRING_ARRAY); + } + + @Test + public void testNotMatchFolderAndFileMatches() throws Exception { + final DefaultConfiguration checkConfig = createCheckConfig(RegexpOnFilenameCheck.class); + checkConfig.addAttribute("match", "false"); + checkConfig.addAttribute("folderPattern", ".*[\\\\/]com[\\\\/].*"); + checkConfig.addAttribute("fileNamePattern", ".*\\.dat"); + final String path = getPath("InputSemantic.java"); + final String[] expected = { + "0: " + getCheckMessage(MSG_MISMATCH, ".*[\\\\/]com[\\\\/].*", ".*\\.dat"), + }; + verify(checkConfig, path, expected); + } + + @Test + public void testNotMatchFolderAndFileNotMatchesFolder() throws Exception { + final DefaultConfiguration checkConfig = createCheckConfig(RegexpOnFilenameCheck.class); + checkConfig.addAttribute("match", "false"); + checkConfig.addAttribute("folderPattern", ".*[\\\\/]javastrangefolder[\\\\/].*"); + checkConfig.addAttribute("fileNamePattern", ".*\\.dat"); + verify(checkConfig, getPath("InputSemantic.java"), ArrayUtils.EMPTY_STRING_ARRAY); + } + + @Test + public void testNotMatchFolderAndFileNotMatchesFile() throws Exception { + final DefaultConfiguration checkConfig = createCheckConfig(RegexpOnFilenameCheck.class); + checkConfig.addAttribute("match", "false"); + checkConfig.addAttribute("folderPattern", ".*[\\\\/]govstrangefolder[\\\\/].*"); + checkConfig.addAttribute("fileNamePattern", ".*\\.java"); + verify(checkConfig, getPath("InputSemantic.java"), ArrayUtils.EMPTY_STRING_ARRAY); + } + + @Test + public void testIgnoreExtension() throws Exception { + final DefaultConfiguration checkConfig = createCheckConfig(RegexpOnFilenameCheck.class); + checkConfig.addAttribute("fileNamePattern", ".*\\.java"); + checkConfig.addAttribute("ignoreFileNameExtensions", "true"); + verify(checkConfig, getPath("InputSemantic.java"), ArrayUtils.EMPTY_STRING_ARRAY); + } + + @Test + public void testIgnoreExtensionNoExtension() throws Exception { + final DefaultConfiguration checkConfig = createCheckConfig(RegexpOnFilenameCheck.class); + checkConfig.addAttribute("fileNamePattern", "\\."); + checkConfig.addAttribute("ignoreFileNameExtensions", "true"); + verify(checkConfig, getPath("InputNoExtension"), ArrayUtils.EMPTY_STRING_ARRAY); + } + + @Test + public void testException() throws Exception { + // escape character needed for testing IOException from File.getCanonicalPath on all OSes + final File file = new File(getPath("") + "\u0000" + File.separatorChar + "Test"); + try { + final RegexpOnFilenameCheck check = new RegexpOnFilenameCheck(); + check.setFileNamePattern("BAD"); + check.process(file, null); + fail("CheckstyleException expected"); + } + catch (CheckstyleException ex) { + assertEquals("unable to create canonical path names for " + file.getAbsolutePath(), + ex.getMessage()); + } + } +} diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpSinglelineCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpSinglelineCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpSinglelineCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpSinglelineCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -19,8 +19,8 @@ package com.puppycrawl.tools.checkstyle.checks.regexp; -import static com.puppycrawl.tools.checkstyle.checks.regexp.MultilineDetector.REGEXP_EXCEEDED; -import static com.puppycrawl.tools.checkstyle.checks.regexp.MultilineDetector.REGEXP_MINIMUM; +import static com.puppycrawl.tools.checkstyle.checks.regexp.MultilineDetector.MSG_REGEXP_EXCEEDED; +import static com.puppycrawl.tools.checkstyle.checks.regexp.MultilineDetector.MSG_REGEXP_MINIMUM; import java.io.File; import java.io.IOException; @@ -51,7 +51,7 @@ final String illegal = "System\\.(out)|(err)\\.print(ln)?\\("; checkConfig.addAttribute("format", illegal); final String[] expected = { - "69: " + getCheckMessage(REGEXP_EXCEEDED, illegal), + "69: " + getCheckMessage(MSG_REGEXP_EXCEEDED, illegal), }; verify(checkConfig, getPath("InputSemantic.java"), expected); } @@ -77,7 +77,7 @@ checkConfig.addAttribute("maximum", "0"); final String[] expected = { - "69: " + getCheckMessage(REGEXP_EXCEEDED, illegal), + "69: " + getCheckMessage(MSG_REGEXP_EXCEEDED, illegal), }; verify(checkConfig, getPath("InputSemantic.java"), expected); } @@ -97,7 +97,7 @@ checkConfig.addAttribute("format", illegal); checkConfig.addAttribute("minimum", "500"); final String[] expected = { - "0: " + getCheckMessage(REGEXP_MINIMUM, "500", illegal), + "0: " + getCheckMessage(MSG_REGEXP_MINIMUM, "500", illegal), }; verify(checkConfig, getPath("InputSemantic.java"), expected); diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpSinglelineJavaCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpSinglelineJavaCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpSinglelineJavaCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpSinglelineJavaCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -19,8 +19,8 @@ package com.puppycrawl.tools.checkstyle.checks.regexp; -import static com.puppycrawl.tools.checkstyle.checks.regexp.MultilineDetector.REGEXP_EXCEEDED; -import static com.puppycrawl.tools.checkstyle.checks.regexp.MultilineDetector.REGEXP_MINIMUM; +import static com.puppycrawl.tools.checkstyle.checks.regexp.MultilineDetector.MSG_REGEXP_EXCEEDED; +import static com.puppycrawl.tools.checkstyle.checks.regexp.MultilineDetector.MSG_REGEXP_MINIMUM; import static org.junit.Assert.assertArrayEquals; import java.io.File; @@ -58,7 +58,7 @@ final String illegal = "System\\.(out)|(err)\\.print(ln)?\\("; checkConfig.addAttribute("format", illegal); final String[] expected = { - "69: " + getCheckMessage(REGEXP_EXCEEDED, illegal), + "69: " + getCheckMessage(MSG_REGEXP_EXCEEDED, illegal), }; verify(checkConfig, getPath("InputSemantic.java"), expected); } @@ -82,7 +82,7 @@ checkConfig.addAttribute("format", illegal); checkConfig.addAttribute("ignoreCase", "true"); final String[] expected = { - "69: " + getCheckMessage(REGEXP_EXCEEDED, illegal), + "69: " + getCheckMessage(MSG_REGEXP_EXCEEDED, illegal), }; verify(checkConfig, getPath("InputSemantic.java"), expected); } @@ -113,7 +113,7 @@ checkConfig.addAttribute("format", illegal); checkConfig.addAttribute("ignoreComments", "false"); final String[] expected = { - "4: " + getCheckMessage(REGEXP_EXCEEDED, illegal), + "4: " + getCheckMessage(MSG_REGEXP_EXCEEDED, illegal), }; verify(checkConfig, getPath("InputTrailingComment.java"), expected); } @@ -134,7 +134,7 @@ checkConfig.addAttribute("format", illegal); checkConfig.addAttribute("ignoreComments", "false"); final String[] expected = { - "19: " + getCheckMessage(REGEXP_EXCEEDED, illegal), + "19: " + getCheckMessage(MSG_REGEXP_EXCEEDED, illegal), }; verify(checkConfig, getPath("InputTrailingComment.java"), expected); } @@ -173,7 +173,7 @@ checkConfig.addAttribute("format", illegal); checkConfig.addAttribute("ignoreComments", "true"); final String[] expected = { - "22: " + getCheckMessage(REGEXP_EXCEEDED, illegal), + "22: " + getCheckMessage(MSG_REGEXP_EXCEEDED, illegal), }; verify(checkConfig, getPath("InputTrailingComment.java"), expected); } @@ -184,7 +184,7 @@ checkConfig.addAttribute("format", illegal); checkConfig.addAttribute("ignoreComments", "true"); final String[] expected = { - "23: " + getCheckMessage(REGEXP_EXCEEDED, illegal), + "23: " + getCheckMessage(MSG_REGEXP_EXCEEDED, illegal), }; verify(checkConfig, getPath("InputTrailingComment.java"), expected); } @@ -236,7 +236,7 @@ checkConfig.addAttribute("minimum", "1"); checkConfig.addAttribute("maximum", "1000"); final String[] expected = { - "0: " + getCheckMessage(REGEXP_MINIMUM, 1, required), + "0: " + getCheckMessage(MSG_REGEXP_MINIMUM, 1, required), }; verify(checkConfig, getPath("InputSemantic.java"), expected); } diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/AnonInnerLengthCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/AnonInnerLengthCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/AnonInnerLengthCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/AnonInnerLengthCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/FileLengthCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/FileLengthCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/FileLengthCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/FileLengthCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/LineLengthCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/LineLengthCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/LineLengthCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/LineLengthCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodLengthCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodLengthCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodLengthCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodLengthCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/OuterTypeNumberCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/OuterTypeNumberCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/OuterTypeNumberCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/OuterTypeNumberCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/ParameterNumberCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/ParameterNumberCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/ParameterNumberCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/ParameterNumberCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/SuppressWarningsHolderTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/SuppressWarningsHolderTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/SuppressWarningsHolderTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/SuppressWarningsHolderTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -44,9 +44,13 @@ import org.powermock.modules.junit4.PowerMockRunner; import com.puppycrawl.tools.checkstyle.BaseCheckTestSupport; +import com.puppycrawl.tools.checkstyle.Checker; +import com.puppycrawl.tools.checkstyle.api.AuditEvent; import com.puppycrawl.tools.checkstyle.api.Configuration; import com.puppycrawl.tools.checkstyle.api.DetailAST; +import com.puppycrawl.tools.checkstyle.api.LocalizedMessage; import com.puppycrawl.tools.checkstyle.api.TokenTypes; +import com.puppycrawl.tools.checkstyle.checks.naming.MemberNameCheck; @RunWith(PowerMockRunner.class) @PrepareForTest({ SuppressWarningsHolder.class, SuppressWarningsHolderTest.class }) @@ -140,7 +144,12 @@ entries.setAccessible(true); entries.set(holder, threadLocal); - assertFalse(SuppressWarningsHolder.isSuppressed("SourceName", 100, 10)); + final Checker source = new Checker(); + final LocalizedMessage message = + new LocalizedMessage(100, 10, null, null, null, "id", MemberNameCheck.class, "message"); + final AuditEvent event = new AuditEvent(source, "fileName", message); + + assertFalse(SuppressWarningsHolder.isSuppressed(event)); } @Test @@ -164,11 +173,24 @@ entries.setAccessible(true); entries.set(holder, threadLocal); - assertFalse(SuppressWarningsHolder.isSuppressed("SourceName", 100, 10)); - - assertTrue(SuppressWarningsHolder.isSuppressed("SourceName", 100, 150)); - - assertTrue(SuppressWarningsHolder.isSuppressed("SourceName", 200, 1)); + final Checker source = new Checker(); + final LocalizedMessage firstMessageForTest = + new LocalizedMessage(100, 10, null, null, null, "id", MemberNameCheck.class, "msg"); + final AuditEvent firstEventForTest = + new AuditEvent(source, "fileName", firstMessageForTest); + assertFalse(SuppressWarningsHolder.isSuppressed(firstEventForTest)); + + final LocalizedMessage secondMessageForTest = + new LocalizedMessage(100, 150, null, null, null, "id", MemberNameCheck.class, "msg"); + final AuditEvent secondEventForTest = + new AuditEvent(source, "fileName", secondMessageForTest); + assertTrue(SuppressWarningsHolder.isSuppressed(secondEventForTest)); + + final LocalizedMessage thirdMessageForTest = + new LocalizedMessage(200, 1, null, null, null, "id", MemberNameCheck.class, "msg"); + final AuditEvent thirdEventForTest = + new AuditEvent(source, "fileName", thirdMessageForTest); + assertTrue(SuppressWarningsHolder.isSuppressed(thirdEventForTest)); } @Test diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/TodoCommentCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/TodoCommentCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/TodoCommentCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/TodoCommentCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/TrailingCommentCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/TrailingCommentCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/TrailingCommentCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/TrailingCommentCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/TranslationCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/TranslationCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/TranslationCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/TranslationCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/UncommentedMainCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/UncommentedMainCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/UncommentedMainCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/UncommentedMainCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/UniquePropertiesCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/UniquePropertiesCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/UniquePropertiesCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/UniquePropertiesCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -19,7 +19,7 @@ package com.puppycrawl.tools.checkstyle.checks; -import static com.puppycrawl.tools.checkstyle.checks.UniquePropertiesCheck.IO_EXCEPTION_KEY; +import static com.puppycrawl.tools.checkstyle.checks.UniquePropertiesCheck.MSG_IO_EXCEPTION_KEY; import static com.puppycrawl.tools.checkstyle.checks.UniquePropertiesCheck.MSG_KEY; import static org.junit.Assert.assertEquals; @@ -124,7 +124,7 @@ retrievedMessage); assertEquals("Message '" + message.getMessage() + "' is not valid", message.getMessage(), - getCheckMessage(IO_EXCEPTION_KEY, fileName, getFileNotFoundDetail(file))); + getCheckMessage(MSG_IO_EXCEPTION_KEY, fileName, getFileNotFoundDetail(file))); } @Test diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/UpperEllCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/UpperEllCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/UpperEllCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/UpperEllCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForInitializerPadCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForInitializerPadCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForInitializerPadCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForInitializerPadCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForIteratorPadCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForIteratorPadCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForIteratorPadCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForIteratorPadCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -19,8 +19,8 @@ package com.puppycrawl.tools.checkstyle.checks.whitespace; -import static com.puppycrawl.tools.checkstyle.checks.whitespace.EmptyForIteratorPadCheck.WS_FOLLOWED; -import static com.puppycrawl.tools.checkstyle.checks.whitespace.EmptyForIteratorPadCheck.WS_NOT_FOLLOWED; +import static com.puppycrawl.tools.checkstyle.checks.whitespace.EmptyForIteratorPadCheck.MSG_WS_FOLLOWED; +import static com.puppycrawl.tools.checkstyle.checks.whitespace.EmptyForIteratorPadCheck.MSG_WS_NOT_FOLLOWED; import static org.junit.Assert.assertArrayEquals; import java.io.File; @@ -60,9 +60,9 @@ @Test public void testDefault() throws Exception { final String[] expected = { - "27:31: " + getCheckMessage(WS_FOLLOWED, ";"), - "43:32: " + getCheckMessage(WS_FOLLOWED, ";"), - "55:11: " + getCheckMessage(WS_FOLLOWED, ";"), + "27:31: " + getCheckMessage(MSG_WS_FOLLOWED, ";"), + "43:32: " + getCheckMessage(MSG_WS_FOLLOWED, ";"), + "55:11: " + getCheckMessage(MSG_WS_FOLLOWED, ";"), }; verify(checkConfig, getPath("InputForWhitespace.java"), expected); } @@ -71,7 +71,7 @@ public void testSpaceOption() throws Exception { checkConfig.addAttribute("option", PadOption.SPACE.toString()); final String[] expected = { - "23:31: " + getCheckMessage(WS_NOT_FOLLOWED, ";"), + "23:31: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, ";"), }; verify(checkConfig, getPath("InputForWhitespace.java"), expected); } diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/FileTabCharacterCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/FileTabCharacterCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/FileTabCharacterCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/FileTabCharacterCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -19,8 +19,8 @@ package com.puppycrawl.tools.checkstyle.checks.whitespace; -import static com.puppycrawl.tools.checkstyle.checks.whitespace.FileTabCharacterCheck.CONTAINS_TAB; -import static com.puppycrawl.tools.checkstyle.checks.whitespace.FileTabCharacterCheck.FILE_CONTAINS_TAB; +import static com.puppycrawl.tools.checkstyle.checks.whitespace.FileTabCharacterCheck.MSG_CONTAINS_TAB; +import static com.puppycrawl.tools.checkstyle.checks.whitespace.FileTabCharacterCheck.MSG_FILE_CONTAINS_TAB; import java.io.File; import java.io.IOException; @@ -51,7 +51,7 @@ public void testDefault() throws Exception { final DefaultConfiguration checkConfig = createConfig(false); final String[] expected = { - "19:25: " + getCheckMessage(FILE_CONTAINS_TAB), + "19:25: " + getCheckMessage(MSG_FILE_CONTAINS_TAB), }; final File[] files = { new File(getPath("InputSimple.java")), @@ -64,14 +64,14 @@ public void testVerbose() throws Exception { final DefaultConfiguration checkConfig = createConfig(true); final String[] expected = { - "19:25: " + getCheckMessage(CONTAINS_TAB), - "145:35: " + getCheckMessage(CONTAINS_TAB), - "146:64: " + getCheckMessage(CONTAINS_TAB), - "154:9: " + getCheckMessage(CONTAINS_TAB), - "155:10: " + getCheckMessage(CONTAINS_TAB), - "156:1: " + getCheckMessage(CONTAINS_TAB), - "157:3: " + getCheckMessage(CONTAINS_TAB), - "158:3: " + getCheckMessage(CONTAINS_TAB), + "19:25: " + getCheckMessage(MSG_CONTAINS_TAB), + "145:35: " + getCheckMessage(MSG_CONTAINS_TAB), + "146:64: " + getCheckMessage(MSG_CONTAINS_TAB), + "154:9: " + getCheckMessage(MSG_CONTAINS_TAB), + "155:10: " + getCheckMessage(MSG_CONTAINS_TAB), + "156:1: " + getCheckMessage(MSG_CONTAINS_TAB), + "157:3: " + getCheckMessage(MSG_CONTAINS_TAB), + "158:3: " + getCheckMessage(MSG_CONTAINS_TAB), }; final File[] files = { new File(getPath("InputSimple.java")), diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -19,10 +19,10 @@ package com.puppycrawl.tools.checkstyle.checks.whitespace; -import static com.puppycrawl.tools.checkstyle.checks.whitespace.GenericWhitespaceCheck.WS_FOLLOWED; -import static com.puppycrawl.tools.checkstyle.checks.whitespace.GenericWhitespaceCheck.WS_ILLEGAL_FOLLOW; -import static com.puppycrawl.tools.checkstyle.checks.whitespace.GenericWhitespaceCheck.WS_NOT_PRECEDED; -import static com.puppycrawl.tools.checkstyle.checks.whitespace.GenericWhitespaceCheck.WS_PRECEDED; +import static com.puppycrawl.tools.checkstyle.checks.whitespace.GenericWhitespaceCheck.MSG_WS_FOLLOWED; +import static com.puppycrawl.tools.checkstyle.checks.whitespace.GenericWhitespaceCheck.MSG_WS_ILLEGAL_FOLLOW; +import static com.puppycrawl.tools.checkstyle.checks.whitespace.GenericWhitespaceCheck.MSG_WS_NOT_PRECEDED; +import static com.puppycrawl.tools.checkstyle.checks.whitespace.GenericWhitespaceCheck.MSG_WS_PRECEDED; import static org.junit.Assert.assertArrayEquals; import java.io.File; @@ -80,32 +80,32 @@ @Test public void testDefault() throws Exception { final String[] expected = { - "16:13: " + getCheckMessage(WS_PRECEDED, "<"), - "16:15: " + getCheckMessage(WS_FOLLOWED, "<"), - "16:23: " + getCheckMessage(WS_PRECEDED, ">"), - "16:43: " + getCheckMessage(WS_PRECEDED, "<"), - "16:45: " + getCheckMessage(WS_FOLLOWED, "<"), - "16:53: " + getCheckMessage(WS_PRECEDED, ">"), - "17:13: " + getCheckMessage(WS_PRECEDED, "<"), - "17:15: " + getCheckMessage(WS_FOLLOWED, "<"), - "17:20: " + getCheckMessage(WS_PRECEDED, "<"), - "17:22: " + getCheckMessage(WS_FOLLOWED, "<"), - "17:30: " + getCheckMessage(WS_PRECEDED, ">"), - "17:32: " + getCheckMessage(WS_FOLLOWED, ">"), - "17:32: " + getCheckMessage(WS_PRECEDED, ">"), - "17:52: " + getCheckMessage(WS_PRECEDED, "<"), - "17:54: " + getCheckMessage(WS_FOLLOWED, "<"), - "17:59: " + getCheckMessage(WS_PRECEDED, "<"), - "17:61: " + getCheckMessage(WS_FOLLOWED, "<"), - "17:69: " + getCheckMessage(WS_PRECEDED, ">"), - "17:71: " + getCheckMessage(WS_FOLLOWED, ">"), - "17:71: " + getCheckMessage(WS_PRECEDED, ">"), - "30:17: " + getCheckMessage(WS_NOT_PRECEDED, "<"), - "30:21: " + getCheckMessage(WS_ILLEGAL_FOLLOW, ">"), - "42:21: " + getCheckMessage(WS_PRECEDED, "<"), - "42:30: " + getCheckMessage(WS_FOLLOWED, ">"), - "60:60: " + getCheckMessage(WS_NOT_PRECEDED, "&"), - "63:60: " + getCheckMessage(WS_FOLLOWED, ">"), + "16:13: " + getCheckMessage(MSG_WS_PRECEDED, "<"), + "16:15: " + getCheckMessage(MSG_WS_FOLLOWED, "<"), + "16:23: " + getCheckMessage(MSG_WS_PRECEDED, ">"), + "16:43: " + getCheckMessage(MSG_WS_PRECEDED, "<"), + "16:45: " + getCheckMessage(MSG_WS_FOLLOWED, "<"), + "16:53: " + getCheckMessage(MSG_WS_PRECEDED, ">"), + "17:13: " + getCheckMessage(MSG_WS_PRECEDED, "<"), + "17:15: " + getCheckMessage(MSG_WS_FOLLOWED, "<"), + "17:20: " + getCheckMessage(MSG_WS_PRECEDED, "<"), + "17:22: " + getCheckMessage(MSG_WS_FOLLOWED, "<"), + "17:30: " + getCheckMessage(MSG_WS_PRECEDED, ">"), + "17:32: " + getCheckMessage(MSG_WS_FOLLOWED, ">"), + "17:32: " + getCheckMessage(MSG_WS_PRECEDED, ">"), + "17:52: " + getCheckMessage(MSG_WS_PRECEDED, "<"), + "17:54: " + getCheckMessage(MSG_WS_FOLLOWED, "<"), + "17:59: " + getCheckMessage(MSG_WS_PRECEDED, "<"), + "17:61: " + getCheckMessage(MSG_WS_FOLLOWED, "<"), + "17:69: " + getCheckMessage(MSG_WS_PRECEDED, ">"), + "17:71: " + getCheckMessage(MSG_WS_FOLLOWED, ">"), + "17:71: " + getCheckMessage(MSG_WS_PRECEDED, ">"), + "30:17: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "<"), + "30:21: " + getCheckMessage(MSG_WS_ILLEGAL_FOLLOW, ">"), + "42:21: " + getCheckMessage(MSG_WS_PRECEDED, "<"), + "42:30: " + getCheckMessage(MSG_WS_FOLLOWED, ">"), + "60:60: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "&"), + "63:60: " + getCheckMessage(MSG_WS_FOLLOWED, ">"), }; verify(checkConfig, getPath("InputGenericWhitespace.java"), expected); } @@ -131,7 +131,7 @@ @Test public void testMethodReferences2() throws Exception { final String[] expected = { - "7:69: " + getCheckMessage(WS_FOLLOWED, ">"), + "7:69: " + getCheckMessage(MSG_WS_FOLLOWED, ">"), }; verify(checkConfig, getNonCompilablePath("InputGenericWhitespaceMethodRef.java"), expected); } diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/MethodParamPadCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/MethodParamPadCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/MethodParamPadCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/MethodParamPadCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -19,9 +19,9 @@ package com.puppycrawl.tools.checkstyle.checks.whitespace; -import static com.puppycrawl.tools.checkstyle.checks.whitespace.MethodParamPadCheck.LINE_PREVIOUS; -import static com.puppycrawl.tools.checkstyle.checks.whitespace.MethodParamPadCheck.WS_NOT_PRECEDED; -import static com.puppycrawl.tools.checkstyle.checks.whitespace.MethodParamPadCheck.WS_PRECEDED; +import static com.puppycrawl.tools.checkstyle.checks.whitespace.MethodParamPadCheck.MSG_LINE_PREVIOUS; +import static com.puppycrawl.tools.checkstyle.checks.whitespace.MethodParamPadCheck.MSG_WS_NOT_PRECEDED; +import static com.puppycrawl.tools.checkstyle.checks.whitespace.MethodParamPadCheck.MSG_WS_PRECEDED; import static org.junit.Assert.assertArrayEquals; import java.io.File; @@ -60,24 +60,24 @@ @Test public void testDefault() throws Exception { final String[] expected = { - "11:32: " + getCheckMessage(WS_PRECEDED, "("), - "13:15: " + getCheckMessage(WS_PRECEDED, "("), - "17:9: " + getCheckMessage(LINE_PREVIOUS, "("), - "20:13: " + getCheckMessage(LINE_PREVIOUS, "("), - "27:24: " + getCheckMessage(WS_PRECEDED, "("), - "32:9: " + getCheckMessage(LINE_PREVIOUS, "("), - "36:39: " + getCheckMessage(WS_PRECEDED, "("), - "38:13: " + getCheckMessage(LINE_PREVIOUS, "("), - "42:16: " + getCheckMessage(WS_PRECEDED, "("), - "44:13: " + getCheckMessage(LINE_PREVIOUS, "("), - "50:21: " + getCheckMessage(WS_PRECEDED, "("), - "52:13: " + getCheckMessage(LINE_PREVIOUS, "("), - "56:18: " + getCheckMessage(WS_PRECEDED, "("), - "58:13: " + getCheckMessage(LINE_PREVIOUS, "("), - "61:36: " + getCheckMessage(WS_PRECEDED, "("), - "63:13: " + getCheckMessage(LINE_PREVIOUS, "("), - "74:15: " + getCheckMessage(WS_PRECEDED, "("), - "79:13: " + getCheckMessage(LINE_PREVIOUS, "("), + "11:32: " + getCheckMessage(MSG_WS_PRECEDED, "("), + "13:15: " + getCheckMessage(MSG_WS_PRECEDED, "("), + "17:9: " + getCheckMessage(MSG_LINE_PREVIOUS, "("), + "20:13: " + getCheckMessage(MSG_LINE_PREVIOUS, "("), + "27:24: " + getCheckMessage(MSG_WS_PRECEDED, "("), + "32:9: " + getCheckMessage(MSG_LINE_PREVIOUS, "("), + "36:39: " + getCheckMessage(MSG_WS_PRECEDED, "("), + "38:13: " + getCheckMessage(MSG_LINE_PREVIOUS, "("), + "42:16: " + getCheckMessage(MSG_WS_PRECEDED, "("), + "44:13: " + getCheckMessage(MSG_LINE_PREVIOUS, "("), + "50:21: " + getCheckMessage(MSG_WS_PRECEDED, "("), + "52:13: " + getCheckMessage(MSG_LINE_PREVIOUS, "("), + "56:18: " + getCheckMessage(MSG_WS_PRECEDED, "("), + "58:13: " + getCheckMessage(MSG_LINE_PREVIOUS, "("), + "61:36: " + getCheckMessage(MSG_WS_PRECEDED, "("), + "63:13: " + getCheckMessage(MSG_LINE_PREVIOUS, "("), + "74:15: " + getCheckMessage(MSG_WS_PRECEDED, "("), + "79:13: " + getCheckMessage(MSG_LINE_PREVIOUS, "("), }; verify(checkConfig, getPath("InputMethodParamPad.java"), expected); } @@ -86,15 +86,15 @@ public void testAllowLineBreaks() throws Exception { checkConfig.addAttribute("allowLineBreaks", "true"); final String[] expected = { - "11:32: " + getCheckMessage(WS_PRECEDED, "("), - "13:15: " + getCheckMessage(WS_PRECEDED, "("), - "27:24: " + getCheckMessage(WS_PRECEDED, "("), - "36:39: " + getCheckMessage(WS_PRECEDED, "("), - "42:16: " + getCheckMessage(WS_PRECEDED, "("), - "50:21: " + getCheckMessage(WS_PRECEDED, "("), - "56:18: " + getCheckMessage(WS_PRECEDED, "("), - "61:36: " + getCheckMessage(WS_PRECEDED, "("), - "74:15: " + getCheckMessage(WS_PRECEDED, "("), + "11:32: " + getCheckMessage(MSG_WS_PRECEDED, "("), + "13:15: " + getCheckMessage(MSG_WS_PRECEDED, "("), + "27:24: " + getCheckMessage(MSG_WS_PRECEDED, "("), + "36:39: " + getCheckMessage(MSG_WS_PRECEDED, "("), + "42:16: " + getCheckMessage(MSG_WS_PRECEDED, "("), + "50:21: " + getCheckMessage(MSG_WS_PRECEDED, "("), + "56:18: " + getCheckMessage(MSG_WS_PRECEDED, "("), + "61:36: " + getCheckMessage(MSG_WS_PRECEDED, "("), + "74:15: " + getCheckMessage(MSG_WS_PRECEDED, "("), }; verify(checkConfig, getPath("InputMethodParamPad.java"), expected); } @@ -103,28 +103,28 @@ public void testSpaceOption() throws Exception { checkConfig.addAttribute("option", "space"); final String[] expected = { - "6:31: " + getCheckMessage(WS_NOT_PRECEDED, "("), - "8:14: " + getCheckMessage(WS_NOT_PRECEDED, "("), - "17:9: " + getCheckMessage(LINE_PREVIOUS, "("), - "20:13: " + getCheckMessage(LINE_PREVIOUS, "("), - "23:23: " + getCheckMessage(WS_NOT_PRECEDED, "("), - "32:9: " + getCheckMessage(LINE_PREVIOUS, "("), - "35:58: " + getCheckMessage(WS_NOT_PRECEDED, "("), - "38:13: " + getCheckMessage(LINE_PREVIOUS, "("), - "41:15: " + getCheckMessage(WS_NOT_PRECEDED, "("), - "44:13: " + getCheckMessage(LINE_PREVIOUS, "("), - "47:28: " + getCheckMessage(WS_NOT_PRECEDED, "("), - "49:20: " + getCheckMessage(WS_NOT_PRECEDED, "("), - "52:13: " + getCheckMessage(LINE_PREVIOUS, "("), - "54:56: " + getCheckMessage(WS_NOT_PRECEDED, "("), - "55:17: " + getCheckMessage(WS_NOT_PRECEDED, "("), - "58:13: " + getCheckMessage(LINE_PREVIOUS, "("), - "60:35: " + getCheckMessage(WS_NOT_PRECEDED, "("), - "63:13: " + getCheckMessage(LINE_PREVIOUS, "("), - "66:25: " + getCheckMessage(WS_NOT_PRECEDED, "("), - "69:66: " + getCheckMessage(WS_NOT_PRECEDED, "("), - "70:57: " + getCheckMessage(WS_NOT_PRECEDED, "("), - "79:13: " + getCheckMessage(LINE_PREVIOUS, "("), + "6:31: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "("), + "8:14: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "("), + "17:9: " + getCheckMessage(MSG_LINE_PREVIOUS, "("), + "20:13: " + getCheckMessage(MSG_LINE_PREVIOUS, "("), + "23:23: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "("), + "32:9: " + getCheckMessage(MSG_LINE_PREVIOUS, "("), + "35:58: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "("), + "38:13: " + getCheckMessage(MSG_LINE_PREVIOUS, "("), + "41:15: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "("), + "44:13: " + getCheckMessage(MSG_LINE_PREVIOUS, "("), + "47:28: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "("), + "49:20: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "("), + "52:13: " + getCheckMessage(MSG_LINE_PREVIOUS, "("), + "54:56: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "("), + "55:17: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "("), + "58:13: " + getCheckMessage(MSG_LINE_PREVIOUS, "("), + "60:35: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "("), + "63:13: " + getCheckMessage(MSG_LINE_PREVIOUS, "("), + "66:25: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "("), + "69:66: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "("), + "70:57: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "("), + "79:13: " + getCheckMessage(MSG_LINE_PREVIOUS, "("), }; verify(checkConfig, getPath("InputMethodParamPad.java"), expected); } diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoLineWrapCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoLineWrapCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoLineWrapCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoLineWrapCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/OperatorWrapCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/OperatorWrapCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/OperatorWrapCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/OperatorWrapCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -19,8 +19,8 @@ package com.puppycrawl.tools.checkstyle.checks.whitespace; -import static com.puppycrawl.tools.checkstyle.checks.whitespace.OperatorWrapCheck.LINE_NEW; -import static com.puppycrawl.tools.checkstyle.checks.whitespace.OperatorWrapCheck.LINE_PREVIOUS; +import static com.puppycrawl.tools.checkstyle.checks.whitespace.OperatorWrapCheck.MSG_LINE_NEW; +import static com.puppycrawl.tools.checkstyle.checks.whitespace.OperatorWrapCheck.MSG_LINE_PREVIOUS; import java.io.File; import java.io.IOException; @@ -52,11 +52,11 @@ public void testDefault() throws Exception { final String[] expected = { - "15:19: " + getCheckMessage(LINE_NEW, "+"), - "16:15: " + getCheckMessage(LINE_NEW, "-"), - "24:18: " + getCheckMessage(LINE_NEW, "&&"), - "39:30: " + getCheckMessage(LINE_NEW, "&"), - "52:30: " + getCheckMessage(LINE_NEW, "&"), + "15:19: " + getCheckMessage(MSG_LINE_NEW, "+"), + "16:15: " + getCheckMessage(MSG_LINE_NEW, "-"), + "24:18: " + getCheckMessage(MSG_LINE_NEW, "&&"), + "39:30: " + getCheckMessage(MSG_LINE_NEW, "&"), + "52:30: " + getCheckMessage(MSG_LINE_NEW, "&"), }; verify(checkConfig, getPath("InputOpWrap.java"), expected); } @@ -66,9 +66,9 @@ throws Exception { checkConfig.addAttribute("option", WrapOption.EOL.toString()); final String[] expected = { - "18:13: " + getCheckMessage(LINE_PREVIOUS, "-"), - "22:13: " + getCheckMessage(LINE_PREVIOUS, "&&"), - "27:13: " + getCheckMessage(LINE_PREVIOUS, "&&"), + "18:13: " + getCheckMessage(MSG_LINE_PREVIOUS, "-"), + "22:13: " + getCheckMessage(MSG_LINE_PREVIOUS, "&&"), + "27:13: " + getCheckMessage(MSG_LINE_PREVIOUS, "&&"), }; verify(checkConfig, getPath("InputOpWrap.java"), expected); } @@ -79,7 +79,7 @@ checkConfig.addAttribute("tokens", "ASSIGN"); checkConfig.addAttribute("option", WrapOption.EOL.toString()); final String[] expected = { - "33:13: " + getCheckMessage(LINE_PREVIOUS, "="), + "33:13: " + getCheckMessage(MSG_LINE_PREVIOUS, "="), }; verify(checkConfig, getPath("InputOpWrap.java"), expected); } diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -19,10 +19,10 @@ package com.puppycrawl.tools.checkstyle.checks.whitespace; -import static com.puppycrawl.tools.checkstyle.checks.whitespace.AbstractParenPadCheck.WS_FOLLOWED; -import static com.puppycrawl.tools.checkstyle.checks.whitespace.AbstractParenPadCheck.WS_NOT_FOLLOWED; -import static com.puppycrawl.tools.checkstyle.checks.whitespace.AbstractParenPadCheck.WS_NOT_PRECEDED; -import static com.puppycrawl.tools.checkstyle.checks.whitespace.AbstractParenPadCheck.WS_PRECEDED; +import static com.puppycrawl.tools.checkstyle.checks.whitespace.AbstractParenPadCheck.MSG_WS_FOLLOWED; +import static com.puppycrawl.tools.checkstyle.checks.whitespace.AbstractParenPadCheck.MSG_WS_NOT_FOLLOWED; +import static com.puppycrawl.tools.checkstyle.checks.whitespace.AbstractParenPadCheck.MSG_WS_NOT_PRECEDED; +import static com.puppycrawl.tools.checkstyle.checks.whitespace.AbstractParenPadCheck.MSG_WS_PRECEDED; import java.io.File; import java.io.IOException; @@ -48,15 +48,15 @@ final DefaultConfiguration checkConfig = createCheckConfig(ParenPadCheck.class); final String[] expected = { - "58:12: " + getCheckMessage(WS_FOLLOWED, "("), - "58:36: " + getCheckMessage(WS_PRECEDED, ")"), - "74:13: " + getCheckMessage(WS_FOLLOWED, "("), - "74:18: " + getCheckMessage(WS_PRECEDED, ")"), - "232:27: " + getCheckMessage(WS_PRECEDED, ")"), - "241:24: " + getCheckMessage(WS_FOLLOWED, "("), - "241:30: " + getCheckMessage(WS_PRECEDED, ")"), - "277:18: " + getCheckMessage(WS_FOLLOWED, "("), - "277:23: " + getCheckMessage(WS_PRECEDED, ")"), + "58:12: " + getCheckMessage(MSG_WS_FOLLOWED, "("), + "58:36: " + getCheckMessage(MSG_WS_PRECEDED, ")"), + "74:13: " + getCheckMessage(MSG_WS_FOLLOWED, "("), + "74:18: " + getCheckMessage(MSG_WS_PRECEDED, ")"), + "232:27: " + getCheckMessage(MSG_WS_PRECEDED, ")"), + "241:24: " + getCheckMessage(MSG_WS_FOLLOWED, "("), + "241:30: " + getCheckMessage(MSG_WS_PRECEDED, ")"), + "277:18: " + getCheckMessage(MSG_WS_FOLLOWED, "("), + "277:23: " + getCheckMessage(MSG_WS_PRECEDED, ")"), }; verify(checkConfig, getPath("InputWhitespace.java"), expected); } @@ -68,39 +68,39 @@ createCheckConfig(ParenPadCheck.class); checkConfig.addAttribute("option", PadOption.SPACE.toString()); final String[] expected = { - "29:20: " + getCheckMessage(WS_NOT_FOLLOWED, "("), - "29:23: " + getCheckMessage(WS_NOT_PRECEDED, ")"), - "37:22: " + getCheckMessage(WS_NOT_FOLLOWED, "("), - "37:26: " + getCheckMessage(WS_NOT_PRECEDED, ")"), - "41:15: " + getCheckMessage(WS_NOT_FOLLOWED, "("), - "41:33: " + getCheckMessage(WS_NOT_PRECEDED, ")"), - "76:20: " + getCheckMessage(WS_NOT_FOLLOWED, "("), - "76:21: " + getCheckMessage(WS_NOT_PRECEDED, ")"), - "97:22: " + getCheckMessage(WS_NOT_FOLLOWED, "("), - "97:28: " + getCheckMessage(WS_NOT_PRECEDED, ")"), - "98:14: " + getCheckMessage(WS_NOT_FOLLOWED, "("), - "98:18: " + getCheckMessage(WS_NOT_PRECEDED, ")"), - "150:28: " + getCheckMessage(WS_NOT_FOLLOWED, "("), - "150:32: " + getCheckMessage(WS_NOT_PRECEDED, ")"), - "153:16: " + getCheckMessage(WS_NOT_FOLLOWED, "("), - "153:20: " + getCheckMessage(WS_NOT_PRECEDED, ")"), - "160:21: " + getCheckMessage(WS_NOT_FOLLOWED, "("), - "160:34: " + getCheckMessage(WS_NOT_PRECEDED, ")"), - "162:20: " + getCheckMessage(WS_NOT_FOLLOWED, "("), - "165:10: " + getCheckMessage(WS_NOT_PRECEDED, ")"), - "178:14: " + getCheckMessage(WS_NOT_FOLLOWED, "("), - "178:36: " + getCheckMessage(WS_NOT_PRECEDED, ")"), - "225:14: " + getCheckMessage(WS_NOT_FOLLOWED, "("), - "235:14: " + getCheckMessage(WS_NOT_FOLLOWED, "("), - "235:39: " + getCheckMessage(WS_NOT_PRECEDED, ")"), - "252:21: " + getCheckMessage(WS_NOT_FOLLOWED, "("), - "252:93: " + getCheckMessage(WS_NOT_PRECEDED, ")"), - "273:26: " + getCheckMessage(WS_NOT_FOLLOWED, "("), - "273:36: " + getCheckMessage(WS_NOT_PRECEDED, ")"), - "275:29: " + getCheckMessage(WS_NOT_FOLLOWED, "("), - "275:42: " + getCheckMessage(WS_NOT_PRECEDED, ")"), - "276:18: " + getCheckMessage(WS_NOT_FOLLOWED, "("), - "276:33: " + getCheckMessage(WS_NOT_PRECEDED, ")"), + "29:20: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "("), + "29:23: " + getCheckMessage(MSG_WS_NOT_PRECEDED, ")"), + "37:22: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "("), + "37:26: " + getCheckMessage(MSG_WS_NOT_PRECEDED, ")"), + "41:15: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "("), + "41:33: " + getCheckMessage(MSG_WS_NOT_PRECEDED, ")"), + "76:20: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "("), + "76:21: " + getCheckMessage(MSG_WS_NOT_PRECEDED, ")"), + "97:22: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "("), + "97:28: " + getCheckMessage(MSG_WS_NOT_PRECEDED, ")"), + "98:14: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "("), + "98:18: " + getCheckMessage(MSG_WS_NOT_PRECEDED, ")"), + "150:28: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "("), + "150:32: " + getCheckMessage(MSG_WS_NOT_PRECEDED, ")"), + "153:16: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "("), + "153:20: " + getCheckMessage(MSG_WS_NOT_PRECEDED, ")"), + "160:21: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "("), + "160:34: " + getCheckMessage(MSG_WS_NOT_PRECEDED, ")"), + "162:20: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "("), + "165:10: " + getCheckMessage(MSG_WS_NOT_PRECEDED, ")"), + "178:14: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "("), + "178:36: " + getCheckMessage(MSG_WS_NOT_PRECEDED, ")"), + "225:14: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "("), + "235:14: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "("), + "235:39: " + getCheckMessage(MSG_WS_NOT_PRECEDED, ")"), + "252:21: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "("), + "252:93: " + getCheckMessage(MSG_WS_NOT_PRECEDED, ")"), + "273:26: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "("), + "273:36: " + getCheckMessage(MSG_WS_NOT_PRECEDED, ")"), + "275:29: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "("), + "275:42: " + getCheckMessage(MSG_WS_NOT_PRECEDED, ")"), + "276:18: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "("), + "276:33: " + getCheckMessage(MSG_WS_NOT_PRECEDED, ")"), }; verify(checkConfig, getPath("InputWhitespace.java"), expected); } @@ -111,13 +111,13 @@ final DefaultConfiguration checkConfig = createCheckConfig(ParenPadCheck.class); final String[] expected = { - "17:34: " + getCheckMessage(WS_PRECEDED, ")"), - "20:35: " + getCheckMessage(WS_PRECEDED, ")"), - "40:14: " + getCheckMessage(WS_FOLLOWED, "("), - "40:36: " + getCheckMessage(WS_PRECEDED, ")"), - "43:14: " + getCheckMessage(WS_FOLLOWED, "("), - "48:27: " + getCheckMessage(WS_PRECEDED, ")"), - "51:26: " + getCheckMessage(WS_PRECEDED, ")"), + "17:34: " + getCheckMessage(MSG_WS_PRECEDED, ")"), + "20:35: " + getCheckMessage(MSG_WS_PRECEDED, ")"), + "40:14: " + getCheckMessage(MSG_WS_FOLLOWED, "("), + "40:36: " + getCheckMessage(MSG_WS_PRECEDED, ")"), + "43:14: " + getCheckMessage(MSG_WS_FOLLOWED, "("), + "48:27: " + getCheckMessage(MSG_WS_PRECEDED, ")"), + "51:26: " + getCheckMessage(MSG_WS_PRECEDED, ")"), }; verify(checkConfig, getPath("InputForWhitespace.java"), expected); } @@ -129,15 +129,15 @@ createCheckConfig(ParenPadCheck.class); checkConfig.addAttribute("option", PadOption.SPACE.toString()); final String[] expected = { - "11:14: " + getCheckMessage(WS_NOT_FOLLOWED, "("), - "11:35: " + getCheckMessage(WS_NOT_PRECEDED, ")"), - "14:14: " + getCheckMessage(WS_NOT_FOLLOWED, "("), - "14:34: " + getCheckMessage(WS_NOT_PRECEDED, ")"), - "17:14: " + getCheckMessage(WS_NOT_FOLLOWED, "("), - "20:14: " + getCheckMessage(WS_NOT_FOLLOWED, "("), - "23:14: " + getCheckMessage(WS_NOT_FOLLOWED, "("), - "27:14: " + getCheckMessage(WS_NOT_FOLLOWED, "("), - "32:14: " + getCheckMessage(WS_NOT_FOLLOWED, "("), + "11:14: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "("), + "11:35: " + getCheckMessage(MSG_WS_NOT_PRECEDED, ")"), + "14:14: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "("), + "14:34: " + getCheckMessage(MSG_WS_NOT_PRECEDED, ")"), + "17:14: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "("), + "20:14: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "("), + "23:14: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "("), + "27:14: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "("), + "32:14: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "("), }; verify(checkConfig, getPath("InputForWhitespace.java"), expected); } @@ -158,70 +158,70 @@ createCheckConfig(ParenPadCheck.class); checkConfig.addAttribute("option", PadOption.NOSPACE.toString()); final String[] expected = { - "44:27: " + getCheckMessage(WS_FOLLOWED, "("), - "44:27: " + getCheckMessage(WS_PRECEDED, ")"), - "45:18: " + getCheckMessage(WS_FOLLOWED, "("), - "48:27: " + getCheckMessage(WS_FOLLOWED, "("), - "49:19: " + getCheckMessage(WS_FOLLOWED, "("), - "49:19: " + getCheckMessage(WS_PRECEDED, ")"), - "52:27: " + getCheckMessage(WS_FOLLOWED, "("), - "53:21: " + getCheckMessage(WS_FOLLOWED, "("), - "54:18: " + getCheckMessage(WS_FOLLOWED, "("), - "54:52: " + getCheckMessage(WS_FOLLOWED, "("), - "54:52: " + getCheckMessage(WS_PRECEDED, ")"), - "57:26: " + getCheckMessage(WS_FOLLOWED, "("), - "58:22: " + getCheckMessage(WS_FOLLOWED, "("), - "59:24: " + getCheckMessage(WS_FOLLOWED, "("), - "60:26: " + getCheckMessage(WS_FOLLOWED, "("), - "60:51: " + getCheckMessage(WS_FOLLOWED, "("), - "60:57: " + getCheckMessage(WS_FOLLOWED, "("), - "61:29: " + getCheckMessage(WS_FOLLOWED, "("), - "62:43: " + getCheckMessage(WS_FOLLOWED, "("), - "63:41: " + getCheckMessage(WS_FOLLOWED, "("), - "65:43: " + getCheckMessage(WS_FOLLOWED, "("), - "78:28: " + getCheckMessage(WS_FOLLOWED, "("), - "78:28: " + getCheckMessage(WS_PRECEDED, ")"), - "79:19: " + getCheckMessage(WS_PRECEDED, ")"), - "82:33: " + getCheckMessage(WS_PRECEDED, ")"), - "83:19: " + getCheckMessage(WS_FOLLOWED, "("), - "83:19: " + getCheckMessage(WS_PRECEDED, ")"), - "86:29: " + getCheckMessage(WS_PRECEDED, ")"), - "87:35: " + getCheckMessage(WS_PRECEDED, ")"), - "88:51: " + getCheckMessage(WS_FOLLOWED, "("), - "88:51: " + getCheckMessage(WS_PRECEDED, ")"), - "88:53: " + getCheckMessage(WS_PRECEDED, ")"), - "90:38: " + getCheckMessage(WS_PRECEDED, ")"), - "91:32: " + getCheckMessage(WS_PRECEDED, ")"), - "92:35: " + getCheckMessage(WS_PRECEDED, ")"), - "93:30: " + getCheckMessage(WS_PRECEDED, ")"), - "94:60: " + getCheckMessage(WS_PRECEDED, ")"), - "94:62: " + getCheckMessage(WS_PRECEDED, ")"), - "94:69: " + getCheckMessage(WS_PRECEDED, ")"), - "95:34: " + getCheckMessage(WS_PRECEDED, ")"), - "96:47: " + getCheckMessage(WS_PRECEDED, ")"), - "97:42: " + getCheckMessage(WS_PRECEDED, ")"), - "99:44: " + getCheckMessage(WS_PRECEDED, ")"), - "112:17: " + getCheckMessage(WS_FOLLOWED, "("), - "113:23: " + getCheckMessage(WS_FOLLOWED, "("), - "113:25: " + getCheckMessage(WS_FOLLOWED, "("), - "113:31: " + getCheckMessage(WS_PRECEDED, ")"), - "114:26: " + getCheckMessage(WS_FOLLOWED, "("), - "114:28: " + getCheckMessage(WS_FOLLOWED, "("), - "114:34: " + getCheckMessage(WS_PRECEDED, ")"), - "114:50: " + getCheckMessage(WS_PRECEDED, ")"), - "115:26: " + getCheckMessage(WS_FOLLOWED, "("), - "115:28: " + getCheckMessage(WS_FOLLOWED, "("), - "115:35: " + getCheckMessage(WS_PRECEDED, ")"), - "115:53: " + getCheckMessage(WS_PRECEDED, ")"), - "115:55: " + getCheckMessage(WS_PRECEDED, ")"), - "119:17: " + getCheckMessage(WS_FOLLOWED, "("), - "119:22: " + getCheckMessage(WS_PRECEDED, ")"), - "123:30: " + getCheckMessage(WS_FOLLOWED, "("), - "123:44: " + getCheckMessage(WS_PRECEDED, ")"), - "126:22: " + getCheckMessage(WS_FOLLOWED, "("), - "126:22: " + getCheckMessage(WS_PRECEDED, ")"), - "130:19: " + getCheckMessage(WS_FOLLOWED, "("), - "130:19: " + getCheckMessage(WS_PRECEDED, ")"), + "44:27: " + getCheckMessage(MSG_WS_FOLLOWED, "("), + "44:27: " + getCheckMessage(MSG_WS_PRECEDED, ")"), + "45:18: " + getCheckMessage(MSG_WS_FOLLOWED, "("), + "48:27: " + getCheckMessage(MSG_WS_FOLLOWED, "("), + "49:19: " + getCheckMessage(MSG_WS_FOLLOWED, "("), + "49:19: " + getCheckMessage(MSG_WS_PRECEDED, ")"), + "52:27: " + getCheckMessage(MSG_WS_FOLLOWED, "("), + "53:21: " + getCheckMessage(MSG_WS_FOLLOWED, "("), + "54:18: " + getCheckMessage(MSG_WS_FOLLOWED, "("), + "54:52: " + getCheckMessage(MSG_WS_FOLLOWED, "("), + "54:52: " + getCheckMessage(MSG_WS_PRECEDED, ")"), + "57:26: " + getCheckMessage(MSG_WS_FOLLOWED, "("), + "58:22: " + getCheckMessage(MSG_WS_FOLLOWED, "("), + "59:24: " + getCheckMessage(MSG_WS_FOLLOWED, "("), + "60:26: " + getCheckMessage(MSG_WS_FOLLOWED, "("), + "60:51: " + getCheckMessage(MSG_WS_FOLLOWED, "("), + "60:57: " + getCheckMessage(MSG_WS_FOLLOWED, "("), + "61:29: " + getCheckMessage(MSG_WS_FOLLOWED, "("), + "62:43: " + getCheckMessage(MSG_WS_FOLLOWED, "("), + "63:41: " + getCheckMessage(MSG_WS_FOLLOWED, "("), + "65:43: " + getCheckMessage(MSG_WS_FOLLOWED, "("), + "78:28: " + getCheckMessage(MSG_WS_FOLLOWED, "("), + "78:28: " + getCheckMessage(MSG_WS_PRECEDED, ")"), + "79:19: " + getCheckMessage(MSG_WS_PRECEDED, ")"), + "82:33: " + getCheckMessage(MSG_WS_PRECEDED, ")"), + "83:19: " + getCheckMessage(MSG_WS_FOLLOWED, "("), + "83:19: " + getCheckMessage(MSG_WS_PRECEDED, ")"), + "86:29: " + getCheckMessage(MSG_WS_PRECEDED, ")"), + "87:35: " + getCheckMessage(MSG_WS_PRECEDED, ")"), + "88:51: " + getCheckMessage(MSG_WS_FOLLOWED, "("), + "88:51: " + getCheckMessage(MSG_WS_PRECEDED, ")"), + "88:53: " + getCheckMessage(MSG_WS_PRECEDED, ")"), + "90:38: " + getCheckMessage(MSG_WS_PRECEDED, ")"), + "91:32: " + getCheckMessage(MSG_WS_PRECEDED, ")"), + "92:35: " + getCheckMessage(MSG_WS_PRECEDED, ")"), + "93:30: " + getCheckMessage(MSG_WS_PRECEDED, ")"), + "94:60: " + getCheckMessage(MSG_WS_PRECEDED, ")"), + "94:62: " + getCheckMessage(MSG_WS_PRECEDED, ")"), + "94:69: " + getCheckMessage(MSG_WS_PRECEDED, ")"), + "95:34: " + getCheckMessage(MSG_WS_PRECEDED, ")"), + "96:47: " + getCheckMessage(MSG_WS_PRECEDED, ")"), + "97:42: " + getCheckMessage(MSG_WS_PRECEDED, ")"), + "99:44: " + getCheckMessage(MSG_WS_PRECEDED, ")"), + "112:17: " + getCheckMessage(MSG_WS_FOLLOWED, "("), + "113:23: " + getCheckMessage(MSG_WS_FOLLOWED, "("), + "113:25: " + getCheckMessage(MSG_WS_FOLLOWED, "("), + "113:31: " + getCheckMessage(MSG_WS_PRECEDED, ")"), + "114:26: " + getCheckMessage(MSG_WS_FOLLOWED, "("), + "114:28: " + getCheckMessage(MSG_WS_FOLLOWED, "("), + "114:34: " + getCheckMessage(MSG_WS_PRECEDED, ")"), + "114:50: " + getCheckMessage(MSG_WS_PRECEDED, ")"), + "115:26: " + getCheckMessage(MSG_WS_FOLLOWED, "("), + "115:28: " + getCheckMessage(MSG_WS_FOLLOWED, "("), + "115:35: " + getCheckMessage(MSG_WS_PRECEDED, ")"), + "115:53: " + getCheckMessage(MSG_WS_PRECEDED, ")"), + "115:55: " + getCheckMessage(MSG_WS_PRECEDED, ")"), + "119:17: " + getCheckMessage(MSG_WS_FOLLOWED, "("), + "119:22: " + getCheckMessage(MSG_WS_PRECEDED, ")"), + "123:30: " + getCheckMessage(MSG_WS_FOLLOWED, "("), + "123:44: " + getCheckMessage(MSG_WS_PRECEDED, ")"), + "126:22: " + getCheckMessage(MSG_WS_FOLLOWED, "("), + "126:22: " + getCheckMessage(MSG_WS_PRECEDED, ")"), + "130:19: " + getCheckMessage(MSG_WS_FOLLOWED, "("), + "130:19: " + getCheckMessage(MSG_WS_PRECEDED, ")"), }; verify(checkConfig, getPath("InputParenPad.java"), expected); } @@ -232,11 +232,11 @@ createCheckConfig(ParenPadCheck.class); checkConfig.addAttribute("tokens", "METHOD_CALL"); final String[] expected = { - "90:38: " + getCheckMessage(WS_PRECEDED, ")"), - "112:17: " + getCheckMessage(WS_FOLLOWED, "("), - "113:23: " + getCheckMessage(WS_FOLLOWED, "("), - "115:53: " + getCheckMessage(WS_PRECEDED, ")"), - "115:55: " + getCheckMessage(WS_PRECEDED, ")"), + "90:38: " + getCheckMessage(MSG_WS_PRECEDED, ")"), + "112:17: " + getCheckMessage(MSG_WS_FOLLOWED, "("), + "113:23: " + getCheckMessage(MSG_WS_FOLLOWED, "("), + "115:53: " + getCheckMessage(MSG_WS_PRECEDED, ")"), + "115:55: " + getCheckMessage(MSG_WS_PRECEDED, ")"), }; verify(checkConfig, getPath("InputParenPad.java"), expected); } diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SeparatorWrapCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SeparatorWrapCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SeparatorWrapCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SeparatorWrapCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -19,8 +19,8 @@ package com.puppycrawl.tools.checkstyle.checks.whitespace; -import static com.puppycrawl.tools.checkstyle.checks.whitespace.SeparatorWrapCheck.LINE_NEW; -import static com.puppycrawl.tools.checkstyle.checks.whitespace.SeparatorWrapCheck.LINE_PREVIOUS; +import static com.puppycrawl.tools.checkstyle.checks.whitespace.SeparatorWrapCheck.MSG_LINE_NEW; +import static com.puppycrawl.tools.checkstyle.checks.whitespace.SeparatorWrapCheck.MSG_LINE_PREVIOUS; import java.io.File; import java.io.IOException; @@ -56,7 +56,7 @@ checkConfig.addAttribute("option", "NL"); checkConfig.addAttribute("tokens", "DOT"); final String[] expected = { - "31:10: " + getCheckMessage(LINE_NEW, "."), + "31:10: " + getCheckMessage(MSG_LINE_NEW, "."), }; verify(checkConfig, getPath("InputSeparatorWrap.java"), expected); } @@ -66,7 +66,7 @@ checkConfig.addAttribute("option", "EOL"); checkConfig.addAttribute("tokens", "COMMA"); final String[] expected = { - "39:17: " + getCheckMessage(LINE_PREVIOUS, ","), + "39:17: " + getCheckMessage(MSG_LINE_PREVIOUS, ","), }; verify(checkConfig, getPath("InputSeparatorWrap.java"), expected); } diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/TypecastParenPadCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/TypecastParenPadCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/TypecastParenPadCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/TypecastParenPadCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -19,10 +19,10 @@ package com.puppycrawl.tools.checkstyle.checks.whitespace; -import static com.puppycrawl.tools.checkstyle.checks.whitespace.AbstractParenPadCheck.WS_FOLLOWED; -import static com.puppycrawl.tools.checkstyle.checks.whitespace.AbstractParenPadCheck.WS_NOT_FOLLOWED; -import static com.puppycrawl.tools.checkstyle.checks.whitespace.AbstractParenPadCheck.WS_NOT_PRECEDED; -import static com.puppycrawl.tools.checkstyle.checks.whitespace.AbstractParenPadCheck.WS_PRECEDED; +import static com.puppycrawl.tools.checkstyle.checks.whitespace.AbstractParenPadCheck.MSG_WS_FOLLOWED; +import static com.puppycrawl.tools.checkstyle.checks.whitespace.AbstractParenPadCheck.MSG_WS_NOT_FOLLOWED; +import static com.puppycrawl.tools.checkstyle.checks.whitespace.AbstractParenPadCheck.MSG_WS_NOT_PRECEDED; +import static com.puppycrawl.tools.checkstyle.checks.whitespace.AbstractParenPadCheck.MSG_WS_PRECEDED; import java.io.File; import java.io.IOException; @@ -49,8 +49,8 @@ final DefaultConfiguration checkConfig = createCheckConfig(TypecastParenPadCheck.class); final String[] expected = { - "89:14: " + getCheckMessage(WS_FOLLOWED, "("), - "89:21: " + getCheckMessage(WS_PRECEDED, ")"), + "89:14: " + getCheckMessage(MSG_WS_FOLLOWED, "("), + "89:21: " + getCheckMessage(MSG_WS_PRECEDED, ")"), }; verify(checkConfig, getPath("InputWhitespace.java"), expected); } @@ -62,14 +62,14 @@ createCheckConfig(TypecastParenPadCheck.class); checkConfig.addAttribute("option", PadOption.SPACE.toString()); final String[] expected = { - "87:21: " + getCheckMessage(WS_NOT_FOLLOWED, "("), - "87:27: " + getCheckMessage(WS_NOT_PRECEDED, ")"), - "88:14: " + getCheckMessage(WS_NOT_FOLLOWED, "("), - "88:20: " + getCheckMessage(WS_NOT_PRECEDED, ")"), - "90:14: " + getCheckMessage(WS_NOT_FOLLOWED, "("), - "90:20: " + getCheckMessage(WS_NOT_PRECEDED, ")"), - "241:18: " + getCheckMessage(WS_NOT_FOLLOWED, "("), - "241:21: " + getCheckMessage(WS_NOT_PRECEDED, ")"), + "87:21: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "("), + "87:27: " + getCheckMessage(MSG_WS_NOT_PRECEDED, ")"), + "88:14: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "("), + "88:20: " + getCheckMessage(MSG_WS_NOT_PRECEDED, ")"), + "90:14: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "("), + "90:20: " + getCheckMessage(MSG_WS_NOT_PRECEDED, ")"), + "241:18: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "("), + "241:21: " + getCheckMessage(MSG_WS_NOT_PRECEDED, ")"), }; verify(checkConfig, getPath("InputWhitespace.java"), expected); } diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -19,8 +19,8 @@ package com.puppycrawl.tools.checkstyle.checks.whitespace; -import static com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAfterCheck.WS_NOT_FOLLOWED; -import static com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAfterCheck.WS_TYPECAST; +import static com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAfterCheck.MSG_WS_NOT_FOLLOWED; +import static com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAfterCheck.MSG_WS_TYPECAST; import static org.junit.Assert.assertArrayEquals; import java.io.File; @@ -57,8 +57,8 @@ @Test public void testDefault() throws Exception { final String[] expected = { - "42:40: " + getCheckMessage(WS_NOT_FOLLOWED, ","), - "71:30: " + getCheckMessage(WS_NOT_FOLLOWED, ","), + "42:40: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, ","), + "71:30: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, ","), }; verify(checkConfig, getPath("InputSimple.java"), expected); } @@ -66,7 +66,7 @@ @Test public void testCast() throws Exception { final String[] expected = { - "88:21: " + getCheckMessage(WS_TYPECAST), + "88:21: " + getCheckMessage(MSG_WS_TYPECAST), }; verify(checkConfig, getPath("InputWhitespace.java"), expected); } @@ -74,9 +74,9 @@ @Test public void testSemi() throws Exception { final String[] expected = { - "54:23: " + getCheckMessage(WS_NOT_FOLLOWED, ";"), - "54:29: " + getCheckMessage(WS_NOT_FOLLOWED, ";"), - "103:19: " + getCheckMessage(WS_NOT_FOLLOWED, ";"), + "54:23: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, ";"), + "54:29: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, ";"), + "103:19: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, ";"), }; verify(checkConfig, getPath("InputBraces.java"), expected); } @@ -84,8 +84,8 @@ @Test public void testEmptyForIterator() throws Exception { final String[] expected = { - "14:31: " + getCheckMessage(WS_NOT_FOLLOWED, ";"), - "17:31: " + getCheckMessage(WS_NOT_FOLLOWED, ";"), + "14:31: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, ";"), + "17:31: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, ";"), }; verify(checkConfig, getPath("InputForWhitespace.java"), expected); } @@ -93,9 +93,9 @@ @Test public void testTypeArgumentAndParameterCommas() throws Exception { final String[] expected = { - "11:21: " + getCheckMessage(WS_NOT_FOLLOWED, ","), - "11:23: " + getCheckMessage(WS_NOT_FOLLOWED, ","), - "11:41: " + getCheckMessage(WS_NOT_FOLLOWED, ","), + "11:21: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, ","), + "11:23: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, ","), + "11:41: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, ","), }; verify(checkConfig, getPath("InputGenerics.java"), expected); } diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundCheckTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundCheckTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundCheckTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundCheckTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -19,8 +19,8 @@ package com.puppycrawl.tools.checkstyle.checks.whitespace; -import static com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAroundCheck.WS_NOT_FOLLOWED; -import static com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAroundCheck.WS_NOT_PRECEDED; +import static com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAroundCheck.MSG_WS_NOT_FOLLOWED; +import static com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAroundCheck.MSG_WS_NOT_PRECEDED; import static org.junit.Assert.assertArrayEquals; import java.io.File; @@ -65,42 +65,42 @@ public void testIt() throws Exception { final String[] expected = { - "16:22: " + getCheckMessage(WS_NOT_PRECEDED, "="), - "16:23: " + getCheckMessage(WS_NOT_FOLLOWED, "="), - "18:24: " + getCheckMessage(WS_NOT_FOLLOWED, "="), - "26:14: " + getCheckMessage(WS_NOT_PRECEDED, "="), - "27:10: " + getCheckMessage(WS_NOT_PRECEDED, "="), - "27:11: " + getCheckMessage(WS_NOT_FOLLOWED, "="), - "28:10: " + getCheckMessage(WS_NOT_PRECEDED, "+="), - "28:12: " + getCheckMessage(WS_NOT_FOLLOWED, "+="), - "29:13: " + getCheckMessage(WS_NOT_FOLLOWED, "-="), - "37:21: " + getCheckMessage(WS_NOT_FOLLOWED, "synchronized"), - "39:12: " + getCheckMessage(WS_NOT_FOLLOWED, "try"), - "39:12: " + getCheckMessage(WS_NOT_PRECEDED, "{"), - "41:14: " + getCheckMessage(WS_NOT_FOLLOWED, "catch"), - "41:34: " + getCheckMessage(WS_NOT_PRECEDED, "{"), - "58:11: " + getCheckMessage(WS_NOT_FOLLOWED, "if"), - "76:19: " + getCheckMessage(WS_NOT_FOLLOWED, "return"), - "97:29: " + getCheckMessage(WS_NOT_PRECEDED, "?"), - "97:30: " + getCheckMessage(WS_NOT_FOLLOWED, "?"), - "97:34: " + getCheckMessage(WS_NOT_PRECEDED, ":"), - "97:35: " + getCheckMessage(WS_NOT_FOLLOWED, ":"), - "98:15: " + getCheckMessage(WS_NOT_PRECEDED, "=="), - "98:17: " + getCheckMessage(WS_NOT_FOLLOWED, "=="), - "104:20: " + getCheckMessage(WS_NOT_FOLLOWED, "*"), - "104:21: " + getCheckMessage(WS_NOT_PRECEDED, "*"), - "119:18: " + getCheckMessage(WS_NOT_PRECEDED, "%"), - "120:20: " + getCheckMessage(WS_NOT_FOLLOWED, "%"), - "121:18: " + getCheckMessage(WS_NOT_PRECEDED, "%"), - "121:19: " + getCheckMessage(WS_NOT_FOLLOWED, "%"), - "123:18: " + getCheckMessage(WS_NOT_PRECEDED, "/"), - "124:20: " + getCheckMessage(WS_NOT_FOLLOWED, "/"), - "125:18: " + getCheckMessage(WS_NOT_PRECEDED, "/"), - "125:19: " + getCheckMessage(WS_NOT_FOLLOWED, "/"), - "153:15: " + getCheckMessage(WS_NOT_FOLLOWED, "assert"), - "156:20: " + getCheckMessage(WS_NOT_PRECEDED, ":"), - "156:21: " + getCheckMessage(WS_NOT_FOLLOWED, ":"), - "262:14: " + getCheckMessage(WS_NOT_FOLLOWED, "}"), + "16:22: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "="), + "16:23: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "="), + "18:24: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "="), + "26:14: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "="), + "27:10: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "="), + "27:11: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "="), + "28:10: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "+="), + "28:12: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "+="), + "29:13: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "-="), + "37:21: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "synchronized"), + "39:12: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "try"), + "39:12: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "{"), + "41:14: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "catch"), + "41:34: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "{"), + "58:11: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "if"), + "76:19: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "return"), + "97:29: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "?"), + "97:30: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "?"), + "97:34: " + getCheckMessage(MSG_WS_NOT_PRECEDED, ":"), + "97:35: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, ":"), + "98:15: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "=="), + "98:17: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "=="), + "104:20: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "*"), + "104:21: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "*"), + "119:18: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "%"), + "120:20: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "%"), + "121:18: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "%"), + "121:19: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "%"), + "123:18: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "/"), + "124:20: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "/"), + "125:18: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "/"), + "125:19: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "/"), + "153:15: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "assert"), + "156:20: " + getCheckMessage(MSG_WS_NOT_PRECEDED, ":"), + "156:21: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, ":"), + "262:14: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "}"), }; verify(checkConfig, getPath("InputWhitespace.java"), expected); } @@ -109,12 +109,12 @@ public void testIt2() throws Exception { final String[] expected = { - "153:27: " + getCheckMessage(WS_NOT_FOLLOWED, "="), - "154:27: " + getCheckMessage(WS_NOT_FOLLOWED, "="), - "155:27: " + getCheckMessage(WS_NOT_FOLLOWED, "="), - "156:27: " + getCheckMessage(WS_NOT_FOLLOWED, "="), - "157:27: " + getCheckMessage(WS_NOT_FOLLOWED, "="), - "158:27: " + getCheckMessage(WS_NOT_FOLLOWED, "="), + "153:27: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "="), + "154:27: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "="), + "155:27: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "="), + "156:27: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "="), + "157:27: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "="), + "158:27: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "="), }; verify(checkConfig, getPath("InputSimple.java"), expected); } @@ -123,14 +123,14 @@ public void testIt3() throws Exception { final String[] expected = { - "37:14: " + getCheckMessage(WS_NOT_FOLLOWED, "while"), - "54:12: " + getCheckMessage(WS_NOT_FOLLOWED, "for"), + "37:14: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "while"), + "54:12: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "for"), // + ":58:23: ';' is not followed by whitespace.", // + ":58:29: ';' is not followed by whitespace.", - "111:27: " + getCheckMessage(WS_NOT_FOLLOWED, "{"), - "111:27: " + getCheckMessage(WS_NOT_PRECEDED, "}"), - "114:40: " + getCheckMessage(WS_NOT_FOLLOWED, "{"), - "114:40: " + getCheckMessage(WS_NOT_PRECEDED, "}"), + "111:27: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "{"), + "111:27: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "}"), + "114:40: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "{"), + "114:40: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "}"), }; verify(checkConfig, getPath("InputBraces.java"), expected); } @@ -141,8 +141,8 @@ checkConfig.addAttribute("allowEmptyMethods", "true"); checkConfig.addAttribute("allowEmptyConstructors", "true"); final String[] expected = { - "37:14: " + getCheckMessage(WS_NOT_FOLLOWED, "while"), - "54:12: " + getCheckMessage(WS_NOT_FOLLOWED, "for"), + "37:14: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "while"), + "54:12: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "for"), }; verify(checkConfig, getPath("InputBraces.java"), expected); } @@ -151,8 +151,8 @@ public void testGenericsTokensAreFlagged() throws Exception { final String[] expected = { - "6:67: " + getCheckMessage(WS_NOT_PRECEDED, "&"), - "6:68: " + getCheckMessage(WS_NOT_FOLLOWED, "&"), + "6:67: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "&"), + "6:68: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "&"), }; verify(checkConfig, getPath("InputGenerics.java"), expected); } @@ -168,7 +168,7 @@ public void testIgnoreEnhancedForColon() throws Exception { checkConfig.addAttribute("ignoreEnhancedForColon", "false"); final String[] expected = { - "19:20: " + getCheckMessage(WS_NOT_PRECEDED, ":"), + "19:20: " + getCheckMessage(MSG_WS_NOT_PRECEDED, ":"), }; verify(checkConfig, getPath("InputWhitespaceAround.java"), expected); @@ -178,12 +178,12 @@ public void testEmptyTypes() throws Exception { checkConfig.addAttribute("allowEmptyTypes", "true"); final String[] expected = { - "29:95: " + getCheckMessage(WS_NOT_FOLLOWED, "{"), - "29:95: " + getCheckMessage(WS_NOT_PRECEDED, "}"), - "30:33: " + getCheckMessage(WS_NOT_FOLLOWED, "{"), - "30:33: " + getCheckMessage(WS_NOT_PRECEDED, "}"), - "31:21: " + getCheckMessage(WS_NOT_FOLLOWED, "{"), - "31:21: " + getCheckMessage(WS_NOT_PRECEDED, "}"), + "29:95: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "{"), + "29:95: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "}"), + "30:33: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "{"), + "30:33: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "}"), + "31:21: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "{"), + "31:21: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "}"), }; verify(checkConfig, getPath("InputEmptyTypesAndCycles.java"), expected); @@ -193,16 +193,16 @@ public void testEmptyLoops() throws Exception { checkConfig.addAttribute("allowEmptyLoops", "true"); final String[] expected = { - "40:65: " + getCheckMessage(WS_NOT_FOLLOWED, "{"), - "40:65: " + getCheckMessage(WS_NOT_PRECEDED, "}"), - "42:17: " + getCheckMessage(WS_NOT_FOLLOWED, "{"), - "42:17: " + getCheckMessage(WS_NOT_PRECEDED, "}"), - "44:20: " + getCheckMessage(WS_NOT_FOLLOWED, "{"), - "44:20: " + getCheckMessage(WS_NOT_PRECEDED, "}"), - "50:44: " + getCheckMessage(WS_NOT_FOLLOWED, "{"), - "50:44: " + getCheckMessage(WS_NOT_PRECEDED, "}"), - "60:18: " + getCheckMessage(WS_NOT_FOLLOWED, "{"), - "60:18: " + getCheckMessage(WS_NOT_PRECEDED, "}"), + "40:65: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "{"), + "40:65: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "}"), + "42:17: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "{"), + "42:17: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "}"), + "44:20: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "{"), + "44:20: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "}"), + "50:44: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "{"), + "50:44: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "}"), + "60:18: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "{"), + "60:18: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "}"), }; verify(checkConfig, getPath("InputEmptyTypesAndCycles.java"), expected); @@ -211,7 +211,7 @@ @Test public void testSwitchWhitespaceAround() throws Exception { final String[] expected = { - "6:15: " + getCheckMessage(WS_NOT_FOLLOWED, "switch"), + "6:15: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "switch"), }; verify(checkConfig, getPath("InputSwitchWhitespaceAround.java"), expected); } @@ -219,7 +219,7 @@ @Test public void testDoWhileWhitespaceAround() throws Exception { final String[] expected = { - "9:16: " + getCheckMessage(WS_NOT_FOLLOWED, "while"), + "9:16: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "while"), }; verify(checkConfig, getPath("InputDoWhileWhitespaceAround.java"), expected); } @@ -297,21 +297,21 @@ public void testAllowEmptyTypesIsSetToFalseAndNonEmptyClasses() throws Exception { checkConfig.addAttribute("allowEmptyTypes", "false"); final String[] expected = { - "6:52: " + getCheckMessage(WS_NOT_PRECEDED, "{"), - "10:20: " + getCheckMessage(WS_NOT_PRECEDED, "{"), - "14:32: " + getCheckMessage(WS_NOT_PRECEDED, "{"), - "18:18: " + getCheckMessage(WS_NOT_PRECEDED, "{"), - "20:24: " + getCheckMessage(WS_NOT_PRECEDED, "{"), - "20:25: " + getCheckMessage(WS_NOT_FOLLOWED, "{"), - "20:31: " + getCheckMessage(WS_NOT_PRECEDED, "}"), - "22:31: " + getCheckMessage(WS_NOT_FOLLOWED, "}"), - "24:18: " + getCheckMessage(WS_NOT_FOLLOWED, "{"), - "24:18: " + getCheckMessage(WS_NOT_PRECEDED, "}"), - "26:69: " + getCheckMessage(WS_NOT_FOLLOWED, "{"), - "26:69: " + getCheckMessage(WS_NOT_PRECEDED, "}"), - "28:24: " + getCheckMessage(WS_NOT_PRECEDED, "{"), - "31:13: " + getCheckMessage(WS_NOT_FOLLOWED, "{"), - "31:13: " + getCheckMessage(WS_NOT_PRECEDED, "}"), + "6:52: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "{"), + "10:20: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "{"), + "14:32: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "{"), + "18:18: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "{"), + "20:24: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "{"), + "20:25: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "{"), + "20:31: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "}"), + "22:31: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "}"), + "24:18: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "{"), + "24:18: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "}"), + "26:69: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "{"), + "26:69: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "}"), + "28:24: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "{"), + "31:13: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "{"), + "31:13: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "}"), }; verify(checkConfig, getPath("InputAllowEmptyTypesAndNonEmptyClasses.java"), expected); @@ -321,17 +321,17 @@ public void testAllowEmptyTypesIsSetToTrueAndNonEmptyClasses() throws Exception { checkConfig.addAttribute("allowEmptyTypes", "true"); final String[] expected = { - "6:52: " + getCheckMessage(WS_NOT_PRECEDED, "{"), - "10:20: " + getCheckMessage(WS_NOT_PRECEDED, "{"), - "14:32: " + getCheckMessage(WS_NOT_PRECEDED, "{"), - "18:18: " + getCheckMessage(WS_NOT_PRECEDED, "{"), - "20:24: " + getCheckMessage(WS_NOT_PRECEDED, "{"), - "20:25: " + getCheckMessage(WS_NOT_FOLLOWED, "{"), - "20:31: " + getCheckMessage(WS_NOT_PRECEDED, "}"), - "22:31: " + getCheckMessage(WS_NOT_FOLLOWED, "}"), - "28:24: " + getCheckMessage(WS_NOT_PRECEDED, "{"), - "31:13: " + getCheckMessage(WS_NOT_FOLLOWED, "{"), - "31:13: " + getCheckMessage(WS_NOT_PRECEDED, "}"), + "6:52: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "{"), + "10:20: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "{"), + "14:32: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "{"), + "18:18: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "{"), + "20:24: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "{"), + "20:25: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "{"), + "20:31: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "}"), + "22:31: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "}"), + "28:24: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "{"), + "31:13: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "{"), + "31:13: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "}"), }; verify(checkConfig, getPath("InputAllowEmptyTypesAndNonEmptyClasses.java"), expected); @@ -340,12 +340,12 @@ @Test public void testNotAllowEmptyLambdaExpressionsByDefault() throws Exception { final String[] expected = { - "7:28: " + getCheckMessage(WS_NOT_FOLLOWED, "{"), - "7:28: " + getCheckMessage(WS_NOT_PRECEDED, "}"), - "12:29: " + getCheckMessage(WS_NOT_FOLLOWED, "{"), - "12:30: " + getCheckMessage(WS_NOT_PRECEDED, "}"), - "13:29: " + getCheckMessage(WS_NOT_FOLLOWED, "{"), - "13:43: " + getCheckMessage(WS_NOT_PRECEDED, "}"), + "7:28: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "{"), + "7:28: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "}"), + "12:29: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "{"), + "12:30: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "}"), + "13:29: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "{"), + "13:43: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "}"), }; verify(checkConfig, getNonCompilablePath("InputAllowEmptyLambdaExpressions.java"), expected); @@ -355,10 +355,10 @@ public void testAllowEmptyLambdaExpressionsWithAllowEmptyLambdaParameter() throws Exception { checkConfig.addAttribute("allowEmptyLambdas", "true"); final String[] expected = { - "12:29: " + getCheckMessage(WS_NOT_FOLLOWED, "{"), - "12:30: " + getCheckMessage(WS_NOT_PRECEDED, "}"), - "13:29: " + getCheckMessage(WS_NOT_FOLLOWED, "{"), - "13:43: " + getCheckMessage(WS_NOT_PRECEDED, "}"), + "12:29: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "{"), + "12:30: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "}"), + "13:29: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "{"), + "13:43: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "}"), }; verify(checkConfig, getNonCompilablePath("InputAllowEmptyLambdaExpressions.java"), expected); diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/ConfigurationLoaderTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/ConfigurationLoaderTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/ConfigurationLoaderTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/ConfigurationLoaderTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/DebugAuditAdapter.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/DebugAuditAdapter.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/DebugAuditAdapter.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/DebugAuditAdapter.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/DebugChecker.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/DebugChecker.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/DebugChecker.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/DebugChecker.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/DebugFilter.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/DebugFilter.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/DebugFilter.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/DebugFilter.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/DefaultConfigurationTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/DefaultConfigurationTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/DefaultConfigurationTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/DefaultConfigurationTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/DefaultLoggerTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/DefaultLoggerTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/DefaultLoggerTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/DefaultLoggerTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/DefinitionsTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/DefinitionsTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/DefinitionsTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/DefinitionsTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/doclets/TokenTypesDocletTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/doclets/TokenTypesDocletTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/doclets/TokenTypesDocletTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/doclets/TokenTypesDocletTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -149,7 +149,7 @@ private static RootDoc getRootDoc(JavadocTool javadocTool, ListBuffer names) throws Exception { final Method getRootDocImpl = getMethodGetRootDocImplByReflection(); - RootDoc rootDoc; + final RootDoc rootDoc; if (System.getProperty("java.version").startsWith("1.7.")) { rootDoc = (RootDoc) getRootDocImpl.invoke(javadocTool, "", "UTF-8", new ModifierFilter(ModifierFilter.ALL_ACCESS), diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/filters/CsvFilterTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/filters/CsvFilterTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/filters/CsvFilterTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/filters/CsvFilterTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/filters/FilterSetTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/filters/FilterSetTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/filters/FilterSetTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/filters/FilterSetTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/filters/IntMatchFilterTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/filters/IntMatchFilterTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/filters/IntMatchFilterTest.java 2015-11-13 05:06:18.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/filters/IntMatchFilterTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/filters/IntRangeFilterTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/filters/IntRangeFilterTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/filters/IntRangeFilterTest.java 2015-11-13 05:06:18.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/filters/IntRangeFilterTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/filters/SeverityMatchFilterTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/filters/SeverityMatchFilterTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/filters/SeverityMatchFilterTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/filters/SeverityMatchFilterTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressElementTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressElementTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressElementTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressElementTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilterTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilterTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilterTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilterTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -217,8 +217,13 @@ new DefaultConfiguration("configuration"); final DefaultConfiguration checksConfig = createCheckConfig(TreeWalker.class); checksConfig.addChild(createCheckConfig(FileContentsHolder.class)); - checksConfig.addChild(createCheckConfig(MemberNameCheck.class)); - checksConfig.addChild(createCheckConfig(ConstantNameCheck.class)); + final DefaultConfiguration memberNameCheckConfig = createCheckConfig(MemberNameCheck.class); + memberNameCheckConfig.addAttribute("id", "ignore"); + checksConfig.addChild(memberNameCheckConfig); + final DefaultConfiguration constantNameCheckConfig = + createCheckConfig(ConstantNameCheck.class); + constantNameCheckConfig.addAttribute("id", null); + checksConfig.addChild(constantNameCheckConfig); checksConfig.addChild(createCheckConfig(IllegalCatchCheck.class)); checkerConfig.addChild(checksConfig); if (checkConfig != null) { @@ -307,4 +312,27 @@ final SuppressionCommentFilter filter = new SuppressionCommentFilter(); Assert.assertTrue(filter.accept(auditEvent)); } + + @Test + public void testSuppressById() throws Exception { + final DefaultConfiguration filterConfig = + createFilterConfig(SuppressionCommentFilter.class); + filterConfig.addAttribute("offCommentFormat", "CSOFF (\\w+) \\(\\w+\\)"); + filterConfig.addAttribute("onCommentFormat", "CSON (\\w+)"); + filterConfig.addAttribute("checkFormat", "$1"); + final String[] suppressedViolationMessages = { + "6:17: Name 'A1' must match pattern '^[a-z][a-zA-Z0-9]*$'.", + "12:9: Name 'line_length' must match pattern '^[a-z][a-zA-Z0-9]*$'.", + }; + final String[] expectedViolationMessages = { + "6:17: Name 'A1' must match pattern '^[a-z][a-zA-Z0-9]*$'.", + "9:30: Name 'abc' must match pattern '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'.", + "12:9: Name 'line_length' must match pattern '^[a-z][a-zA-Z0-9]*$'.", + "15:18: Name 'ID' must match pattern '^[a-z][a-zA-Z0-9]*$'.", + }; + + verify(createChecker(filterConfig), + getPath("InputSuppressByIdWithCommentFilter.java"), + removeSuppressed(expectedViolationMessages, suppressedViolationMessages)); + } } diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionFilterTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionFilterTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionFilterTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionFilterTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -19,14 +19,34 @@ package com.puppycrawl.tools.checkstyle.filters; -import org.junit.Assert; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import java.io.IOException; +import java.io.InputStream; +import java.net.URI; +import java.net.URL; + import org.junit.Test; +import org.junit.runner.RunWith; + +import org.mockito.BDDMockito; +import org.mockito.Mockito; + +import org.powermock.api.mockito.PowerMockito; +import org.powermock.core.classloader.annotations.PrepareForTest; +import org.powermock.modules.junit4.PowerMockRunner; import com.puppycrawl.tools.checkstyle.api.AuditEvent; import com.puppycrawl.tools.checkstyle.api.CheckstyleException; +import com.puppycrawl.tools.checkstyle.utils.CommonUtils; + import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; +@RunWith(PowerMockRunner.class) +@PrepareForTest({SuppressionFilter.class, CommonUtils.class}) public class SuppressionFilterTest { @Test public void testEqualsAndHashCode() { @@ -39,13 +59,122 @@ @Test public void testAccept() throws CheckstyleException { - final SuppressionFilter filter = new SuppressionFilter(); - filter.setFile("src/test/resources/com/puppycrawl/tools/checkstyle/filters/" - + "suppressions_none.xml"); + final String fileName = "src/test/resources/com/puppycrawl/tools/checkstyle/filters/" + + "suppressions_none.xml"; + final boolean optional = false; + final SuppressionFilter filter = createSupressionFilter(fileName, optional); final AuditEvent ev = new AuditEvent(this, "ATest.java", null); - Assert.assertTrue(filter.accept(ev)); + assertTrue(filter.accept(ev)); + } + + @Test + public void testAcceptOnNullFile() throws CheckstyleException { + final String fileName = null; + final boolean optional = false; + final SuppressionFilter filter = createSupressionFilter(fileName, optional); + + final AuditEvent ev = new AuditEvent(this, "AnyJava.java", null); + + assertTrue(filter.accept(ev)); + } + + @Test + public void testNonExistanceSuppressionFileWithFalseOptional() throws Exception { + final String fileName = "src/test/resources/com/puppycrawl/tools/checkstyle/filters/" + + "non_existance_suppresion_file.xml"; + try { + final boolean optional = false; + createSupressionFilter(fileName, optional); + fail("Exception is expected"); + } + catch (CheckstyleException ex) { + assertEquals("Unable to find: " + fileName, ex.getMessage()); + } + } + + @Test + public void testExistanceInvalidSuppressionFileWithTrueOptional() throws Exception { + final String fileName = "src/test/resources/com/puppycrawl/tools/checkstyle/filters/" + + "suppressions_invalid_file.xml"; + try { + final boolean optional = true; + createSupressionFilter(fileName, optional); + fail("Exception is expected"); + } + catch (CheckstyleException ex) { + assertEquals("Unable to parse " + fileName + " - invalid files or checks format", + ex.getMessage()); + } + } + + @Test + public void testExistingSuppressionFileWithTrueOptional() throws Exception { + final String fileName = "src/test/resources/com/puppycrawl/tools/checkstyle/filters/" + + "suppressions_none.xml"; + final boolean optional = true; + final SuppressionFilter filter = createSupressionFilter(fileName, optional); + + final AuditEvent ev = new AuditEvent(this, "AnyFile.java", null); + + assertTrue(filter.accept(ev)); } + @Test + public void testExistingConfigWithTrueOptionalThrowsIoErrorWhileClosing() + throws Exception { + final InputStream inputStream = PowerMockito.mock(InputStream.class); + Mockito.doThrow(IOException.class).when(inputStream).close(); + + final URL url = PowerMockito.mock(URL.class); + BDDMockito.given(url.openStream()).willReturn(inputStream); + + final URI uri = PowerMockito.mock(URI.class); + BDDMockito.given(uri.toURL()).willReturn(url); + + PowerMockito.mockStatic(CommonUtils.class); + + final String fileName = "src/test/resources/com/puppycrawl/tools/checkstyle/filters/" + + "suppressions_none.xml"; + BDDMockito.given(CommonUtils.getUriByFilename(fileName)).willReturn(uri); + + final boolean optional = true; + final SuppressionFilter filter = createSupressionFilter(fileName, optional); + final AuditEvent ev = new AuditEvent(this, "AnyFile.java", null); + assertTrue(filter.accept(ev)); + } + + @Test + public void testNonExistanceSuppressionFileWithTrueOptional() throws Exception { + final String fileName = "src/test/resources/com/puppycrawl/tools/checkstyle/filters/" + + "non_existance_suppresion_file.xml"; + final boolean optional = true; + final SuppressionFilter filter = createSupressionFilter(fileName, optional); + + final AuditEvent ev = new AuditEvent(this, "AnyFile.java", null); + + assertTrue(filter.accept(ev)); + } + + @Test + public void testNonExistanceSuppressionUrlWithTrueOptional() throws Exception { + final String fileName = + "http://checkstyle.sourceforge.net/non_existing_suppression.xml"; + final boolean optional = true; + final SuppressionFilter filter = createSupressionFilter(fileName, optional); + + final AuditEvent ev = new AuditEvent(this, "AnyFile.java", null); + + assertTrue(filter.accept(ev)); + } + + private static SuppressionFilter createSupressionFilter(String fileName, boolean optional) + throws CheckstyleException { + final SuppressionFilter suppressionFilter = new SuppressionFilter(); + suppressionFilter.setFile(fileName); + suppressionFilter.setOptional(optional); + suppressionFilter.finishLocalSetup(); + return suppressionFilter; + } } diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWarningsFilterTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWarningsFilterTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWarningsFilterTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWarningsFilterTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -125,11 +125,19 @@ "com.puppycrawl.tools.checkstyle.checks.sizes." + "ParameterNumberCheck=paramnum"); checksConfig.addChild(holderConfig); - checksConfig.addChild(createCheckConfig(MemberNameCheck.class)); - checksConfig.addChild(createCheckConfig(ConstantNameCheck.class)); + final DefaultConfiguration memberNameCheckConfig = createCheckConfig(MemberNameCheck.class); + memberNameCheckConfig.addAttribute("id", "ignore"); + checksConfig.addChild(memberNameCheckConfig); + final DefaultConfiguration constantNameCheckConfig = + createCheckConfig(ConstantNameCheck.class); + constantNameCheckConfig.addAttribute("id", ""); + checksConfig.addChild(constantNameCheckConfig); checksConfig.addChild(createCheckConfig(ParameterNumberCheck.class)); checksConfig.addChild(createCheckConfig(IllegalCatchCheck.class)); - checksConfig.addChild(createCheckConfig(UncommentedMainCheck.class)); + final DefaultConfiguration uncommentedMainCheckConfig = + createCheckConfig(UncommentedMainCheck.class); + uncommentedMainCheckConfig.addAttribute("id", "ignore"); + checksConfig.addChild(uncommentedMainCheckConfig); checksConfig.addChild(createCheckConfig(JavadocTypeCheck.class)); checkerConfig.addChild(checksConfig); if (checkConfig != null) { @@ -152,4 +160,23 @@ coll.removeAll(Arrays.asList(remove)); return coll.toArray(new String[coll.size()]); } + + @Test + public void testSuppressById() throws Exception { + final DefaultConfiguration filterConfig = + createFilterConfig(SuppressWarningsFilter.class); + final String[] suppressedViolationMessages = { + "6:17: Name 'A1' must match pattern '^[a-z][a-zA-Z0-9]*$'.", + "8: Uncommented main method found.", + }; + final String[] expectedViolationMessages = { + "3: Missing a Javadoc comment.", + "6:17: Name 'A1' must match pattern '^[a-z][a-zA-Z0-9]*$'.", + "8: Uncommented main method found.", + }; + + verify(createChecker(filterConfig), + getPath("InputSuppressByIdWithWarningsFilter.java"), + removeSuppressed(expectedViolationMessages, suppressedViolationMessages)); + } } diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilterTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilterTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilterTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilterTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -217,8 +217,13 @@ new DefaultConfiguration("configuration"); final DefaultConfiguration checksConfig = createCheckConfig(TreeWalker.class); checksConfig.addChild(createCheckConfig(FileContentsHolder.class)); - checksConfig.addChild(createCheckConfig(MemberNameCheck.class)); - checksConfig.addChild(createCheckConfig(ConstantNameCheck.class)); + final DefaultConfiguration memberNameCheckConfig = createCheckConfig(MemberNameCheck.class); + memberNameCheckConfig.addAttribute("id", "ignore"); + checksConfig.addChild(memberNameCheckConfig); + final DefaultConfiguration constantNameCheckConfig = + createCheckConfig(ConstantNameCheck.class); + constantNameCheckConfig.addAttribute("id", null); + checksConfig.addChild(constantNameCheckConfig); checksConfig.addChild(createCheckConfig(IllegalCatchCheck.class)); checkerConfig.addChild(checksConfig); if (checkConfig != null) { @@ -311,4 +316,27 @@ final String[] suppressed = ArrayUtils.EMPTY_STRING_ARRAY; verifySuppressed(filterConfig, suppressed); } + + @Test + public void testSuppressById() throws Exception { + final DefaultConfiguration filterConfig = + createFilterConfig(SuppressWithNearbyCommentFilter.class); + filterConfig.addAttribute("commentFormat", "@cs-: (\\w+) \\(\\w+\\)"); + filterConfig.addAttribute("checkFormat", "$1"); + filterConfig.addAttribute("influenceFormat", "0"); + final String[] suppressedViolationMessages = { + "5:17: Name 'A1' must match pattern '^[a-z][a-zA-Z0-9]*$'.", + "9:9: Name 'line_length' must match pattern '^[a-z][a-zA-Z0-9]*$'.", + }; + final String[] expectedViolationMessages = { + "5:17: Name 'A1' must match pattern '^[a-z][a-zA-Z0-9]*$'.", + "7:30: Name 'abc' must match pattern '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'.", + "9:9: Name 'line_length' must match pattern '^[a-z][a-zA-Z0-9]*$'.", + "11:18: Name 'ID' must match pattern '^[a-z][a-zA-Z0-9]*$'.", + }; + + verify(createChecker(filterConfig), + getPath("InputSuppressByIdWithNearbyCommentFilter.java"), + removeSuppressed(expectedViolationMessages, suppressedViolationMessages)); + } } diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/grammars/comments/AllBlockCommentsTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/grammars/comments/AllBlockCommentsTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/grammars/comments/AllBlockCommentsTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/grammars/comments/AllBlockCommentsTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/grammars/comments/AllSinglelineCommentsTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/grammars/comments/AllSinglelineCommentsTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/grammars/comments/AllSinglelineCommentsTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/grammars/comments/AllSinglelineCommentsTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/grammars/comments/CommentsTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/grammars/comments/CommentsTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/grammars/comments/CommentsTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/grammars/comments/CommentsTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/grammars/comments/CompareTreesWithComments.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/grammars/comments/CompareTreesWithComments.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/grammars/comments/CompareTreesWithComments.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/grammars/comments/CompareTreesWithComments.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -56,7 +56,7 @@ } private static boolean isAstEquals(DetailAST expected, DetailAST actual) { - boolean result; + final boolean result; if (expected == actual) { result = true; } diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/grammars/EmbeddedNullCharTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/grammars/EmbeddedNullCharTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/grammars/EmbeddedNullCharTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/grammars/EmbeddedNullCharTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/grammars/GeneratedJava14LexerTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/grammars/GeneratedJava14LexerTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/grammars/GeneratedJava14LexerTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/grammars/GeneratedJava14LexerTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/grammars/HexFloatsTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/grammars/HexFloatsTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/grammars/HexFloatsTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/grammars/HexFloatsTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/grammars/Java7DiamondTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/grammars/Java7DiamondTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/grammars/Java7DiamondTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/grammars/Java7DiamondTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/grammars/Java7MultiCatchTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/grammars/Java7MultiCatchTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/grammars/Java7MultiCatchTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/grammars/Java7MultiCatchTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/grammars/Java7NumericalLiteralsTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/grammars/Java7NumericalLiteralsTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/grammars/Java7NumericalLiteralsTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/grammars/Java7NumericalLiteralsTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/grammars/Java7StringSwitchTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/grammars/Java7StringSwitchTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/grammars/Java7StringSwitchTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/grammars/Java7StringSwitchTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/grammars/Java7TryWithResourcesTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/grammars/Java7TryWithResourcesTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/grammars/Java7TryWithResourcesTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/grammars/Java7TryWithResourcesTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/grammars/java8/AnnotationTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/grammars/java8/AnnotationTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/grammars/java8/AnnotationTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/grammars/java8/AnnotationTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/grammars/java8/DefaultMethodsTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/grammars/java8/DefaultMethodsTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/grammars/java8/DefaultMethodsTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/grammars/java8/DefaultMethodsTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/grammars/java8/LambdaTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/grammars/java8/LambdaTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/grammars/java8/LambdaTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/grammars/java8/LambdaTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/grammars/java8/MethodReferencesTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/grammars/java8/MethodReferencesTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/grammars/java8/MethodReferencesTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/grammars/java8/MethodReferencesTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/grammars/javadoc/JavadocParseTreeTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/grammars/javadoc/JavadocParseTreeTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/grammars/javadoc/JavadocParseTreeTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/grammars/javadoc/JavadocParseTreeTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/grammars/javadoc/ParseTreeBuilder.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/grammars/javadoc/ParseTreeBuilder.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/grammars/javadoc/ParseTreeBuilder.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/grammars/javadoc/ParseTreeBuilder.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/grammars/LineCommentAtTheEndOfFileTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/grammars/LineCommentAtTheEndOfFileTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/grammars/LineCommentAtTheEndOfFileTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/grammars/LineCommentAtTheEndOfFileTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/grammars/MultiDimensionalArraysInGenericsTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/grammars/MultiDimensionalArraysInGenericsTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/grammars/MultiDimensionalArraysInGenericsTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/grammars/MultiDimensionalArraysInGenericsTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/grammars/UnicodeEscapeTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/grammars/UnicodeEscapeTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/grammars/UnicodeEscapeTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/grammars/UnicodeEscapeTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/grammars/VarargTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/grammars/VarargTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/grammars/VarargTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/grammars/VarargTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/internal/AllChecksTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/internal/AllChecksTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/internal/AllChecksTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/internal/AllChecksTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -19,6 +19,8 @@ package com.puppycrawl.tools.checkstyle.internal; +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; import java.util.Arrays; import java.util.HashSet; import java.util.Locale; @@ -163,6 +165,43 @@ } } + @Test + public void testAllCheckstyleModulesHaveMessage() throws Exception { + for (Class module : CheckUtil.getCheckstyleChecks()) { + Assert.assertFalse(module.getSimpleName() + + " should have atleast one 'MSG_*' field for error messages", CheckUtil + .getCheckMessages(module).isEmpty()); + } + } + + @Test + public void testAllCheckstyleMessages() throws Exception { + for (Class module : CheckUtil.getCheckstyleChecks()) { + for (Field message : CheckUtil.getCheckMessages(module)) { + Assert.assertEquals(module.getSimpleName() + "." + message.getName() + + " should be 'public static final'", Modifier.PUBLIC | Modifier.STATIC + | Modifier.FINAL, message.getModifiers()); + + // below is required for package/private classes + if (!message.isAccessible()) { + message.setAccessible(true); + } + + final String result = CheckUtil.getCheckMessage(module, message.get(null) + .toString()); + + Assert.assertNotNull(module.getSimpleName() + " should have text for the message '" + + message.getName() + "'", result); + Assert.assertFalse( + module.getSimpleName() + " should have non-empty text for the message '" + + message.getName() + "'", result.trim().isEmpty()); + Assert.assertFalse(module.getSimpleName() + + " should have non-TODO text for the message '" + message.getName() + "'", + result.trim().startsWith("TODO")); + } + } + } + /** * Checks that an array is a subset of other array. * @param array to check whether it is a subset. diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/internal/CheckUtil.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/internal/CheckUtil.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/internal/CheckUtil.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/internal/CheckUtil.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -21,9 +21,13 @@ import java.io.File; import java.io.IOException; +import java.lang.reflect.Field; import java.lang.reflect.Modifier; +import java.text.MessageFormat; import java.util.Arrays; import java.util.HashSet; +import java.util.Locale; +import java.util.Properties; import java.util.Set; import javax.xml.parsers.DocumentBuilder; @@ -38,6 +42,9 @@ import com.google.common.reflect.ClassPath; import com.puppycrawl.tools.checkstyle.api.AutomaticBean; import com.puppycrawl.tools.checkstyle.api.Filter; +import com.puppycrawl.tools.checkstyle.checks.regexp.RegexpMultilineCheck; +import com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineCheck; +import com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck; import com.puppycrawl.tools.checkstyle.utils.TokenUtils; public final class CheckUtil { @@ -203,6 +210,65 @@ && className.endsWith("Filter"); } + /** + * Get's the check's messages. + * @param module class to examine. + * @return a set of checkstyle's module message fields. + * @throws ClassNotFoundException if the attempt to read a protected class fails. + */ + public static Set getCheckMessages(Class module) throws ClassNotFoundException { + final Set checkstyleMessages = new HashSet<>(); + + // get all fields from current class + final Field[] fields = module.getDeclaredFields(); + + for (Field field : fields) { + if (field.getName().startsWith("MSG_")) { + checkstyleMessages.add(field); + } + } + + // deep scan class through hierarchy + final Class superModule = module.getSuperclass(); + + if (superModule != null) { + checkstyleMessages.addAll(getCheckMessages(superModule)); + } + + // special cases that require additional classes + if (module == RegexpMultilineCheck.class) { + checkstyleMessages.addAll(getCheckMessages(Class + .forName("com.puppycrawl.tools.checkstyle.checks.regexp.MultilineDetector"))); + } + else if (module == RegexpSinglelineCheck.class + || module == RegexpSinglelineJavaCheck.class) { + checkstyleMessages.addAll(getCheckMessages(Class + .forName("com.puppycrawl.tools.checkstyle.checks.regexp.SinglelineDetector"))); + } + + return checkstyleMessages; + } + + /** + * Gets the check message 'as is' from appropriate 'messages.properties' + * file. + * + * @param messageKey the key of message in 'messages.properties' file. + * @param arguments the arguments of message in 'messages.properties' file. + * @return the check's formatted message. + */ + public static String getCheckMessage(Class module, String messageKey, Object... arguments) { + final Properties pr = new Properties(); + try { + pr.load(module.getResourceAsStream("messages.properties")); + } + catch (IOException ex) { + return null; + } + final MessageFormat formatter = new MessageFormat(pr.getProperty(messageKey), Locale.ROOT); + return formatter.format(arguments); + } + public static String getTokenText(int[] tokens, int... subtractions) { if (Arrays.equals(tokens, TokenUtils.getAllTokenIds()) && subtractions.length == 0) { return "TokenTypes."; diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/internal/CommitValidationTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/internal/CommitValidationTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/internal/CommitValidationTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/internal/CommitValidationTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -138,7 +138,7 @@ } private static List getCommitsToCheck() throws Exception { - List commits; + final List commits; try (Repository repo = new FileRepositoryBuilder().findGitDir().build()) { final RevCommitsPair revCommitsPair = resolveRevCommitsPair(repo); if (COMMITS_RESOLUTION_MODE == CommitsResolutionMode.BY_COUNTER) { @@ -168,8 +168,8 @@ RevCommitsPair revCommitIteratorPair; try (RevWalk revWalk = new RevWalk(repo)) { - Iterator first; - Iterator second; + final Iterator first; + final Iterator second; final ObjectId headId = repo.resolve(Constants.HEAD); final RevCommit headCommit = revWalk.parseCommit(headId); diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/internal/TestUtils.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/internal/TestUtils.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/internal/TestUtils.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/internal/TestUtils.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/internal/XDocsPagesTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/internal/XDocsPagesTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/internal/XDocsPagesTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/internal/XDocsPagesTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -25,6 +25,7 @@ import java.io.File; import java.io.IOException; import java.io.StringReader; +import java.lang.reflect.Field; import java.nio.file.Path; import java.util.ArrayList; import java.util.Arrays; @@ -98,6 +99,7 @@ "name=\"SuppressWithNearbyCommentFilter\"", "name=\"SuppressWarningsFilter\"", "name=\"RegexpHeader\"", + "name=\"RegexpOnFilename\"", "name=\"RegexpSingleline\"", "name=\"RegexpMultiline\"", "name=\"JavadocPackage\"", @@ -296,7 +298,7 @@ } private static void validateCheckSection(ModuleFactory moduleFactory, String fileName, - String sectionName, Node section) { + String sectionName, Node section) throws Exception { Object instance = null; try { @@ -317,10 +319,15 @@ continue; } + // optional sections that can be skipped if they have nothing to report if (subSectionPos == 1 && !"Properties".equals(subSectionName)) { validatePropertySection(fileName, sectionName, null, instance); subSectionPos++; } + if (subSectionPos == 4 && !"Error Messages".equals(subSectionName)) { + validateErrorSection(fileName, sectionName, null, instance); + subSectionPos++; + } Assert.assertEquals(fileName + " section '" + sectionName + "' should be in order", getSubSectionName(subSectionPos), @@ -338,9 +345,12 @@ validateUsageExample(fileName, sectionName, subSection); break; case 4: - validatePackageSection(fileName, sectionName, subSection, instance); + validateErrorSection(fileName, sectionName, subSection, instance); break; case 5: + validatePackageSection(fileName, sectionName, subSection, instance); + break; + case 6: validateParentSection(fileName, sectionName, subSection); break; default: @@ -368,9 +378,12 @@ result = "Example of Usage"; break; case 4: - result = "Package"; + result = "Error Messages"; break; case 5: + result = "Package"; + break; + case 6: result = "Parent Module"; break; default: @@ -479,6 +492,64 @@ } } } + + private static void validateErrorSection(String fileName, String sectionName, Node subSection, + Object instance) throws Exception { + final Class clss = instance.getClass(); + final Set fields = CheckUtil.getCheckMessages(clss); + final Set list = new TreeSet<>(); + + for (Field field : fields) { + // below is required for package/private classes + if (!field.isAccessible()) { + field.setAccessible(true); + } + + list.add(field.get(null).toString()); + } + + final StringBuilder expectedText = new StringBuilder(); + + for (String s : list) { + expectedText.append(s); + expectedText.append("\n"); + } + + if (expectedText.length() > 0) { + expectedText.append("All messages can be customized if the default message doesn't " + + "suite you.\nPlease see the documentation to learn how to."); + } + + if (subSection == null) { + Assert.assertEquals(fileName + " section '" + sectionName + + "' should have the expected error keys", "", expectedText.toString()); + } + else { + Assert.assertEquals(fileName + " section '" + sectionName + + "' should have the expected error keys", expectedText.toString().trim(), + subSection.getTextContent().replaceAll("\n\\s+", "\n").trim()); + + for (Node node : XmlUtil.findChildElementsByTag(subSection, "a")) { + final String url = node.getAttributes().getNamedItem("href").getTextContent(); + final String linkText = node.getTextContent().trim(); + final String expectedUrl; + + if ("see the documentation".equals(linkText)) { + expectedUrl = "config.html#Custom_messages"; + } + else { + expectedUrl = "https://github.com/search?q=" + + "path%3Asrc%2Fmain%2Fresources%2F" + + clss.getPackage().getName().replace(".", "%2F") + + "+filename%3Amessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22" + + linkText + "%22"; + } + + Assert.assertEquals(fileName + " section '" + sectionName + + "' should have matching url for '" + linkText + "'", expectedUrl, url); + } + } + } private static void validateUsageExample(String fileName, String sectionName, Node subSection) { final String text = subSection.getTextContent().replace("Checkstyle Style", "") diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/internal/XDocUtil.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/internal/XDocUtil.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/internal/XDocUtil.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/internal/XDocUtil.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/internal/XmlUtil.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/internal/XmlUtil.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/internal/XmlUtil.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/internal/XmlUtil.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/MainTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/MainTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/MainTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/MainTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/PackageNamesLoaderTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/PackageNamesLoaderTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/PackageNamesLoaderTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/PackageNamesLoaderTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/PackageObjectFactoryTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/PackageObjectFactoryTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/PackageObjectFactoryTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/PackageObjectFactoryTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/PropertiesExpanderTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/PropertiesExpanderTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/PropertiesExpanderTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/PropertiesExpanderTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/PropertyCacheFileTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/PropertyCacheFileTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/PropertyCacheFileTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/PropertyCacheFileTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/TreeWalkerTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/TreeWalkerTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/TreeWalkerTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/TreeWalkerTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/utils/AnnotationUtilityTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/utils/AnnotationUtilityTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/utils/AnnotationUtilityTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/utils/AnnotationUtilityTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/utils/CheckUtilsTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/utils/CheckUtilsTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/utils/CheckUtilsTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/utils/CheckUtilsTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/utils/CommonUtilsTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/utils/CommonUtilsTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/utils/CommonUtilsTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/utils/CommonUtilsTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/utils/JavadocUtilsTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/utils/JavadocUtilsTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/utils/JavadocUtilsTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/utils/JavadocUtilsTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/utils/ScopeUtilsTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/utils/ScopeUtilsTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/utils/ScopeUtilsTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/utils/ScopeUtilsTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/utils/TokenUtilsTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/utils/TokenUtilsTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/utils/TokenUtilsTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/utils/TokenUtilsTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/XMLLoggerTest.java checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/XMLLoggerTest.java --- checkstyle-6.14.1/src/test/java/com/puppycrawl/tools/checkstyle/XMLLoggerTest.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/java/com/puppycrawl/tools/checkstyle/XMLLoggerTest.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputEmptyCatchBlock.java checkstyle-6.15/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputEmptyCatchBlock.java --- checkstyle-6.14.1/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputEmptyCatchBlock.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputEmptyCatchBlock.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputFinalLocalVariable.java checkstyle-6.15/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputFinalLocalVariable.java --- checkstyle-6.14.1/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputFinalLocalVariable.java 2015-12-26 21:19:24.000000000 +0000 +++ checkstyle-6.15/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputFinalLocalVariable.java 2016-01-30 23:19:28.000000000 +0000 @@ -281,3 +281,155 @@ } } } + +class Class3 { + public void test1() { + final boolean b = true; + int shouldBeFinal; //Violation + + if (b) { + shouldBeFinal = 1; + } + else { + shouldBeFinal = 2; + } + } + + public void test2() { + final int b = 10; + int shouldBeFinal; //Violation + + switch (b) { + case 0: + shouldBeFinal = 1; + break; + default: + shouldBeFinal = 2; + break; + } + } + + public void test3() { + int x; // No Violation + try { + x = 0; + } catch (final Exception e) { + x = 1; + } + + int y; // No Violation + try { + y = 0; + } finally { + y = 1; + } + } + + public void test4() { + final boolean b = false; + int x; // No Violation + if (b) { + x = 1; + } else { + x = 2; + } + + if(b) { + x = 3; + } + } + + public void test5() { + final boolean b = false; + int shouldBeFinal; //Violation + if(b) { + } + if (b) { + shouldBeFinal = 1; + } else { + shouldBeFinal = 2; + } + } +} + +class class4 { + public void foo() { + int shouldBeFinal; //violation + class Bar { + void bar () { + int shouldBeFinal; //Violation + final boolean b = false; + if (b) { + shouldBeFinal = 1; + } else { + shouldBeFinal = 2; + } + } + } + } +} + +class class5 { + public void test1(){ + final boolean b = false; + int shouldBeFinal; //Violation + if(b){ + if(b){ + shouldBeFinal = 1; + } else { + shouldBeFinal = 2; + } + } + } + public void test2() { + final int b = 10; + int shouldBeFinal; //Violation + + switch (b) { + case 0: + switch (b) { + case 0: + shouldBeFinal = 1; + break; + default: + shouldBeFinal = 2; + break; + } + break; + default: + shouldBeFinal = 3; + break; + } + } + public void test3() { + int x; //No Violation + try { + x = 0; + try { + x = 0; + } catch (final Exception e) { + x = 1; + } + } catch (final Exception e) { + x = 1; + } + } + public void test4() { + int shouldBeFinal; //violation + class Bar { + void bar () { + int shouldBeFinal; //Violation + final boolean b = false; + if (b) { + if (b) { + shouldBeFinal = 1; + } else { + shouldBeFinal = 2; + } + } else { + shouldBeFinal = 2; + } + } + } + } +} diff -Nru checkstyle-6.14.1/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputRequireThis.java checkstyle-6.15/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputRequireThis.java --- checkstyle-6.14.1/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputRequireThis.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputRequireThis.java 2016-01-30 23:19:28.000000000 +0000 @@ -123,3 +123,14 @@ } } } + +class Issue2539{ + void foo(int i) {} + static void foo(double i) {} + void foo() {} + + void bar() { + foo(1); + foo(); + } +} diff -Nru checkstyle-6.14.1/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputAnnotationClosingParenthesisEndsInSameIndentationAsOpening.java checkstyle-6.15/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputAnnotationClosingParenthesisEndsInSameIndentationAsOpening.java --- checkstyle-6.14.1/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputAnnotationClosingParenthesisEndsInSameIndentationAsOpening.java 1970-01-01 00:00:00.000000000 +0000 +++ checkstyle-6.15/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputAnnotationClosingParenthesisEndsInSameIndentationAsOpening.java 2016-01-30 23:19:28.000000000 +0000 @@ -0,0 +1,24 @@ +package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0 + +@interface SimpleType { //indent:0 exp:0 + Class value(); //indent:4 exp:4 +} //indent:0 exp:0 + +@SimpleType( //indent:0 exp:0 + value = Boolean.class //indent:4 exp:4 +) //indent:0 exp:0 +public class InputAnnotationClosingParenthesisEndsInSameIndentationAsOpening { //indent:0 exp:0 +} //indent:0 exp:0 + +@SimpleType( value = Boolean.class //indent:0 exp:0 +) //indent:0 exp:0 +class InputAnnotationClosingParenthesisJustLineAfterOpeningSameIndentationAsOpening { //indent:0 exp:0 +} //indent:0 exp:0 + +@SimpleType( value = Boolean.class //indent:0 exp:0 + ) //indent:16 exp:0 warn +class InputAnnotationClosingParenthesHasBadIndentation { //indent:0 exp:0 + @SimpleType( value = Boolean.class //indent:4 exp:4 + ) //indent:8 exp:4 warn + Boolean booleanField; //indent:4 exp:4 +} //indent:0 exp:0 \ No newline at end of file diff -Nru checkstyle-6.14.1/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputFromGuava.java checkstyle-6.15/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputFromGuava.java --- checkstyle-6.14.1/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputFromGuava.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputFromGuava.java 2016-01-30 23:19:29.000000000 +0000 @@ -216,7 +216,7 @@ { //indent:2 exp:2 return null; //indent:4 exp:4 } //indent:2 exp:2 - + private static class ValueReference ints = new LinkedList (); + ints.stream().map( t -> { return t * 2;} ).filter( t -> { return false;}); + ints.stream().map( t -> { int m = t * 2; return m; } ); //warn + ints.stream().map( t -> { int m = t * 2; return m; } ); int i = 3; //warn + ints.stream().map( t -> t * 2); int k = 4; //warn + ints.stream().map( t -> t * 2); + List ints2 = new LinkedList (); + ints.stream().map( t -> { return ints2.stream().map(w -> { return w * 2; });}); + ints.stream().map( t -> { return ints2.stream().map(w -> { int m = w * 2; return m; });}); //warn + ints.stream().map( t -> { + return ints2.stream().map( + w -> { + int m = w * 2; + return m; + }); + }); + ints.stream().map( t -> { + int k = 0; + for (int i = 0;i < 10;i++) { + k = i + k; + } + return k; + }); + } + + private static void good() { + } } diff -Nru checkstyle-6.14.1/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/design/package-info.java checkstyle-6.15/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/design/package-info.java --- checkstyle-6.14.1/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/design/package-info.java 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/design/package-info.java 2016-01-30 23:19:28.000000000 +0000 @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2015 the original author or authors. +// Copyright (C) 2001-2016 the original author or authors. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff -Nru checkstyle-6.14.1/src/xdocs/checks.xml checkstyle-6.15/src/xdocs/checks.xml --- checkstyle-6.14.1/src/xdocs/checks.xml 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/xdocs/checks.xml 2016-01-30 23:19:28.000000000 +0000 @@ -638,6 +638,10 @@ any file type. + +RegexpOnFilename +Implementation of a check that matches based on file and/or folder path. +RegexpSingleline Implementation of a check that looks for a single line in any file type.
-
+
- + + annotation.location + +
- + + annotation.location.alone + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.annotation
-
+
- + + annotation.incorrect.style + +
- + + annotation.parens.missing + +
- + + annotation.parens.present + +
- + + annotation.trailing.comma.missing + +
- + + annotation.trailing.comma.present + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.annotation
-
+
- + + annotation.missing.deprecated + +
- + + javadoc.duplicateTag + +
- + + javadoc.missing + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.annotation
-
+
- + + annotation.missing.override + +
- + + tag.not.valid.on + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.annotation
To configure the check:
-
+
- + + annotation.package.location + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.annotation
-
+
- + + suppressed.warning.not.allowed + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.annotation
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks
-
+
- + + block.nested + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.blocks
-
+
- + + block.empty + +
- + + block.noStmt + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.blocks
-
+
- + + catch.block.empty + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.blocks
-
+
- + + line.break.after + +
- + + line.new + +
- + + line.previous + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.blocks
-
+
- + + needBraces + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.blocks
-
+
- + + line.alone + +
- + + line.break.before + +
- + + line.new + +
- + + line.same + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.blocks
-
+
- + + array.trailing.comma + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.coding @@ -114,6 +127,19 @@
-
+
- + + inline.conditional.avoid + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.coding @@ -220,6 +246,19 @@
-
+
- + + covariant.equals + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.coding @@ -337,6 +376,31 @@
-
+
- + + declaration.order.access + +
- + + declaration.order.constructor + +
- + + declaration.order.instance + +
- + + declaration.order.static + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.coding @@ -382,6 +446,19 @@
-
+
- + + default.comes.last + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.coding @@ -424,6 +501,19 @@
-
+
- + + empty.statement + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.coding @@ -505,6 +595,23 @@
-
+
- + + equals.avoid.null + +
- + + equalsIgnoreCase.avoid.null + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.coding @@ -556,6 +663,19 @@
-
+
- + + equals.noHashCode + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.coding @@ -608,6 +728,19 @@
-
+
- + + explicit.init + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.coding @@ -725,6 +858,23 @@
-
+
- + + fall.through + +
- + + fall.through.last + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.coding @@ -846,6 +996,19 @@
-
+
- + + final.variable + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.coding @@ -1050,6 +1213,19 @@
-
+
- + + hidden.field + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.coding @@ -1115,6 +1291,19 @@
-
+
- + + illegal.catch + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.coding @@ -1218,6 +1407,19 @@
-
+
- + + instantiation.avoid + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.coding @@ -1315,6 +1517,19 @@
-
+
- + + illegal.throw + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.coding @@ -1384,6 +1599,19 @@
-
+
- + + illegal.token + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.coding @@ -1479,6 +1707,19 @@
-
+
- + + illegal.token.text + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.coding @@ -1599,6 +1840,19 @@
-
+
- + + illegal.type + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.coding @@ -1670,6 +1924,19 @@
-
+
- + + assignment.inner.avoid + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.coding @@ -1880,6 +2147,19 @@
-
+
- + + magic.number + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.coding @@ -1919,6 +2199,19 @@
-
+
- + + missing.ctor + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.coding @@ -1974,6 +2267,19 @@
-
+
- + + missing.switch.default + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.coding @@ -2081,6 +2387,19 @@
-
+
- + + modified.control.variable + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.coding @@ -2200,6 +2519,19 @@
-
+
- + + multiple.string.literal + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.coding @@ -2250,6 +2582,23 @@
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.coding @@ -2315,6 +2664,19 @@
-
+
- + + nested.for.depth + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.coding @@ -2379,6 +2741,19 @@
-
+
- + + nested.if.depth + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.coding @@ -2443,6 +2818,19 @@
-
+
- + + nested.try.depth + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.coding @@ -2496,6 +2884,19 @@
-
+
- + + avoid.clone.method + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.coding @@ -2539,6 +2940,19 @@
-
+
- + + avoid.finalizer.method + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.coding @@ -2615,6 +3029,19 @@
-
+
- + + multiple.statements.line + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.coding @@ -2666,6 +3093,19 @@
-
+
- + + overload.methods.declaration + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.coding @@ -2710,6 +3150,19 @@
-
+
- + + missing.package.declaration + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.coding @@ -2752,6 +3205,19 @@
-
+
- + + parameter.assignment + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.coding @@ -2773,6 +3239,25 @@ "this.methodName(args)" and that those references don't rely on the default behavior when "this." is absent.
+ ++ Warning: the Check is very controversial and not that actual nowadays. +
+ ++ Rationale: +
+-
+
- + The same notation/habit for C++ and Java (C++ have global methods, so having + "this." do make sense in it to distinguish call of method of class + instead of global). + +
- + Non-IDE development (ease of refactoring, some clearness to distinguish + static and non-static methods). + +
-
+
- + + require.this.method + +
- + + require.this.variable + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.coding @@ -2942,6 +3444,19 @@
-
+
- + + return.count + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.coding @@ -2991,6 +3506,19 @@
-
+
- + + simplify.expression + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.coding @@ -3052,6 +3580,19 @@
-
+
- + + simplify.boolReturn + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.coding @@ -3103,6 +3644,19 @@
-
+
- + + string.literal.equality + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.coding @@ -3148,6 +3702,19 @@
-
+
- + + missing.super.call + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.coding @@ -3194,6 +3761,19 @@
-
+
- + + missing.super.call + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.coding @@ -3296,6 +3876,39 @@
-
+
- + + unnecessary.paren.assign + +
- + + unnecessary.paren.expr + +
- + + unnecessary.paren.ident + +
- + + unnecessary.paren.literal + +
- + + unnecessary.paren.return + +
- + + unnecessary.paren.string + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.coding @@ -3500,6 +4113,23 @@
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.coding diff -Nru checkstyle-6.14.1/src/xdocs/config_design.xml checkstyle-6.15/src/xdocs/config_design.xml --- checkstyle-6.14.1/src/xdocs/config_design.xml 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/xdocs/config_design.xml 2016-01-30 23:19:28.000000000 +0000 @@ -146,6 +146,19 @@
-
+
- + + design.forExtension + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.design @@ -190,6 +203,19 @@
-
+
- + + final.class + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.design @@ -260,6 +286,19 @@
-
+
- + + hide.utility.class + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.design @@ -299,6 +338,19 @@
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.design @@ -376,6 +428,19 @@
-
+
- + + interface.type + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.design @@ -456,6 +521,19 @@
-
+
- + + mutable.exception + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.design @@ -538,6 +616,19 @@
-
+
- + + one.top.level.class + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.design @@ -633,6 +724,19 @@
-
+
- + + throws.count + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.design @@ -925,6 +1029,19 @@
-
+
- + + variable.notPrivate + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.design diff -Nru checkstyle-6.14.1/src/xdocs/config_filters.xml checkstyle-6.15/src/xdocs/config_filters.xml --- checkstyle-6.14.1/src/xdocs/config_filters.xml 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/xdocs/config_filters.xml 2016-01-30 23:19:28.000000000 +0000 @@ -317,6 +317,53 @@ //resume ... +
+ It is possible to specify an ID of checks, so that it can be leveraged by the
+ SuppressionCommentFilter to skip validations. The following examples show how to skip
+ validations near code that is surrounded with // CSOFF <ID> (reason)
+ and // CSON <ID>, where ID is the ID of checks you want to suppress.
+
+ Examples of Checkstyle checks configuration: +
++ Example of SuppressionCommentFilter configuration (checkFormat which is set to '$1' + points that ID of the checks is in the first group of offCommentFormat and + onCommentFormat regular expressions): +
+-
@@ -342,7 +389,8 @@
audit events for Check errors according to
a suppressions XML
document in a file. If there is no configured
- suppressions file, the Filter accepts all audit events.
+ suppressions file or the optional is set to true and
+ suppressions file was not found the Filter accepts all audit events.
nonefalse@@ -599,6 +660,45 @@ @SuppressWarnings({"NoWhitespaceAfter"}) private int [] ARRAY; // should NOT fail MemberNameCheck and NoWhitespaceAfterCheck +
+ It is possible to specify an ID of checks, so that it can be leveraged by the
+ SuppressWarningsFilter to skip validations. The following examples show how to skip
+ validations near code that has @SuppressWarnings("checkstyle:<ID>") or
+ just @SuppressWarnings("<ID>") annotation, where ID is the ID of checks
+ you want to suppress.
+
+ Example of Checkstyle check configuration: +
++ To make the annotations available to the filter. +
++ To configure filter to suppress audit events for annotations add: +
+-
@@ -790,6 +890,50 @@
+ It is possible to specify an ID of checks, so that it can be leveraged by the
+ SuppressWithNearbyCommentFilter to skip validations. The following examples
+ show how to skip validations near code that has comment like
+ // @cs-: <ID/> (reason), where ID is the ID of checks you want to
+ suppress.
+
+ Examples of Checkstyle checks configuration: +
++ Example of SuppressWithNearbyCommentFilter configuration (checkFormat which + is set to '$1' points that ID of the checks is in the first group of + commentFormat regular expressions): +
+-
diff -Nru checkstyle-6.14.1/src/xdocs/config_header.xml checkstyle-6.15/src/xdocs/config_header.xml
--- checkstyle-6.14.1/src/xdocs/config_header.xml 2015-12-26 15:05:48.000000000 +0000
+++ checkstyle-6.15/src/xdocs/config_header.xml 2016-01-30 23:19:28.000000000 +0000
@@ -148,6 +148,23 @@
-
+
- + + header.mismatch + +
- + + header.missing + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.header
-
+
- + + header.mismatch + +
- + + header.missing + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.header diff -Nru checkstyle-6.14.1/src/xdocs/config_imports.xml checkstyle-6.15/src/xdocs/config_imports.xml --- checkstyle-6.14.1/src/xdocs/config_imports.xml 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/xdocs/config_imports.xml 2016-01-30 23:19:28.000000000 +0000 @@ -106,6 +106,18 @@
-
+
- + + import.avoidStar + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.imports
-
+
- + + import.avoidStatic + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.imports
-
+
- + + custom.import.order + +
- + + custom.import.order.lex + +
- + + custom.import.order.line.separator + +
- + + custom.import.order.nonGroup.expected + +
- + + custom.import.order.nonGroup.import + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.imports @@ -587,6 +641,19 @@
-
+
- + + import.illegal + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.imports @@ -698,6 +765,27 @@
-
+
- + + import.control.disallowed + +
- + + import.control.missing.file + +
- + + import.control.unknown.pkg + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.imports @@ -930,6 +1018,23 @@
-
+
- + + import.ordering + +
- + + import.separation + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.imports @@ -987,6 +1092,27 @@
-
+
- + + import.duplicate + +
- + + import.lang + +
- + + import.same + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.imports @@ -1097,6 +1223,19 @@
-
+
- + + import.unused + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.imports diff -Nru checkstyle-6.14.1/src/xdocs/config_javadoc.xml checkstyle-6.15/src/xdocs/config_javadoc.xml --- checkstyle-6.14.1/src/xdocs/config_javadoc.xml 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/xdocs/config_javadoc.xml 2016-01-30 23:19:28.000000000 +0000 @@ -95,6 +95,39 @@
-
+
- + + at.clause.order + +
- + + javadoc.missed.html.close + +
- + + javadoc.parse.error + +
- + + javadoc.parse.rule.error + +
- + + javadoc.unrecognized.antlr.error + +
- + + javadoc.wrong.singleton.html.tag + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.javadoc @@ -399,6 +432,47 @@
-
+
- + + javadoc.classInfo + +
- + + javadoc.duplicateTag + +
- + + javadoc.expectedTag + +
- + + javadoc.invalidInheritDoc + +
- + + javadoc.missing + +
- + + javadoc.return.expected + +
- + + javadoc.unusedTag + +
- + + javadoc.unusedTagGeneral + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.javadoc @@ -474,6 +548,23 @@
-
+
- + + javadoc.legacyPackageHtml + +
- + + javadoc.packageInfo + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.javadoc @@ -569,6 +660,51 @@
-
+
- + + javadoc.missed.html.close + +
- + + javadoc.paragraph.line.before + +
- + + javadoc.paragraph.misplaced.tag + +
- + + javadoc.paragraph.redundant.paragraph + +
- + + javadoc.paragraph.tag.after + +
- + + javadoc.parse.error + +
- + + javadoc.parse.rule.error + +
- + + javadoc.unrecognized.antlr.error + +
- + + javadoc.wrong.singleton.html.tag + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.javadoc @@ -772,6 +908,39 @@
-
+
- + + javadoc.empty + +
- + + javadoc.extraHtml + +
- + + javadoc.incompleteTag + +
- + + javadoc.missing + +
- + + javadoc.noPeriod + +
- + + javadoc.unclosedHtml + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.javadoc @@ -833,6 +1002,39 @@
-
+
- + + javadoc.missed.html.close + +
- + + javadoc.parse.error + +
- + + javadoc.parse.rule.error + +
- + + javadoc.unrecognized.antlr.error + +
- + + javadoc.wrong.singleton.html.tag + +
- + + tag.continuation.indent + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.javadoc @@ -995,6 +1197,39 @@
-
+
- + + javadoc.missing + +
- + + javadoc.unknownTag + +
- + + javadoc.unusedTag + +
- + + javadoc.unusedTagGeneral + +
- + + type.missingTag + +
- + + type.tagFormat + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.javadoc @@ -1109,6 +1344,19 @@
-
+
- + + javadoc.missing + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.javadoc @@ -1152,6 +1400,39 @@
-
+
- + + javadoc.missed.html.close + +
- + + javadoc.parse.error + +
- + + javadoc.parse.rule.error + +
- + + javadoc.unrecognized.antlr.error + +
- + + javadoc.wrong.singleton.html.tag + +
- + + non.empty.atclause + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.javadoc @@ -1228,6 +1509,39 @@
-
+
- + + javadoc.missed.html.close + +
- + + javadoc.parse.error + +
- + + javadoc.parse.rule.error + +
- + + javadoc.unrecognized.antlr.error + +
- + + javadoc.wrong.singleton.html.tag + +
- + + singleline.javadoc + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.javadoc @@ -1310,6 +1624,43 @@
-
+
- + + javadoc.missed.html.close + +
- + + javadoc.parse.error + +
- + + javadoc.parse.rule.error + +
- + + javadoc.unrecognized.antlr.error + +
- + + javadoc.wrong.singleton.html.tag + +
- + + summary.first.sentence + +
- + + summary.javaDoc + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.javadoc @@ -1421,6 +1772,27 @@
-
+
- + + javadoc.writeTag + +
- + + type.missingTag + +
- + + type.tagFormat + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.javadoc diff -Nru checkstyle-6.14.1/src/xdocs/config_metrics.xml checkstyle-6.15/src/xdocs/config_metrics.xml --- checkstyle-6.14.1/src/xdocs/config_metrics.xml 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/xdocs/config_metrics.xml 2016-01-30 23:19:28.000000000 +0000 @@ -127,6 +127,19 @@
-
+
- + + booleanExpressionComplexity + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.metrics @@ -214,6 +227,19 @@
-
+
- + + classDataAbstractionCoupling + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.metrics @@ -298,6 +324,19 @@
-
+
- + + classFanOutComplexity + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.metrics @@ -490,6 +529,19 @@
-
+
- + + cyclomaticComplexity + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.metrics @@ -597,6 +649,27 @@
-
+
- + + ncss.class + +
- + + ncss.file + +
- + + ncss.method + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.metrics @@ -757,6 +830,19 @@
-
+
- + + npathComplexity + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.metrics diff -Nru checkstyle-6.14.1/src/xdocs/config_misc.xml checkstyle-6.15/src/xdocs/config_misc.xml --- checkstyle-6.14.1/src/xdocs/config_misc.xml 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/xdocs/config_misc.xml 2016-01-30 23:19:28.000000000 +0000 @@ -84,6 +84,19 @@
-
+
- + + array.type.style + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks @@ -227,6 +240,19 @@
-
+
- + + forbid.escaped.unicode.char + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks @@ -456,6 +482,23 @@
-
+
- + + comments.indentation.block + +
- + + comments.indentation.single + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.indentation @@ -740,6 +783,31 @@
-
+
- + + descendant.token.max + +
- + + descendant.token.min + +
- + + descendant.token.sum.max + +
- + + descendant.token.sum.min + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks @@ -886,6 +954,19 @@
-
+
- + + final.parameter + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks @@ -1024,6 +1105,31 @@
-
+
- + + indentation.child.error + +
- + + indentation.child.error.multi + +
- + + indentation.error + +
- + + indentation.error.multi + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.indentation @@ -1119,6 +1225,23 @@
-
+
- + + noNewlineAtEOF + +
- + + unable.open + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks @@ -1163,6 +1286,19 @@
-
+
- + + type.file.mismatch + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks @@ -1244,6 +1380,19 @@
-
+
- + + todo.match + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks @@ -1373,6 +1522,19 @@
-
+
- + + trailing.comments + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks @@ -1505,6 +1667,23 @@
-
+
- + + translation.missingKey + +
- + + translation.missingTranslationFile + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks @@ -1580,6 +1759,19 @@
-
+
- + + uncommented.main + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks @@ -1644,6 +1836,23 @@
-
+
- + + properties.duplicate.property + +
- + + unable.open.cause + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks @@ -1698,6 +1907,19 @@
-
+
- + + upperEll + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks diff -Nru checkstyle-6.14.1/src/xdocs/config_modifier.xml checkstyle-6.15/src/xdocs/config_modifier.xml --- checkstyle-6.14.1/src/xdocs/config_modifier.xml 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/xdocs/config_modifier.xml 2016-01-30 23:19:28.000000000 +0000 @@ -92,6 +92,23 @@
-
+
- + + annotation.order + +
- + + mod.order + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.modifier
-
+
- + + redundantModifier + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.modifier
-
+
- + + abbreviation.as.word + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.naming
-
+
- + + illegal.abstract.class.name + +
- + + no.abstract.class.modifier + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.naming
-
+
- + + name.invalidPattern + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.naming
-
+
- + + name.invalidPattern + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.naming
-
+
- + + name.invalidPattern + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.naming
-
+
- + + name.invalidPattern + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.naming
-
+
- + + name.invalidPattern + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.naming
-
+
- + + name.invalidPattern + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.naming
-
+
- + + name.invalidPattern + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.naming
-
+
- + + method.name.equals.class.name + +
- + + name.invalidPattern + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.naming
-
+
- + + name.invalidPattern + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.naming
-
+
- + + name.invalidPattern + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.naming
-
+
- + + name.invalidPattern + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.naming
-
+
- + + name.invalidPattern + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.naming
-
+
- + + name.invalidPattern + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.naming
-
+
- + + duplicate.regexp + +
- + + illegal.regexp + +
- + + required.regexp + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.regexp @@ -541,6 +562,223 @@
-
+
- + + regexp.StackOverflowError + +
- + + regexp.empty + +
- + + regexp.exceeded + +
- + + regexp.minimum + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
++ com.puppycrawl.tools.checkstyle.checks.regexp +
++ Checker +
++ Implementation of a check that looks for a file name and/or path match (or mis-match) + against specified patterns. It can also be used to verify files match specific naming + patterns not covered by other checks (Ex: properties, xml, etc.). +
++ When customizing the check, the properties are applied in a specific order. + The fileExtensions property first picks only files that match any of the + specific extensions supplied. + Once files are matched against the fileExtensions, the match property is then + used in conjuction with the patterns to determine if the check is looking + for a match or mis-match on those files. If the fileNamePattern is + supplied, the matching is only applied to the fileNamePattern and not the + folderPattern. If no fileNamePattern is supplied, then matching is applied + to the folderPattern only and will result in all files in a folder to be + reported on violations. If no folderPattern is supplied, then all folders + that checkstyle finds are examined for violations. + The ignoreFileNameExtensions property drops the file extension and applies + the fileNamePattern only to the rest of file name. For example, if the file is + named 'test.java' and this property is turned on, the pattern is only applied + to 'test'. +
++ If this check is configured with no properties, then the default behavior + of this check is to report file names with spaces in them. + When at least one pattern property is supplied, the entire check is under + the user's control to allow them to fully customize the behavior. +
++ It is recommended that if you create your own pattern, to also + specify a custom error message. This allows the error message printed + to be clear what the violation is, especially if multiple RegexpOnFilename + checks are used. + Argument 0 for the message populates the check's folderPattern. + Argument 1 for the message populates the check's fileNamePattern. + The file name is not passed as an argument since it is part of CheckStyle's + default error messages. +
+| name | +description | +type | +default value | +
|---|---|---|---|
| folderPattern | +Regular expression to match the folder path against. | +regular expression | +null |
+
| fileNamePattern | +Regular expression to match the file name against. | +regular expression | +null |
+
| match | +Whether to look for a match or mis-match on the file name, if the + fileNamePattern is supplied, otherwise it is applied on the folderPattern. | +Boolean | +true |
+
| ignoreFileNameExtensions | +Whether to ignore the file extension for the file name match. | +Boolean | +false |
+
| fileExtensions | +File type extension of files to process. If this is specified, then + only files that match these types are examined with the other patterns. | +String Set | +{} |
+
+ To configure the check to report file names that contain a space: +
++ To configure the check to force picture files to not be 'gif': +
++ OR: +
++ To configure the check to only allow property and xml files to be located in the resource folder: +
++ To configure the check to only allow Java and XML files in your folders use the below. +
+
+ To configure the check to only allow Java and XML files only in your source folder
+ and ignore any other folders:
+ Note: 'folderPattern' must be specified if checkstyle is analyzing more than
+ the normal source folder, like the 'bin' folder where class files can be located.
+
+ To configure the check to only allow file names to be camel case: +
+-
+
- + + Checkstyle Style + +
-
+
- + + regexp.filename.match + +
- + + regexp.filename.mismatch + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.regexp @@ -669,6 +907,25 @@
-
+
- + + regexp.exceeded + +
-
+
- + + regexp.minimum + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.regexp @@ -773,6 +1030,25 @@
-
+
- + + regexp.exceeded + +
-
+
- + + regexp.minimum + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.regexp diff -Nru checkstyle-6.14.1/src/xdocs/config_sizes.xml checkstyle-6.15/src/xdocs/config_sizes.xml --- checkstyle-6.14.1/src/xdocs/config_sizes.xml 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/xdocs/config_sizes.xml 2016-01-30 23:19:28.000000000 +0000 @@ -73,6 +73,19 @@
-
+
- + + maxLen.anonInner + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.sizes @@ -156,6 +169,19 @@
-
+
- + + executableStatementCount + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.sizes @@ -229,6 +255,19 @@
-
+
- + + maxLen.file + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.sizes @@ -333,6 +372,19 @@
-
+
- + + maxLineLen + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.sizes @@ -445,6 +497,35 @@
-
+
- + + too.many.methods + +
- + + too.many.packageMethods + +
- + + too.many.privateMethods + +
- + + too.many.protectedMethods + +
- + + too.many.publicMethods + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.sizes @@ -560,6 +641,19 @@
-
+
- + + maxLen.method + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.sizes @@ -631,6 +725,19 @@
-
+
- + + maxOuterTypes + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.sizes @@ -746,6 +853,19 @@
-
+
- + + maxParam + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.sizes diff -Nru checkstyle-6.14.1/src/xdocs/config_whitespace.xml checkstyle-6.15/src/xdocs/config_whitespace.xml --- checkstyle-6.14.1/src/xdocs/config_whitespace.xml 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/xdocs/config_whitespace.xml 2016-01-30 23:19:28.000000000 +0000 @@ -81,6 +81,25 @@
-
+
- + + ws.notPreceded + +
-
+
- + + ws.preceded + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.whitespace @@ -158,6 +177,25 @@
-
+
- + + ws.followed + +
-
+
- + + ws.notFollowed + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.whitespace @@ -305,6 +343,27 @@
-
+
- + + empty.line.separator + +
- + + empty.line.separator.multiple.lines + +
- + + empty.line.separator.multiple.lines.after + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.whitespace @@ -400,6 +459,23 @@
-
+
- + + containsTab + +
- + + file.containsTab + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.whitespace @@ -476,6 +552,31 @@
-
+
- + + ws.followed + +
- + + ws.illegalFollow + +
- + + ws.notPreceded + +
- + + ws.preceded + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.whitespace @@ -605,6 +706,27 @@
-
+
- + + line.previous + +
- + + ws.notPreceded + +
- + + ws.preceded + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.whitespace @@ -710,6 +832,19 @@
-
+
- + + no.line.wrap + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.whitespace @@ -847,6 +982,19 @@
-
+
- + + ws.followed + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.whitespace @@ -943,6 +1091,19 @@
-
+
- + + ws.preceded + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.whitespace @@ -1085,6 +1246,25 @@
-
+
- + + line.new + +
-
+
- + + line.previous + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.whitespace @@ -1253,6 +1433,31 @@
-
+
- + + ws.followed + +
- + + ws.notFollowed + +
- + + ws.notPreceded + +
- + + ws.preceded + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.whitespace @@ -1373,6 +1578,23 @@
-
+
- + + line.new + +
- + + line.previous + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.whitespace @@ -1443,6 +1665,31 @@
-
+
- + + ws.followed + +
- + + ws.notFollowed + +
- + + ws.notPreceded + +
- + + ws.preceded + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.whitespace @@ -1528,6 +1775,25 @@
-
+
- + + ws.notFollowed + +
-
+
- + + ws.typeCast + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.whitespace @@ -1765,6 +2031,25 @@
-
+
- + + ws.notFollowed + +
-
+
- + + ws.notPreceded + +
+ All messages can be customized if the default message doesn't suite you. + Please see the documentation to learn how to. +
+com.puppycrawl.tools.checkstyle.checks.whitespace diff -Nru checkstyle-6.14.1/src/xdocs/config.xml checkstyle-6.15/src/xdocs/config.xml --- checkstyle-6.14.1/src/xdocs/config.xml 2015-12-26 15:05:48.000000000 +0000 +++ checkstyle-6.15/src/xdocs/config.xml 2016-01-30 23:19:28.000000000 +0000 @@ -619,7 +619,7 @@
- Each check configuration element can zero or more message elements. Every check uses one or
+ Each check configuration element can have zero or more message elements. Every check uses one or
more distinct message keys to log violations. If you want to
customize a certain message you need to specify the message key
in the key attribute of the message element.
@@ -637,12 +637,11 @@
The obvious question is how do you know which message keys a
- Check uses, so that you can override them? Well, that is the
- tricky part. To find out which keys a Check uses you currently
- need to look into the Check's source code, in conjunction with
- the Check's messages.properties file.
- Tools/plugins might come to the rescue on this topic, so have a
- look there.
+ Check uses, so that you can override them? You can examine all
+ keys in the check's specific configuration
+ documentation. Each check has a section called 'Error Messages'.
+ This section lists every key the check uses and links to the default
+ message used by checkstyle.
+
+ InterfaceTypeParameterName
+ config +
+ test
-
-
- An Ant task. -
- A command line tool. +
- An Ant task. +
- A command line interface (CLI).
@@ -244,7 +244,7 @@
New:
+-
+
- + new Check: RegexpOnFilename. Author: rnveach, Roman Ivanov #2546 + +
- + SuppressionFilter: new option 'optional' to allow skip SuppressionFilter if config file does not exist. Author: liscju #1002 + +
- + Add possibility to specify a unique ID to all Regexp checks. Author: Andrei Selkin #1008 + +
Bug fixes:
+-
+
- + StringIndexOutOfBoundsException in Indentation check. Author: rnveach #2645 + +
- + AbstractJavadocCheck should process only doc comments placed before class, interface, constructor, method, or field declarations. Author: Baratali Izmailov #325 + +
- + SummaryJavadoc: false "end with a period" reports when inheritDoc is used . Author: rnveach #2805 + +
- + JavadocMethod: allowedAnnotations hides bad javadocs. Author: rnveach #2806 + +
- + FinalLocalVariable doesn't report variable when condition separates 2 assignments. Author: Bhavik Patel #2807 + +
- + Config of Google Style does not include InterfaceTypeParameterName check. Author: Andrei Selkin #2792 + +
- + Indentation on annotation parameters is wrong. Author: liscju #1349 + +
- + OneStatementPerLine check and lambda expression. Author: liscju #2688 + +
- + Gui should have a splitter bettween tree and code and prefered columns size. Author: liscju #2767 + +
- + RequireThis reports false-positive when an instance method is overloaded with a static one. Author: Vladislav Lisetskiy #2539 + +
Notes:
+-
+
- + Add checkstyle messages to xdocs. Author: rnveach #2836 + +
- + Setup 'Circle CI' to run checkstyle-tester project on JDK sources. Author: Vladislav Lisetskiy, Roman Ivanov #2815 + +
- + Enforce Checks of sevntu.checkstyle (released version) over Checkstyle source code. Author: Yasser Aziza #2661 + +
- + Use Codeship CI for testing. Author: Roman Ivanov #2727 + +
- + Refactor gui package. Author: Vladislav Lisetskiy, Roman Ivanov #2609 + +
- + doc: Add sbt-checkstyle-plugin to list of active tools. Author: Andrew Johnson + +
Bug fixes: