Mercurial > hg > release > icedtea-web-1.7

changeset 518:83032226f86a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixing several typos from previous push.
author Jiri Vanek <jvanek@redhat.com>
date Thu, 06 Sep 2012 14:09:09 +0200
parents 4d8eccca14ed
children 0db02eca94bf
files ChangeLog tests/reproducers/simple/ParametrizedJarUrl/testcases/ParametrizedJarUrlTests.java tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java
diffstat 4 files changed, 17 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Sep 05 16:02:18 2012 +0200
+++ b/ChangeLog	Thu Sep 06 14:09:09 2012 +0200
@@ -1,3 +1,13 @@
+2012-09-06  Jiri Vanek  <jvanek@redhat.com>
+
+	Fixing several typos from previous push
+	* tests/test-extensions/net/sourceforge/jnlp/ServerLauncher.java:
+	(getUrlUponThisInstance) Javadoc, replaced Ctreate with Create.
+	* tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java: (run)
+	Fixed indentation.
+	* tests/reproducers/simple/ParametrizedJarUrl/testcases/ParametrizedJarUrlTests.java:
+	Refactored createCodeBAse to createCodeBase.
+	
 2012-09-05  Jiri Vanek  <jvanek@redhat.com>
 
 	Fixing several errors which were causing incorrect behaviour causing
--- a/tests/reproducers/simple/ParametrizedJarUrl/testcases/ParametrizedJarUrlTests.java	Wed Sep 05 16:02:18 2012 +0200
+++ b/tests/reproducers/simple/ParametrizedJarUrl/testcases/ParametrizedJarUrlTests.java	Thu Sep 06 14:09:09 2012 +0200
@@ -65,7 +65,7 @@
         ServerLauncher server2 = ServerAccess.getIndependentInstance();
         String originalResourceName = "ParametrizedJarUrlSigned.html";
         String newResourceName = "ParametrizedJarUrlSigned_COPY2.html";
-        createCodeBAse(originalResourceName, newResourceName, server2.getUrl(""));
+        createCodeBase(originalResourceName, newResourceName, server2.getUrl(""));
         //set codebase to second server
         ProcessResult pr = server.executeBrowser(newResourceName);
         server2.stop();
@@ -78,12 +78,12 @@
     public void parametrizedAppletTestSignedBrowserTest_hardcodedCodeBase() throws Exception {
         String originalResourceName = "ParametrizedJarUrlSigned.html";
         String newResourceName = "ParametrizedJarUrlSigned_COPY1.html";
-        createCodeBAse(originalResourceName, newResourceName, server.getUrl(""));
+        createCodeBase(originalResourceName, newResourceName, server.getUrl(""));
         ProcessResult pr = server.executeBrowser(newResourceName);
         evaluateSignedApplet(pr);
     }
 
-    private void createCodeBAse(String originalResourceName, String newResourceName, URL codebase) throws MalformedURLException, IOException {
+    private void createCodeBase(String originalResourceName, String newResourceName, URL codebase) throws MalformedURLException, IOException {
         String originalContent = ServerAccess.getContentOfStream(new FileInputStream(new File(server.getDir(), originalResourceName)));
         String nwContent = originalContent.replaceAll("codebase=\".\"", "codebase=\"" + codebase + "\"");
         ServerAccess.saveFile(nwContent, new File(server.getDir(), newResourceName));
@@ -149,7 +149,7 @@
         Assert.assertTrue("AppletTestSigned stdout should contain " + s1 + " but didn't", pr.stdout.contains(s1));
         String s2 = "value2";
         Assert.assertTrue("AppletTestSigned stdout should contain " + s2 + " but didn't", pr.stdout.contains(s2));
-//        to strict!
+//        too strict!
 //        String s4 = "AppletTestSigned was stopped";
 //        Assert.assertFalse("AppletTestSigned stdout shouldn't contains " + s4 + " but did", pr.stdout.contains(s4));
 //        String s5 = "AppletTestSigned will be destroyed";
--- a/tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java	Wed Sep 05 16:02:18 2012 +0200
+++ b/tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java	Thu Sep 06 14:09:09 2012 +0200
@@ -585,14 +585,14 @@
     }
 
     /**
-     * Ctreate resource on http, on 'localhost' on port on which this cached instance is running
+     * Create resource on http, on 'localhost' on port on which this cached instance is running
      * @param resource
      * @return
      * @throws MalformedURLException
      */
     public URL getUrlUponThisInstance(String resource) throws MalformedURLException {
         getInstance();
-       return getUrlUponInstance(server,resource);
+        return getUrlUponInstance(server, resource);
     }
 
     /**
--- a/tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java	Wed Sep 05 16:02:18 2012 +0200
+++ b/tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java	Thu Sep 06 14:09:09 2012 +0200
@@ -99,7 +99,7 @@
                         }
                         ServerAccess.logNoReprint("Getting: " + p);
                         p = URLDecoder.decode(p, "UTF-8");
-                        p=p.replaceAll("\\?.*", "");
+                        p = p.replaceAll("\\?.*", "");
                         p = (".".concat((p.endsWith("/")) ? p.concat("index.html") : p)).replace('/', File.separatorChar);
                         ServerAccess.logNoReprint("Serving: " + p);
                         File pp = new File(dir, p);