ensure entry exists in arquillian.xml after adding container to pom

forge · Jul 19, 2013 · 38e6cb4 · 38e6cb4
1 parent 974defb
commit 38e6cb4
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/src/main/java/org/jboss/forge/arquillian/ArquillianPlugin.java b/src/main/java/org/jboss/forge/arquillian/ArquillianPlugin.java
@@ -163,12 +163,22 @@ else if (testframework.equals("testng"))
 
       ResourceFacet resources = project.getFacet(ResourceFacet.class);
       FileResource<?> resource = (FileResource<?>) resources.getTestResourceFolder().getChild("arquillian.xml");
+      Node arquillianConfig = null;
       if (!resource.exists())
       {
-         Node arquillianConfig = createNewArquillianConfig();
-         // Add an empty container config
-         arquillianConfig.getOrCreate("container@qualifier=" + containerId);
-         resource.setContents(XMLParser.toXMLString(arquillianConfig));
+         arquillianConfig = createNewArquillianConfig();
+      }
+      else
+      {
+         arquillianConfig = XMLParser.parse(resource.getResourceInputStream());
+      }
+
+      // Make sure a container config exists for this container (otherwise activating it will fail)
+      Node containerConfig = arquillianConfig.getSingle("container@qualifier=" + containerId);
+      if (containerConfig == null)
+      {
+          arquillianConfig.createChild("container@qualifier=" + containerId);
+          resource.setContents(XMLParser.toXMLString(arquillianConfig));
       }
    }
 

diff --git a/src/test/java/test/integration/PluginTest.java b/src/test/java/test/integration/PluginTest.java
@@ -20,6 +20,8 @@
 import org.jboss.forge.arquillian.ArquillianPlugin;
 import org.jboss.forge.arquillian.container.Container;
 import org.jboss.forge.maven.MavenCoreFacet;
+import org.jboss.forge.parser.xml.Node;
+import org.jboss.forge.parser.xml.XMLParser;
 import org.jboss.forge.project.Project;
 import org.jboss.forge.project.facets.ResourceFacet;
 import org.jboss.forge.resources.FileResource;
@@ -87,6 +89,15 @@ private Project installContainer(final String container, final List<DependencyMa
       assertNotNull("Verify that the plugin use a version property for junit",
               pom.getProperties().get(ArquillianPlugin.JUNIT_VERSION_PROP_NAME));
 
+      ResourceFacet facet = project.getFacet(ResourceFacet.class);
+      FileResource<?> arquillianXml = facet.getTestResource("arquillian.xml");
+
+      assertThat(arquillianXml, is(notNullValue()));
+      assertThat(arquillianXml.exists(), is(true));
+
+      Node arquillianXmlRoot = XMLParser.parse(arquillianXml.getResourceInputStream());
+      assertThat(arquillianXmlRoot.getSingle("container@qualifier=" + container), is(notNullValue()));
+
       return project;
    }