Fix forge output clean up

forge · Feb 19, 2014 · 5cbe04c · 5cbe04c
1 parent e9ec288
commit 5cbe04c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/impl-projects/src/main/java/org/jboss/forge/addon/gradle/projects/GradleFacetImpl.java b/impl-projects/src/main/java/org/jboss/forge/addon/gradle/projects/GradleFacetImpl.java
@@ -7,6 +7,8 @@
 package org.jboss.forge.addon.gradle.projects;
 
 import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.Map;
 
 import javax.inject.Inject;
@@ -186,7 +188,15 @@ private void loadModel()
 
       FileResource<?> forgeOutputfile = (FileResource<?>) getFaceted().getRootDirectory().getChild(
                GradleSourceUtil.FORGE_OUTPUT_XML);
-      String forgeOutput = Streams.toString(forgeOutputfile.getResourceInputStream());
+      String forgeOutput = null;
+      try (InputStream stream = forgeOutputfile.getResourceInputStream())
+      {
+         forgeOutput = Streams.toString(stream);
+      }
+      catch (IOException e)
+      {
+         throw new RuntimeException(e);
+      }
 
       forgeOutputfile.delete();
 

diff --git a/tests/src/test/java/org/jboss/forge/addon/gradle/projects/GradleFacetTest.java b/tests/src/test/java/org/jboss/forge/addon/gradle/projects/GradleFacetTest.java
@@ -7,6 +7,7 @@
 package org.jboss.forge.addon.gradle.projects;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
@@ -19,6 +20,7 @@
 import org.gradle.jarjar.com.google.common.collect.Lists;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.forge.addon.gradle.parser.GradleSourceUtil;
 import org.jboss.forge.addon.gradle.projects.model.GradleModelBuilder;
 import org.jboss.forge.addon.gradle.projects.model.GradleTask;
 import org.jboss.forge.addon.gradle.projects.model.GradleTaskBuilder;
@@ -76,6 +78,14 @@ public void cleanUp()
    {
       projectProvider.clean();
    }
+
+   @Test
+   public void testForgeOutputCleanUp()
+   {
+      facet.getModel();
+      assertFalse(((FileResource<?>) resourceFactory.create(new File(project.getRootDirectory()
+               .getFullyQualifiedName(), GradleSourceUtil.FORGE_OUTPUT_XML))).exists());
+   }
 
    @Test
    public void testReadTaskList()