Author: dallen6 Date: 2009-02-19 12:35:10 -0500 (Thu, 19 Feb 2009) New Revision: 1601 Modified: tck/trunk/impl/src/main/resources/tck-audit.xml Log: Changed the assertions a little in section 7, Events. Modified: tck/trunk/impl/src/main/resources/tck-audit.xml =================================================================== --- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-02-19 15:34:25 UTC (rev 1600) +++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-02-19 17:35:10 UTC (rev 1601) @@ -2592,22 +2592,34 @@ <section id="7.1" title="Event types and binding types"> <assertion id="a"> - <text>An event object is an instance of a concrete Java class with no type variables or wildcards</text> + <text>An event object is an instance of a concrete Java class with no [type variables] or wildcards</text> </assertion> <assertion id="b"> - <text>The event types of the event include all superclasses and interfaces of the class of the event object</text> + <text>An event object is an instance of a concrete Java class with no type variables or [wildcards]</text> </assertion> <assertion id="c"> - <text>An event binding type is a Java annotation defined as @Target({FIELD, PARAMETER}) or @Target({METHOD, FIELD, PARAMETER, TYPE}) and @Retention(RUNTIME)</text> + <text>The event types of the event include all superclasses and interfaces of the class of the event object</text> </assertion> <assertion id="d"> + <text>An event binding type is a Java annotation defined as[@Target({FIELD, PARAMETER})] or @Target({METHOD, FIELD, PARAMETER, TYPE}) and @Retention(RUNTIME)</text> + </assertion> + + <assertion id="e"> + <text>An event binding type is a Java annotation defined as @Target({FIELD, PARAMETER}) or [@Target({METHOD, FIELD, PARAMETER, TYPE})] and @Retention(RUNTIME)</text> + </assertion> + + <assertion id="f"> + <text>An event binding type is a Java annotation defined as @Target({FIELD, PARAMETER}) or @Target({METHOD, FIELD, PARAMETER, TYPE}) and [@Retention(RUNTIME)]</text> + </assertion> + + <assertion id="g"> <text>All event binding types must specify the @javax.inject.BindingType meta-annotation</text> </assertion> - <assertion id="e"> + <assertion id="h"> <text>An event consumer will be notified of an event if the observed event type it specifies is one of the event types of the event, and if all the observed event bindings it specifies are event bindings of the event</text> </assertion> @@ -2620,9 +2632,17 @@ </assertion> <assertion id="b"> - <text>If the type of the event object passed to fireEvent() contains type variables or wildcards, an IllegalArgumentException is thrown</text> + <text>If the type of the event object passed to fireEvent() contains [type variables] or wildcards, an IllegalArgumentException is thrown</text> </assertion> + <assertion id="c"> + <text>If the type of the event object passed to fireEvent() contains type variables or [wildcards], an IllegalArgumentException is thrown</text> + </assertion> + + <assertion id="d"> + <text>If an instance of an annotation that is not a binding type is passed to fireEvent(), an IllegalArgumentException is thrown. (Not in PRD2, but should appear in next revision)</text> + </assertion> + </section> <section id="7.3" title="Observing events via the Observer interface">