aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Vanek <[email protected]>2012-09-06 14:09:09 +0200
committerJiri Vanek <[email protected]>2012-09-06 14:09:09 +0200
commitea9beb5ebd38fb92f7214cd64784e82f78e71309 (patch)
tree50af75981f83be16ecbfa83be509ec608857b3da
parente5a1c62b36ce30b1b2fd2bb54f663ab553c247cd (diff)
Fixing several typos from previous push.
-rw-r--r--ChangeLog10
-rw-r--r--tests/reproducers/simple/ParametrizedJarUrl/testcases/ParametrizedJarUrlTests.java8
-rw-r--r--tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java4
-rw-r--r--tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java2
4 files changed, 17 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index c0182cc..b1e5e87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2012-09-06 Jiri Vanek <[email protected]>
+
+ 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 <[email protected]>
Fixing several errors which were causing incorrect behaviour causing
diff --git a/tests/reproducers/simple/ParametrizedJarUrl/testcases/ParametrizedJarUrlTests.java b/tests/reproducers/simple/ParametrizedJarUrl/testcases/ParametrizedJarUrlTests.java
index 12258ec..7d2da42 100644
--- a/tests/reproducers/simple/ParametrizedJarUrl/testcases/ParametrizedJarUrlTests.java
+++ b/tests/reproducers/simple/ParametrizedJarUrl/testcases/ParametrizedJarUrlTests.java
@@ -65,7 +65,7 @@ public class ParametrizedJarUrlTests extends BrowserTest{
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 class ParametrizedJarUrlTests extends BrowserTest{
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 @@ public class ParametrizedJarUrlTests extends BrowserTest{
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";
diff --git a/tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java b/tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java
index da5c265..62b502b 100644
--- a/tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java
+++ b/tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java
@@ -585,14 +585,14 @@ public class ServerAccess {
}
/**
- * 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);
}
/**
diff --git a/tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java b/tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java
index 207f142..c6212b8 100644
--- a/tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java
+++ b/tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java
@@ -99,7 +99,7 @@ class TinyHttpdImpl extends Thread {
}
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);