diff options
author | Omair Majid <[email protected]> | 2012-10-29 15:07:56 -0400 |
---|---|---|
committer | Omair Majid <[email protected]> | 2012-10-29 15:07:56 -0400 |
commit | c1a0c080ff1b1b9ba864780b3636b206726d4a89 (patch) | |
tree | 1a6f97b6db869be355deb6a9a47feb98b1a07f46 | |
parent | 9e461930e968ff765397e564555a2d8891b9eab6 (diff) |
Reproducer for PR1186
Add a reproducer to verify that deployment properties are available
to jnlp applications as system properties.
4 files changed, 167 insertions, 0 deletions
@@ -1,5 +1,12 @@ 2012-10-29 Omair Majid <[email protected]> + * tests/reproducers/signed/DeploymentPropertiesAreExposed/resources/DeploymentPropertiesAreExposed.jnlp, + * tests/reproducers/signed/DeploymentPropertiesAreExposed/srcs/Test.java, + * tests/reproducers/signed/DeploymentPropertiesAreExposed/testcases/DeploymentPropertiesAreExposedTest.java: + New files. + +2012-10-29 Omair Majid <[email protected]> + PR1186 * netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java: (load(boolean)): Delegate to load(File,File,boolean). diff --git a/tests/reproducers/signed/DeploymentPropertiesAreExposed/resources/DeploymentPropertiesAreExposed.jnlp b/tests/reproducers/signed/DeploymentPropertiesAreExposed/resources/DeploymentPropertiesAreExposed.jnlp new file mode 100644 index 0000000..2415f44 --- /dev/null +++ b/tests/reproducers/signed/DeploymentPropertiesAreExposed/resources/DeploymentPropertiesAreExposed.jnlp @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +This file is part of IcedTea. + +IcedTea is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +IcedTea is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with IcedTea; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. + --> + +<jnlp spec="1.0" + codebase="." + href="DeploymentPropertiesAreExposed.jnlp"> + <information> + <title>Verify that deployment configuration properties are exposed</title> + <vendor>IcedTea</vendor> + </information> + <security> + <all-permissions /> + </security> + <resources> + <jar href="DeploymentPropertiesAreExposed.jar"/> + </resources> + <application-desc main-class="Test"/> +</jnlp> diff --git a/tests/reproducers/signed/DeploymentPropertiesAreExposed/srcs/Test.java b/tests/reproducers/signed/DeploymentPropertiesAreExposed/srcs/Test.java new file mode 100644 index 0000000..e7cccd3 --- /dev/null +++ b/tests/reproducers/signed/DeploymentPropertiesAreExposed/srcs/Test.java @@ -0,0 +1,42 @@ +/* Test.java +Copyright (C) 2012 Red Hat, Inc. + +This file is part of IcedTea. + +IcedTea is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License as published by +the Free Software Foundation, version 2. + +IcedTea is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with IcedTea; see the file COPYING. If not, write to +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. +*/ + +public class Test { + public static void main(String[] args) { + System.out.println(System.getProperty("deployment.user.logdir")); + } +} diff --git a/tests/reproducers/signed/DeploymentPropertiesAreExposed/testcases/DeploymentPropertiesAreExposedTest.java b/tests/reproducers/signed/DeploymentPropertiesAreExposed/testcases/DeploymentPropertiesAreExposedTest.java new file mode 100644 index 0000000..51d2197 --- /dev/null +++ b/tests/reproducers/signed/DeploymentPropertiesAreExposed/testcases/DeploymentPropertiesAreExposedTest.java @@ -0,0 +1,66 @@ +/* DeploymentPropertiesAreExposedTest.java +Copyright (C) 2012 Red Hat, Inc. + +This file is part of IcedTea. + +IcedTea is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License as published by +the Free Software Foundation, version 2. + +IcedTea is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with IcedTea; see the file COPYING. If not, write to +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. + */ + +import static org.junit.Assert.*; + +import java.io.File; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import net.sourceforge.jnlp.ServerAccess; +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( + trustCertificates, "/DeploymentPropertiesAreExposed.jnlp"); + + String expectedRegex = ".*" + File.separator + ".icedtea" + File.separator + "log" + ".*"; + String actual = result.stdout.trim(); + + boolean stdOutMatches = actual.matches(expectedRegex); + + assertTrue("'" + actual + "' should match '" + expectedRegex + "' but did not", stdOutMatches); + } + +} |