@@ -20,22 +20,7 @@ public void testGenerateModuleFile() {
20
20
PsiFile expectedFile = myFixture .configureByFile (filePath );
21
21
PsiDirectory projectDir = getProjectDirectory ();
22
22
23
- Project project = myFixture .getProject ();
24
- List <String > dependencies = new ArrayList <>(Arrays .asList ("Foo_Bar" , "Magento_Backend" ));
25
- List <String > licenses = new ArrayList <>(Arrays .asList ("Test License 1" , "Test License 2" ));
26
- ModuleComposerJsonData composerJsonData = new ModuleComposerJsonData (
27
- "Test" ,
28
- "Module" ,
29
- projectDir ,
30
- "test-description" ,
31
- "test/module" ,
32
- "1.0.0-dev" ,
33
- licenses ,
34
- dependencies ,
35
- true
36
- );
37
- ModuleComposerJsonGenerator composerJsonGenerator = new ModuleComposerJsonGenerator (composerJsonData , project );
38
- PsiFile composerJson = composerJsonGenerator .generate ("test" );
23
+ PsiFile composerJson = generateComposerJson (true , projectDir );
39
24
40
25
assertGeneratedFileIsCorrect (
41
26
expectedFile ,
@@ -49,6 +34,16 @@ public void testGenerateFileInRoot() {
49
34
PsiFile expectedFile = myFixture .configureByFile (filePath );
50
35
PsiDirectory projectDir = getProjectDirectory ();
51
36
37
+ PsiFile composerJson = generateComposerJson (false , projectDir );
38
+
39
+ assertGeneratedFileIsCorrect (
40
+ expectedFile ,
41
+ projectDir .getVirtualFile ().getPath (),
42
+ composerJson
43
+ );
44
+ }
45
+
46
+ private PsiFile generateComposerJson (boolean createModuleDirectories , PsiDirectory projectDir ) {
52
47
Project project = myFixture .getProject ();
53
48
List <String > dependencies = new ArrayList <>(Arrays .asList ("Foo_Bar" , "Magento_Backend" ));
54
49
List <String > licenses = new ArrayList <>(Arrays .asList ("Test License 1" , "Test License 2" ));
@@ -61,15 +56,9 @@ public void testGenerateFileInRoot() {
61
56
"1.0.0-dev" ,
62
57
licenses ,
63
58
dependencies ,
64
- false
59
+ createModuleDirectories
65
60
);
66
61
ModuleComposerJsonGenerator composerJsonGenerator = new ModuleComposerJsonGenerator (composerJsonData , project );
67
- PsiFile composerJson = composerJsonGenerator .generate ("test" );
68
-
69
- assertGeneratedFileIsCorrect (
70
- expectedFile ,
71
- projectDir .getVirtualFile ().getPath (),
72
- composerJson
73
- );
62
+ return composerJsonGenerator .generate ("test" );
74
63
}
75
64
}
0 commit comments