Merge branch 'master' of https://github.com/ianpojman/scala-arm into ianpojman-master

Author: jsuereth

src/main/scala/resource/Resource.scala

@@ -116,20 +116,6 @@ sealed trait MediumPriorityResourceImplicits extends LowPriorityResourceImplicit
     override def close(r: A) = r.close()
     override def toString = "Resource[javax.sql.PooledConnection]"
   }
-
-  // GZIP must be "finished" when done.
-  @deprecated("Use `gzipOuputStreamResource`", "3.0")
-  object gzipOuputStraemResource extends Resource[GZIPOutputStream] {
-    override def close(r: GZIPOutputStream): Unit = r.finish()
-    override def toString = "Resource[GZIPOutputStream]"
-  }
-
-  // GZIP must be "finished" when done.
-  implicit object gzipOuputStreamResource extends Resource[GZIPOutputStream] {
-    override def close(r: GZIPOutputStream): Unit = r.finish()
-    override def toString = "Resource[GZIPOutputStream]"
-  }
-
   // JarFile does not extends java.io.Closeable on all JDKs.
   implicit object jarFileResource extends Resource[JarFile] {
     override def close(r: JarFile): Unit = r.close()

src/test/scala/resource/TestUsing.scala

@@ -2,7 +2,7 @@ package resource
 
 import java.io._
 import java.nio.charset.Charset
-import java.util.zip.{GZIPInputStream, GZIPOutputStream}
+import java.util.zip.{DeflaterOutputStream, GZIPInputStream, GZIPOutputStream}
 
 import org.junit.Test
 import org.junit.Assert._
@@ -85,4 +85,17 @@ class TestUsing {
     val result = new String(buf)
     assertEquals("Failed to successfully read from gzip", expected, result)
   }
-}
+
+  @Test
+  def testGzipClose(): Unit = {
+    val l = new GZIPOutputStream(new ByteArrayOutputStream())
+    managed(l).acquireFor { _ => }
+    assertTrue("GZIPOutputStream was closed after write", streamClosed(l))
+  }
+
+  def streamClosed(gzipOut: DeflaterOutputStream): Boolean = {
+    val privateField = classOf[DeflaterOutputStream].getDeclaredField("closed")
+    privateField.setAccessible(true)
+    privateField.get(gzipOut).asInstanceOf[Boolean]
+  }
+}