@@ -19,6 +19,7 @@ public class PreferenceDiXmlGeneratorTest extends BaseGeneratorTestCase {
19
19
private static final String MODULE_DIR = "src/app/code/Foo/Bar/" ;
20
20
private static final String TARGET_MODEL_ONE_CLASS_FQN = "Foo\\ Bar\\ Model\\ SimpleModelOne" ;
21
21
private static final String TARGET_MODEL_TWO_CLASS_FQN = "Foo\\ Bar\\ Model\\ SimpleModelTwo" ;
22
+ private static final String NAMESPACE = "Foo\\ Bar\\ Model\\ Override" ;
22
23
23
24
/**
24
25
* Test preference DI XML file generation.
@@ -28,8 +29,7 @@ public void testGeneratePreferenceDiXml() {
28
29
final PsiFile preferenceDiXmlFile = addPreferenceDiXml (
29
30
TARGET_MODEL_ONE_CLASS_FQN ,
30
31
"Foo\\ Bar\\ Model\\ Override\\ SimpleModelOne" ,
31
- area ,
32
- "Foo\\ Bar\\ Model\\ Override"
32
+ area
33
33
);
34
34
35
35
final String filePath = this .getFixturePath (ModuleDiXml .FILE_NAME );
@@ -50,8 +50,7 @@ public void testGeneratePreferenceDiXmlForAdminhtmlArea() {
50
50
final PsiFile preferenceDiXmlFile = addPreferenceDiXml (
51
51
TARGET_MODEL_TWO_CLASS_FQN ,
52
52
"Foo\\ Bar\\ Model\\ Override\\ SimpleModelTwo" ,
53
- area ,
54
- "Foo\\ Bar\\ Model\\ Override"
53
+ area
55
54
);
56
55
57
56
final String filePath = this .getFixturePath (ModuleDiXml .FILE_NAME );
@@ -72,14 +71,12 @@ public void testAddTwoPreferencesToOneDiXmlFile() {
72
71
addPreferenceDiXml (
73
72
TARGET_MODEL_ONE_CLASS_FQN ,
74
73
"Foo\\ Bar\\ Model\\ Override\\ SimpleModelOne" ,
75
- area ,
76
- "Foo\\ Bar\\ Model\\ Override"
74
+ area
77
75
);
78
76
final PsiFile preferenceDiXmlFile = addPreferenceDiXml (
79
77
TARGET_MODEL_TWO_CLASS_FQN ,
80
78
"Foo\\ Bar\\ Model\\ Override\\ SimpleModelTwo" ,
81
- area ,
82
- "Foo\\ Bar\\ Model\\ Override"
79
+ area
83
80
);
84
81
85
82
final String filePath = this .getFixturePath (ModuleDiXml .FILE_NAME );
@@ -98,22 +95,20 @@ public void testAddTwoPreferencesToOneDiXmlFile() {
98
95
* @param targetClassFnq Target class FQN
99
96
* @param preferenceFqn Preference FQN
100
97
* @param area Area
101
- * @param namespace Namespace
102
98
* @return PsiFile
103
99
*/
104
100
private PsiFile addPreferenceDiXml (
105
101
final String targetClassFnq ,
106
102
final String preferenceFqn ,
107
- final String area ,
108
- final String namespace
103
+ final String area
109
104
) {
110
105
final Project project = myFixture .getProject ();
111
106
final PhpClass targetClass = GetPhpClassByFQN .getInstance (project ).execute (targetClassFnq );
112
107
final PreferenceDiXmFileData preferenceDiXmlFileData = new PreferenceDiXmFileData (
113
108
MODULE ,
114
109
targetClass ,
115
110
preferenceFqn ,
116
- namespace ,
111
+ NAMESPACE ,
117
112
area
118
113
);
119
114
final PreferenceDiXmlGenerator moduleXmlGenerator = new PreferenceDiXmlGenerator (
0 commit comments