Skip to content

Commit a495f8f

Browse files
author
Sergiy Zhovnir
committed
#issue-57 Adjusting the test
1 parent 9751a5a commit a495f8f

File tree

1 file changed

+15
-12
lines changed

1 file changed

+15
-12
lines changed

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

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public class ModuleControllerClassGeneratorTest extends BaseGeneratorTestCase {
88

99
public void testGenerateFrontendControllerFile() {
1010
Project project = myFixture.getProject();
11-
ControllerFileData cronjobClassData = new ControllerFileData(
11+
ControllerFileData controllerFileData = new ControllerFileData(
1212
"Controller/Entity",
1313
"GetAction",
1414
"Foo_Bar",
@@ -19,23 +19,23 @@ public void testGenerateFrontendControllerFile() {
1919
"Foo\\Bar\\Controller\\Entity"
2020
);
2121
ModuleControllerClassGenerator moduleControllerClassGenerator = new ModuleControllerClassGenerator(
22-
cronjobClassData,
22+
controllerFileData,
2323
project
2424
);
25-
PsiFile cronJobFile = moduleControllerClassGenerator.generate("test");
25+
PsiFile controllerFile = moduleControllerClassGenerator.generate("test");
2626

2727
String filePath = this.getFixturePath("GetAction.php");
2828
PsiFile expectedFile = myFixture.configureByFile(filePath);
2929
assertGeneratedFileIsCorrect(
3030
expectedFile,
3131
"src/app/code/Foo/Bar/Controller/Entity",
32-
cronJobFile
32+
controllerFile
3333
);
3434
}
3535

3636
public void testGenerateFrontendInheritActionControllerFile() {
3737
Project project = myFixture.getProject();
38-
ControllerFileData cronjobClassData = new ControllerFileData(
38+
ControllerFileData controllerFileData = new ControllerFileData(
3939
"Controller/Entity",
4040
"DeleteAction",
4141
"Foo_Bar",
@@ -46,23 +46,23 @@ public void testGenerateFrontendInheritActionControllerFile() {
4646
"Foo\\Bar\\Controller\\Entity"
4747
);
4848
ModuleControllerClassGenerator moduleControllerClassGenerator = new ModuleControllerClassGenerator(
49-
cronjobClassData,
49+
controllerFileData,
5050
project
5151
);
52-
PsiFile cronJobFile = moduleControllerClassGenerator.generate("test");
52+
PsiFile controllerFile = moduleControllerClassGenerator.generate("test");
5353

5454
String filePath = this.getFixturePath("DeleteAction.php");
5555
PsiFile expectedFile = myFixture.configureByFile(filePath);
5656
assertGeneratedFileIsCorrect(
5757
expectedFile,
5858
"src/app/code/Foo/Bar/Controller/Entity",
59-
cronJobFile
59+
controllerFile
6060
);
6161
}
6262

6363
public void testGenerateBackendControllerFile() {
6464
Project project = myFixture.getProject();
65-
ControllerFileData cronjobClassData = new ControllerFileData(
65+
ControllerFileData controllerFileData = new ControllerFileData(
6666
"Controller/Adminhtml/Entity",
6767
"BackendSaveAction",
6868
"Foo_Bar",
@@ -72,15 +72,18 @@ public void testGenerateBackendControllerFile() {
7272
true,
7373
"Foo\\Bar\\Controller\\Adminhtml\\Entity"
7474
);
75-
ModuleControllerClassGenerator moduleControllerClassGenerator = new ModuleControllerClassGenerator(cronjobClassData, project);
76-
PsiFile cronJobFile = moduleControllerClassGenerator.generate("test");
75+
ModuleControllerClassGenerator moduleControllerClassGenerator = new ModuleControllerClassGenerator(
76+
controllerFileData,
77+
project
78+
);
79+
PsiFile controllerFile = moduleControllerClassGenerator.generate("test");
7780

7881
String filePath = this.getFixturePath("BackendSaveAction.php");
7982
PsiFile expectedFile = myFixture.configureByFile(filePath);
8083
assertGeneratedFileIsCorrect(
8184
expectedFile,
8285
"src/app/code/Foo/Bar/Controller/Adminhtml/Entity",
83-
cronJobFile
86+
controllerFile
8487
);
8588
}
8689
}

0 commit comments

Comments
 (0)