Skip to content

Commit 6cc8906

Browse files
author
Vitaliy Boyko
committed
Refactoring after code review
1 parent d7c7fa5 commit 6cc8906

File tree

1 file changed

+13
-24
lines changed

1 file changed

+13
-24
lines changed

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

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,7 @@ public void testGenerateModuleFile() {
2020
PsiFile expectedFile = myFixture.configureByFile(filePath);
2121
PsiDirectory projectDir = getProjectDirectory();
2222

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);
3924

4025
assertGeneratedFileIsCorrect(
4126
expectedFile,
@@ -49,6 +34,16 @@ public void testGenerateFileInRoot() {
4934
PsiFile expectedFile = myFixture.configureByFile(filePath);
5035
PsiDirectory projectDir = getProjectDirectory();
5136

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) {
5247
Project project = myFixture.getProject();
5348
List<String> dependencies = new ArrayList<>(Arrays.asList("Foo_Bar", "Magento_Backend"));
5449
List<String> licenses = new ArrayList<>(Arrays.asList("Test License 1", "Test License 2"));
@@ -61,15 +56,9 @@ public void testGenerateFileInRoot() {
6156
"1.0.0-dev",
6257
licenses,
6358
dependencies,
64-
false
59+
createModuleDirectories
6560
);
6661
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");
7463
}
7564
}

0 commit comments

Comments
 (0)