From e7a13c92d739a1fa0259ea1d0cc3df60aecad124 Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Mon, 7 Oct 2013 14:02:15 -0400
Subject: DeploymentConfiguration properties reproducer fix
Update test to reflect changed log directory
---
.../testcases/DeploymentPropertiesAreExposedTest.java | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
(limited to 'tests/reproducers/signed')
diff --git a/tests/reproducers/signed/DeploymentPropertiesAreExposed/testcases/DeploymentPropertiesAreExposedTest.java b/tests/reproducers/signed/DeploymentPropertiesAreExposed/testcases/DeploymentPropertiesAreExposedTest.java
index 51d2197..9e8fe97 100644
--- a/tests/reproducers/signed/DeploymentPropertiesAreExposed/testcases/DeploymentPropertiesAreExposedTest.java
+++ b/tests/reproducers/signed/DeploymentPropertiesAreExposed/testcases/DeploymentPropertiesAreExposedTest.java
@@ -42,20 +42,25 @@ import java.util.Arrays;
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);
--
cgit v1.2.3