Add di.xml tests, fix static tests, add resources and TestData folders to exclude pattern

Author: coderimus

gradle-tasks/pmd/ruleset.xml

@@ -18,6 +18,7 @@
     </rule>
     <rule ref="category/java/codestyle.xml">
         <exclude name="AtLeastOneConstructor" />
+        <exclude name="LongVariable" />
     </rule>
     <rule ref="category/java/design.xml">
         <exclude name="LawOfDemeter"/>
@@ -28,6 +29,8 @@
     <rule ref="category/java/errorprone.xml">
         <exclude name="BeanMembersShouldSerialize"/>
     </rule>
+    <exclude-pattern>.*/resources/.*</exclude-pattern>
+    <exclude-pattern>.*/testData/.*</exclude-pattern>
     <rule ref="category/java/multithreading.xml"/>
     <rule ref="category/java/performance.xml"/>
     <rule ref="category/java/security.xml" />

resources/magento2/common.properties

@@ -33,3 +33,4 @@ common.cli.create.new.cli.command.title=Create a new Magento 2 CLI Command
 common.cli.generate.error=New CLI Command Generation Error
 common.cli.class.title=CLI Command Class
 common.validationErrorTitle=Validation Error
+common.defaultConsoleDirectory=Console

src/com/magento/idea/magento2plugin/actions/generation/NewCLICommandAction.java

@@ -17,9 +17,10 @@
 import com.magento.idea.magento2plugin.actions.generation.dialog.NewCLICommandDialog;
 import org.jetbrains.annotations.NotNull;
 
+@SuppressWarnings({"PMD.FieldNamingConventions", "PMD.OnlyOneReturn"})
 public class NewCLICommandAction extends AnAction {
-    public static String ACTION_NAME = "Magento 2 CLI Command";//NOPMD
-    public static String ACTION_DESCRIPTION = "Create a new Magento 2 CLI Command";//NOPMD
+    public static String ACTION_NAME = "Magento 2 CLI Command";
+    public static String ACTION_DESCRIPTION = "Create a new Magento 2 CLI Command";
 
     public NewCLICommandAction() {
         super(ACTION_NAME, ACTION_DESCRIPTION, MagentoIcons.MODULE);
@@ -30,12 +31,12 @@ public void actionPerformed(@NotNull final AnActionEvent event) {
         final DataContext context = event.getDataContext();
         final IdeView view = LangDataKeys.IDE_VIEW.getData(context);
         if (view == null) {
-            return;//NOPMD
+            return;
         }
 
         final Project project = CommonDataKeys.PROJECT.getData(context);
         if (project == null) {
-            return;//NOPMD
+            return;
         }
 
         final PsiDirectory directory = view.getOrChooseDirectory();

src/com/magento/idea/magento2plugin/actions/generation/NewCronjobAction.java

@@ -2,39 +2,45 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 package com.magento.idea.magento2plugin.actions.generation;
 
 import com.intellij.ide.IdeView;
-import com.intellij.openapi.actionSystem.*;
+import com.intellij.openapi.actionSystem.AnAction;
+import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.actionSystem.CommonDataKeys;
+import com.intellij.openapi.actionSystem.DataContext;
+import com.intellij.openapi.actionSystem.LangDataKeys;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiDirectory;
 import com.magento.idea.magento2plugin.MagentoIcons;
 import com.magento.idea.magento2plugin.actions.generation.dialog.NewCronjobDialog;
 import org.jetbrains.annotations.NotNull;
 
+@SuppressWarnings({"PMD.FieldNamingConventions", "PMD.OnlyOneReturn"})
 public class NewCronjobAction extends AnAction {
     public static String ACTION_NAME = "Magento 2 Cronjob";
     public static String ACTION_DESCRIPTION = "Create a new Magento 2 cronjob";
 
-    NewCronjobAction() {
+    public NewCronjobAction() {
         super(ACTION_NAME, ACTION_DESCRIPTION, MagentoIcons.MODULE);
     }
 
     @Override
-    public void actionPerformed(@NotNull AnActionEvent e) {
-        DataContext dataContext = e.getDataContext();
-        IdeView view = LangDataKeys.IDE_VIEW.getData(dataContext);
+    public void actionPerformed(final @NotNull AnActionEvent event) {
+        final DataContext dataContext = event.getDataContext();
+        final IdeView view = LangDataKeys.IDE_VIEW.getData(dataContext);
 
         if (view == null) {
             return;
         }
 
-        Project project = CommonDataKeys.PROJECT.getData(dataContext);
+        final Project project = CommonDataKeys.PROJECT.getData(dataContext);
         if (project == null) {
             return;
         }
 
-        PsiDirectory directory = view.getOrChooseDirectory();
+        final PsiDirectory directory = view.getOrChooseDirectory();
         if (directory == null) {
             return;
         }

src/com/magento/idea/magento2plugin/actions/generation/data/CLICommandClassData.java

@@ -5,7 +5,8 @@
 
 package com.magento.idea.magento2plugin.actions.generation.data;
 
-public class CLICommandClassData { //NOPMD
+@SuppressWarnings({"PMD.CommentSize", "PMD.DataClass"})
+public class CLICommandClassData {
     private final String className;
     private final String parentDirectory;
     private final String commandName;

src/com/magento/idea/magento2plugin/actions/generation/dialog/AbstractDialog.java

@@ -2,28 +2,31 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 package com.magento.idea.magento2plugin.actions.generation.dialog;
 
 import com.magento.idea.magento2plugin.bundles.CommonBundle;
-
-import javax.swing.*;
-import java.awt.*;
+import java.awt.Dimension;
+import java.awt.Toolkit;
+import javax.swing.JDialog;
 
 /**
- * All code generate dialog should extend this class
+ * All code generate dialog should extend this class.
  */
+@SuppressWarnings({"PMD.ShortVariable", "PMD.MissingSerialVersionUID"})
 public abstract class AbstractDialog extends JDialog {
 
     protected CommonBundle bundle;
 
     public AbstractDialog() {
+        super();
         this.bundle = new CommonBundle();
     }
 
-    protected void centerDialog(AbstractDialog dialog) {
-        Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-        int x = screenSize.width / 2  - dialog.getSize().width / 2;
-        int y = screenSize.height / 2 - dialog.getSize().height / 2;
+    protected void centerDialog(final AbstractDialog dialog) {
+        final Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+        final int x = screenSize.width / 2  - dialog.getSize().width / 2;
+        final int y = screenSize.height / 2 - dialog.getSize().height / 2;
         dialog.setLocation(x, y);
     }
 

src/com/magento/idea/magento2plugin/actions/generation/dialog/CreateAnObserverDialog.java

@@ -30,7 +30,13 @@
 import javax.swing.KeyStroke;
 import org.jetbrains.annotations.NotNull;
 
-public class CreateAnObserverDialog extends AbstractDialog { //NOPMD
+@SuppressWarnings({
+        "PMD.TooManyFields",
+        "PMD.MissingSerialVersionUID",
+        "PMD.DataClass",
+        "PMD.UnusedPrivateField",
+})
+public class CreateAnObserverDialog extends AbstractDialog {
     @NotNull
     private final Project project;
     @NotNull
@@ -44,11 +50,11 @@ public class CreateAnObserverDialog extends AbstractDialog { //NOPMD
     private FilteredComboBox observerModule;
     private JComboBox observerArea;
     private JTextField observerName;
-    private JLabel observerClassNameLabel;//NOPMD
-    private JLabel observerDirectoryName;//NOPMD
-    private JLabel selectObserverModule;//NOPMD
-    private JLabel observerAreaLabel;//NOPMD
-    private JLabel observerNameLabel;//NOPMD
+    private JLabel observerClassNameLabel;
+    private JLabel observerDirectoryName;
+    private JLabel selectObserverModule;
+    private JLabel observerAreaLabel;
+    private JLabel observerNameLabel;
 
     /**
      * Constructor.
@@ -73,6 +79,7 @@ public CreateAnObserverDialog(@NotNull final Project project, final String targe
 
         setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
         addWindowListener(new WindowAdapter() {
+            @Override
             public void windowClosing(final WindowEvent event) {
                 onCancel();
             }

src/com/magento/idea/magento2plugin/actions/generation/dialog/NewCLICommandDialog.form

@@ -6,8 +6,9 @@
       <xy x="20" y="20" width="904" height="497"/>
     </constraints>
     <properties>
-      <minimumSize width="597" height="497"/>
+      <minimumSize width="497" height="397"/>
       <opaque value="false"/>
+      <preferredSize width="411" height="312"/>
     </properties>
     <border type="none"/>
     <children>
@@ -40,7 +41,9 @@
                 <preferred-size width="150" height="-1"/>
               </grid>
             </constraints>
-            <properties/>
+            <properties>
+              <text resource-bundle="magento2/common" key="common.defaultConsoleDirectory"/>
+            </properties>
           </component>
           <component id="a06d9" class="javax.swing.JTextField" binding="cliCommandNameField">
             <constraints>
@@ -131,6 +134,7 @@
               </grid>
             </constraints>
             <properties>
+              <lineWrap value="true"/>
               <wrapStyleWord value="false"/>
             </properties>
           </component>

src/com/magento/idea/magento2plugin/actions/generation/dialog/NewCLICommandDialog.java

@@ -28,12 +28,13 @@
 import javax.swing.JTextField;
 import javax.swing.KeyStroke;
 
+@SuppressWarnings({"PMD.MissingSerialVersionUID"})
 public class NewCLICommandDialog extends AbstractDialog {
     private JPanel contentPane;
-    private JTextField cliCommandClassNameField;//NOPMD
-    private JTextField cliCommandParentDirectoryField;//NOPMD
-    private JTextField cliCommandNameField;//NOPMD
-    private JTextArea cliCommandDescriptionField;//NOPMD
+    private JTextField cliCommandClassNameField;
+    private JTextField cliCommandParentDirectoryField;
+    private JTextField cliCommandNameField;
+    private JTextArea cliCommandDescriptionField;
     private JButton buttonCancel;
     private JButton buttonOK;