Skip to content

Commit 0bdd7f3

Browse files
author
Vitaliy Boyko
committed
Static fixes
1 parent d957ffe commit 0bdd7f3

File tree

2 files changed

+34
-20
lines changed

2 files changed

+34
-20
lines changed

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

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
5+
56
package com.magento.idea.magento2plugin.actions.generation.generator;
67

78
import com.intellij.psi.PsiDirectory;
@@ -10,43 +11,48 @@
1011
import com.magento.idea.magento2plugin.BaseProjectTestCase;
1112
import com.magento.idea.magento2plugin.magento.packages.File;
1213
import com.magento.idea.magento2plugin.project.util.GetProjectBasePath;
14+
import org.junit.After;
1315
import org.junit.Before;
1416

15-
abstract public class BaseGeneratorTestCase extends BaseProjectTestCase {
16-
private static final String testDataFolderPath = "testData" + File.separator + "actions" + File.separator;
17-
private static final String fixturesFolderPath = "generation" + File.separator + "generator" + File.separator;
17+
public abstract class BaseGeneratorTestCase extends BaseProjectTestCase {
18+
private static final String TEST_DATA_FOLDER_PATH = "testData" + File.separator
19+
+ "actions" + File.separator;
20+
private static final String FIXTURES_FOLDER_PATH = "generation" + File.separator
21+
+ "generator" + File.separator;
1822

1923
@Override
2024
@Before
2125
protected void setUp() throws Exception {
2226
super.setUp();
23-
myFixture.setTestDataPath(testDataFolderPath);
27+
myFixture.setTestDataPath(TEST_DATA_FOLDER_PATH);
2428
}
2529

2630
@Override
31+
@After
2732
protected void tearDown() throws Exception {
2833
super.tearDown();
2934
LightPlatformTestCase.closeAndDeleteProject();
3035
}
3136

32-
protected String getFixturePath(String fileName) {
33-
return prepareFixturePath(fileName, fixturesFolderPath);
37+
protected String getFixturePath(final String fileName) {
38+
return prepareFixturePath(fileName, FIXTURES_FOLDER_PATH);
3439
}
3540

41+
@SuppressWarnings({"PMD.JUnitAssertionsShouldIncludeMessage"})
3642
protected void assertGeneratedFileIsCorrect(
37-
PsiFile expectedFile,
38-
String expectedDirectory,
39-
PsiFile resultFile) {
40-
43+
final PsiFile expectedFile,
44+
final String expectedDirectory,
45+
final PsiFile resultFile
46+
) {
4147
assertTrue(resultFile.getContainingDirectory().getVirtualFile().getPath()
42-
.endsWith(expectedDirectory));
48+
.endsWith(expectedDirectory));
4349
assertEquals(expectedFile.getText(), resultFile.getText());
4450
assertEquals(expectedFile.getName(), resultFile.getName());
4551
}
4652

4753
protected PsiDirectory getProjectDirectory() {
4854
return myFixture.getPsiManager().findDirectory(
49-
GetProjectBasePath.execute(myFixture.getProject())
55+
GetProjectBasePath.execute(myFixture.getProject())
5056
);
5157
}
5258
}

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

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
5+
56
package com.magento.idea.magento2plugin.actions.generation.generator;
67

78
import com.intellij.openapi.project.Project;
@@ -12,6 +13,9 @@
1213

1314
public class ModuleRegistrationPhpGeneratorTest extends BaseGeneratorTestCase {
1415

16+
/**
17+
* Test for generation of registration.php file.
18+
*/
1519
public void testGenerateRegistrationPhpFile() {
1620
final String filePath = this.getFixturePath(RegistrationPhp.FILE_NAME);
1721
final PsiFile expectedFile = myFixture.configureByFile(filePath);
@@ -23,9 +27,10 @@ public void testGenerateRegistrationPhpFile() {
2327
projectDir,
2428
true
2529
);
26-
final ModuleRegistrationPhpGenerator moduleRegistrationPhpGenerator = new ModuleRegistrationPhpGenerator(
27-
moduleRegistrationPhpData,
28-
project
30+
final ModuleRegistrationPhpGenerator moduleRegistrationPhpGenerator
31+
= new ModuleRegistrationPhpGenerator(
32+
moduleRegistrationPhpData,
33+
project
2934
);
3035
final PsiFile registrationPhp = moduleRegistrationPhpGenerator.generate("test");
3136
assertGeneratedFileIsCorrect(
@@ -35,8 +40,10 @@ public void testGenerateRegistrationPhpFile() {
3540
);
3641
}
3742

38-
public void testGenerateRegistrationPhpFileInRoot()
39-
{
43+
/**
44+
* Test for generation of registration.php file for a module project.
45+
*/
46+
public void testGenerateRegistrationPhpFileInRoot() {
4047
final String filePath = this.getFixturePath(RegistrationPhp.FILE_NAME);
4148
final PsiFile expectedFile = myFixture.configureByFile(filePath);
4249
final Project project = myFixture.getProject();
@@ -47,9 +54,10 @@ public void testGenerateRegistrationPhpFileInRoot()
4754
projectDir,
4855
false
4956
);
50-
final ModuleRegistrationPhpGenerator moduleRegistrationPhpGenerator = new ModuleRegistrationPhpGenerator(
51-
moduleRegistrationPhpData,
52-
project
57+
final ModuleRegistrationPhpGenerator moduleRegistrationPhpGenerator
58+
= new ModuleRegistrationPhpGenerator(
59+
moduleRegistrationPhpData,
60+
project
5361
);
5462
final PsiFile registrationPhp = moduleRegistrationPhpGenerator.generate("test");
5563
assertGeneratedFileIsCorrect(

0 commit comments

Comments
 (0)