@@ -19,6 +19,7 @@ public class PreferenceDiXmlGeneratorTest extends BaseGeneratorTestCase {
1919 private static final String MODULE_DIR = "src/app/code/Foo/Bar/" ;
2020 private static final String TARGET_MODEL_ONE_CLASS_FQN = "Foo\\ Bar\\ Model\\ SimpleModelOne" ;
2121 private static final String TARGET_MODEL_TWO_CLASS_FQN = "Foo\\ Bar\\ Model\\ SimpleModelTwo" ;
22+ private static final String NAMESPACE = "Foo\\ Bar\\ Model\\ Override" ;
2223
2324 /**
2425 * Test preference DI XML file generation.
@@ -28,8 +29,7 @@ public void testGeneratePreferenceDiXml() {
2829 final PsiFile preferenceDiXmlFile = addPreferenceDiXml (
2930 TARGET_MODEL_ONE_CLASS_FQN ,
3031 "Foo\\ Bar\\ Model\\ Override\\ SimpleModelOne" ,
31- area ,
32- "Foo\\ Bar\\ Model\\ Override"
32+ area
3333 );
3434
3535 final String filePath = this .getFixturePath (ModuleDiXml .FILE_NAME );
@@ -50,8 +50,7 @@ public void testGeneratePreferenceDiXmlForAdminhtmlArea() {
5050 final PsiFile preferenceDiXmlFile = addPreferenceDiXml (
5151 TARGET_MODEL_TWO_CLASS_FQN ,
5252 "Foo\\ Bar\\ Model\\ Override\\ SimpleModelTwo" ,
53- area ,
54- "Foo\\ Bar\\ Model\\ Override"
53+ area
5554 );
5655
5756 final String filePath = this .getFixturePath (ModuleDiXml .FILE_NAME );
@@ -72,14 +71,12 @@ public void testAddTwoPreferencesToOneDiXmlFile() {
7271 addPreferenceDiXml (
7372 TARGET_MODEL_ONE_CLASS_FQN ,
7473 "Foo\\ Bar\\ Model\\ Override\\ SimpleModelOne" ,
75- area ,
76- "Foo\\ Bar\\ Model\\ Override"
74+ area
7775 );
7876 final PsiFile preferenceDiXmlFile = addPreferenceDiXml (
7977 TARGET_MODEL_TWO_CLASS_FQN ,
8078 "Foo\\ Bar\\ Model\\ Override\\ SimpleModelTwo" ,
81- area ,
82- "Foo\\ Bar\\ Model\\ Override"
79+ area
8380 );
8481
8582 final String filePath = this .getFixturePath (ModuleDiXml .FILE_NAME );
@@ -98,22 +95,20 @@ public void testAddTwoPreferencesToOneDiXmlFile() {
9895 * @param targetClassFnq Target class FQN
9996 * @param preferenceFqn Preference FQN
10097 * @param area Area
101- * @param namespace Namespace
10298 * @return PsiFile
10399 */
104100 private PsiFile addPreferenceDiXml (
105101 final String targetClassFnq ,
106102 final String preferenceFqn ,
107- final String area ,
108- final String namespace
103+ final String area
109104 ) {
110105 final Project project = myFixture .getProject ();
111106 final PhpClass targetClass = GetPhpClassByFQN .getInstance (project ).execute (targetClassFnq );
112107 final PreferenceDiXmFileData preferenceDiXmlFileData = new PreferenceDiXmFileData (
113108 MODULE ,
114109 targetClass ,
115110 preferenceFqn ,
116- namespace ,
111+ NAMESPACE ,
117112 area
118113 );
119114 final PreferenceDiXmlGenerator moduleXmlGenerator = new PreferenceDiXmlGenerator (
0 commit comments