Skip to content

Commit 3bed0ab

Browse files
Fixed test class static check issues
1 parent 73b729a commit 3bed0ab

File tree

2 files changed

+21
-20
lines changed

2 files changed

+21
-20
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ private ConvertPluginParamsToString() {}
4242
*
4343
* @return String
4444
*/
45-
@SuppressWarnings({"PMD.NPathComplexity", "PMD.CyclomaticComplexity"})
45+
@SuppressWarnings({"PMD.NPathComplexity", "PMD.CyclomaticComplexity", "PMD.ConfusingTernary"})
4646
public static String execute(
4747
final Collection<PsiElement> parameters,
4848
final @NotNull Plugin.PluginType type,

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

+20-19
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616

1717
public class PluginClassGeneratorTest extends BaseGeneratorTestCase {
1818

19-
private static final String targetClassFnq = "Foo\\Bar\\Service\\SimpleService";
20-
private static final String targetMethodName = "execute";
21-
private static final String module = "Foo_Bar";
22-
private static final String pluginNamespace = "Foo\\Bar\\Plugin";
23-
private static final String pluginFqn = "Foo\\Bar\\Plugin\\TestPlugin";
24-
private static final String pluginClassName = "TestPlugin";
25-
private static final String pluginDir = "Plugin";
19+
private static final String TARGET_CLASS_FQN = "Foo\\Bar\\Service\\SimpleService";
20+
private static final String TARGET_METHOD_NAME = "execute";
21+
private static final String MODULE_NAME = "Foo_Bar";
22+
private static final String PLUGIN_NAMESPACE = "Foo\\Bar\\Plugin";
23+
private static final String PLUGIN_FQN = "Foo\\Bar\\Plugin\\TestPlugin";
24+
private static final String PLUGIN_CLASS_NAME = "TestPlugin";
25+
private static final String PLUGIN_DIR = "Plugin";
2626

2727
/**
2828
* Test of plugin generation.
@@ -33,8 +33,8 @@ public void testGeneratePluginClassFile() {
3333
addPluginToTargetClass(Plugin.PluginType.around.toString());
3434
pluginClassFile = addPluginToTargetClass(Plugin.PluginType.after.toString());
3535

36-
String filePath = this.getFixturePath(pluginClassName.concat(".php"));
37-
PsiFile expectedFile = myFixture.configureByFile(filePath);
36+
final String filePath = this.getFixturePath(PLUGIN_CLASS_NAME.concat(".php"));
37+
final PsiFile expectedFile = myFixture.configureByFile(filePath);
3838

3939
assertGeneratedFileIsCorrect(
4040
expectedFile,
@@ -51,21 +51,22 @@ public void testGeneratePluginClassFile() {
5151
* @return PsiFile
5252
*/
5353
private PsiFile addPluginToTargetClass(final @NotNull String pluginType) {
54-
Project project = myFixture.getProject();
55-
PhpClass targetClass = GetPhpClassByFQN.getInstance(project).execute(targetClassFnq);
56-
Method targetMethod = targetClass.findMethodByName(targetMethodName);
54+
final Project project = myFixture.getProject();
55+
final PhpClass targetClass =
56+
GetPhpClassByFQN.getInstance(project).execute(TARGET_CLASS_FQN);
57+
final Method targetMethod = targetClass.findMethodByName(TARGET_METHOD_NAME);
5758

58-
PluginFileData pluginClass = new PluginFileData(
59-
pluginDir,
60-
pluginClassName,
59+
final PluginFileData pluginClass = new PluginFileData(
60+
PLUGIN_DIR,
61+
PLUGIN_CLASS_NAME,
6162
pluginType,
62-
module,
63+
MODULE_NAME,
6364
targetClass,
6465
targetMethod,
65-
pluginFqn,
66-
pluginNamespace
66+
PLUGIN_FQN,
67+
PLUGIN_NAMESPACE
6768
);
68-
PluginClassGenerator pluginClassGenerator = new PluginClassGenerator(
69+
final PluginClassGenerator pluginClassGenerator = new PluginClassGenerator(
6970
pluginClass,
7071
project
7172
);

0 commit comments

Comments
 (0)