/hg/icedtea-web: 2 new changesets

[jkang at icedtea.classpath.org]

changeset 7e1a098d6335 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=7e1a098d6335
author: Jie Kang <jkang at redhat.com>
date: Mon Mar 02 10:02:35 2015 -0500

	Use temporary cache in PluginBridge unit tests

	2015-03-02  Jie Kang  <jkang at redhat.com>

	    Use temporary cache in PluginBridge unit tests
	    * tests/netx/unit/net/sourceforge/jnlp/PluginBridgeTest.java: sets
	    temporary cache in @BeforeClass and unsets in @AfterClass


changeset 11b46740b094 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=11b46740b094
author: Jie Kang <jkang at redhat.com>
date: Tue Mar 03 09:14:07 2015 -0500

	Fix DeadLockTest reproducers

	2015-03-03  Jie Kang  <jkang at redhat.com>

	    Fix DeadLockTest reproducers
	    * tests/reproducers/simple/deadlocktest/testcases/DeadLockTestTest.java:
	    (testSimpletest1lunchFork), (testSimpletest1lunchNoFork) removed division
	    by two in final assert


diffstat:

 ChangeLog                                                             |  13 ++++++
 tests/netx/unit/net/sourceforge/jnlp/PluginBridgeTest.java            |  21 ++++++++++
 tests/reproducers/simple/deadlocktest/testcases/DeadLockTestTest.java |   4 +-
 3 files changed, 36 insertions(+), 2 deletions(-)

diffs (91 lines):

diff -r 85fe0274f4a8 -r 11b46740b094 ChangeLog
--- a/ChangeLog	Mon Mar 02 14:23:39 2015 +0100
+++ b/ChangeLog	Tue Mar 03 09:14:07 2015 -0500
@@ -1,3 +1,16 @@
+2015-03-03  Jie Kang  <jkang at redhat.com>
+
+	Fix DeadLockTest reproducers
+	* tests/reproducers/simple/deadlocktest/testcases/DeadLockTestTest.java:
+	(testSimpletest1lunchFork), (testSimpletest1lunchNoFork) removed division
+	by two in final assert
+
+2015-03-02  Jie Kang  <jkang at redhat.com>
+
+	Use temporary cache in PluginBridge unit tests
+	* tests/netx/unit/net/sourceforge/jnlp/PluginBridgeTest.java: sets
+	temporary cache in @BeforeClass and unsets in @AfterClass
+
 2015-02-27  Jiri Vanek  <jvanek at redhat.com>
 
 	Silenced to verbose unittests
diff -r 85fe0274f4a8 -r 11b46740b094 tests/netx/unit/net/sourceforge/jnlp/PluginBridgeTest.java
--- a/tests/netx/unit/net/sourceforge/jnlp/PluginBridgeTest.java	Mon Mar 02 14:23:39 2015 +0100
+++ b/tests/netx/unit/net/sourceforge/jnlp/PluginBridgeTest.java	Tue Mar 03 09:14:07 2015 -0500
@@ -24,6 +24,7 @@
 
 import static org.junit.Assert.assertEquals;
 
+import java.io.File;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -32,11 +33,17 @@
 import java.util.Map;
 import java.util.List;
 
+import net.sourceforge.jnlp.cache.CacheUtil;
 import net.sourceforge.jnlp.cache.UpdatePolicy;
+import net.sourceforge.jnlp.config.DeploymentConfiguration;
+import net.sourceforge.jnlp.runtime.JNLPRuntime;
 import net.sourceforge.jnlp.util.logging.NoStdOutErrTest;
 import net.sourceforge.jnlp.util.replacements.BASE64Encoder;
+
+import org.junit.AfterClass;
 import org.junit.Assert;
 
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 public class PluginBridgeTest extends NoStdOutErrTest{
@@ -74,6 +81,20 @@
         return new PluginParameters(params);
     }
 
+    private static String originalCacheDir;
+
+    @BeforeClass
+    public static void setup() {
+        originalCacheDir = JNLPRuntime.getConfiguration().getProperty(DeploymentConfiguration.KEY_USER_CACHE_DIR);
+        JNLPRuntime.getConfiguration().setProperty(DeploymentConfiguration.KEY_USER_CACHE_DIR, System.getProperty("java.io.tmpdir") + File.separator + "tempcache");
+    }
+
+    @AfterClass
+    public static void teardown() {
+        CacheUtil.clearCache();
+        JNLPRuntime.getConfiguration().setProperty(DeploymentConfiguration.KEY_USER_CACHE_DIR, originalCacheDir);
+    }
+
     @Test
     public void testAbsoluteJNLPHref() throws MalformedURLException, Exception {
         URL codeBase = new URL("http://undesired.absolute.codebase.com");
diff -r 85fe0274f4a8 -r 11b46740b094 tests/reproducers/simple/deadlocktest/testcases/DeadLockTestTest.java
--- a/tests/reproducers/simple/deadlocktest/testcases/DeadLockTestTest.java	Mon Mar 02 14:23:39 2015 +0100
+++ b/tests/reproducers/simple/deadlocktest/testcases/DeadLockTestTest.java	Tue Mar 03 09:14:07 2015 -0500
@@ -120,7 +120,7 @@
         ServerAccess.logOutputReprint("java66: " + afterKill.size());
         Assert.assertEquals("assert that just old javas remians", 0, (before.size() - afterKill.size()));
         // div by two is caused by jav in java process hierarchy
-        Assert.assertEquals("launched JVMs must be exactly 2, was " + (during.size() - before.size()) / 2, 2, (during.size() - before.size()) / 2);
+        Assert.assertEquals("launched JVMs must be exactly 2, was " + (during.size() - before.size()), 2, (during.size() - before.size()));
     }
 
     @Test
@@ -142,7 +142,7 @@
         ServerAccess.logOutputReprint("java99: " + afterKill.size());
         Assert.assertEquals("assert that just old javas remians", 0, (before.size() - afterKill.size()));
         // div by two is caused by jav in java process hierarchy
-        Assert.assertEquals("launched JVMs must be exactly 1, was  " + (during.size() - before.size()) / 2, 1, (during.size() - before.size()) / 2);
+        Assert.assertEquals("launched JVMs must be exactly 1, was  " + (during.size() - before.size()), 1, (during.size() - before.size()));
     }
 
     /**