Skip to content

Commit c6aed76

Browse files
author
Sergiy Zhovnir
committed
Fixing static tests
1 parent 16e8243 commit c6aed76

File tree

2 files changed

+58
-54
lines changed

2 files changed

+58
-54
lines changed

‎tests/com/magento/idea/magento2plugin/actions/generation/generator/PreferenceClassGeneratorTest.java‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,24 @@
1212
import com.magento.idea.magento2plugin.util.GetPhpClassByFQN;
1313

1414
public class PreferenceClassGeneratorTest extends BaseGeneratorTestCase {
15-
private static final String module = "Foo_Bar";
16-
private static final String targetSimpleModelOneClassFqn = "Foo\\Bar\\Model\\SimpleModelOne";
17-
private static final String targetSimpleModelTwoClassFqn = "Foo\\Bar\\Model\\SimpleModelTwo";
15+
private static final String MODULE = "Foo_Bar";
16+
private static final String TARGET_MODEL_ONE_CLASS_FQN = "Foo\\Bar\\Model\\SimpleModelOne";
17+
private static final String TARGET_MODEL_TWO_CLASS_FQN = "Foo\\Bar\\Model\\SimpleModelTwo";
1818

1919
/**
2020
* Test preference class file generation.
2121
*/
2222
public void testGeneratePreferenceClassFile() {
23-
PsiFile preferenceClassFile = createPreferenceClassFile(
24-
targetSimpleModelOneClassFqn,
23+
final PsiFile preferenceClassFile = createPreferenceClassFile(
24+
TARGET_MODEL_ONE_CLASS_FQN,
2525
"Model/Override",
2626
"SimpleModelOneOverride",
2727
"Foo\\Bar\\Model\\Override\\SimpleModelOneOverride",
2828
"Foo\\Bar\\Model\\Override",
2929
false
3030
);
31-
String filePath = this.getFixturePath("SimpleModelOneOverride.php");
32-
PsiFile expectedFile = myFixture.configureByFile(filePath);
31+
final String filePath = this.getFixturePath("SimpleModelOneOverride.php");
32+
final PsiFile expectedFile = myFixture.configureByFile(filePath);
3333

3434
assertGeneratedFileIsCorrect(
3535
expectedFile,
@@ -42,16 +42,16 @@ public void testGeneratePreferenceClassFile() {
4242
* Test preference class file generation with inheritance.
4343
*/
4444
public void testGeneratePreferenceClassFileWithInheritance() {
45-
PsiFile preferenceClassFile = createPreferenceClassFile(
46-
targetSimpleModelTwoClassFqn,
45+
final PsiFile preferenceClassFile = createPreferenceClassFile(
46+
TARGET_MODEL_TWO_CLASS_FQN,
4747
"Model/Override",
4848
"SimpleModelTwoOverride",
4949
"Foo\\Bar\\Model\\Override\\SimpleModelTwoOverride",
5050
"Foo\\Bar\\Model\\Override",
5151
true
5252
);
53-
String filePath = this.getFixturePath("SimpleModelTwoOverride.php");
54-
PsiFile expectedFile = myFixture.configureByFile(filePath);
53+
final String filePath = this.getFixturePath("SimpleModelTwoOverride.php");
54+
final PsiFile expectedFile = myFixture.configureByFile(filePath);
5555

5656
assertGeneratedFileIsCorrect(
5757
expectedFile,
@@ -72,25 +72,25 @@ public void testGeneratePreferenceClassFileWithInheritance() {
7272
* @return PsiFile
7373
*/
7474
private PsiFile createPreferenceClassFile(
75-
String targetClassFnq,
76-
String preferenceDirectory,
77-
String preferenceClassName,
78-
String preferenceFqn,
79-
String namespace,
80-
Boolean inheritClass
75+
final String targetClassFnq,
76+
final String preferenceDirectory,
77+
final String preferenceClassName,
78+
final String preferenceFqn,
79+
final String namespace,
80+
final Boolean inheritClass
8181
) {
82-
Project project = myFixture.getProject();
83-
PhpClass targetClass = GetPhpClassByFQN.getInstance(project).execute(targetClassFnq);
84-
PreferenceFileData preferenceFileData = new PreferenceFileData(
82+
final Project project = myFixture.getProject();
83+
final PhpClass targetClass = GetPhpClassByFQN.getInstance(project).execute(targetClassFnq);
84+
final PreferenceFileData preferenceFileData = new PreferenceFileData(
8585
preferenceDirectory,
8686
preferenceClassName,
87-
module,
87+
MODULE,
8888
targetClass,
8989
preferenceFqn,
9090
namespace,
9191
inheritClass
9292
);
93-
PreferenceClassGenerator preferenceClassGenerator = new PreferenceClassGenerator(
93+
final PreferenceClassGenerator preferenceClassGenerator = new PreferenceClassGenerator(
9494
preferenceFileData,
9595
project
9696
);

‎tests/com/magento/idea/magento2plugin/actions/generation/generator/PreferenceDiXmlGeneratorTest.java‎

Lines changed: 36 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,25 @@
1515
import com.magento.idea.magento2plugin.util.GetPhpClassByFQN;
1616

1717
public class PreferenceDiXmlGeneratorTest extends BaseGeneratorTestCase {
18-
private static final String module = "Foo_Bar";
19-
private static final String moduleDir = "src/app/code/Foo/Bar/";
20-
private static final String targetSimpleModelOneClassFqn = "Foo\\Bar\\Model\\SimpleModelOne";
21-
private static final String targetSimpleModelTwoClassFqn = "Foo\\Bar\\Model\\SimpleModelTwo";
18+
private static final String MODULE = "Foo_Bar";
19+
private static final String MODULE_DIR = "src/app/code/Foo/Bar/";
20+
private static final String TARGET_MODEL_ONE_CLASS_FQN = "Foo\\Bar\\Model\\SimpleModelOne";
21+
private static final String TARGET_MODEL_TWO_CLASS_FQN = "Foo\\Bar\\Model\\SimpleModelTwo";
2222

2323
/**
2424
* Test preference DI XML file generation.
2525
*/
2626
public void testGeneratePreferenceDiXml() {
27-
String area = Package.Areas.base.toString();
28-
PsiFile preferenceDiXmlFile = addPreferenceDiXml(
29-
targetSimpleModelOneClassFqn,
27+
final String area = Package.Areas.base.toString();
28+
final PsiFile preferenceDiXmlFile = addPreferenceDiXml(
29+
TARGET_MODEL_ONE_CLASS_FQN,
3030
"Foo\\Bar\\Model\\Override\\SimpleModelOne",
3131
area,
3232
"Foo\\Bar\\Model\\Override"
3333
);
3434

35-
String filePath = this.getFixturePath(ModuleDiXml.FILE_NAME);
36-
PsiFile expectedFile = myFixture.configureByFile(filePath);
35+
final String filePath = this.getFixturePath(ModuleDiXml.FILE_NAME);
36+
final PsiFile expectedFile = myFixture.configureByFile(filePath);
3737

3838
assertGeneratedFileIsCorrect(
3939
expectedFile,
@@ -46,16 +46,16 @@ public void testGeneratePreferenceDiXml() {
4646
* Test preference DI XML file generation for adminhtml area.
4747
*/
4848
public void testGeneratePreferenceDiXmlForAdminhtmlArea() {
49-
String area = Package.Areas.adminhtml.toString();
50-
PsiFile preferenceDiXmlFile = addPreferenceDiXml(
51-
targetSimpleModelTwoClassFqn,
49+
final String area = Package.Areas.adminhtml.toString();
50+
final PsiFile preferenceDiXmlFile = addPreferenceDiXml(
51+
TARGET_MODEL_TWO_CLASS_FQN,
5252
"Foo\\Bar\\Model\\Override\\SimpleModelTwo",
5353
area,
5454
"Foo\\Bar\\Model\\Override"
5555
);
5656

57-
String filePath = this.getFixturePath(ModuleDiXml.FILE_NAME);
58-
PsiFile expectedFile = myFixture.configureByFile(filePath);
57+
final String filePath = this.getFixturePath(ModuleDiXml.FILE_NAME);
58+
final PsiFile expectedFile = myFixture.configureByFile(filePath);
5959

6060
assertGeneratedFileIsCorrect(
6161
expectedFile,
@@ -68,22 +68,22 @@ public void testGeneratePreferenceDiXmlForAdminhtmlArea() {
6868
* Test the adding of two preferences to one DI XML file.
6969
*/
7070
public void testAddTwoPreferencesToOneDiXmlFile() {
71-
String area = Package.Areas.frontend.toString();
71+
final String area = Package.Areas.frontend.toString();
7272
addPreferenceDiXml(
73-
targetSimpleModelOneClassFqn,
73+
TARGET_MODEL_ONE_CLASS_FQN,
7474
"Foo\\Bar\\Model\\Override\\SimpleModelOne",
7575
area,
7676
"Foo\\Bar\\Model\\Override"
7777
);
78-
PsiFile preferenceDiXmlFile = addPreferenceDiXml(
79-
targetSimpleModelTwoClassFqn,
78+
final PsiFile preferenceDiXmlFile = addPreferenceDiXml(
79+
TARGET_MODEL_TWO_CLASS_FQN,
8080
"Foo\\Bar\\Model\\Override\\SimpleModelTwo",
8181
area,
8282
"Foo\\Bar\\Model\\Override"
8383
);
8484

85-
String filePath = this.getFixturePath(ModuleDiXml.FILE_NAME);
86-
PsiFile expectedFile = myFixture.configureByFile(filePath);
85+
final String filePath = this.getFixturePath(ModuleDiXml.FILE_NAME);
86+
final PsiFile expectedFile = myFixture.configureByFile(filePath);
8787

8888
assertGeneratedFileIsCorrect(
8989
expectedFile,
@@ -102,21 +102,21 @@ public void testAddTwoPreferencesToOneDiXmlFile() {
102102
* @return PsiFile
103103
*/
104104
private PsiFile addPreferenceDiXml(
105-
String targetClassFnq,
106-
String preferenceFqn,
107-
String area,
108-
String namespace
105+
final String targetClassFnq,
106+
final String preferenceFqn,
107+
final String area,
108+
final String namespace
109109
) {
110-
Project project = myFixture.getProject();
111-
PhpClass targetClass = GetPhpClassByFQN.getInstance(project).execute(targetClassFnq);
112-
PreferenceDiXmFileData preferenceDiXmlFileData = new PreferenceDiXmFileData(
113-
module,
110+
final Project project = myFixture.getProject();
111+
final PhpClass targetClass = GetPhpClassByFQN.getInstance(project).execute(targetClassFnq);
112+
final PreferenceDiXmFileData preferenceDiXmlFileData = new PreferenceDiXmFileData(
113+
MODULE,
114114
targetClass,
115115
preferenceFqn,
116116
namespace,
117117
area
118118
);
119-
PreferenceDiXmlGenerator moduleXmlGenerator = new PreferenceDiXmlGenerator(
119+
final PreferenceDiXmlGenerator moduleXmlGenerator = new PreferenceDiXmlGenerator(
120120
preferenceDiXmlFileData,
121121
project
122122
);
@@ -130,11 +130,15 @@ private PsiFile addPreferenceDiXml(
130130
* @param area Area name
131131
* @return String
132132
*/
133-
private String getExpectedDirectory(String area) {
133+
private String getExpectedDirectory(final String area) {
134+
String expectedDirectory;
135+
134136
if (area.equals(Package.Areas.base.toString())) {
135-
return moduleDir + Package.MODULE_BASE_AREA_DIR;
137+
expectedDirectory = MODULE_DIR + Package.MODULE_BASE_AREA_DIR;
138+
} else {
139+
expectedDirectory = MODULE_DIR + Package.MODULE_BASE_AREA_DIR + File.separator + area;
136140
}
137141

138-
return moduleDir + Package.MODULE_BASE_AREA_DIR + File.separator + area;
142+
return expectedDirectory;
139143
}
140144
}

0 commit comments

Comments
 (0)