#issue-83 Fixing static tests

Author: Sergiy Zhovnir

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

@@ -6,11 +6,15 @@
 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.NewUiComponentGridDialog;
+import com.magento.idea.magento2plugin.MagentoIcons;
 
 @SuppressWarnings({"PMD.OnlyOneReturn"})
 public class NewUiComponentGridAction extends AnAction {

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

@@ -52,7 +52,7 @@ public String getModuleName() {
     }
 
     /**
-     * Get area
+     * Get area.
      *
      * @return String
      */
@@ -61,7 +61,7 @@ public String getArea() {
     }
 
     /**
-     * Get name
+     * Get name.
      *
      * @return String
      */

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

@@ -8,30 +8,33 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiDirectory;
 import com.jetbrains.php.lang.psi.elements.PhpClass;
-import com.magento.idea.magento2plugin.actions.generation.NewUiComponentGridAction;
-import com.magento.idea.magento2plugin.actions.generation.data.CronGroupXmlData;
 import com.magento.idea.magento2plugin.actions.generation.data.UiComponentGridData;
 import com.magento.idea.magento2plugin.actions.generation.data.UiComponentGridDataProviderData;
 import com.magento.idea.magento2plugin.actions.generation.data.UiComponentGridToolbarData;
 import com.magento.idea.magento2plugin.actions.generation.dialog.validator.NewUiComponentGridDialogValidator;
 import com.magento.idea.magento2plugin.actions.generation.generator.UiComponentGridDataProviderGenerator;
 import com.magento.idea.magento2plugin.actions.generation.generator.UiComponentGridXmlGenerator;
+import com.magento.idea.magento2plugin.actions.generation.NewUiComponentGridAction;
 import com.magento.idea.magento2plugin.magento.files.UiComponentGridDataProviderPhp;
 import com.magento.idea.magento2plugin.magento.packages.Areas;
 import com.magento.idea.magento2plugin.magento.packages.File;
-import com.magento.idea.magento2plugin.magento.packages.HttpMethod;
 import com.magento.idea.magento2plugin.magento.packages.Package;
 import com.magento.idea.magento2plugin.ui.FilteredComboBox;
 import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectoryUtil;
 import com.magento.idea.magento2plugin.util.magento.GetResourceCollections;
-
-import javax.swing.*;
 import java.awt.event.KeyEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+import javax.swing.KeyStroke;
 
 public class NewUiComponentGridDialog extends AbstractDialog {
     private final Project project;
@@ -181,8 +184,7 @@ private void addActionListeners() {
         dataProviderType.addActionListener(event -> onDataProviderTypeChange());
     }
 
-    private void generateFile()
-    {
+    private void generateFile() {
         final UiComponentGridDataProviderGenerator DataProviderGenerator;
         DataProviderGenerator = new UiComponentGridDataProviderGenerator(
                 getGridDataProviderData(),
@@ -237,8 +239,11 @@ private List<String> getCollectionOptions() {
         if (this.collectionOptions == null) {
             this.collectionOptions = new ArrayList<>();
             this.collectionOptions.add("");
+            GetResourceCollections getResourceCollections = GetResourceCollections.getInstance(
+                    this.project
+            );
 
-            for (final PhpClass collectionClass: GetResourceCollections.getInstance(this.project).execute()) {
+            for (final PhpClass collectionClass: getResourceCollections.execute()) {
                 this.collectionOptions.add(collectionClass.getFQN());
             }
         }

src/com/magento/idea/magento2plugin/actions/generation/dialog/validator/NewUiComponentGridDialogValidator.java

@@ -14,8 +14,7 @@
 import com.magento.idea.magento2plugin.magento.files.UiComponentGridDataProviderPhp;
 import com.magento.idea.magento2plugin.magento.packages.Areas;
 import com.magento.idea.magento2plugin.util.RegExUtil;
-
-import javax.swing.*;
+import javax.swing.JOptionPane;
 
 @SuppressWarnings({"PMD.OnlyOneReturn", "PMD.NonThreadSafeSingleton"})
 public class NewUiComponentGridDialogValidator {

src/com/magento/idea/magento2plugin/actions/generation/generator/UiComponentGridDataProviderGenerator.java

@@ -9,12 +9,11 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiFile;
-import com.jetbrains.php.lang.psi.PhpFile;
 import com.jetbrains.php.lang.psi.elements.PhpClass;
+import com.jetbrains.php.lang.psi.PhpFile;
 import com.magento.idea.magento2plugin.actions.generation.data.UiComponentGridDataProviderData;
 import com.magento.idea.magento2plugin.actions.generation.generator.util.DirectoryGenerator;
 import com.magento.idea.magento2plugin.actions.generation.generator.util.FileFromTemplateGenerator;
-import com.magento.idea.magento2plugin.actions.generation.util.CodeStyleSettings;
 import com.magento.idea.magento2plugin.bundles.CommonBundle;
 import com.magento.idea.magento2plugin.bundles.ValidatorBundle;
 import com.magento.idea.magento2plugin.indexes.ModuleIndex;
@@ -23,8 +22,8 @@
 import com.magento.idea.magento2plugin.magento.packages.Package;
 import com.magento.idea.magento2plugin.util.GetFirstClassOfFile;
 import com.magento.idea.magento2plugin.util.GetPhpClassByFQN;
-import javax.swing.JOptionPane;
 import java.util.Properties;
+import javax.swing.JOptionPane;
 
 @SuppressWarnings({"PMD.OnlyOneReturn", "PMD.DataflowAnomalyAnalysis"})
 public class UiComponentGridDataProviderGenerator extends FileGenerator {

src/com/magento/idea/magento2plugin/magento/files/UiComponentGridDataProviderPhp.java

@@ -9,11 +9,12 @@
 import com.jetbrains.php.lang.PhpLanguage;
 
 public class UiComponentGridDataProviderPhp implements ModuleFileInterface {
-    public final static String COLLECTION_TEMPLATE = "Magento Module Ui Grid Collection Data Provider Php";
-    public final static String CUSTOM_TEMPLATE = "Magento Module Ui Grid Custom Data Provider Php";
-    public final static String FILE_EXTENSION = "php";
-    public final static String CUSTOM_TYPE = "custom";
-    public final static String COLLECTION_TYPE = "collection";
+    public static final String COLLECTION_TEMPLATE =
+            "Magento Module Ui Grid Collection Data Provider Php";
+    public static final String CUSTOM_TEMPLATE = "Magento Module Ui Grid Custom Data Provider Php";
+    public static final String FILE_EXTENSION = "php";
+    public static final String CUSTOM_TYPE = "custom";
+    public static final String COLLECTION_TYPE = "collection";
     private static UiComponentGridDataProviderPhp INSTANCE = null;
     private String className;
     private String providerType;
@@ -43,7 +44,6 @@ public static UiComponentGridDataProviderPhp getInstance(
      * Set class name.
      *
      * @param className String
-     * @return void
      */
     public void setClassName(final String className) {
         this.className = className;
@@ -53,7 +53,6 @@ public void setClassName(final String className) {
      * Set provided type.
      *
      * @param providerType String
-     * @return void
      */
     public void setProviderType(final String providerType) {
         this.providerType = providerType;

src/com/magento/idea/magento2plugin/util/magento/GetResourceCollections.java

@@ -18,6 +18,13 @@ public class GetResourceCollections {
     private static GetResourceCollections INSTANCE = null;
     private Project project;
 
+    /**
+     * Get instance of a class.
+     *
+     * @param project Project
+     *
+     * @return GetResourceCollections
+     */
     public static GetResourceCollections getInstance(Project project) {
         if (null == INSTANCE) {
             INSTANCE = new GetResourceCollections();
@@ -29,7 +36,7 @@ public static GetResourceCollections getInstance(Project project) {
     /**
      * Get Magento resource collection list.
      *
-     * @return List<PhpClass>
+     * @return List
      */
     public List<PhpClass> execute() {
         PhpIndex phpIndex = PhpIndex.getInstance(project);

tests/com/magento/idea/magento2plugin/actions/generation/generator/UiComponentGridDataProviderGeneratorTest.java

@@ -21,8 +21,7 @@ public class UiComponentGridDataProviderGeneratorTest extends BaseGeneratorTestC
     /**
      * Test data provider class file generation with custom type.
      */
-    public void testGenerateCustomDataProvider()
-    {
+    public void testGenerateCustomDataProvider() {
         final PsiFile dataProviderFile = generateDataProvider(
                 UiComponentGridDataProviderPhp.CUSTOM_TYPE,
                 null
@@ -40,8 +39,7 @@ public void testGenerateCustomDataProvider()
     /**
      * Test data provider class file generation with collection type.
      */
-    public void testGenerateCollectionDataProvider()
-    {
+    public void testGenerateCollectionDataProvider() {
         final PsiFile dataProviderFile = generateDataProvider(
                 UiComponentGridDataProviderPhp.COLLECTION_TYPE,
                 COLLECTION_FQN

tests/com/magento/idea/magento2plugin/actions/generation/generator/UiComponentGridXmlGeneratorTest.java

@@ -21,6 +21,9 @@ public class UiComponentGridXmlGeneratorTest extends BaseGeneratorTestCase {
     private static final String ACL = "Foo_Bar::custom_entity";
     private static final String PROVIDER_CLASS_NAME = "Foo\\Bar\\Ui\\Listing\\DataProvider";
 
+    /**
+     * Test UI component listing file generation for specific area.
+     */
     public void testGenerateUiGridForBaseArea() {
         final String area = Areas.base.toString();
         final PsiFile cronGroupsXmlFile = generateComponentGridXml(
@@ -33,6 +36,9 @@ public void testGenerateUiGridForBaseArea() {
         assertGeneratedFileIsCorrect(expectedFile, getExpectedDirectory(area), cronGroupsXmlFile);
     }
 
+    /**
+     * Test UI component listing file generation without toolbar.
+     */
     public void testGenerateUiGridWithoutToolbar() {
         final String area = Areas.adminhtml.toString();
         final PsiFile cronGroupsXmlFile = generateComponentGridXml(