Ignore:
Timestamp:
Sep 24, 2014, 9:34:21 PM (11 years ago)
Author:
dmik
Message:

icedtea-web: Merge version 1.5.1 from vendor to trunk.

Location:
trunk/icedtea-web/tests/reproducers/signed
Files:
1 deleted
22 edited
18 copied

Legend:

Unmodified
Added
Removed

  • trunk/icedtea-web/tests/reproducers/signed/AppletTestSigned/resources/AppletTestSigned.html

    r418 r429  
    3838<html><head></head><body bgcolor="red">
    3939<p>
    40   <applet code="AppletTestSigned.class" archive="XslowXAppletTestSigned.jar" codebase="." width="100" height="100">
     40  <applet code="AppletTestSigned.class" archive="AppletTestSigned.jar" codebase="." width="100" height="100">
    4141    <param name="key1" value="value1">
    4242    <param name="key2" value="#value2">

  • trunk/icedtea-web/tests/reproducers/signed/AppletTestSigned/srcs/AppletTestSigned.java

    r418 r429  
    4949                Thread.sleep(n);
    5050                System.out.println("AppletTestSigned killing himself after " + n + " ms of life");
     51                System.out.println("*** APPLET FINISHED ***");
    5152                System.exit(0);
    5253            } catch (Exception ex) {

  • trunk/icedtea-web/tests/reproducers/signed/AppletTestSigned/testcases/AppletTestSignedTests.java

    r418 r429  
    4444import net.sourceforge.jnlp.browsertesting.Browsers;
    4545import net.sourceforge.jnlp.annotations.TestInBrowsers;
     46import net.sourceforge.jnlp.closinglisteners.Rule;
     47import net.sourceforge.jnlp.closinglisteners.RulesFolowingClosingListener;
     48import static net.sourceforge.jnlp.closinglisteners.RulesFolowingClosingListener.*;
    4649import org.junit.Assert;
    4750
    … …  
    5154
    5255    private final List<String> l = Collections.unmodifiableList(Arrays.asList(new String[]{"-Xtrustall"}));
     56    private static final String s0 = "AppletTestSigned was started";
     57    private static final String s1 = "value1";
     58    private static final String s2 = "value2";
     59    private static final String s3 = "AppletTestSigned was initialised";
     60    private static final String s7 = "AppletTestSigned killing himself after 2000 ms of life";
     61    private static final ContainsRule startedRule = new ContainsRule(s0);
     62    private static final ContainsRule variable1Rule = new ContainsRule(s1);
     63    private static final ContainsRule variable2Rule = new ContainsRule(s2);
     64    private static final ContainsRule initialisedRule = new ContainsRule(s3);
     65    private static final ContainsRule killedRule = new ContainsRule(s7);
     66    private static final RulesFolowingClosingListener okListener=new RulesFolowingClosingListener(startedRule, variable1Rule, variable2Rule, initialisedRule, killedRule);
    5367
    54     @Test
     68   // @Test
    5569    public void AppletTestSignedTest() throws Exception {
    5670        ProcessResult pr = server.executeJavawsHeadless(l, "/AppletTestSigned.jnlp");
    … …  
    6175
    6276    private void evaluateSignedApplet(ProcessResult pr, boolean javawsApplet) {
    63         String s3 = "AppletTestSigned was initialised";
    64         Assert.assertTrue("AppletTestSigned stdout should contain " + s3 + " but didn't", pr.stdout.contains(s3));
    65         String s0 = "AppletTestSigned was started";
    66         Assert.assertTrue("AppletTestSigned stdout should contain " + s0 + " but didn't", pr.stdout.contains(s0));
    67         String s1 = "value1";
    68         Assert.assertTrue("AppletTestSigned stdout should contain " + s1 + " but didn't", pr.stdout.contains(s1));
    69         String s2 = "value2";
    70         Assert.assertTrue("AppletTestSigned stdout should contain " + s2 + " but didn't", pr.stdout.contains(s2));
    71         String ss = "xception";
    72         Assert.assertFalse("AppletTestSigned stderr should not contain " + ss + " but did", pr.stderr.contains(ss));
    73         String s7 = "AppletTestSigned killing himself after 2000 ms of life";
    74         Assert.assertTrue("AppletTestSigned stdout should contain " + s7 + " but didn't", pr.stdout.contains(s7));
     77        Assert.assertTrue("AppletTestSigned stdout " + initialisedRule.toPassingString() + " but didn't", initialisedRule.evaluate(pr.stdout));
     78        Assert.assertTrue("AppletTestSigned stdout " + startedRule.toPassingString() + " but didn't", startedRule.evaluate(pr.stdout));
     79        Assert.assertTrue("AppletTestSigned stdout " + variable1Rule.toPassingString() + " but didn't", variable1Rule.evaluate(pr.stdout));
     80        Assert.assertTrue("AppletTestSigned stdout " + variable2Rule.toPassingString() + " but didn't", variable2Rule.evaluate(pr.stdout));
     81        Assert.assertTrue("AppletTestSigned stdout " + killedRule.toPassingString() + " but didn't", killedRule.evaluate(pr.stdout));
    7582        if (!javawsApplet) {
    7683            /*this is working correctly in most browser, but not in all. temporarily disabling
    … …  
    8592    @Test
    8693    @TestInBrowsers(testIn = {Browsers.all})
    87     public void AppletTestSignedFirefoxTest() throws Exception {
     94    public void AppletTestSignedFirefoxTestXslowX() throws Exception {
    8895        ServerAccess.PROCESS_TIMEOUT = 30 * 1000;
    8996        try {
    90             ProcessResult pr = server.executeBrowser("/AppletTestSigned.html");
     97            ProcessResult pr = server.executeBrowser("/AppletTestSigned2.html", okListener, null);
    9198            evaluateSignedApplet(pr, false);
    92             Assert.assertTrue(pr.wasTerminated);
     99            //Assert.assertTrue(pr.wasTerminated);
    93100            //Assert.assertEquals((Integer) 0, pr.returnValue); due to destroy is null
    94101        } finally {
    … …  
    96103        }
    97104    }
     105
     106    @Test
     107    @TestInBrowsers(testIn = {Browsers.all})
     108    public void AppletTestSignedFirefoxTest() throws Exception {
     109        ProcessResult pr = server.executeBrowser("/AppletTestSigned.html", ServerAccess.AutoClose.CLOSE_ON_CORRECT_END);
     110        evaluateSignedApplet(pr, false);
     111        //Assert.assertTrue(pr.wasTerminated);
     112        //Assert.assertEquals((Integer) 0, pr.returnValue); due to destroy is null
     113    }
    98114}

  • trunk/icedtea-web/tests/reproducers/signed/CacheReproducer/testcases/CacheReproducerTest.java

    r418 r429  
    4545import java.util.Arrays;
    4646import java.util.List;
     47import java.util.PropertyResourceBundle;
    4748import java.util.regex.Matcher;
    4849import java.util.regex.Pattern;
    4950import net.sourceforge.jnlp.ServerAccess;
    50 import net.sourceforge.jnlp.ServerAccess.ProcessResult;
     51import net.sourceforge.jnlp.ProcessResult;
    5152import net.sourceforge.jnlp.annotations.KnownToFail;
     53import net.sourceforge.jnlp.config.Defaults;
     54import net.sourceforge.jnlp.tools.MessageProperties;
    5255import org.junit.AfterClass;
    5356import org.junit.Assert;
    … …  
    6164    private static final List<String> trustedVerboses = Arrays.asList(new String[]{"-Xtrustall", ServerAccess.HEADLES_OPTION,"-verbose"});
    6265    private static final List<String> verbosed = Arrays.asList(new String[]{"-verbose", ServerAccess.HEADLES_OPTION});
    63     private static final String home = System.getProperty("user.home");
    64     private static final String name = System.getProperty("user.name");
    65     private static final String tmp = System.getProperty("java.io.tmpdir");
    66     private static final File icedteaDir = new File(home + "/" + ".icedtea");
    67     private static final File icedteaCache = new File(icedteaDir, "cache");
    68     private static final File icedteaCacheFile = new File(icedteaCache, "recently_used");
    69     private static final File netxLock = new File(tmp + "/" + name + "/netx/locks/netx_running");
     66
    7067    private static final String lre = "LruCacheException";
    7168    private static final String ioobe = "IndexOutOfBoundsException";
    … …  
    7471    private static final String corruptString = "156dsf1562kd5";
    7572
    76      String testS = "#netx file\n"
    77                 + "#Mon Dec 12 16:20:46 CET 2011\n"
    78                 + "1323703236508,0=/home/xp13/.icedtea/cache/0/http/localhost/ReadPropertiesBySignedHack.jnlp\n"
    79                 + "1323703243086,2=/home/xp14/.icedtea/cache/2/http/localhost/ReadProperties.jar\n"
    80                 + "1323703243082,1=/home/xp15/.icedtea/cache/1/http/localhost/ReadPropertiesBySignedHack.jar";
     73    private static final File icedteaCache = new File(Defaults.USER_CACHE_HOME, "cache");
     74    private static final File icedteaCacheFile = new File(icedteaCache, "recently_used");
     75    private static final File netxLock = new File(System.getProperty("java.io.tmpdir"),
     76            System.getProperty("user.name") + File.separator +
     77            "netx" + File.separator +
     78            "locks" + File.separator +
     79            "netx_running");
     80
     81    String testS = "#netx file\n"
     82               + "#Mon Dec 12 16:20:46 CET 2011\n"
     83               + "1323703236508,0=/home/xp13/.icedtea/cache/0/http/localhost/ReadPropertiesBySignedHack.jnlp\n"
     84               + "1323703243086,2=/home/xp14/.icedtea/cache/2/http/localhost/ReadProperties.jar\n"
     85               + "1323703243082,1=/home/xp15/.icedtea/cache/1/http/localhost/ReadPropertiesBySignedHack.jar";
    8186
    8287    @Test
    … …  
    9499    }
    95100
    96      private class ParallelSimpleTestRunner extends Thread {
    97            public boolean b=false;
    98             @Override
    99             public void run() {
    100                 try {
    101 
    102                     ServerAccess.ProcessResult pr = runSimpleTest1();
    103                     evaluateSimpleTest1OkCache(pr);
    104                     b=true;
    105                 } catch (Exception ex) {
    106                     throw new RuntimeException(ex);
    107                 }
    108             }
    109         };
     101    private class ParallelSimpleTestRunner extends Thread {
     102        public boolean b=false;
     103        @Override
     104        public void run() {
     105            try {
     106                ProcessResult pr = runSimpleTest1();
     107                evaluateSimpleTest1OkCache(pr);
     108                b=true;
     109            } catch (Exception ex) {
     110                throw new RuntimeException(ex);
     111            }
     112        }
     113    }
    110114
    111115    @Test
    … …  
    261265            public void run() {
    262266                try {
    263                     ServerAccess.ProcessResult pr = server.executeJavawsHeadless(verbosed, "/deadlocktest.jnlp");
     267                    ProcessResult pr = server.executeJavawsHeadless(verbosed, "/deadlocktest.jnlp");
    264268                } catch (Exception ex) {
    265269                    throw new RuntimeException(ex);
    … …  
    270274        Thread.sleep(1000);
    271275        pr = tryToClearcache();
    272         String q = "Can not clear cache at this time";
    273         Assert.assertTrue("Stderr should contain " + q + ", but did not.", pr.stderr.contains(q));
    274         assertCacheIsNotEmpty();
    275     }
    276 
    277      
     276
     277        String cacheClearError = MessageProperties.getMessage("CCannotClearCache");
     278        Assert.assertTrue("Stderr should contain " + cacheClearError + ", but did not.", pr.stderr.contains(cacheClearError));
     279        assertCacheIsNotEmpty();
     280    }
     281
    278282    //next four tests are designed to ensure, that corrupted cache will not break already loaded cached files
    279283    public static final String CR1 = "CacheReproducer1";
    … …  
    338342            if (netxLock.isFile()) {
    339343                boolean b = netxLock.delete();
    340                 junit.framework.Assert.assertTrue(b);
     344                Assert.assertTrue(b);
    341345            }
    342346
    … …  
    378382        }
    379383        String sb = breakOne(s, 0);
    380         junit.framework.Assert.assertEquals(s, sb);
     384        Assert.assertEquals(s, sb);
    381385        for (int x = 1; x <= 3; x++) {
    382386            String[] sx = breakOne(s, x).split("\n");
    … …  
    427431
    428432    private static String breakPaths(String s) {
    429        return s.replaceAll(home+".*", "/ho");
     433       return s.replaceAll(System.getProperty("user.home") + ".*", "/ho");
    430434    }
    431435
    … …  
    448452    }
    449453
    450     private static ServerAccess.ProcessResult runSimpleTest1() throws Exception {
     454    private static ProcessResult runSimpleTest1() throws Exception {
    451455        return runSimpleTest1(verbosed, "simpletest1");
    452456    }
    453457
    454     private static ServerAccess.ProcessResult runSimpleTest1(List<String> args, String s) throws Exception {
    455         ServerAccess.ProcessResult pr2 = server.executeJavawsHeadless(args, "/" + s + ".jnlp");
     458    private static ProcessResult runSimpleTest1(List<String> args, String s) throws Exception {
     459        ProcessResult pr2 = server.executeJavawsHeadless(args, "/" + s + ".jnlp");
    456460        return pr2;
    457461    }
    458462
    459     private static ServerAccess.ProcessResult runSimpleTest1Signed() throws Exception {
     463    private static ProcessResult runSimpleTest1Signed() throws Exception {
    460464        return runSimpleTestSigned("SimpletestSigned1");
    461465    }
    462466
    463     private static ServerAccess.ProcessResult runSimpleTestSigned(String id) throws Exception {
     467    private static ProcessResult runSimpleTestSigned(String id) throws Exception {
    464468        return runSimpleTest1(trustedVerboses, id);
    465469    }
    466470
    467     private static void evaluateSimpleTest1OkCache(ServerAccess.ProcessResult pr2) throws Exception {
     471    private static void evaluateSimpleTest1OkCache(ProcessResult pr2) throws Exception {
    468472        String s = "Good simple javaws exapmle";
    469473        Assert.assertTrue("test stdout should contain " + s + " but didn't", pr2.stdout.contains(s));
    … …  
    473477
    474478    private static ProcessResult tryToClearcache() throws Exception {
    475         ServerAccess.ProcessResult pr1 = ServerAccess.executeProcess(clear);
     479        ProcessResult pr1 = ServerAccess.executeProcess(clear);
    476480        return pr1;
    477481    }

  • trunk/icedtea-web/tests/reproducers/signed/ClasspathManifestTest/testcases/ClasspathManifestTest.java

    r418 r429  
    3939import java.util.List;
    4040
     41import net.sourceforge.jnlp.ProcessResult;
    4142import net.sourceforge.jnlp.ServerAccess;
    42 import net.sourceforge.jnlp.ServerAccess.ProcessResult;
    43 import net.sourceforge.jnlp.annotations.Bug;
    4443import net.sourceforge.jnlp.annotations.KnownToFail;
    4544import net.sourceforge.jnlp.annotations.NeedsDisplay;
    … …  
    5150import org.junit.Test;
    5251
    53 @Bug(id = "PR975")
    5452public class ClasspathManifestTest extends BrowserTest {
    5553
    … …  
    7977        commands.add(ServerAccess.HEADLES_OPTION);
    8078        commands.add("ClasspathManifestApplicationTest.jnlp");
    81         ServerAccess.ProcessResult pr = ServerAccess.executeProcess(commands, server.getDir());
     79        ProcessResult pr = ServerAccess.executeProcess(commands, server.getDir());
    8280        checkAppFails(pr, "ApplicationJNLPLocalTest");
    8381    }
    … …  
    8684    @Test
    8785    public void AppletJNLPRemoteTest() throws Exception {
    88         ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/ClasspathManifestAppletTest.jnlp");
     86        ProcessResult pr = server.executeJavawsHeadless(null, "/ClasspathManifestAppletTest.jnlp");
    8987        checkAppFails(pr, "AppletJNLPRemoteTest");
    9088    }
    … …  
    9896        commands.add(ServerAccess.HEADLES_OPTION);
    9997        commands.add("ClasspathManifestAppletTest.jnlp");
    100         ServerAccess.ProcessResult pr = ServerAccess.executeProcess(commands, server.getDir());
     98        ProcessResult pr = ServerAccess.executeProcess(commands, server.getDir());
    10199        checkAppFails(pr, "AppletJNLPRLocalTest");
    102100    }
    … …  
    106104    @Test
    107105    public void BrowserJNLPHrefRemoteTest() throws Exception {
    108         ServerAccess.ProcessResult pr = server.executeBrowser("/ClasspathManifestJNLPHrefTest.html");
     106        ProcessResult pr = server.executeBrowser("/ClasspathManifestJNLPHrefTest.html");
    109107        checkAppFails(pr, "BrowserJNLPHrefRemoteTest");
    110108    }
    … …  
    118116        commands.add(server.getBrowserLocation());
    119117        commands.add("ClasspathManifestJNLPHrefTest.html");
    120         ServerAccess.ProcessResult pr = ServerAccess.executeProcess(commands, server.getDir());
     118        ProcessResult pr = ServerAccess.executeProcess(commands, server.getDir());
    121119        checkAppFails(pr, "BrowserJNLPHrefLocalTest");
    122120    }
    … …  
    126124    @Test
    127125    public void BrowserAppletRemoteTest() throws Exception {
    128         ServerAccess.ProcessResult pr = server.executeBrowser("/ClasspathManifestAppletTest.html");
     126        ProcessResult pr = server.executeBrowser("/ClasspathManifestAppletTest.html");
    129127        Assert.assertTrue("ClasspathManifest.BrowserAppletRemoteTest stdout should contain " + s1 + " but didn't", pr.stdout.contains(s1));
    130128        // Should be the only one to search manifest for classpath.
    131129        Assert.assertTrue("ClasspathManifest.BrowserAppletRemoteTest stdout should contain " + s2 + " but didn't", pr.stdout.contains(s2));
    132         Assert.assertFalse("ClasspathManifest.BrowserAppletRemoteTest stderr should not contain " + ss + " but did", pr.stderr.contains(ss));
    133130    }
    134131}

  • trunk/icedtea-web/tests/reproducers/signed/ExtensionJnlp/testcases/ExtensionJnlpTest.java

    r418 r429  
    3939import java.util.Collections;
    4040import java.util.List;
     41import net.sourceforge.jnlp.ProcessResult;
    4142import net.sourceforge.jnlp.ServerAccess;
    4243import net.sourceforge.jnlp.annotations.Bug;
    … …  
    5657    @Test
    5758    public void checkingForRequiredResources() throws Exception {
    58         ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/UsesSignedJar.jnlp");
     59        ProcessResult pr = server.executeJavawsHeadless(l, "/UsesSignedJar.jnlp");
    5960        Assert.assertTrue("Could not locate SignedJarResource class within SignedJarResource jar", pr.stdout.contains(jarOutput));
    6061
    … …  
    6768    @Test
    6869    public void usingSignedExtension() throws Exception {
    69         ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/UsesSignedJarExtension.jnlp");
     70        ProcessResult pr = server.executeJavawsHeadless(l, "/UsesSignedJarExtension.jnlp");
    7071        Assert.assertTrue("Stdout should contain " + jarOutput + " but did not", pr.stdout.contains(jarOutput));
    7172    }
    … …  
    7475    @Test
    7576    public void mainJarInExtension() throws Exception {
    76         ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/UsesSignedJnlpJarAndSignedJarExtension.jnlp");
     77        ProcessResult pr = server.executeJavawsHeadless(l, "/UsesSignedJnlpJarAndSignedJarExtension.jnlp");
    7778        Assert.assertTrue("Stdout should contain " + jarOutput + " but did not", pr.stdout.contains(jarOutput));
    7879    }
    … …  
    8182    @Test
    8283    public void checkingSignedJnlpInExtension() throws Exception {
    83         ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/UsesSignedJnlpExtension.jnlp");
     84        ProcessResult pr = server.executeJavawsHeadless(l, "/UsesSignedJnlpExtension.jnlp");
    8485        Assert.assertTrue("Stdout should contain " + signedJnlpException + " but did not", pr.stderr.contains(signedJnlpException));
    8586    }

  • trunk/icedtea-web/tests/reproducers/signed/InternalClassloaderWithDownloadedResource/testcases/InternalClassloaderWithDownloadedResourceTest.java

    r418 r429  
    4040import java.util.Collections;
    4141import java.util.List;
     42import net.sourceforge.jnlp.ProcessResult;
    4243import net.sourceforge.jnlp.ServerAccess;
    43 import net.sourceforge.jnlp.ServerAccess.ProcessResult;
    4444import net.sourceforge.jnlp.annotations.Bug;
    4545import net.sourceforge.jnlp.annotations.NeedsDisplay;
    … …  
    7979    @Bug(id = {"RH816592","PR858"})
    8080    public void launchInternalClassloaderWithDownloadedResourceAsJnlpApplication() throws Exception {
    81         ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/InternalClassloaderWithDownloadedResource-new.jnlp");
     81        ProcessResult pr = server.executeJavawsHeadless(l, "/InternalClassloaderWithDownloadedResource-new.jnlp");
    8282        evaluate(pr);
    8383        Assert.assertFalse("should not be terminated but was", pr.wasTerminated);
    … …  
    8888        String ss = "Good simple javaws exapmle";
    8989        Assert.assertTrue("Stdout should  contains " + ss + " but didn't", pr.stdout.contains(ss));
    90         String s = "xception";
    91         Assert.assertFalse("Stderr should  not contains " + s + " but did", pr.stderr.contains(s));
    9290    }
    9391
    … …  
    9593    @Bug(id = {"RH816592","PR858"})
    9694    public void launchInternalClassloaderWithDownloadedResourceAsJnlpApplet() throws Exception {
    97         ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/InternalClassloaderWithDownloadedResource-applet-new.jnlp");
     95        ProcessResult pr = server.executeJavawsHeadless(l, "/InternalClassloaderWithDownloadedResource-applet-new.jnlp");
    9896        evaluate(pr);
    9997        Assert.assertFalse("should not be terminated but was", pr.wasTerminated);
    … …  
    106104    @TestInBrowsers(testIn={Browsers.all})
    107105    public void launchInternalClassloaderWithDownloadedResourceAsHtmlApplet() throws Exception {
    108         ServerAccess.ProcessResult pr = server.executeBrowser("/InternalClassloaderWithDownloadedResource-new.html");
     106        ProcessResult pr = server.executeBrowser("/InternalClassloaderWithDownloadedResource-new.html");
    109107        evaluate(pr);
    110108        Assert.assertTrue("should be terminated but was not", pr.wasTerminated);
    … …  
    114112    @Bug(id = {"http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2012-May/018737.html"})
    115113    public void launchInternalClassloaderWithDownloadedResourceAsJnlpApplicationHack() throws Exception {
    116         ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/InternalClassloaderWithDownloadedResource-hack.jnlp");
     114        ProcessResult pr = server.executeJavawsHeadless(l, "/InternalClassloaderWithDownloadedResource-hack.jnlp");
    117115        evaluate(pr);
    118116        Assert.assertFalse("should not be terminated but was", pr.wasTerminated);
    … …  
    123121    @Bug(id = {"http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2012-May/018737.html"})
    124122    public void launchInternalClassloaderWithDownloadedResourceAsJnlpAppletHack() throws Exception {
    125         ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/InternalClassloaderWithDownloadedResource-applet-hack.jnlp");
     123        ProcessResult pr = server.executeJavawsHeadless(l, "/InternalClassloaderWithDownloadedResource-applet-hack.jnlp");
    126124        evaluate(pr);
    127125        Assert.assertFalse("should not be terminated but was", pr.wasTerminated);
    … …  
    134132    @TestInBrowsers(testIn={Browsers.all})
    135133    public void launchInternalClassloaderWithDownloadedResourceAsHtmlAppletHack() throws Exception {
    136         ServerAccess.ProcessResult pr = server.executeBrowser("/InternalClassloaderWithDownloadedResource-hack.html");
     134        ProcessResult pr = server.executeBrowser("/InternalClassloaderWithDownloadedResource-hack.html");
    137135        evaluate(pr);
    138136        Assert.assertTrue("should be terminated but was not", pr.wasTerminated);

  • trunk/icedtea-web/tests/reproducers/signed/MissingJar/testcases/MissingJarTest.java

    r418 r429  
    1 /* MissingJar.java
     1/* MissingJarTest.java
    22Copyright (C) 2011 Red Hat, Inc.
    33
    … …  
    3939import java.util.Collections;
    4040import java.util.List;
     41import net.sourceforge.jnlp.ProcessResult;
    4142import net.sourceforge.jnlp.ServerAccess;
    42 import net.sourceforge.jnlp.ServerAccess.ProcessResult;
     43
    4344import org.junit.Assert;
    44 
    4545import org.junit.Test;
    4646
    … …  
    6161    @Test
    6262    public void MissingJarTest1() throws Exception {
    63         ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/MissingJar.jnlp");
     63        ProcessResult pr = server.executeJavawsHeadless(l, "/MissingJar.jnlp");
    6464        evaluateResult(pr);
    6565    }
    … …  
    6767    @Test
    6868    public void MissingJarTest2() throws Exception {
    69         ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/MissingJar2.jnlp");
     69        ProcessResult pr = server.executeJavawsHeadless(l, "/MissingJar2.jnlp");
    7070        evaluateResult(pr);
    7171    }
    … …  
    7373    @Test
    7474    public void MissingJarTest3() throws Exception {
    75         ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/MissingJar3.jnlp");
     75        ProcessResult pr = server.executeJavawsHeadless(l, "/MissingJar3.jnlp");
    7676        evaluateResult(pr);
    7777    }
    … …  
    7979    @Test
    8080    public void MissingJarTest4() throws Exception {
    81         ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/MissingJar4.jnlp");
     81        ProcessResult pr = server.executeJavawsHeadless(l, "/MissingJar4.jnlp");
    8282        evaluateResult(pr);
    8383    }

  • trunk/icedtea-web/tests/reproducers/signed/ReadPropertiesBySignedHack/testcases/ReadPropertiesBySignedHackTest.java

    r418 r429  
    1 /* ReadPropertiesSignedTest.java
     1/* ReadPropertiesBySignedHackTest.java
    22Copyright (C) 2011 Red Hat, Inc.
    33
    … …  
    3636 */
    3737
    38 
    3938import java.util.Arrays;
    4039import java.util.Collections;
    4140import java.util.List;
     41import net.sourceforge.jnlp.ProcessResult;
    4242import net.sourceforge.jnlp.ServerAccess;
     43
    4344import org.junit.Assert;
    4445import org.junit.Test;
    … …  
    5354    public void ReadPropertiesBySignedHackWithjoutXtrustAll() throws Exception {
    5455        //no request for permissions
    55         ServerAccess.ProcessResult pr=server.executeJavawsHeadless(l,"/ReadPropertiesBySignedHack.jnlp");
     56        ProcessResult pr=server.executeJavawsHeadless(l,"/ReadPropertiesBySignedHack.jnlp");
    5657        String s="java.lang.SecurityException: class \"ReadProperties\"'s signer information does not match signer information of other classes in the same package";
    5758        Assert.assertTrue("Stderr should contains "+s+" but did not",pr.stderr.contains(s));
    5859        String ss="ClassNotFoundException";
    5960        Assert.assertFalse("Stderr should not contains "+ss+" but did",pr.stderr.contains(ss));
    60         Assert.assertTrue("stdout lenght should be <2 but was "+pr.stdout.length(),pr.stdout.length()<2); // /home/user or /root or eanything else :(
    6161        Assert.assertFalse("should not be terminated but was",pr.wasTerminated);
    6262        Assert.assertEquals((Integer)0, pr.returnValue);

  • trunk/icedtea-web/tests/reproducers/signed/ReadPropertiesSigned/testcases/ReadPropertiesSignedTest.java

    r418 r429  
    3636 */
    3737
    38 
    3938import java.util.Arrays;
    4039import java.util.Collections;
    4140import java.util.List;
     41import net.sourceforge.jnlp.ProcessResult;
    4242import net.sourceforge.jnlp.ServerAccess;
     43
    4344import org.junit.Assert;
    4445import org.junit.Test;
    … …  
    5455    public void ReadSignedPropertiesWithoutPermissionsWithXtrustAll() throws Exception {
    5556        //no request for permissions
    56         ServerAccess.ProcessResult pr=server.executeJavawsHeadless(l,"/ReadPropertiesSigned1.jnlp");
     57        ProcessResult pr=server.executeJavawsHeadless(l,"/ReadPropertiesSigned1.jnlp");
    5758        Assert.assertTrue("Stderr should match "+accessMatcher+" but did not",pr.stderr.matches(accessMatcher));
    5859        String ss="ClassNotFoundException";
    5960        Assert.assertFalse("Stderr should not contains "+ss+" but did",pr.stderr.contains(ss));
    60         Assert.assertTrue("stdout lenght should be <2 but was "+pr.stdout.length(),pr.stdout.length()<2); // /home/user or /root or eanything else :(
    6161        Assert.assertFalse("should not be terminated but was",pr.wasTerminated);
    6262        Assert.assertEquals((Integer)0, pr.returnValue);
    … …  
    6666    public void ReadSignedPropertiesWithPermissionsWithXtrustAll() throws Exception {
    6767        //request for allpermissions
    68         ServerAccess.ProcessResult pr=server.executeJavawsHeadless(l,"/ReadPropertiesSigned2.jnlp");
     68        ProcessResult pr=server.executeJavawsHeadless(l,"/ReadPropertiesSigned2.jnlp");
    6969        Assert.assertFalse("Stderr should NOT match "+accessMatcher+" but did",pr.stderr.matches(accessMatcher));
    7070        String ss="ClassNotFoundException";
    7171        Assert.assertFalse("Stderr should not contains "+ss+" but did",pr.stderr.contains(ss));
    72         Assert.assertTrue("stdout lenght should be >= but was "+pr.stdout.length(),pr.stdout.length()>=4); // /home/user or /root or eanything else :(
    7372        Assert.assertFalse("should not be terminated but was",pr.wasTerminated);
    7473        Assert.assertEquals((Integer)0, pr.returnValue);
    … …  
    7776    @Test
    7877    public void EnsureXtrustallNotAffectingUnsignedBehaviour() throws Exception {
    79         ServerAccess.ProcessResult pr=server.executeJavawsHeadless(l,"/ReadProperties1.jnlp");
     78        ProcessResult pr=server.executeJavawsHeadless(l,"/ReadProperties1.jnlp");
    8079        Assert.assertTrue("Stderr should match "+accessMatcher+" but did not",pr.stderr.matches(accessMatcher));
    8180        String ss="ClassNotFoundException";
    8281        Assert.assertFalse("Stderr should not contains "+ss+" but did",pr.stderr.contains(ss));
    83         Assert.assertFalse("stdout lenght should not be  >2 but was "+pr.stdout.length(),pr.stdout.length()>2);
    8482        Assert.assertFalse("should not be terminated but was",pr.wasTerminated);
    8583        Assert.assertEquals((Integer)0, pr.returnValue);
    86         ServerAccess.ProcessResult pr2=server.executeJavawsHeadless(null,"/ReadProperties1.jnlp");
     84        ProcessResult pr2=server.executeJavawsHeadless(null,"/ReadProperties1.jnlp");
    8785        Assert.assertEquals(pr.stderr, pr2.stderr);
    8886        Assert.assertEquals(pr.stdout, pr2.stdout);
    89 
    9087    }
    9188  }

  • trunk/icedtea-web/tests/reproducers/signed/SavingCookies/resources/CheckCookieAndGotoClear.html

    r418 r429  
    3838 
    3939<!-- Uses show-document to go to a page that clears the cookie -->
    40  
     40
    4141<html><head></head><body bgcolor="red">
    4242<p>
    4343  <applet code="CheckingCookies.class" archive="SavingCookies.jar" codebase="." width="100" height="100">
    44  
     44
    4545  <param name="show-document" value="ClearPersistentCookie.html">
    46  
     46
    4747  </applet>
    4848</p>

  • trunk/icedtea-web/tests/reproducers/signed/SavingCookies/resources/ClearPersistentCookie.html

    r418 r429  
    4141
    4242  <param name="persistent" value="no">
    43  
     43
    4444  <param name="cookie" value="TEST=deleted; Expires=Thu, 01 Jan 1970 00:00:01 GMT">
    4545

  • trunk/icedtea-web/tests/reproducers/signed/SavingCookies/resources/SavePersistentCookie.html

    r418 r429  
    4141
    4242  <param name="persistent" value="yes">
    43  
     43
    4444  <param name="cookie" value="TEST=persistent">
    45  
     45
    4646  </applet>
    4747</p>

  • trunk/icedtea-web/tests/reproducers/signed/SavingCookies/resources/SavePersistentCookieAndGotoCheck.html

    r418 r429  
    4242  <param name="show-document" value="CheckCookieAndGotoClear.html">
    4343  <param name="persistent" value="yes">
    44  
     44
    4545  <param name="cookie" value="TEST=persistent">
    4646

  • trunk/icedtea-web/tests/reproducers/signed/SavingCookies/resources/SaveSessionCookie.html

    r418 r429  
    4141
    4242  <param name="persistent" value="no">
    43  
     43
    4444  <param name="cookie" value="TEST=session">
    4545

  • trunk/icedtea-web/tests/reproducers/signed/SavingCookies/srcs/SavingCookies.java

    r418 r429  
    11/* SavingCookies.java
    22 Store cookies in the java cookie store, and go to a page that confirms they are there.
    3  
     3
    44Copyright (C) 2012 Red Hat, Inc.
    55

  • trunk/icedtea-web/tests/reproducers/signed/SavingCookies/testcases/SavingCookiesTests.java

    r418 r429  
    5151
    5252public class SavingCookiesTests extends BrowserTest {
    53    
     53
    5454    static final String ENTERING_CHECK = "Entered CheckingCookies";
    5555    static final String CHECKING_COMPLETION = "Finished CheckingCookies";
    … …  
    8686                };
    8787                if (url.endsWith(".html")) {
    88                     pr = server.executeBrowser(url, stdoutListener, stdoutListener);
     88                    pr = server.executeBrowser(url, stdoutListener, null);
    8989                } else if (url.endsWith(".jnlp")) {
    90                     pr = server.executeJavawsHeadless(TRUSTALL, url, stdoutListener, stdoutListener);
     90                    pr = server.executeJavawsHeadless(TRUSTALL, url, stdoutListener, null, null);
    9191                }
    9292            } catch (Exception ex) {
    … …  
    106106        final String COOKIE_SANITY_CHECK = "Found cookie: TEST=";
    107107        ProcessResult pr = server.executeBrowser("/CheckCookie.html");
    108        
     108
    109109        Assert.assertFalse("stdout should NOT contain '" + COOKIE_SANITY_CHECK + "' but did.", pr.stdout.contains(COOKIE_SANITY_CHECK));
    110110        Assert.assertTrue("stdout should contain '" + CHECKING_COMPLETION + "' but did not.", pr.stdout.contains(CHECKING_COMPLETION));
    111111    }
    112    
     112
    113113    @Test
    114114    @TestInBrowsers(testIn = { Browsers.one })
    … …  
    130130            Thread.sleep(100);
    131131        }
    132        
     132
    133133        ProcessResult check = server.executeBrowser("/CheckCookie.html");
    134134        save.join();
    135        
     135
    136136        Assert.assertTrue("stdout should contain '" + ENTERING_CHECK + "' but did not.", save.pr.stdout.contains(ENTERING_CHECK));
    137137        //XXX: It is necessary to check save.pr's stdout, because it does not show up in 'check.stdout' for some reason
    … …  
    155155    public void AppletPersistentCookieShowDoc() throws Exception {
    156156        ProcessResult pr = server.executeBrowser("/SavePersistentCookieAndGotoCheck.html");
    157        
     157
    158158        Assert.assertTrue("stdout should contain '" + ENTERING_CHECK + "' but did not.", pr.stdout.contains(ENTERING_CHECK));
    159159        Assert.assertTrue("stdout should contain '" + COOKIE_PERSISTENT_CHECK + "' but did not.", pr.stdout.contains(COOKIE_PERSISTENT_CHECK));

  • trunk/icedtea-web/tests/reproducers/signed/SignedJnlpApplication/testcases/SignedJnlpApplicationTest.java

    r418 r429  
    3939import java.util.Collections;
    4040import java.util.List;
     41import net.sourceforge.jnlp.ProcessResult;
    4142import net.sourceforge.jnlp.ServerAccess;
     43
    4244import org.junit.Assert;
    4345import org.junit.Test;
    … …  
    5355    @Test
    5456    public void launchingFileMatchesSignedApplication1() throws Exception {
    55         ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/SignedJnlpApplication1.jnlp");
     57        ProcessResult pr = server.executeJavawsHeadless(l, "/SignedJnlpApplication1.jnlp");
    5658        String s = "Running signed application in main";
    5759        Assert.assertTrue("Stdout should contains " + s + " but did not", pr.stdout.contains(s));
    … …  
    6365    @Test
    6466    public void launchingFileDoesNotMatchSignedApplication1() throws Exception {
    65         ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/SignedJnlpApplication2.jnlp");
     67        ProcessResult pr = server.executeJavawsHeadless(l, "/SignedJnlpApplication2.jnlp");
    6668        Assert.assertTrue("Stderr should contains " + signedException + " but did not", pr.stderr.contains(signedException));
    6769    }
    … …  
    7274    @Test
    7375    public void launchingFileDoesNotMatchSignedApplication2() throws Exception {
    74         ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/SignedJnlpApplication3.jnlp");
     76        ProcessResult pr = server.executeJavawsHeadless(l, "/SignedJnlpApplication3.jnlp");
    7577        Assert.assertTrue("Stderr should contains " + signedException + " but did not", pr.stderr.contains(signedException));
    7678    }

  • trunk/icedtea-web/tests/reproducers/signed/SignedJnlpCaseTestOne/testcases/SignedJnlpCaseOneTest.java

    r418 r429  
    3939import java.util.Collections;
    4040import java.util.List;
     41import net.sourceforge.jnlp.ProcessResult;
    4142import net.sourceforge.jnlp.ServerAccess;
     43
    4244import org.junit.Assert;
    4345import org.junit.Test;
    … …  
    5052    @Test
    5153    public void launchingFileMatchesSigned() throws Exception {
    52         ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/SignedJnlpCaseTestOne1.jnlp");
     54        ProcessResult pr = server.executeJavawsHeadless(l, "/SignedJnlpCaseTestOne1.jnlp");
    5355        String s = "Running signed application in main";
    5456        Assert.assertTrue("Stdout should contains " + s + " but did not", pr.stdout.contains(s));
    … …  
    5759    @Test
    5860    public void launchingFileDoesNotMatchSigned() throws Exception {
    59         ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/SignedJnlpCaseTestOne2.jnlp");
     61        ProcessResult pr = server.executeJavawsHeadless(l, "/SignedJnlpCaseTestOne2.jnlp");
    6062        String s = "net.sourceforge.jnlp.LaunchException: Fatal: Application Error: The signed " +
    6163                "JNLP file did not match the launching JNLP file. Missing Resource: Signed Application did not match " +

  • trunk/icedtea-web/tests/reproducers/signed/SignedJnlpCaseTestTwo/testcases/SignedJnlpCaseTwoTest.java

    r418 r429  
    3939import java.util.Collections;
    4040import java.util.List;
     41import net.sourceforge.jnlp.ProcessResult;
    4142import net.sourceforge.jnlp.ServerAccess;
    4243import org.junit.Assert;
    … …  
    5051    @Test
    5152    public void launchingFileMatchesSigned() throws Exception {
    52         ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/SignedJnlpCaseTestTwo1.jnlp");
     53        ProcessResult pr = server.executeJavawsHeadless(l, "/SignedJnlpCaseTestTwo1.jnlp");
    5354        String s = "Running signed application in main";
    5455        Assert.assertTrue("Stdout should contains " + s + " but did not", pr.stdout.contains(s));
    … …  
    5758    @Test
    5859    public void launchingFileDoesNotMatchSigned() throws Exception {
    59         ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/SignedJnlpCaseTestTwo2.jnlp");
     60        ProcessResult pr = server.executeJavawsHeadless(l, "/SignedJnlpCaseTestTwo2.jnlp");
    6061        String s = "net.sourceforge.jnlp.LaunchException: Fatal: Application Error: The signed " +
    6162                "JNLP file did not match the launching JNLP file. Missing Resource: Signed Application did not match " +

  • trunk/icedtea-web/tests/reproducers/signed/SignedJnlpTemplate/testcases/SignedJnlpTemplateTest.java

    r418 r429  
    3939import java.util.Collections;
    4040import java.util.List;
     41import net.sourceforge.jnlp.ProcessResult;
    4142import net.sourceforge.jnlp.ServerAccess;
     43
    4244import org.junit.Assert;
    4345import org.junit.Test;
    … …  
    5355    @Test
    5456    public void launchingFileMatchesSignedTemplate1() throws Exception {
    55         ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/SignedJnlpTemplate1.jnlp");
     57        ProcessResult pr = server.executeJavawsHeadless(l, "/SignedJnlpTemplate1.jnlp");
    5658        String s = "Running signed application in main";
    5759        Assert.assertTrue("Stdout should contains " + s + " but did not", pr.stdout.contains(s));
    … …  
    6365    @Test
    6466    public void launchingFileDoesNotMatchSignedTemplate2() throws Exception {
    65         ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/SignedJnlpTemplate2.jnlp");
     67        ProcessResult pr = server.executeJavawsHeadless(l, "/SignedJnlpTemplate2.jnlp");
    6668        Assert.assertTrue("Stderr should contains " + signedException + " but did not", pr.stderr.contains(signedException));
    6769    }
    … …  
    7274    @Test
    7375    public void launchingFileDoesNotMatchSignedTemplate3() throws Exception {
    74         ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/SignedJnlpTemplate3.jnlp");
     76        ProcessResult pr = server.executeJavawsHeadless(l, "/SignedJnlpTemplate3.jnlp");
    7577        Assert.assertTrue("Stderr should contains " + signedException + " but did not", pr.stderr.contains(signedException));
    7678    }

  • trunk/icedtea-web/tests/reproducers/signed/Spaces can be everywhere signed/testcases/SpacesCanBeEverywhereTestsSigned.java

    r418 r429  
    3838import java.util.ArrayList;
    3939import java.util.List;
     40import net.sourceforge.jnlp.ProcessResult;
    4041import net.sourceforge.jnlp.ServerAccess;
    4142import net.sourceforge.jnlp.annotations.Bug;
    … …  
    4445import net.sourceforge.jnlp.browsertesting.Browsers;
    4546import net.sourceforge.jnlp.annotations.TestInBrowsers;
     47
    4648import org.junit.Assert;
    47 
    4849import org.junit.Test;
    4950
    5051@Bug(id={"http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-October/016127.html","PR804","PR811"})
    5152public class SpacesCanBeEverywhereTestsSigned extends BrowserTest {
    52 
    5353
    5454    @Bug(id="PR811")
    … …  
    8383         * only on ocal files, and probably only from test run - it can be ignored
    8484         */
    85         ServerAccess.ProcessResult pr =  ServerAccess.executeProcess(commands);
    86         String s="Signed spaces can be everywhere.jsr was launched correctly";
    87         Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
    88         String cc = "xception";
    89         Assert.assertFalse("stderr should NOT contains `" + cc + "`, but did", pr.stderr.contains(cc));
     85        ProcessResult pr =  ServerAccess.executeProcess(commands);
     86        String s="Signed spaces can be everywhere.jsr was launched correctly";
     87        Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
    9088        Assert.assertFalse("should not be terminated, but was", pr.wasTerminated);
    9189        Assert.assertEquals((Integer) 0, pr.returnValue);
    … …  
    9694    @NeedsDisplay
    9795    public void SpacesCanBeEverywhereRemoteAppletTestsJnlp2Signed() throws Exception {
    98         ServerAccess.ProcessResult pr = server.executeJavaws("/NotOnly%20spaces%20can%20kill%20%C4%9B%C5%A1%C4%8D%C5%99%C5%BE%20too%20signed.jnlp");
    99         String s="Signed spaces can be everywhere.jsr was launched correctly";
    100         Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
    101         String cc = "xception";
    102         Assert.assertFalse("stderr should NOT contains `" + cc + "`, but did", pr.stderr.contains(cc));
     96        ProcessResult pr = server.executeJavaws("/NotOnly%20spaces%20can%20kill%20%C4%9B%C5%A1%C4%8D%C5%99%C5%BE%20too%20signed.jnlp");
     97        String s="Signed spaces can be everywhere.jsr was launched correctly";
     98        Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
    10399        Assert.assertFalse("should NOT be terminated, but was not", pr.wasTerminated);
    104100    }
    … …  
    109105    @TestInBrowsers(testIn = {Browsers.one})
    110106    public void SpacesCanBeEverywhereRemoteAppletTestsHtml2Signed() throws Exception {
    111         ServerAccess.ProcessResult pr = server.executeBrowser("/spaces+applet+Tests+signed.html");
    112         String s="Signed spaces can be everywhere.jsr was launched correctly";
    113         Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
    114         String cc = "xception";
    115         Assert.assertFalse("stderr should NOT contains `" + cc + "`, but did", pr.stderr.contains(cc));
     107        ProcessResult pr = server.executeBrowser("/spaces+applet+Tests+signed.html");
     108        String s="Signed spaces can be everywhere.jsr was launched correctly";
     109        Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
    116110        Assert.assertTrue("should be terminated, but was not", pr.wasTerminated);
    117111    }
    … …  
    121115    @Test
    122116    public void SpacesCanBeEverywhereRemoteTests1Signed() throws Exception {
    123         ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/Spaces%20can%20be%20everywhere1%20signed.jnlp");
     117        ProcessResult pr = server.executeJavawsHeadless(null, "/Spaces%20can%20be%20everywhere1%20signed.jnlp");
    124118        String s = "Good simple javaws exapmle";
    125119        Assert.assertTrue("stdout should contains `" + s + "`, but did not", pr.stdout.contains(s));
    … …  
    133127    @Test
    134128    public void SpacesCanBeEverywhereRemoteTests2Signed() throws Exception {
    135         ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/Spaces%20can%20be%20everywhere2%20signed.jnlp");
     129        ProcessResult pr = server.executeJavawsHeadless(null, "/Spaces%20can%20be%20everywhere2%20signed.jnlp");
    136130        String s="Signed spaces can be everywhere.jsr was launched correctly";
    137131        Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
    … …  
    145139    @Test
    146140    public void SpacesCanBeEverywhereRemoteTests2Signed_withQuery1() throws Exception {
    147         ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/Spaces%20can%20be%20everywhere2%20signed.jnlp?test=20");
     141        ProcessResult pr = server.executeJavawsHeadless(null, "/Spaces%20can%20be%20everywhere2%20signed.jnlp?test=20");
    148142        String s="Signed spaces can be everywhere.jsr was launched correctly";
    149143        Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
    … …  
    157151    @Test
    158152    public void SpacesCanBeEverywhereRemoteTests2Signed_withQuery2() throws Exception {
    159         ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/Spaces%20can%20be%20everywhere2%20signed.jnlp?test%3D20");
     153        ProcessResult pr = server.executeJavawsHeadless(null, "/Spaces%20can%20be%20everywhere2%20signed.jnlp?test%3D20");
    160154
    161155        String s="Signed spaces can be everywhere.jsr was launched correctly";
    … …  
    170164    @Test
    171165    public void SpacesCanBeEverywhereRemoteTests3Signed() throws Exception {
    172         ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/SpacesCanBeEverywhere1signed.jnlp");
     166        ProcessResult pr = server.executeJavawsHeadless(null, "/SpacesCanBeEverywhere1signed.jnlp");
    173167        String s="Signed spaces can be everywhere.jsr was launched correctly";
    174168        Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
    … …  
    187181        commands.add(ServerAccess.HEADLES_OPTION);
    188182        commands.add("Spaces can be everywhere1.jnlp");
    189         ServerAccess.ProcessResult pr = ServerAccess.executeProcess(commands,server.getDir());
     183        ProcessResult pr = ServerAccess.executeProcess(commands,server.getDir());
    190184        String s = "Good simple javaws exapmle";
    191185        Assert.assertTrue("stdout should contains `" + s + "`, but did not", pr.stdout.contains(s));
    … …  
    203197        commands.add(ServerAccess.HEADLES_OPTION);
    204198        commands.add("Spaces can be everywhere2 signed.jnlp");
    205         ServerAccess.ProcessResult pr = ServerAccess.executeProcess(commands,server.getDir());
     199        ProcessResult pr = ServerAccess.executeProcess(commands,server.getDir());
    206200        String s="Signed spaces can be everywhere.jsr was launched correctly";
    207201        Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
    … …  
    219213        commands.add(ServerAccess.HEADLES_OPTION);
    220214        commands.add(server.getDir()+"/Spaces can be everywhere2 signed.jnlp");
    221         ServerAccess.ProcessResult pr = ServerAccess.executeProcess(commands);
     215        ProcessResult pr = ServerAccess.executeProcess(commands);
    222216        String s="Signed spaces can be everywhere.jsr was launched correctly";
    223217        Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
    … …  
    235229        commands.add(ServerAccess.HEADLES_OPTION);
    236230        commands.add("SpacesCanBeEverywhere1signed.jnlp");
    237         ServerAccess.ProcessResult pr = ServerAccess.executeProcess(commands,server.getDir());
     231        ProcessResult pr = ServerAccess.executeProcess(commands,server.getDir());
    238232        String s="Signed spaces can be everywhere.jsr was launched correctly";
    239233        Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
Note: See TracChangeset for help on using the changeset viewer.