Fixed tests

Author: Vitaliy Boyko

src/com/magento/idea/magento2plugin/actions/generation/data/ModuleXmlData.java

@@ -14,7 +14,7 @@ public class ModuleXmlData {
     private final String moduleName;
     private final String setupVersion;
     private final PsiDirectory baseDir;
-    private final List<String> moduleDependencies;
+    private final List<String> moduleSequences;
     private final boolean createModuleDirs;
 
     /**
@@ -31,14 +31,14 @@ public ModuleXmlData(
             final String moduleName,
             final String setupVersion,
             final PsiDirectory baseDir,
-            final List<String> moduleDependencies,
+            final List<String> moduleSequences,
             final boolean createModuleDirs
     ) {
         this.packageName = packageName;
         this.moduleName = moduleName;
         this.setupVersion = setupVersion;
         this.baseDir = baseDir;
-        this.moduleDependencies = moduleDependencies;
+        this.moduleSequences = moduleSequences;
         this.createModuleDirs = createModuleDirs;
     }
 
@@ -58,8 +58,8 @@ public String getSetupVersion() {
         return this.setupVersion;
     }
 
-    public List<String> getModuleDependencies() {
-        return moduleDependencies;
+    public List<String> getModuleSequences() {
+        return moduleSequences;
     }
 
     public boolean isCreateModuleDirs() {

src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleXmlGenerator.java

@@ -14,9 +14,9 @@
 import com.magento.idea.magento2plugin.actions.generation.generator.util.FileFromTemplateGenerator;
 import com.magento.idea.magento2plugin.magento.files.ModuleXml;
 import com.magento.idea.magento2plugin.magento.packages.Package;
-import org.jetbrains.annotations.NotNull;
 import java.util.List;
 import java.util.Properties;
+import org.jetbrains.annotations.NotNull;
 
 public class ModuleXmlGenerator extends FileGenerator {
 
@@ -75,20 +75,21 @@ protected void fillAttributes(final Properties attributes) {
         if (moduleXmlData.getSetupVersion() != null) {
             attributes.setProperty("SETUP_VERSION", moduleXmlData.getSetupVersion());
         }
-        attributes.setProperty("SEQUENCES", this.getDependenciesString(moduleXmlData.getModuleDependencies()));
+        attributes.setProperty("SEQUENCES", this.getSequencesString(moduleXmlData.getModuleSequences()));
     }
 
-    private String getDependenciesString(List dependenciesList) {
+    private String getSequencesString(final List sequences) {
         String result = "";
-        Object[] dependencies = dependenciesList.toArray();
-        boolean noDependency = dependencies.length == 1 && dependencies[0].equals(ModuleXml.NO_DEPENDENCY_LABEL);
+        Object[] dependencies = sequences.toArray();
+        boolean noDependency = dependencies.length == 1 && dependencies[0]
+                .equals(ModuleXml.NO_SEQUENCES_LABEL);
 
         if (noDependency) {
             return result;
         }
 
-        for (int i = 0; i < dependencies.length; i++) {
-            String dependency = dependencies[i].toString();
+        for (Object o : dependencies) {
+            String dependency = o.toString();
             result = result.concat("<module name=\"" + dependency + "\"/>");
         }
 

src/com/magento/idea/magento2plugin/generation/php/MagentoModuleGenerator.java

@@ -5,14 +5,11 @@
 
 package com.magento.idea.magento2plugin.generation.php;
 
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParser;
 import com.intellij.ide.util.projectWizard.WebProjectTemplate;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.startup.StartupManager;
-import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.platform.ProjectGeneratorPeer;
 import com.intellij.psi.PsiDirectory;
@@ -27,20 +24,13 @@
 import com.magento.idea.magento2plugin.actions.generation.generator.ModuleRegistrationPhpGenerator;
 import com.magento.idea.magento2plugin.actions.generation.generator.ModuleXmlGenerator;
 import com.magento.idea.magento2plugin.init.ConfigurationManager;
-import com.magento.idea.magento2plugin.magento.files.ComposerJson;
 import com.magento.idea.magento2plugin.project.Settings;
 import java.util.ArrayList;
 import javax.swing.Icon;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.util.ArrayList;
-import java.util.List;
-
 public class MagentoModuleGenerator extends WebProjectTemplate<MagentoProjectGeneratorSettings> {
     public static String actionName = "Magento 2 Module";
 
@@ -142,7 +132,7 @@ private PsiFile generateComposerJson(
      * @param project Project
      * @param baseDir Base directory
      * @param settings Settings
-     * @return
+     * @return void
      */
     private PsiFile generateRegistrationPhp(
             @NotNull final Project project,

src/com/magento/idea/magento2plugin/magento/files/ModuleXml.java

@@ -12,7 +12,7 @@ public class ModuleXml implements ModuleFileInterface {
     public static final String FILE_NAME = "module.xml";
     public static final String MODULE_ATTR_NAME = "name";
     public static final String TEMPLATE = "Magento Module XML";
-    public static final String NO_DEPENDENCY_LABEL = "None";
+    public static final String NO_SEQUENCES_LABEL = "None";
     private static final ModuleXml INSTANCE = new ModuleXml();
 
     /**

testData/actions/generation/generator/ModuleXmlGenerator/generateFileInRoot/module.xml

@@ -1,5 +1,10 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Test_Module"/>
+    <module name="Test_Module">
+        <sequence>
+            <module name="Magento_Catalog"/>
+            <module name="Magento_InventoryApi"/>
+        </sequence>
+    </module>
 </config>

testData/actions/generation/generator/ModuleXmlGenerator/generateModuleFile/module.xml

@@ -1,5 +1,10 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Test_Module"/>
+    <module name="Test_Module">
+        <sequence>
+            <module name="Magento_Catalog"/>
+            <module name="Magento_InventoryApi"/>
+        </sequence>
+    </module>
 </config>

testData/actions/generation/generator/ModuleXmlGeneratorHaveSetupVersion/generateModuleFile/module.xml

@@ -1,5 +1,10 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Test_Module1" setup_version="1.0.0"/>
+    <module name="Test_Module1" setup_version="1.0.0">
+        <sequence>
+            <module name="Magento_Catalog"/>
+            <module name="Magento_InventoryApi"/>
+        </sequence>
+    </module>
 </config>

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

@@ -7,6 +7,7 @@
 import com.magento.idea.magento2plugin.magento.files.ModuleXml;
 import com.magento.idea.magento2plugin.magento.packages.File;
 import com.magento.idea.magento2plugin.magento.packages.Package;
+import java.util.Arrays;
 
 public class ModuleXmlGeneratorHaveSetupVersionTest extends BaseGeneratorTestCase {
 
@@ -24,6 +25,7 @@ public void testGenerateModuleFile() {
                 "Module1",
                 "1.0.0",
                 projectDir,
+                Arrays.asList("Magento_Catalog", "Magento_InventoryApi"),
                 true
         );
         final ModuleXmlGenerator moduleXmlGenerator = new ModuleXmlGenerator(

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

@@ -12,6 +12,7 @@
 import com.magento.idea.magento2plugin.magento.files.ModuleXml;
 import com.magento.idea.magento2plugin.magento.packages.File;
 import com.magento.idea.magento2plugin.magento.packages.Package;
+import java.util.Arrays;
 
 public class ModuleXmlGeneratorTest extends BaseGeneratorTestCase {
 
@@ -29,6 +30,7 @@ public void testGenerateModuleFile() {
                 "Module",
                 null,
                 projectDir,
+                Arrays.asList("Magento_Catalog", "Magento_InventoryApi"),
                 true
         );
         final ModuleXmlGenerator moduleXmlGenerator = new ModuleXmlGenerator(
@@ -60,6 +62,7 @@ public void testGenerateFileInRoot() {
                 "Module",
                 null,
                 projectDir,
+                Arrays.asList("Magento_Catalog", "Magento_InventoryApi"),
                 false
         );
         final ModuleXmlGenerator moduleXmlGenerator = new ModuleXmlGenerator(