977: Code refactoring

Author: bohdan-harniuk

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

@@ -16,9 +16,8 @@
 import com.jetbrains.php.lang.psi.elements.impl.ClassConstImpl;
 import com.magento.idea.magento2plugin.magento.files.RegistrationPhp;
 import com.magento.idea.magento2plugin.magento.packages.ComponentType;
-import java.util.Collection;
-
 import com.magento.idea.magento2plugin.magento.packages.Package;
+import java.util.Collection;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

tests/com/magento/idea/magento2plugin/completion/xml/BackendModelXmlCompletionRegistrarTest.java

@@ -2,29 +2,30 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 package com.magento.idea.magento2plugin.completion.xml;
 
 import com.magento.idea.magento2plugin.magento.files.ModuleConfigXml;
 import com.magento.idea.magento2plugin.magento.files.ModuleSystemXmlFile;
 
 public class BackendModelXmlCompletionRegistrarTest extends CompletionXmlFixtureTestCase {
 
-    private static final String[] systemXmlBackendModelLookupStringCheck = new String[]{
+    private static final String[] SYSTEM_XML_BACKEND_MODEL_LOOKUP_STRING_CHECK = {
                 "Magento\\Backend\\Model\\Source\\Roles"
         };
-    private static final String[] configXmlBackendModelLookupStringCheck = new String[]{
+    private static final String[] CONFIG_XML_BACKEND_MODEL_LOOKUP_STRING_CHECK = {
                 "Magento\\Backend\\Model\\Source\\YesNo"
     };
 
     public void testSystemXmlElementProvideCompletion() {
-        String filePath = this.getFixturePath(ModuleSystemXmlFile.FILE_NAME);
+        final String filePath = this.getFixturePath(ModuleSystemXmlFile.FILE_NAME);
         myFixture.configureByFile(filePath);
 
-        assertCompletionContains(filePath, systemXmlBackendModelLookupStringCheck);
+        assertCompletionContains(filePath, SYSTEM_XML_BACKEND_MODEL_LOOKUP_STRING_CHECK);
     }
 
     public void testSystemXmlElementCompletionWontShow() {
-        String filePath = this.getFixturePath(
+        final String filePath = this.getFixturePath(
             ModuleSystemXmlFile.FILE_NAME
         );
         myFixture.copyFileToProject(filePath);
@@ -33,35 +34,35 @@ public void testSystemXmlElementCompletionWontShow() {
     }
 
     public void testSystemXmlBackendModelAttributeMatchWithFile() {
-        String filePath = this.getFixturePath(
+        final String filePath = this.getFixturePath(
             ModuleSystemXmlFile.FILE_NAME
         );
 
-        assertFileContainsCompletions(filePath, systemXmlBackendModelLookupStringCheck);
+        assertFileContainsCompletions(filePath, SYSTEM_XML_BACKEND_MODEL_LOOKUP_STRING_CHECK);
     }
 
     public void testSystemXmlBackendModelAttributeDontMatchWithFile() {
-        String filePath = this.getFixturePath(
+        final String filePath = this.getFixturePath(
             "other-file-than-system.xml"
         );
 
         assertFileNotContainsCompletions(
                 filePath,
-                systemXmlBackendModelLookupStringCheck
+                SYSTEM_XML_BACKEND_MODEL_LOOKUP_STRING_CHECK
         );
     }
 
     public void testConfigXmlElementProvideCompletion() {
-        String filePath = this.getFixturePath(
+        final String filePath = this.getFixturePath(
             ModuleConfigXml.FILE_NAME
         );
         myFixture.copyFileToProject(filePath);
 
-        assertCompletionContains(filePath, configXmlBackendModelLookupStringCheck);
+        assertCompletionContains(filePath, CONFIG_XML_BACKEND_MODEL_LOOKUP_STRING_CHECK);
     }
 
     public void testConfigXmlElementCompletionWontShow() {
-        String filePath = this.getFixturePath(
+        final String filePath = this.getFixturePath(
             ModuleConfigXml.FILE_NAME
         );
         myFixture.copyFileToProject(filePath);
@@ -70,21 +71,21 @@ public void testConfigXmlElementCompletionWontShow() {
     }
 
     public void testConfigXmlBackendModelAttributeMatchWithFile() {
-        String filePath = this.getFixturePath(
+        final String filePath = this.getFixturePath(
             ModuleConfigXml.FILE_NAME
         );
 
-        assertFileContainsCompletions(filePath, configXmlBackendModelLookupStringCheck);
+        assertFileContainsCompletions(filePath, CONFIG_XML_BACKEND_MODEL_LOOKUP_STRING_CHECK);
     }
 
     public void testConfigXmlBackendModelAttributeDontMatchWithFile() {
-        String filePath = this.getFixturePath(
+        final String filePath = this.getFixturePath(
             "other-file-than-config.xml"
         );
 
         assertFileNotContainsCompletions(
                 filePath,
-                configXmlBackendModelLookupStringCheck
+                CONFIG_XML_BACKEND_MODEL_LOOKUP_STRING_CHECK
         );
     }
 }

tests/com/magento/idea/magento2plugin/completion/xml/SourceModelXmlCompletionRegistrarTest.java

@@ -2,6 +2,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 package com.magento.idea.magento2plugin.completion.xml;
 
 import com.magento.idea.magento2plugin.magento.files.ModuleSystemXmlFile;
@@ -10,55 +11,55 @@
 
 public class SourceModelXmlCompletionRegistrarTest extends CompletionXmlFixtureTestCase {
 
-    private static final String[] lookupStringsCheck = new String[]{
+    private static final String[] LOOKUP_STRINGS_CHECK = {
             "Magento\\Backend\\Model\\Source\\YesNo"
     };
 
     public void testSourceModelXmlElementMustProvideCompletion() {
-        String filePath = this.getFixturePath(ModuleSystemXmlFile.FILE_NAME);
+        final String filePath = this.getFixturePath(ModuleSystemXmlFile.FILE_NAME);
         myFixture.copyFileToProject(filePath);
 
-        assertCompletionContains(filePath, lookupStringsCheck);
+        assertCompletionContains(filePath, LOOKUP_STRINGS_CHECK);
     }
 
     public void testSourceModelXmlElementMatchWithFilePositiveCase() {
-        String filePath = this.getFixturePath(ModuleSystemXmlFile.FILE_NAME);
+        final String filePath = this.getFixturePath(ModuleSystemXmlFile.FILE_NAME);
         myFixture.copyFileToProject(filePath);
 
-        assertFileContainsCompletions(filePath, lookupStringsCheck);
+        assertFileContainsCompletions(filePath, LOOKUP_STRINGS_CHECK);
     }
 
     public void testSourceModelXmlElementMatchWithFileNegativeCase() {
-        String filePath = this.getFixturePath("not-system.xml");
+        final String filePath = this.getFixturePath("not-system.xml");
         myFixture.copyFileToProject(filePath);
 
         assertFileNotContainsCompletions(
             filePath,
-            lookupStringsCheck
+                LOOKUP_STRINGS_CHECK
         );
     }
 
     public void testSourceModelXmlAttributeMustProvideCompletion() {
-        String filePath = this.getFixturePath(ModuleWidgetXml.FILE_NAME);
+        final String filePath = this.getFixturePath(ModuleWidgetXml.FILE_NAME);
         myFixture.copyFileToProject(filePath);
 
-        assertCompletionContains(filePath, lookupStringsCheck);
+        assertCompletionContains(filePath, LOOKUP_STRINGS_CHECK);
     }
 
     public void testSourceModelXmlAttributeMatchWithFilePositiveCase() {
-        String filePath = this.getFixturePath(ModuleWidgetXml.FILE_NAME);
+        final String filePath = this.getFixturePath(ModuleWidgetXml.FILE_NAME);
         myFixture.copyFileToProject(filePath);
 
-        assertFileContainsCompletions(filePath, lookupStringsCheck);
+        assertFileContainsCompletions(filePath, LOOKUP_STRINGS_CHECK);
     }
 
     public void testSourceModelXmlAttributeMatchWithFileNegativeCase() throws IOException {
-        String filePath = this.getFixturePath("not-widget.xml");
+        final String filePath = this.getFixturePath("not-widget.xml");
         myFixture.copyFileToProject(filePath);
 
         assertFileNotContainsCompletions(
             filePath,
-            lookupStringsCheck
+                LOOKUP_STRINGS_CHECK
         );
     }
 }