Skip to content

Commit

Permalink
For #243: adjust other tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@ebruchez
ebruchez committed May 8, 2015
1 parent c4af52e commit 65b8f02
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 30 deletions.
54 changes: 27 additions & 27 deletions src/test/resources/ops/unit-tests/xforms-server/tests-xforms-components.xml
View file
Expand Up @@ -421,11 +421,11 @@
</instance>
<instance id="fr-errors-instance" model-id="my-summary≡fr-error-summary-model">
<errors>
<error absolute-id="|first-name-control|" position="151" label="First name" alert="Invalid first name" level="error" section-name=""/>
<error absolute-id="|note-control⊙1|" position="156" label="Note" alert="Invalid note" level="error" section-name=""/>
<error absolute-id="|note-control⊙2|" position="156" label="Note" alert="Invalid note" level="error" section-name=""/>
<error absolute-id="|note-control⊙3|" position="156" label="Note" alert="Invalid note" level="error" section-name=""/>
<error absolute-id="|last-name-control|" position="159" label="Last name" alert="Invalid last name" level="error" section-name=""/>
<error absolute-id="|first-name-control|" position="152" label="First name" alert="Invalid first name" level="error" section-name=""/>
<error absolute-id="|note-control⊙1|" position="157" label="Note" alert="Invalid note" level="error" section-name=""/>
<error absolute-id="|note-control⊙2|" position="157" label="Note" alert="Invalid note" level="error" section-name=""/>
<error absolute-id="|note-control⊙3|" position="157" label="Note" alert="Invalid note" level="error" section-name=""/>
<error absolute-id="|last-name-control|" position="160" label="Last name" alert="Invalid last name" level="error" section-name=""/>
</errors>
</instance>
<instance id="fr-state-instance" model-id="my-summary≡fr-error-summary-model">
Expand All @@ -444,36 +444,36 @@
</instances>
<controls>
<control effective-id="my-summary≡er" index="2"/>
<control effective-id="my-summary≡xf-115⊙1" case-id="xf-120"/>
<control effective-id="my-summary≡xf-121⊙1" case-id="xf-122"/>
<control effective-id="my-summary≡xf-115⊙2" case-id="xf-120"/>
<control effective-id="my-summary≡xf-121⊙2" case-id="xf-122"/>
<control effective-id="my-summary≡xf-116⊙1" case-id="xf-121"/>
<control effective-id="my-summary≡xf-122⊙1" case-id="xf-123"/>
<control effective-id="my-summary≡xf-116⊙2" case-id="xf-121"/>
<control effective-id="my-summary≡xf-122⊙2" case-id="xf-123"/>
<control effective-id="repeat" index="2"/>
</controls>
</dynamic-state>
</xxf:dynamic-state>
<xxf:action>
<xxf:control-values>
<xxf:control id="my-summary≡body" class="fr-error-summary-body fr-level-error"/>
<xxf:control id="my-summary≡xf-114⊙1">1</xxf:control>
<xxf:div id="my-summary≡xf-120⊙1" visibility="visible"/>
<xxf:div id="my-summary≡xf-116⊙1" visibility="hidden"/>
<xxf:attribute for="my-summary≡xf-117⊙1" name="href"/>
<xxf:control id="my-summary≡xf-119⊙1" class="fr-error-label" relevant="false"/>
<xxf:div id="my-summary≡xf-122⊙1" visibility="visible"/>
<xxf:div id="my-summary≡xf-126⊙1" visibility="hidden"/>
<xxf:control id="my-summary≡xf-123⊙1" class="fr-error-label" label="Note"/>
<xxf:control id="my-summary≡xf-127⊙1" class="fr-error-label" relevant="false"/>
<xxf:control id="my-summary≡xf-115⊙1">1</xxf:control>
<xxf:div id="my-summary≡xf-121⊙1" visibility="visible"/>
<xxf:div id="my-summary≡xf-117⊙1" visibility="hidden"/>
<xxf:attribute for="my-summary≡xf-118⊙1" name="href"/>
<xxf:control id="my-summary≡xf-120⊙1" class="fr-error-label" relevant="false"/>
<xxf:div id="my-summary≡xf-123⊙1" visibility="visible"/>
<xxf:div id="my-summary≡xf-127⊙1" visibility="hidden"/>
<xxf:control id="my-summary≡xf-124⊙1" class="fr-error-label" label="Note"/>
<xxf:control id="my-summary≡xf-128⊙1" class="fr-error-label" relevant="false"/>
<xxf:control id="my-summary≡ao⊙1" class="fr-error-alert fr-error-alert-error">Invalid note</xxf:control>
<xxf:control id="my-summary≡xf-114⊙2">2</xxf:control>
<xxf:div id="my-summary≡xf-120⊙2" visibility="visible"/>
<xxf:div id="my-summary≡xf-116⊙2" visibility="hidden"/>
<xxf:attribute for="my-summary≡xf-117⊙2" name="href"/>
<xxf:control id="my-summary≡xf-119⊙2" class="fr-error-label" relevant="false"/>
<xxf:div id="my-summary≡xf-122⊙2" visibility="visible"/>
<xxf:div id="my-summary≡xf-126⊙2" visibility="hidden"/>
<xxf:control id="my-summary≡xf-123⊙2" class="fr-error-label" label="Last name"/>
<xxf:control id="my-summary≡xf-127⊙2" class="fr-error-label" relevant="false"/>
<xxf:control id="my-summary≡xf-115⊙2">2</xxf:control>
<xxf:div id="my-summary≡xf-121⊙2" visibility="visible"/>
<xxf:div id="my-summary≡xf-117⊙2" visibility="hidden"/>
<xxf:attribute for="my-summary≡xf-118⊙2" name="href"/>
<xxf:control id="my-summary≡xf-120⊙2" class="fr-error-label" relevant="false"/>
<xxf:div id="my-summary≡xf-123⊙2" visibility="visible"/>
<xxf:div id="my-summary≡xf-127⊙2" visibility="hidden"/>
<xxf:control id="my-summary≡xf-124⊙2" class="fr-error-label" label="Last name"/>
<xxf:control id="my-summary≡xf-128⊙2" class="fr-error-label" relevant="false"/>
<xxf:control id="my-summary≡ao⊙2" class="fr-error-alert fr-error-alert-error">Invalid last name</xxf:control>
<xxf:control id="first-name-control" label="First name" alert="Invalid first name" required="true" level="error" empty="true"/>
<xxf:control id="note-control⊙1" label="Note" alert="Invalid note" required="true" level="error" empty="true"/>
Expand Down
8 changes: 5 additions & 3 deletions src/test/resources/ops/unit-tests/xforms-server/tests-xforms-xbl.xml
View file
Expand Up @@ -3651,9 +3651,11 @@
<xf:trigger id="foo-trigger">
<xf:label>Open me</xf:label>
<!-- Open global dialog upon click -->
<xxf:show ev:event="DOMActivate" dialog="my-dialog" xxbl:scope="outer">
<xf:property name="my-id" value="event('xxf:absolute-targetid')"/>
</xxf:show>
<xf:action ev:event="DOMActivate">
<xxf:show dialog="my-dialog" xxbl:scope="outer">
<xf:property name="my-id" value="event('xxf:absolute-targetid')"/>
</xxf:show>
</xf:action>
<!-- Upon callback, store value received -->
<xf:setvalue ev:event="my-callback" ref="instance()" value="event('my-value')"/>
</xf:trigger>
Expand Down

0 comments on commit 65b8f02

Please sign in to comment.