[rfc][icedtea-web] closing listener idea

[Adam Domurad]

>>>   public class AppletTestTests extends BrowserTest {
> >>
> >> +    private final String s7 = "Aplet killing himself after 2000 ms
> of
> >> life";
> > Aplet -> Applet (Is there another occurence of this typo ?)
> 
> I let it be intentionally, it is also in src and more tests depend on
> it.

OK. Although it is unfortunate when such things creep.

> > Oh boy this is so generic it reminds me of the Boost C++ library :).
> (If
> > you're unfamiliar, almost all their types take <type> parameters.)
> 
> Yap, I'm familiar, and I don like it :)
> 
> However here it seemed to me useful - kept.

Yes, I wasn't saying it was necessarily bad. Also Boost can be
wonderful, it is a huge library with many parts :).

Latest patch comments:

> diff -r faae12ea6f3c tests/reproducers/signed/AppletTestSigned/testcases/AppletTestSignedTests.java
> --- a/tests/reproducers/signed/AppletTestSigned/testcases/AppletTestSignedTests.java	Mon Sep 24 15:41:02 2012 +0200
> +++ b/tests/reproducers/signed/AppletTestSigned/testcases/AppletTestSignedTests.java	Mon Sep 24 16:23:19 2012 +0200
> @@ -43,6 +43,9 @@
>  import net.sourceforge.jnlp.browsertesting.BrowserTest;
>  import net.sourceforge.jnlp.browsertesting.Browsers;
>  import net.sourceforge.jnlp.annotations.TestInBrowsers;
> +import net.sourceforge.jnlp.closinglisteners.Rule;
> +import net.sourceforge.jnlp.closinglisteners.RulesFolowingClosingListener;
> +import static net.sourceforge.jnlp.closinglisteners.RulesFolowingClosingListener.*;
>  import org.junit.Assert;
>  
>  import org.junit.Test;
> @@ -50,8 +53,22 @@
>  public class AppletTestSignedTests extends BrowserTest {
>  
>      private final List<String> l = Collections.unmodifiableList(Arrays.asList(new String[]{"-Xtrustall"}));
> +    private static final String ss = "xception";
> +    private static final String s0 = "AppletTestSigned was started";
> +    private static final String s1 = "value1";
> +    private static final String s2 = "value2";
> +    private static final String s3 = "AppletTestSigned was initialised";
> +    private static final String s7 = "AppletTestSigned killing himself after 2000 ms of life";
> +    private static final ContainsRule exceptionRule = new ContainsRule(ss);
> +    private static final ContainsRule startedRule = new ContainsRule(s0);
> +    private static final ContainsRule variable1Rule = new ContainsRule(s1);
> +    private static final ContainsRule variable2Rule = new ContainsRule(s2);
> +    private static final ContainsRule initialisedRule = new ContainsRule(s3);
> +    private static final ContainsRule killedRule = new ContainsRule(s7);
> +    private static final Rule[] okRules = new Rule[]{startedRule, variable1Rule, variable2Rule, initialisedRule, killedRule};

Thanks for changing names. Originals can be left alone I suppose, I don't want to go digging in the past too much :)

> [..snip..]
> +    }
> +
> +    public void addRules(Rule[] rules) {
> +        if (rules == null) {
> +            throw new NullPointerException("rules cant be null");
> +        }
> +        this.rules.addAll(Arrays.asList(rules));
> +    }

This could take Rule... for consistency. Feel free to change without new patch.

> +
> +    @Override
> +    protected boolean isAlowedToFinish(String content) {
> +        if (rules == null || rules.size() < 1) {
> +            throw new IllegalStateException("No rules specified");
> +        }
> +        for (Rule rule : rules) {
> +            if (!rule.evaluate(content)) {
> +                return false;
> +            }
> +        }
> +        return true;
> +
> +
> +    }
> +}
> diff -r faae12ea6f3c tests/test-extensions/net/sourceforge/jnlp/closinglisteners/StringRule.java
> --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
> +++ b/tests/test-extensions/net/sourceforge/jnlp/closinglisteners/StringRule.java	Mon Sep 24 16:23:19 2012 +0200
> @@ -0,0 +1,57 @@
> +/* StringRule.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.
> +*/
> +package net.sourceforge.jnlp.closinglisteners;
> +
> +public abstract class StringRule<T>  implements Rule<String, T>{
> +    protected String rule;
> +
> +    public StringRule(String rule) {
> +        setRule(rule);
> +    }
> +
> +    public StringRule() {
> +    }
> +
> +
> +    @Override
> +    public void setRule(String rule){
> +        this.rule=rule;
> +    }
> +    @Override
> +    public abstract boolean evaluate(T upon);
> +
> +}


Thanks! OK for HEAD.
- Adam