/hg/icedtea-web: fix clean to replace new Manifest Attributes me...

[ldracz at icedtea.classpath.org]

changeset 3a1ad6a916a8 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=3a1ad6a916a8
author: Lukasz Dracz <ldracz at redhat.com>
date: Thu Mar 26 11:37:18 2015 -0400

	fix clean to replace new Manifest Attributes messages

	2015-03-26  Lukasz Dracz  <ldracz at redhat.com>

		fix clean to replace new Manifest Attributes messages
		* tests/reproducers/custom/remote/testcases/RemoteApplicationSettings.java:
		Changed clean to replace the two new Manifest Attributes Checker messages
		instead of the old deleted Manifest Attributes Checker message


diffstat:

 ChangeLog                                                                |  7 +++++++
 tests/reproducers/custom/remote/testcases/RemoteApplicationSettings.java |  6 ++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diffs (41 lines):

diff -r 7dc1ec5da8c5 -r 3a1ad6a916a8 ChangeLog
--- a/ChangeLog	Wed Mar 25 14:33:42 2015 -0400
+++ b/ChangeLog	Thu Mar 26 11:37:18 2015 -0400
@@ -1,3 +1,10 @@
+2015-03-26  Lukasz Dracz  <ldracz at redhat.com>
+
+	fix clean to replace new Manifest Attributes messages
+	* tests/reproducers/custom/remote/testcases/RemoteApplicationSettings.java:
+	Changed clean to replace the two new Manifest Attributes Checker messages
+	instead of the old deleted Manifest Attributes Checker message
+
 2015-03-25  Lukasz Dracz  <ldracz at redhat.com>
 
 	Change Manifest Attributes Checker to check combinations of attributes
diff -r 7dc1ec5da8c5 -r 3a1ad6a916a8 tests/reproducers/custom/remote/testcases/RemoteApplicationSettings.java
--- a/tests/reproducers/custom/remote/testcases/RemoteApplicationSettings.java	Wed Mar 25 14:33:42 2015 -0400
+++ b/tests/reproducers/custom/remote/testcases/RemoteApplicationSettings.java	Thu Mar 26 11:37:18 2015 -0400
@@ -41,13 +41,10 @@
 import java.util.List;
 import net.sourceforge.jnlp.JNLPFile;
 import net.sourceforge.jnlp.ProcessResult;
-import net.sourceforge.jnlp.runtime.ManifestAttributesChecker;
 import net.sourceforge.jnlp.runtime.Translator;
 import org.junit.Assert;
 import org.junit.Test;
 
-;
-
 public class RemoteApplicationSettings {
 
     public static final String mustEmpty = "must be empty, was not";
@@ -78,7 +75,8 @@
         URL u;
 
         public String clean(String s){
-            s = s.replace(ManifestAttributesChecker.MANIFEST_CHECK_DISABLED_MESSAGE,"");
+            s = s.replace(Translator.R("MACDisabledMessage"),"");
+            s = s.replace(Translator.R("MACCheckSkipped", ".*", ".*"), "");
             s = s.replace(JNLPFile.TITLE_NOT_FOUND, "");
             s = s.replaceAll("Fontconfig warning.*", "");
             return  s.replaceAll("\\s*" + JNLPFile.TITLE_NOT_FOUND + "\\s*", "").trim();