Fixed tests

Author: Sergiy Zhovnir

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

@@ -14,6 +14,7 @@
 import com.magento.idea.magento2plugin.actions.generation.generator.ModuleControllerClassGenerator;
 import com.magento.idea.magento2plugin.magento.files.ControllerBackendPhp;
 import com.magento.idea.magento2plugin.magento.files.ControllerFrontendPhp;
+import com.magento.idea.magento2plugin.magento.packages.Areas;
 import com.magento.idea.magento2plugin.magento.packages.File;
 import com.magento.idea.magento2plugin.magento.packages.HttpRequest;
 import com.magento.idea.magento2plugin.magento.packages.Package;
@@ -198,7 +199,7 @@ private PsiFile generateFile() {
 
     private void suggestControllerDirectory() {
         final String area = getArea();
-        if (area.equals(Package.Areas.adminhtml.toString())) {
+        if (area.equals(Areas.adminhtml.toString())) {
             controllerParentDir.setText(ControllerBackendPhp.DEFAULT_DIR);
             return;
         }
@@ -207,30 +208,30 @@ private void suggestControllerDirectory() {
 
     private void toggleAdminPanel() {
         final String area = getArea();
-        if (area.equals(Package.Areas.adminhtml.toString()) && inheritClass.isSelected()) {
+        if (area.equals(Areas.adminhtml.toString()) && inheritClass.isSelected()) {
             adminPanel.setVisible(true);
             return;
         }
         adminPanel.setVisible(false);
     }
 
     private String getNamespace() {
-        final String[]parts = moduleName.split(Package.VENDOR_MODULE_NAME_SEPARATOR);
+        final String[]parts = moduleName.split(Package.vendorModuleNameSeparator);
         if (parts[0] == null || parts[1] == null || parts.length > 2) {
             return null;
         }
         final String directoryPart = getControllerDirectory().replace(
                 File.separator,
-                Package.FQN_SEPARATOR
+                Package.fqnSeparator
         );
-        final String controllerPart = Package.FQN_SEPARATOR + getControllerName();
+        final String controllerPart = Package.fqnSeparator + getControllerName();
 
         return String.format(
                 "%s%s%s%s%s%s",
                 parts[0],
-                Package.FQN_SEPARATOR,
+                Package.fqnSeparator,
                 parts[1],
-                Package.FQN_SEPARATOR,
+                Package.fqnSeparator,
                 directoryPart,
                 controllerPart
         );
@@ -247,8 +248,8 @@ protected void onCancel() {
     private ArrayList<String> getAreaList() {
         return new ArrayList<>(
                 Arrays.asList(
-                        Package.Areas.frontend.toString(),
-                        Package.Areas.adminhtml.toString()
+                        Areas.frontend.toString(),
+                        Areas.adminhtml.toString()
                 )
         );
     }

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

@@ -20,6 +20,7 @@
 import com.magento.idea.magento2plugin.magento.files.Controller;
 import com.magento.idea.magento2plugin.magento.files.ControllerBackendPhp;
 import com.magento.idea.magento2plugin.magento.files.ControllerFrontendPhp;
+import com.magento.idea.magento2plugin.magento.packages.Areas;
 import com.magento.idea.magento2plugin.magento.packages.File;
 import com.magento.idea.magento2plugin.magento.packages.HttpRequest;
 import com.magento.idea.magento2plugin.magento.packages.Package;
@@ -137,7 +138,7 @@ private String getControllerFqn() {
         return String.format(
                 "%s%s%s",
                 controllerFileData.getNamespace(),
-                Package.FQN_SEPARATOR,
+                Package.fqnSeparator,
                 controllerFileData.getActionClassName()
         );
     }
@@ -156,7 +157,7 @@ private PhpClass createControllerClass(String actionName) {
         }
 
         final Properties attributes = getAttributes();
-        final String adminhtmlArea = Package.Areas.adminhtml.toString();
+        final String adminhtmlArea = Areas.adminhtml.toString();
 
         if (controllerFileData.getControllerArea().equals(adminhtmlArea)) {
             controllerFile = fileFromTemplateGenerator.generate(
@@ -193,7 +194,7 @@ protected void fillAttributes(final Properties attributes) {
         uses.add(httpMethodInterface);
 
         if (controllerFileData.getIsInheritClass()) {
-            final String adminhtmlArea = Package.Areas.adminhtml.toString();
+            final String adminhtmlArea = Areas.adminhtml.toString();
 
             if (controllerFileData.getControllerArea().equals(adminhtmlArea)) {
                 uses.add(Controller.ADMINHTML_CONTROLLER_FQN);

src/com/magento/idea/magento2plugin/magento/packages/HttpRequest.java

@@ -16,7 +16,7 @@ public enum HttpMethod {
         DELETE("Magento\\Framework\\App\\Action\\HttpDeleteActionInterface"),
         PUT("Magento\\Framework\\App\\Action\\HttpPutActionInterface");
 
-        final private String interfaceFqn;
+        private String interfaceFqn;
 
         HttpMethod(String interfaceFqn) {
             this.interfaceFqn = interfaceFqn;
@@ -43,7 +43,6 @@ public static String getRequestInterfaceFqnByMethodName(final String methodName)
      * @return List of HTTP methods.
      */
     public static List<String> getHttpMethodList() {
-        final String a;
         final List<String> methodNameList = new ArrayList<>();
 
         for (final HttpMethod httpMethod: HttpMethod.values()) {