/hg/icedtea-web: DeploymentConfiguration properties reproducer fix

[aazores at icedtea.classpath.org]

changeset 9424264bb603 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=9424264bb603
author: Andrew Azores <aazores at redhat.com>
date: Mon Oct 07 14:02:15 2013 -0400

	DeploymentConfiguration properties reproducer fix

	Update test to reflect changed log directory


diffstat:

 ChangeLog                                                                                                 |   6 +++++
 tests/reproducers/signed/DeploymentPropertiesAreExposed/testcases/DeploymentPropertiesAreExposedTest.java |  11 +++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diffs (45 lines):

diff -r cdd42af7c0b5 -r 9424264bb603 ChangeLog
--- a/ChangeLog	Thu Oct 03 09:25:35 2013 -0400
+++ b/ChangeLog	Mon Oct 07 14:02:15 2013 -0400
@@ -1,3 +1,9 @@
+2013-10-07  Andrew Azores  <aazores at redhat.com>
+
+	DeploymentConfiguration properties reproducer fix
+	* tests/reproducers/signed/DeploymentPropertiesAreExposed/testcases/DeploymentPropertiesAreExposedTest.java: 
+	update test to reflect changed log directory
+
 2013-10-03  Andrew Azores  <aazores at redhat.com>
 
 	PR1204 patch regression fix
diff -r cdd42af7c0b5 -r 9424264bb603 tests/reproducers/signed/DeploymentPropertiesAreExposed/testcases/DeploymentPropertiesAreExposedTest.java
--- a/tests/reproducers/signed/DeploymentPropertiesAreExposed/testcases/DeploymentPropertiesAreExposedTest.java	Thu Oct 03 09:25:35 2013 -0400
+++ b/tests/reproducers/signed/DeploymentPropertiesAreExposed/testcases/DeploymentPropertiesAreExposedTest.java	Mon Oct 07 14:02:15 2013 -0400
@@ -42,20 +42,25 @@
 import java.util.Collections;
 import java.util.List;
 import net.sourceforge.jnlp.ServerAccess;
+import net.sourceforge.jnlp.ProcessResult;
+import net.sourceforge.jnlp.runtime.JNLPRuntime;
+import net.sourceforge.jnlp.config.DeploymentConfiguration;
 import org.junit.Test;
 
 public class DeploymentPropertiesAreExposedTest {
 
-
     @Test
     public void verifyDeploymentConfigrationIsExposedAsSystemProperties() throws Exception {
         ServerAccess server = new ServerAccess();
         List<String> trustCertificates = Arrays.asList(new String[] {"-Xtrustall"});
 
-        ServerAccess.ProcessResult result = server.executeJavawsHeadless(
+        ProcessResult result = server.executeJavawsHeadless(
             trustCertificates, "/DeploymentPropertiesAreExposed.jnlp");
 
-        String expectedRegex = ".*" + File.separator + ".icedtea" + File.separator + "log" + ".*";
+        DeploymentConfiguration config = JNLPRuntime.getConfiguration();
+        config.load();
+        String userLogDir = config.getProperty(DeploymentConfiguration.KEY_USER_LOG_DIR);
+        String expectedRegex = userLogDir + "/?";
         String actual = result.stdout.trim();
 
         boolean stdOutMatches = actual.matches(expectedRegex);