/hg/icedtea-web: 2 new changesets

[jvanek at icedtea.classpath.org]

changeset dedecb2fff07 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=dedecb2fff07
author: Jiri Vanek <jvanek at redhat.com>
date: Fri Mar 27 13:43:46 2015 +0100

	Makefile.am: (stamps/generate-docs.stamp) fixed redundant false in version appearing in docs


changeset d1b6ca2e899a in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=d1b6ca2e899a
author: Jiri Vanek <jvanek at redhat.com>
date: Fri Mar 27 13:49:10 2015 +0100

	* tests/reproducers/custom/TrustedOnlyAttribute/testcases/TrustedOnlyAttributeTest.java: added BeforeClass and AfterClass hunks which adapt USER_DEPLOYMENT_FILE for test's needs.


diffstat:

 ChangeLog                                                                             |  11 ++
 Makefile.am                                                                           |   6 +-
 tests/reproducers/custom/TrustedOnlyAttribute/testcases/TrustedOnlyAttributeTest.java |  40 ++++++++++
 3 files changed, 54 insertions(+), 3 deletions(-)

diffs (100 lines):

diff -r 3a1ad6a916a8 -r d1b6ca2e899a ChangeLog
--- a/ChangeLog	Thu Mar 26 11:37:18 2015 -0400
+++ b/ChangeLog	Fri Mar 27 13:49:10 2015 +0100
@@ -1,3 +1,14 @@
+2015-03-25  Lukasz Dracz  <ldracz at redhat.com>
+
+	* tests/reproducers/custom/TrustedOnlyAttribute/testcases/TrustedOnlyAttributeTest.java:
+	added BeforeClass and AfterClass hunks which adapt USER_DEPLOYMENT_FILE for
+	test's needs.
+
+2015-03-27  Jiri Vanek  <jvanek at redhat.com>
+
+	* Makefile.am: (stamps/generate-docs.stamp) fixed redundant false in version
+	appearing in docs
+
 2015-03-26  Lukasz Dracz  <ldracz at redhat.com>
 
 	fix clean to replace new Manifest Attributes messages
diff -r 3a1ad6a916a8 -r d1b6ca2e899a Makefile.am
--- a/Makefile.am	Thu Mar 26 11:37:18 2015 -0400
+++ b/Makefile.am	Fri Mar 27 13:49:10 2015 +0100
@@ -525,16 +525,16 @@
 	  export LANG=$$LANG_ID; \
 	  mkdir "$$HTML_DOCS_TARGET_DIR/$$ID" ; \
 	  echo "<li><a href='$$ID/icedtea-web.html'>$$LANG_ID</a></li>"  >> "$$HTML_DOCS_INDEX" ; \
-	  $$TP_COMMAND html "$$HTML_DOCS_TARGET_DIR/$$ID" false "$$TP_TAIL" ; \
+	  $$TP_COMMAND html "$$HTML_DOCS_TARGET_DIR/$$ID" $$TP_TAIL ; \
 	  mkdir "$$PLAIN_DOCS_TARGET_DIR/$$ID" ; \
-	  $$TP_COMMAND plain "$$PLAIN_DOCS_TARGET_DIR/$$ID" 160 false "$$TP_TAIL"; \
+	  $$TP_COMMAND plain "$$PLAIN_DOCS_TARGET_DIR/$$ID" 160 $$TP_TAIL; \
 	  if [ $$ID == "en" ] ; then \
 	    MAN_DESC="$$MAN_DOCS_TARGET_DIR/man1" ; \
 	  else \
 	    MAN_DESC="$$MAN_DOCS_TARGET_DIR/$$ID/man1" ; \
 	  fi ; \
 	  mkdir -p "$$MAN_DESC" ; \
-	  $$TP_COMMAND man $$ENCOD "$$MAN_DESC" "$$TP_TAIL" ; \
+	  $$TP_COMMAND man $$ENCOD "$$MAN_DESC" $$TP_TAIL ; \
 	  $$TP_COMMAND htmlIntro "$(NETX_DIR)/net/sourceforge/jnlp/resources/about_$$ID.html" "$$TP_TAIL"; \
 	done ; \
 	export LANG=$$LANG_BACKUP ; \
diff -r 3a1ad6a916a8 -r d1b6ca2e899a tests/reproducers/custom/TrustedOnlyAttribute/testcases/TrustedOnlyAttributeTest.java
--- a/tests/reproducers/custom/TrustedOnlyAttribute/testcases/TrustedOnlyAttributeTest.java	Thu Mar 26 11:37:18 2015 -0400
+++ b/tests/reproducers/custom/TrustedOnlyAttribute/testcases/TrustedOnlyAttributeTest.java	Fri Mar 27 13:49:10 2015 +0100
@@ -45,15 +45,55 @@
 import net.sourceforge.jnlp.browsertesting.Browsers;
 import net.sourceforge.jnlp.closinglisteners.AutoOkClosingListener;
 
+import net.sourceforge.jnlp.config.PathsAndFiles;
+import net.sourceforge.jnlp.util.FileUtils;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertFalse;
 
+import java.io.File;
+import java.io.IOException;
+
 public class TrustedOnlyAttributeTest extends BrowserTest {
 
     private static final String RUNNING_STRING = "TrustedOnlyAttribute applet running";
     private static final String CLOSE_STRING = AutoOkClosingListener.MAGICAL_OK_CLOSING_STRING;
 
+    private static File deployFile;
+    private static String attributesCheck;
+
+    @BeforeClass
+    public static void setupDeploymentProperties() throws IOException {
+        deployFile = PathsAndFiles.USER_DEPLOYMENT_FILE.getFile();
+        String properties = FileUtils.loadFileAsString(deployFile);
+
+        for (String line : properties.split("\n")) {
+            if (line.contains("deployment.manifest.attribute.check")) {
+                attributesCheck = line;
+                properties = properties.replace(line, "deployment.manifest.attributes.check=TRUSTED\n");
+            }
+        }
+        if (attributesCheck == null) {
+            properties += "deployment.manifest.attributes.check=TRUSTED\n";
+        }
+
+        FileUtils.saveFile(properties, deployFile);
+    }
+
+    @AfterClass
+    public static void setbackDeploymentProperties() throws IOException {
+        String properties = FileUtils.loadFileAsString(deployFile);
+        if (attributesCheck != null) {
+            properties = properties.replace("deployment.manifest.attributes.check=TRUSTED\n", attributesCheck);
+        } else {
+            properties = properties.replace("deployment.manifest.attributes.check=TRUSTED\n", "");
+        }
+
+        FileUtils.saveFile(properties, deployFile);
+    }
+
     @NeedsDisplay
     @Test
     @TestInBrowsers(testIn={Browsers.one})