commit 79f25a0ab9371f95f310113f41ff5bf12e385e1b
author Florian Waibel <fwaibel@eclipsesource.com> Sun May 24 11:22:19 2015 +0200
committer Florian Waibel <fwaibel@eclipsesource.com> Sun May 24 11:22:19 2015 +0200
tree 2f01208d86bc4d4350232e0b77aec6fbe216fc9e
parent 1d4d1c5be4c54fa9e0e3a2fed3086cea861755c5

Fixes resource leak(s) in JUnit test

org.eclipse.virgo.apps.repository.web/src/test/java/org/eclipse/virgo/apps/repository/web/RepositoryControllerTests.java

diff --git a/org.eclipse.virgo.apps.repository.web/src/test/java/org/eclipse/virgo/apps/repository/web/RepositoryControllerTests.java b/org.eclipse.virgo.apps.repository.web/src/test/java/org/eclipse/virgo/apps/repository/web/RepositoryControllerTests.java
index c664b95..b3e4531 100644
--- a/org.eclipse.virgo.apps.repository.web/src/test/java/org/eclipse/virgo/apps/repository/web/RepositoryControllerTests.java
+++ b/org.eclipse.virgo.apps.repository.web/src/test/java/org/eclipse/virgo/apps/repository/web/RepositoryControllerTests.java
@@ -19,6 +19,7 @@
 import static org.junit.Assert.assertEquals;
 
 import java.io.ByteArrayInputStream;
+import java.io.InputStream;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -27,7 +28,6 @@
 import org.junit.Test;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
-
 import org.eclipse.virgo.apps.repository.core.RepositoryIndex;
 import org.eclipse.virgo.apps.repository.core.RepositoryManager;
 
@@ -54,20 +54,23 @@
         byte[] indexBytes = new byte[] { 1, 2, 3, 4, 5, 6, 7, 8 };
 
         RepositoryIndex repositoryIndex = createMock(RepositoryIndex.class);
-        expect(repositoryIndex.getInputStream()).andReturn(new ByteArrayInputStream(indexBytes)).anyTimes();
-        expect(repositoryIndex.getETag()).andReturn("123456789").anyTimes();
-        expect(repositoryIndex.getLength()).andReturn(indexBytes.length).anyTimes();
 
-        expect(this.repositoryManager.getIndex("my-repo")).andReturn(repositoryIndex);
-
-        replay(this.repositoryManager, repositoryIndex);
-
-        repositoryController.getIndex(request, response);
-
-        verify(this.repositoryManager, repositoryIndex);
-
-        assertEquals("application/org.eclipse.virgo.repository.Index", response.getContentType());
-        assertArrayEquals(indexBytes, response.getContentAsByteArray());
+        try (InputStream indexBytesAsStream = new ByteArrayInputStream(indexBytes)) {
+            expect(repositoryIndex.getInputStream()).andReturn(indexBytesAsStream);
+            expect(repositoryIndex.getETag()).andReturn("123456789").anyTimes();
+            expect(repositoryIndex.getLength()).andReturn(indexBytes.length);
+            
+            expect(this.repositoryManager.getIndex("my-repo")).andReturn(repositoryIndex);
+            
+            replay(this.repositoryManager, repositoryIndex);
+            
+            repositoryController.getIndex(request, response);
+            
+            verify(this.repositoryManager, repositoryIndex);
+            
+            assertEquals("application/org.eclipse.virgo.repository.Index", response.getContentType());
+            assertArrayEquals(indexBytes, response.getContentAsByteArray());
+        }
     }
 
     @Test