Mercurial > hg > release > icedtea-web-1.6
changeset 1163:716ea0c2ec19
Silenced to verbose unittests
* netx/net/sourceforge/jnlp/cache/ResourceDownloader.java: refactored to use try-with-resources
* tests/netx/unit/net/sourceforge/jnlp/PluginBridgeTest.java: become NoStdOutErrTest
* tests/netx/unit/net/sourceforge/jnlp/cache/ResourceDownloaderTest.java: same
* tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java: same
* tests/netx/unit/net/sourceforge/jnlp/cache/ResourceUrlCreatorTest.java: same
| author | Jiri Vanek <jvanek@redhat.com> |
|---|---|
| date | Fri, 27 Feb 2015 15:09:18 +0100 |
| parents | 5efce17cc54c |
| children | 85fe0274f4a8 |
| files | ChangeLog netx/net/sourceforge/jnlp/cache/ResourceDownloader.java tests/netx/unit/net/sourceforge/jnlp/PluginBridgeTest.java tests/netx/unit/net/sourceforge/jnlp/cache/ResourceDownloaderTest.java tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java tests/netx/unit/net/sourceforge/jnlp/cache/ResourceUrlCreatorTest.java |
| diffstat | 6 files changed, 51 insertions(+), 49 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Feb 27 15:05:42 2015 +0100 +++ b/ChangeLog Fri Feb 27 15:09:18 2015 +0100 @@ -1,3 +1,13 @@ +2015-02-27 Jiri Vanek <jvanek@redhat.com> + + Silenced to verbose unittests + * netx/net/sourceforge/jnlp/cache/ResourceDownloader.java: refactored to use + try-with-resources + * tests/netx/unit/net/sourceforge/jnlp/PluginBridgeTest.java: become NoStdOutErrTest + * tests/netx/unit/net/sourceforge/jnlp/cache/ResourceDownloaderTest.java: same + * tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java: same + * tests/netx/unit/net/sourceforge/jnlp/cache/ResourceUrlCreatorTest.java: same + 2015-02-27 Jiri Vanek <jvanek@redhat.com> All manifests in reproducers' jars have now Application-Name attribute
--- a/netx/net/sourceforge/jnlp/cache/ResourceDownloader.java Fri Feb 27 15:05:42 2015 +0100 +++ b/netx/net/sourceforge/jnlp/cache/ResourceDownloader.java Fri Feb 27 15:09:18 2015 +0100 @@ -375,14 +375,14 @@ private void writeDownloadToFile(Resource resource, URL downloadLocation, InputStream in) throws IOException { byte buf[] = new byte[1024]; int rlen; - OutputStream out = CacheUtil.getOutputStream(downloadLocation, resource.getDownloadVersion()); - while (-1 != (rlen = in.read(buf))) { - resource.incrementTransferred(rlen); - out.write(buf, 0, rlen); + try (OutputStream out = CacheUtil.getOutputStream(downloadLocation, resource.getDownloadVersion())) { + while (-1 != (rlen = in.read(buf))) { + resource.incrementTransferred(rlen); + out.write(buf, 0, rlen); + } + + in.close(); } - - in.close(); - out.close(); } private void uncompressGzip(URL compressedLocation, URL uncompressedLocation, Version version) throws IOException { @@ -390,38 +390,38 @@ byte buf[] = new byte[1024]; int rlen; - GZIPInputStream gzInputStream = new GZIPInputStream(new FileInputStream(CacheUtil - .getCacheFile(compressedLocation, version))); - InputStream inputStream = new BufferedInputStream(gzInputStream); - - BufferedOutputStream outputStream = new BufferedOutputStream(new FileOutputStream(CacheUtil - .getCacheFile(uncompressedLocation, version))); - - while (-1 != (rlen = inputStream.read(buf))) { - outputStream.write(buf, 0, rlen); + try (GZIPInputStream gzInputStream = new GZIPInputStream(new FileInputStream(CacheUtil + .getCacheFile(compressedLocation, version)))) { + InputStream inputStream = new BufferedInputStream(gzInputStream); + + BufferedOutputStream outputStream = new BufferedOutputStream(new FileOutputStream(CacheUtil + .getCacheFile(uncompressedLocation, version))); + + while (-1 != (rlen = inputStream.read(buf))) { + outputStream.write(buf, 0, rlen); + } + + outputStream.close(); + inputStream.close(); } - - outputStream.close(); - inputStream.close(); - gzInputStream.close(); } private void uncompressPackGz(URL compressedLocation, URL uncompressedLocation, Version version) throws IOException { OutputController.getLogger().log(OutputController.Level.ERROR_DEBUG, "Extracting packgz: " + compressedLocation + " to " + uncompressedLocation); - GZIPInputStream gzInputStream = new GZIPInputStream(new FileInputStream(CacheUtil - .getCacheFile(compressedLocation, version))); - InputStream inputStream = new BufferedInputStream(gzInputStream); - - JarOutputStream outputStream = new JarOutputStream(new FileOutputStream(CacheUtil - .getCacheFile(uncompressedLocation, version))); - - Pack200.Unpacker unpacker = Pack200.newUnpacker(); - unpacker.unpack(inputStream, outputStream); - - outputStream.close(); - inputStream.close(); - gzInputStream.close(); + try (GZIPInputStream gzInputStream = new GZIPInputStream(new FileInputStream(CacheUtil + .getCacheFile(compressedLocation, version)))) { + InputStream inputStream = new BufferedInputStream(gzInputStream); + + JarOutputStream outputStream = new JarOutputStream(new FileOutputStream(CacheUtil + .getCacheFile(uncompressedLocation, version))); + + Pack200.Unpacker unpacker = Pack200.newUnpacker(); + unpacker.unpack(inputStream, outputStream); + + outputStream.close(); + inputStream.close(); + } } /**
--- a/tests/netx/unit/net/sourceforge/jnlp/PluginBridgeTest.java Fri Feb 27 15:05:42 2015 +0100 +++ b/tests/netx/unit/net/sourceforge/jnlp/PluginBridgeTest.java Fri Feb 27 15:09:18 2015 +0100 @@ -33,12 +33,13 @@ import java.util.List; import net.sourceforge.jnlp.cache.UpdatePolicy; +import net.sourceforge.jnlp.util.logging.NoStdOutErrTest; import net.sourceforge.jnlp.util.replacements.BASE64Encoder; import org.junit.Assert; import org.junit.Test; -public class PluginBridgeTest { +public class PluginBridgeTest extends NoStdOutErrTest{ private class MockJNLPCreator extends JNLPCreator { private URL JNLPHref;
--- a/tests/netx/unit/net/sourceforge/jnlp/cache/ResourceDownloaderTest.java Fri Feb 27 15:05:42 2015 +0100 +++ b/tests/netx/unit/net/sourceforge/jnlp/cache/ResourceDownloaderTest.java Fri Feb 27 15:09:18 2015 +0100 @@ -3,15 +3,10 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import java.io.BufferedInputStream; -import java.io.BufferedOutputStream; import java.io.ByteArrayOutputStream; import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; -import java.io.InputStream; import java.io.PrintStream; import java.net.HttpURLConnection; import java.net.URL; @@ -19,14 +14,11 @@ import java.util.EnumSet; import java.util.HashMap; import java.util.jar.Attributes; -import java.util.jar.JarInputStream; import java.util.jar.JarOutputStream; import java.util.jar.Manifest; import java.util.jar.Pack200; -import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; -import javax.smartcardio.ATR; import org.junit.AfterClass; import org.junit.Assert; @@ -40,9 +32,10 @@ import net.sourceforge.jnlp.config.DeploymentConfiguration; import net.sourceforge.jnlp.runtime.JNLPRuntime; import net.sourceforge.jnlp.util.JarFile; +import net.sourceforge.jnlp.util.logging.NoStdOutErrTest; import net.sourceforge.jnlp.util.logging.OutputController; -public class ResourceDownloaderTest { +public class ResourceDownloaderTest extends NoStdOutErrTest{ public static ServerLauncher testServer; public static ServerLauncher testServerWithBrokenHead; @@ -342,8 +335,6 @@ private Resource setupResource(String fileName, String text) throws IOException { File f = setupFile(fileName, text); URL url = downloadServer.getUrl(fileName); - System.out.println(url); - Resource resource = Resource.getResource(url, null, UpdatePolicy.NEVER); return resource; }
--- a/tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java Fri Feb 27 15:05:42 2015 +0100 +++ b/tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java Fri Feb 27 15:09:18 2015 +0100 @@ -66,9 +66,10 @@ import net.sourceforge.jnlp.config.DeploymentConfiguration; import net.sourceforge.jnlp.runtime.JNLPRuntime; import net.sourceforge.jnlp.util.UrlUtils; +import net.sourceforge.jnlp.util.logging.NoStdOutErrTest; import net.sourceforge.jnlp.util.logging.OutputController; -public class ResourceTrackerTest { +public class ResourceTrackerTest extends NoStdOutErrTest{ public static ServerLauncher downloadServer; private static final PrintStream[] backedUpStream = new PrintStream[4];
--- a/tests/netx/unit/net/sourceforge/jnlp/cache/ResourceUrlCreatorTest.java Fri Feb 27 15:05:42 2015 +0100 +++ b/tests/netx/unit/net/sourceforge/jnlp/cache/ResourceUrlCreatorTest.java Fri Feb 27 15:09:18 2015 +0100 @@ -1,18 +1,17 @@ package net.sourceforge.jnlp.cache; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertFalse; import java.net.MalformedURLException; import java.net.URL; import net.sourceforge.jnlp.DownloadOptions; import net.sourceforge.jnlp.Version; +import net.sourceforge.jnlp.util.logging.NoStdOutErrTest; import org.junit.Test; -public class ResourceUrlCreatorTest { +public class ResourceUrlCreatorTest extends NoStdOutErrTest{ private static final Version VERSION_11 = new Version("1.1"); private static final Version VERSION_20 = new Version("2.0");