[rfc][icedtea-web] fixfor portalbank.no

[Adam Domurad]

> [..snip..]
> +package net.sourceforge.jnlp;
> +
> +import org.junit.Assert;
> +import org.junit.Test;
> +
> +public class VersionTest {
> +
> +    private static boolean[] results = {true,
> +        true,
> +        false,
> +        true,
> +        false,
> +        true,
> +        false,
> +        true,
> +        false,
> +        false,
> +        false,
> +        false,
> +        true,
> +        true,
> +        true,
> +        true,
> +        true,
> +        true,
> +        false,
> +        true};

Please remove this (it is hard to understand) in favour of:

- A list of Version's that match Version("1.1* 1.3*")
- A list of Version's that do not match Version("1.1* 1.3*")
- A list of Version's that match Version("1.2+")
- A list of Version's that do not match Version("1.2+")

Unless you have a different idea, of course.

> +    private static Version jvms[] = {
> +        new Version("1.1* 1.3*"),
> +        new Version("1.2+"),};
> +    private static Version versions[] = {
> +        new Version("1.1"),
> +        new Version("1.1.8"),
> +        new Version("1.2"),
> +        new Version("1.3"),
> +        new Version("2.0"),
> +        new Version("1.3.1"),
> +        new Version("1.2.1"),
> +        new Version("1.3.1-beta"),
> +        new Version("1.1 1.2"),
> +        new Version("1.2 1.3"),};
> +
> +    @Test
> +    public void testMatches() {
> +
> +        int i = 0;
> +        for (int j = 0; j < jvms.length; j++) {
> +            for (int v = 0; v < versions.length; v++) {
> +                i++;
> +                String debugOutput = i + " " + jvms[j].toString() + " ";
> +                if (!jvms[j].matches(versions[v])) {
> +                    debugOutput += "!";
> +                }
> +                debugOutput += "matches " + versions[v].toString();
> +                ServerAccess.logOutputReprint(debugOutput);
> +                Assert.assertEquals(results[i - 1], 
> jvms[j].matches(versions[v]));
> +            }
> +        }
> +
> +
> +    }
> +}
> diff -r 3fa3d0fdce30 
> tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java
> --- 
> a/tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java 
>  Tue Apr 30 11:31:28 2013 -0400
> +++ 
> b/tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java 
>  Thu May 02 11:38:23 2013 +0200
> @@ -1,54 +1,70 @@
>  /* ResourceTrackerTest.java
> -Copyright (C) 2012 Red Hat, Inc.
> + Copyright (C) 2012 Red Hat, Inc.
>
> -This file is part of IcedTea.
> + This file is part of IcedTea.
>
> -IcedTea is free software; you can redistribute it and/or
> -modify it under the terms of the GNU General Public License as 
> published by
> -the Free Software Foundation, version 2.
> + IcedTea is free software; you can redistribute it and/or
> + modify it under the terms of the GNU General Public License as 
> published by
> + the Free Software Foundation, version 2.
>
> -IcedTea is distributed in the hope that it will be useful,
> -but WITHOUT ANY WARRANTY; without even the implied warranty of
> -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> -General Public License for more details.
> + IcedTea is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> + General Public License for more details.
>
> -You should have received a copy of the GNU General Public License
> -along with IcedTea; see the file COPYING.  If not, write to
> -the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
> Boston, MA
> -02110-1301 USA.
> + You should have received a copy of the GNU General Public License
> + along with IcedTea; see the file COPYING.  If not, write to
> + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
> Boston, MA
> + 02110-1301 USA.
>
> -Linking this library statically or dynamically with other modules is
> -making a combined work based on this library.  Thus, the terms and
> -conditions of the GNU General Public License cover the whole
> -combination.
> + Linking this library statically or dynamically with other modules is
> + making a combined work based on this library.  Thus, the terms and
> + conditions of the GNU General Public License cover the whole
> + combination.
>
> -As a special exception, the copyright holders of this library give you
> -permission to link this library with independent modules to produce an
> -executable, regardless of the license terms of these independent
> -modules, and to copy and distribute the resulting executable under
> -terms of your choice, provided that you also meet, for each linked
> -independent module, the terms and conditions of the license of that
> -module.  An independent module is a module which is not derived from
> -or based on this library.  If you modify this library, you may extend
> -this exception to your version of the library, but you are not
> -obligated to do so.  If you do not wish to do so, delete this
> -exception statement from your version.
> + As a special exception, the copyright holders of this library give you
> + permission to link this library with independent modules to produce an
> + executable, regardless of the license terms of these independent
> + modules, and to copy and distribute the resulting executable under
> + terms of your choice, provided that you also meet, for each linked
> + independent module, the terms and conditions of the license of that
> + module.  An independent module is a module which is not derived from
> + or based on this library.  If you modify this library, you may extend
> + this exception to your version of the library, but you are not
> + obligated to do so.  If you do not wish to do so, delete this
> + exception statement from your version.
>   */
>  package net.sourceforge.jnlp.cache;
>
> +import java.io.ByteArrayOutputStream;
> +import java.io.File;
> +import java.io.IOException;
> +import java.io.PrintStream;
>  import java.io.UnsupportedEncodingException;
> +import java.net.HttpURLConnection;
>  import java.net.MalformedURLException;
>  import java.net.URISyntaxException;
>  import java.net.URL;
> -
> +import java.util.HashMap;
> +import net.sourceforge.jnlp.ServerAccess;
> +import net.sourceforge.jnlp.ServerLauncher;
> +import net.sourceforge.jnlp.Version;
> +import net.sourceforge.jnlp.runtime.JNLPRuntime;
>  import net.sourceforge.jnlp.util.UrlUtils;
> -
> +import org.junit.AfterClass;
>  import org.junit.Assert;
> +import org.junit.BeforeClass;
>  import org.junit.Test;
>
> -/** Test various corner cases of the parser */
>  public class ResourceTrackerTest {
>
> +    public static ServerLauncher testServer;
> +    public static ServerLauncher testServerWithBrokenHead;

Thankyou :-))

> +    private static PrintStream backedUpStream;
> +    private static ByteArrayOutputStream currentErrorStream;
> +    private static final String nameStub1 = "itw-server";
> +    private static final String nameStub2 = "test-file";
> +
>      @Test
>      public void testNormalizeUrl() throws Exception {
>          URL[] u = getUrls();
> [..snip..]
> Exception {
> +        redirectErr();
> +        try {
> +            File fileForServerWithHeader = 
> File.createTempFile(nameStub1, nameStub2);
> +            File versiondFileForServerWithHeader = new 
> File(fileForServerWithHeader.getParentFile(), 
> fileForServerWithHeader.getName() + "-2.0");

versiond -> versioned

Thanks. It may be a mouthful but it really is better IMO
[..snip..]
> +        } catch (Exception ex) {
> +            ServerAccess.logException(ex);
> +            exception = ex;
> +        }
> +        Assert.assertNull("no exception expected - was" + exception, 
> exception);
> +
> +        ServerLauncher serverLauncher 
> =ServerAccess.getIndependentInstance(System.getProperty("user.dir"), 
> ServerAccess.findFreePort());
> +        try{
> +                try {
> +            HttpUtils.consumeAndCloseConnectionSilently(new 
> HttpURLConnection(serverLauncher.getUrl("someIhopeReallyNotExistingUrlOnBlahBlahTestServerToMakeAdamHappy")) 
> { //:)

Simple names please. 'NotExisting' or something. My point was that where 
you used 'blahblah' most people use 'foo', 'bar', or 'test'.

Otherwise OK. You can push once these points are addressed IMO.
Happy hacking,
-Adam