Fixed test case

Author: bohdan-harniuk

src/com/magento/idea/magento2plugin/actions/generation/generator/code/util/ConvertPluginParamsToString.java

@@ -92,12 +92,10 @@ public static String execute(
 
             if (type.equals(Plugin.PluginType.after) && iterator == 0) {
                 if (returnType != null
-                        && returnType.getText().equals(MagentoPhpClass.VOID_RETURN_TYPE)) {
-                    buf.append(", $result");
+                        && !returnType.getText().equals(MagentoPhpClass.VOID_RETURN_TYPE)) {
+                    buf.append(", ").append(returnType.getText()).append(" $result");
                 } else {
-                    if (returnType != null) {
-                        buf.append(", ").append(returnType.getText()).append(" $result");
-                    }
+                    buf.append(", $result");
                 }
             }
             if (type.equals(Plugin.PluginType.around) && iterator == 0) {

testData/actions/generation/generator/PluginClassGenerator/generatePluginClassFile/TestPlugin.php

@@ -8,38 +8,37 @@
 
 class TestPlugin
 {
-
     /**
-     * @param \Foo\Bar\Service\SimpleService $subject
+     * @param SimpleService $subject
      * @param int $param1
      * @param string $param2
      * @return array
      */
-    public function beforeExecute(\Foo\Bar\Service\SimpleService $subject, int $param1, string $param2)
+    public function beforeExecute(SimpleService $subject, int $param1, string $param2)
     {
         // TODO: Implement plugin method.
         return [$param1, $param2];
     }
 
     /**
-     * @param \Foo\Bar\Service\SimpleService $subject
+     * @param SimpleService $subject
      * @param callable $proceed
      * @param int $param1
      * @param string $param2
      */
-    public function aroundExecute(\Foo\Bar\Service\SimpleService $subject, callable $proceed, int $param1, string $param2)
+    public function aroundExecute(SimpleService $subject, callable $proceed, int $param1, string $param2)
     {
         // TODO: Implement plugin method.
         return $proceed($param1, $param2);
     }
 
     /**
-     * @param \Foo\Bar\Service\SimpleService $subject
+     * @param SimpleService $subject
      * @param $result
      * @param int $param1
      * @param string $param2
      */
-    public function afterExecute(\Foo\Bar\Service\SimpleService $subject, $result, int $param1, string $param2)
+    public function afterExecute(SimpleService $subject, $result, int $param1, string $param2)
     {
         // TODO: Implement plugin method.
         return $result;

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

@@ -2,6 +2,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 package com.magento.idea.magento2plugin.actions.generation.generator;
 
 import com.intellij.openapi.project.Project;
@@ -11,8 +12,10 @@
 import com.magento.idea.magento2plugin.actions.generation.data.PluginFileData;
 import com.magento.idea.magento2plugin.magento.files.Plugin;
 import com.magento.idea.magento2plugin.util.GetPhpClassByFQN;
+import org.jetbrains.annotations.NotNull;
 
 public class PluginClassGeneratorTest extends BaseGeneratorTestCase {
+
     private static final String targetClassFnq = "Foo\\Bar\\Service\\SimpleService";
     private static final String targetMethodName = "execute";
     private static final String module = "Foo_Bar";
@@ -21,8 +24,10 @@ public class PluginClassGeneratorTest extends BaseGeneratorTestCase {
     private static final String pluginClassName = "TestPlugin";
     private static final String pluginDir = "Plugin";
 
-    public void testGeneratePluginClassFile()
-    {
+    /**
+     * Test of plugin generation.
+     */
+    public void testGeneratePluginClassFile() {
         PsiFile pluginClassFile;
         addPluginToTargetClass(Plugin.PluginType.before.toString());
         addPluginToTargetClass(Plugin.PluginType.around.toString());
@@ -38,8 +43,14 @@ public void testGeneratePluginClassFile()
         );
     }
 
-    private PsiFile addPluginToTargetClass(String pluginType)
-    {
+    /**
+     * Add plugins for the target class.
+     *
+     * @param pluginType String
+     *
+     * @return PsiFile
+     */
+    private PsiFile addPluginToTargetClass(final @NotNull String pluginType) {
         Project project = myFixture.getProject();
         PhpClass targetClass = GetPhpClassByFQN.getInstance(project).execute(targetClassFnq);
         Method targetMethod = targetClass.findMethodByName(targetMethodName);