Implement group in GradleModelLoader

forge · Aug 6, 2013 · 35ab877 · 35ab877
1 parent 0912e01
commit 35ab877
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 20 deletions.
diff --git a/impl/src/main/java/org/jboss/forge/addon/gradle/projects/model/GradleModelImpl.java b/impl/src/main/java/org/jboss/forge/addon/gradle/projects/model/GradleModelImpl.java
@@ -20,8 +20,8 @@ public class GradleModelImpl implements GradleModel
 {
    private String script;
 
-   private String name;
    private String group;
+   private String name;
    private String version;
    private String packaging;
    private String archivePath;
@@ -53,14 +53,15 @@ public GradleModelImpl()
       this.sourceSets = Lists.newArrayList();
    }
 
-   public GradleModelImpl(String script, String projectName, String version,
+   public GradleModelImpl(String script, String group, String name, String version,
             String packaging, String archivePath, List<GradleTask> tasks,
             List<GradleDependency> dependencies, List<GradleDependency> managedDependencies,
             List<GradleProfile> profiles, List<GradlePlugin> plugins, List<GradleRepository> repositories,
             List<GradleSourceSet> sourceSets, Map<String, String> properties)
    {
       this.script = script;
-      this.name = projectName;
+      this.group = group;
+      this.name = name;
       this.version = version;
       this.packaging = packaging;
       this.archivePath = archivePath;

diff --git a/impl/src/main/java/org/jboss/forge/addon/gradle/projects/model/GradleModelLoaderImpl.java b/impl/src/main/java/org/jboss/forge/addon/gradle/projects/model/GradleModelLoaderImpl.java
@@ -47,7 +47,8 @@ private List<GradleProfile> profilesFromNode(String script, Node rootNode)
 
    private GradleModel modelFromNode(String script, Node projectNode, List<GradleProfile> profiles)
    {
-      String projectName = projectNameFromNode(projectNode);
+      String group = groupFromNode(projectNode);
+      String name = nameFromNode(projectNode);
       String version = versionFromNode(projectNode);
       List<GradleTask> tasks = tasksFromNode(projectNode);
       List<GradleDependency> deps = depsFromNode(projectNode);
@@ -57,11 +58,16 @@ private GradleModel modelFromNode(String script, Node projectNode, List<GradlePr
       List<GradleSourceSet> sourceSets = sourceSetsFromNode(projectNode);
       Map<String, String> properties = propertiesFromNode(projectNode);
 
-      return new GradleModelImpl("", projectName, version, "", "", tasks, deps,
+      return new GradleModelImpl(script, group, name, version, "", "", tasks, deps,
                managedDeps, profiles, plugins, repositories, sourceSets, properties);
    }
+
+   private String groupFromNode(Node projectNode)
+   {
+      return projectNode.getSingle("group").getText().trim();
+   }
 
-   private String projectNameFromNode(Node projectNode)
+   private String nameFromNode(Node projectNode)
    {
       return projectNode.getSingle("name").getText().trim();
    }

diff --git a/impl/src/test/java/org/jboss/forge/addon/gradle/projects/model/GradleModelLoaderTest.java b/impl/src/test/java/org/jboss/forge/addon/gradle/projects/model/GradleModelLoaderTest.java
@@ -31,9 +31,15 @@ public static void init() throws IOException
       String source = Streams.toString(GradleModelLoaderTest.class.getResourceAsStream("/loader/forge-output.xml"));
       model = loader.loadFromXML(source);
    }
+
+   @Test
+   public void getGroup()
+   {
+      assertEquals("groupgroup", model.getGroup());
+   }
 
    @Test
-   public void testProjectName()
+   public void testName()
    {
       assertEquals("Gradle Test Project", model.getName());
    }

diff --git a/impl/src/test/resources/loader/build.gradle b/impl/src/test/resources/loader/build.gradle
@@ -6,6 +6,7 @@ apply plugin: 'eclipse'
 apply from: '../../../main/resources/forge.gradle'
 
 sourceCompatibility = '1.7'
+group = 'groupgroup'
 version = '0.1-SNAPSHOT'
 
 def mainClass = 'org.test.MainClass'

diff --git a/impl/src/test/resources/loader/forge-output.xml b/impl/src/test/resources/loader/forge-output.xml
@@ -1,7 +1,7 @@
 <forgeOutput>
    <project>
       <group>
-
+         groupgroup
       </group>
       <name>
          Gradle Test Project
@@ -96,13 +96,13 @@
                   compileScala
                </task>
                <task>
-                  compileGroovy
+                  compileJava
                </task>
                <task>
-                  processResources
+                  compileGroovy
                </task>
                <task>
-                  compileJava
+                  processResources
                </task>
             </dependsOn>
          </task>
@@ -122,10 +122,10 @@
                   cleanEclipseJdt
                </task>
                <task>
-                  cleanEclipseClasspath
+                  cleanEclipseProject
                </task>
                <task>
-                  cleanEclipseProject
+                  cleanEclipseClasspath
                </task>
             </dependsOn>
          </task>
@@ -219,13 +219,13 @@
             </name>
             <dependsOn>
                <task>
-                  eclipseJdt
+                  eclipseClasspath
                </task>
                <task>
                   eclipseProject
                </task>
                <task>
-                  eclipseClasspath
+                  eclipseJdt
                </task>
             </dependsOn>
          </task>
@@ -360,13 +360,13 @@
             </name>
             <dependsOn>
                <task>
-                  compileTestScala
+                  compileTestJava
                </task>
                <task>
-                  compileTestGroovy
+                  compileTestScala
                </task>
                <task>
-                  compileTestJava
+                  compileTestGroovy
                </task>
                <task>
                   processTestResources
@@ -845,7 +845,7 @@
       </name>
       <project>
          <group>
-
+            groupgroup
          </group>
          <name>
             Gradle Test Project
@@ -974,7 +974,7 @@
       </name>
       <project>
          <group>
-
+            groupgroup
          </group>
          <name>
             Gradle Test Project