Skip to content

Commit 16e8243

Browse files
author
Sergiy Zhovnir
committed
#issue-203-204 Fixed static tests
1 parent 17ebcb6 commit 16e8243

File tree

2 files changed

+22
-18
lines changed

2 files changed

+22
-18
lines changed

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

Lines changed: 8 additions & 4 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;
@@ -16,7 +17,7 @@ public class PreferenceClassGeneratorTest extends BaseGeneratorTestCase {
1617
private static final String targetSimpleModelTwoClassFqn = "Foo\\Bar\\Model\\SimpleModelTwo";
1718

1819
/**
19-
* Test preference class file generation
20+
* Test preference class file generation.
2021
*/
2122
public void testGeneratePreferenceClassFile() {
2223
PsiFile preferenceClassFile = createPreferenceClassFile(
@@ -38,7 +39,7 @@ public void testGeneratePreferenceClassFile() {
3839
}
3940

4041
/**
41-
* Test preference class file generation with inheritance
42+
* Test preference class file generation with inheritance.
4243
*/
4344
public void testGeneratePreferenceClassFileWithInheritance() {
4445
PsiFile preferenceClassFile = createPreferenceClassFile(
@@ -60,7 +61,7 @@ public void testGeneratePreferenceClassFileWithInheritance() {
6061
}
6162

6263
/**
63-
* Create preference class file
64+
* Create preference class file.
6465
*
6566
* @param targetClassFnq Target Class FQN
6667
* @param preferenceDirectory Preference Directory
@@ -89,7 +90,10 @@ private PsiFile createPreferenceClassFile(
8990
namespace,
9091
inheritClass
9192
);
92-
PreferenceClassGenerator preferenceClassGenerator = new PreferenceClassGenerator(preferenceFileData, project);
93+
PreferenceClassGenerator preferenceClassGenerator = new PreferenceClassGenerator(
94+
preferenceFileData,
95+
project
96+
);
9397

9498
return preferenceClassGenerator.generate("test");
9599
}

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

Lines changed: 14 additions & 14 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;
@@ -20,10 +21,9 @@ public class PreferenceDiXmlGeneratorTest extends BaseGeneratorTestCase {
2021
private static final String targetSimpleModelTwoClassFqn = "Foo\\Bar\\Model\\SimpleModelTwo";
2122

2223
/**
23-
* Test preference DI XML file generation
24+
* Test preference DI XML file generation.
2425
*/
25-
public void testGeneratePreferenceDiXml()
26-
{
26+
public void testGeneratePreferenceDiXml() {
2727
String area = Package.Areas.base.toString();
2828
PsiFile preferenceDiXmlFile = addPreferenceDiXml(
2929
targetSimpleModelOneClassFqn,
@@ -43,10 +43,9 @@ public void testGeneratePreferenceDiXml()
4343
}
4444

4545
/**
46-
* Test preference DI XML file generation for adminhtml area
46+
* Test preference DI XML file generation for adminhtml area.
4747
*/
48-
public void testGeneratePreferenceDiXmlForAdminhtmlArea()
49-
{
48+
public void testGeneratePreferenceDiXmlForAdminhtmlArea() {
5049
String area = Package.Areas.adminhtml.toString();
5150
PsiFile preferenceDiXmlFile = addPreferenceDiXml(
5251
targetSimpleModelTwoClassFqn,
@@ -66,10 +65,9 @@ public void testGeneratePreferenceDiXmlForAdminhtmlArea()
6665
}
6766

6867
/**
69-
* Test the adding of two preferences to one DI XML file
68+
* Test the adding of two preferences to one DI XML file.
7069
*/
71-
public void testAddTwoPreferencesToOneDiXmlFile()
72-
{
70+
public void testAddTwoPreferencesToOneDiXmlFile() {
7371
String area = Package.Areas.frontend.toString();
7472
addPreferenceDiXml(
7573
targetSimpleModelOneClassFqn,
@@ -95,7 +93,7 @@ public void testAddTwoPreferencesToOneDiXmlFile()
9593
}
9694

9795
/**
98-
* Add preference to XML file
96+
* Add preference to XML file.
9997
*
10098
* @param targetClassFnq Target class FQN
10199
* @param preferenceFqn Preference FQN
@@ -118,19 +116,21 @@ private PsiFile addPreferenceDiXml(
118116
namespace,
119117
area
120118
);
121-
PreferenceDiXmlGenerator moduleXmlGenerator = new PreferenceDiXmlGenerator(preferenceDiXmlFileData, project);
119+
PreferenceDiXmlGenerator moduleXmlGenerator = new PreferenceDiXmlGenerator(
120+
preferenceDiXmlFileData,
121+
project
122+
);
122123

123124
return moduleXmlGenerator.generate("test");
124125
}
125126

126127
/**
127-
* Get expected directory based on provided area
128+
* Get expected directory based on provided area.
128129
*
129130
* @param area Area name
130131
* @return String
131132
*/
132-
private String getExpectedDirectory(String area)
133-
{
133+
private String getExpectedDirectory(String area) {
134134
if (area.equals(Package.Areas.base.toString())) {
135135
return moduleDir + Package.MODULE_BASE_AREA_DIR;
136136
}

0 commit comments

Comments
 (0)