From richfaces-svn-commits at lists.jboss.org Thu Sep 23 07:19:08 2010
Content-Type: multipart/mixed; boundary="===============4328748331329928390=="
MIME-Version: 1.0
From: richfaces-svn-commits at lists.jboss.org
To: richfaces-svn-commits at lists.jboss.org
Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r19322 - in
 modules/tests/metamer/trunk: application/src/main/webapp/components/a4jRegion
 and 1 other directories.
Date: Thu, 23 Sep 2010 07:19:08 -0400
Message-ID: <201009231119.o8NBJ8Vw018589@svn01.web.mwc.hst.phx2.redhat.com>

--===============4328748331329928390==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: lfryc(a)redhat.com
Date: 2010-09-23 07:19:07 -0400 (Thu, 23 Sep 2010)
New Revision: 19322

Added:
   modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRe=
gion/nested-decoration.xhtml
   modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRe=
gion/nested-insertion.xhtml
Modified:
   modules/tests/metamer/trunk/application/src/main/java/org/richfaces/test=
s/metamer/bean/A4JRegionBean.java
   modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRe=
gion/nested.xhtml
   modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tes=
ts/metamer/ftest/a4jRegion/NestedRegionModel.java
   modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tes=
ts/metamer/ftest/a4jRegion/TestNestedRegion.java
Log:
a4j:region tests in nested ui:decorate and ui:insert (RFPL-724)

Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfac=
es/tests/metamer/bean/A4JRegionBean.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tes=
ts/metamer/bean/A4JRegionBean.java	2010-09-23 09:32:03 UTC (rev 19321)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tes=
ts/metamer/bean/A4JRegionBean.java	2010-09-23 11:19:07 UTC (rev 19322)
@@ -38,7 +38,7 @@
 =

 /**
  * Managed bean for a4j:region.
- *
+ * =

  * @author Exadel, Nick Belaevski, <a href=3D"mailto:ppitonak(a)redhat.com=
">Pavol Pitonak</a>
  * @version $Revision$
  */
@@ -50,7 +50,8 @@
     private static final SelectItem[] AVAILABLE_EXECUTE_OPTIONS =3D new Se=
lectItem[] { new SelectItem(null, "default"),
         new SelectItem("@all"), new SelectItem("@form"), new SelectItem("@=
region"), new SelectItem("@this"),
         new SelectItem("outerValueInput", "Outer"), new SelectItem("region=
ValueInput", "Region"),
-        new SelectItem("nestedRegionValueInput", "Nested region") };
+        new SelectItem("nestedRegionValueInput", "Nested region"),
+        new SelectItem("decorationValueInput", "Decoration"), new SelectIt=
em("insertionValueInput", "Insertion") };
     private static Logger logger;
     // for page simple.xhtml
     private Attributes attributes;
@@ -60,10 +61,48 @@
     private String execute;
     private String nestedExecute;
     private String outerExecute;
+    private String decorationExecute;
+    private String decorationValue;
+    private String insertionExecute;
+
+    public String getInsertionExecute() {
+        return insertionExecute;
+    }
+
+    public void setInsertionExecute(String insertionExecute) {
+        this.insertionExecute =3D insertionExecute;
+    }
+
+    public String getInsertionValue() {
+        return insertionValue;
+    }
+
+    public void setInsertionValue(String insertionValue) {
+        this.insertionValue =3D insertionValue;
+    }
+
+    private String insertionValue;
+
+    public String getDecorationExecute() {
+        return decorationExecute;
+    }
+
+    public void setDecorationExecute(String decorationExecute) {
+        this.decorationExecute =3D decorationExecute;
+    }
+
+    public String getDecorationValue() {
+        return decorationValue;
+    }
+
+    public void setDecorationValue(String decorationValue) {
+        this.decorationValue =3D decorationValue;
+    }
+
     private String outerValue;
     private String regionValue;
     private String nestedRegionValue;
-    private String lastExecutedLinkValue;
+    private String lastExecutedButtonValue;
 =

     /**
      * Initializes the managed bean.
@@ -160,11 +199,11 @@
     }
 =

     public void handleBehavior(AjaxBehaviorEvent event) {
-        lastExecutedLinkValue =3D (String) event.getComponent().getAttribu=
tes().get("value");
+        lastExecutedButtonValue =3D (String) event.getComponent().getAttri=
butes().get("value");
     }
 =

-    public String getLastExecutedLinkValue() {
-        return lastExecutedLinkValue;
+    public String getLastExecutedButtonValue() {
+        return lastExecutedButtonValue;
     }
 =

     public void handleDefaultsValueChange(ValueChangeEvent event) {
@@ -172,6 +211,9 @@
 =

         setOuterExecute(newValue);
         setExecute(newValue);
+        setDecorationExecute(newValue);
+        setInsertionExecute(newValue);
         setNestedExecute(newValue);
+
     }
 }

Added: modules/tests/metamer/trunk/application/src/main/webapp/components/a=
4jRegion/nested-decoration.xhtml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jR=
egion/nested-decoration.xhtml	                        (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jR=
egion/nested-decoration.xhtml	2010-09-23 11:19:07 UTC (rev 19322)
@@ -0,0 +1,57 @@
+<!--
+JBoss, Home of Professional Open Source
+Copyright 2010, Red Hat, Inc. and individual contributors
+by the @authors tag. See the copyright.txt in the distribution for a
+full listing of individual contributors.
+
+This is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation; either version 2.1 of
+the License, or (at your option) any later version.
+
+This software 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
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this software; if not, write to the Free
+Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+02110-1301 USA, or see the FSF site: http://www.fsf.org.
+-->
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www=
.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns=3D"http://www.w3.org/1999/xhtml"
+	xmlns:h=3D"http://java.sun.com/jsf/html"
+	xmlns:f=3D"http://java.sun.com/jsf/core"
+	xmlns:ui=3D"http://java.sun.com/jsf/facelets"
+	xmlns:a4j=3D"http://richfaces.org/a4j">
+
+<ui:composition>
+	=

+	<fieldset>
+	=

+		<legend>Decoration</legend>
+	=

+		<h:panelGrid columns=3D"3">
+			<h:inputText id=3D"decorationValueInput"
+				value=3D"#{a4jRegionBean.decorationValue}" />
+		=

+			<h:commandButton id=3D"decorationValueButton" value=3D"Decoration">
+				<a4j:ajax id=3D"decorationValueAjax"
+					listener=3D"#{a4jRegionBean.handleBehavior}"
+					execute=3D"#{a4jRegionBean.decorationExecute}" render=3D"outputValues=
" />
+			</h:commandButton>
+			<h:selectOneMenu id=3D"decorationSelect"
+				value=3D"#{a4jRegionBean.decorationExecute}">
+				<f:selectItems value=3D"#{a4jRegionBean.executeOptions}" />
+				<a4j:ajax event=3D"change" render=3D"decorationSelect" execute=3D"@thi=
s" />
+			</h:selectOneMenu>
+		</h:panelGrid>
+	=

+	</fieldset>
+
+</ui:composition>
+
+
+</html>
\ No newline at end of file

Added: modules/tests/metamer/trunk/application/src/main/webapp/components/a=
4jRegion/nested-insertion.xhtml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jR=
egion/nested-insertion.xhtml	                        (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jR=
egion/nested-insertion.xhtml	2010-09-23 11:19:07 UTC (rev 19322)
@@ -0,0 +1,55 @@
+<!--
+JBoss, Home of Professional Open Source
+Copyright 2010, Red Hat, Inc. and individual contributors
+by the @authors tag. See the copyright.txt in the distribution for a
+full listing of individual contributors.
+
+This is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation; either version 2.1 of
+the License, or (at your option) any later version.
+
+This software 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
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this software; if not, write to the Free
+Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+02110-1301 USA, or see the FSF site: http://www.fsf.org.
+-->
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www=
.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns=3D"http://www.w3.org/1999/xhtml"
+	xmlns:h=3D"http://java.sun.com/jsf/html"
+	xmlns:f=3D"http://java.sun.com/jsf/core"
+	xmlns:ui=3D"http://java.sun.com/jsf/facelets"
+	xmlns:a4j=3D"http://richfaces.org/a4j">
+
+<ui:composition>
+
+	<fieldset>
+	=

+		<legend>Insertion</legend>
+		=

+		<h:panelGrid columns=3D"3">
+			<h:inputText id=3D"insertionValueInput"
+				value=3D"#{a4jRegionBean.insertionValue}" />
+			<h:commandButton id=3D"insertionValueButton" value=3D"Insertion">
+				<a4j:ajax id=3D"insertionValueAjax"
+					listener=3D"#{a4jRegionBean.handleBehavior}"
+					execute=3D"#{a4jRegionBean.insertionExecute}" render=3D"outputValues"=
 />
+			</h:commandButton>
+			<h:selectOneMenu id=3D"insertionSelect"
+				value=3D"#{a4jRegionBean.insertionExecute}">
+				<f:selectItems value=3D"#{a4jRegionBean.executeOptions}" />
+				<a4j:ajax event=3D"change" render=3D"insertionSelect" execute=3D"@this=
" />
+			</h:selectOneMenu>
+		</h:panelGrid>
+		=

+	</fieldset>
+
+</ui:composition>
+
+</html>
\ No newline at end of file

Modified: modules/tests/metamer/trunk/application/src/main/webapp/component=
s/a4jRegion/nested.xhtml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jR=
egion/nested.xhtml	2010-09-23 09:32:03 UTC (rev 19321)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jR=
egion/nested.xhtml	2010-09-23 11:19:07 UTC (rev 19322)
@@ -61,26 +61,8 @@
                 <h:outputLabel id=3D"defaultSelectLabel" value=3D"Defaults=
 for all" for=3D"defaultsSelect"/>
                 <h:selectOneMenu id=3D"defaultsSelect" valueChangeListener=
=3D"#{a4jRegionBean.handleDefaultsValueChange}">
                     <f:selectItems value=3D"#{a4jRegionBean.executeOptions=
}" />
-                    <a4j:ajax event=3D"change" render=3D"outerSelect, regi=
onSelect, nestedRegionSelect" execute=3D"@this"/>
+                    <a4j:ajax event=3D"change" render=3D"outerSelect, regi=
onSelect, decorationSelect, insertionSelect, nestedRegionSelect" execute=3D=
"@this"/>
                 </h:selectOneMenu>
-
-                <h:outputLabel id=3D"outerSelectLabel" value=3D"Outer" for=
=3D"outerSelect"/>
-                <h:selectOneMenu id=3D"outerSelect" value=3D"#{a4jRegionBe=
an.outerExecute}">
-                    <f:selectItems value=3D"#{a4jRegionBean.executeOptions=
}" />
-                    <a4j:ajax event=3D"change" render=3D"outerSelect" exec=
ute=3D"@this"/>
-                </h:selectOneMenu>
-
-                <h:outputLabel id=3D"regionSelectLabel" value=3D"Region" f=
or=3D"regionSelect"/>
-                <h:selectOneMenu id=3D"regionSelect" value=3D"#{a4jRegionB=
ean.execute}">
-                    <f:selectItems value=3D"#{a4jRegionBean.executeOptions=
}" />
-                    <a4j:ajax event=3D"change" render=3D"regionSelect" exe=
cute=3D"@this"/>
-                </h:selectOneMenu>
-
-                <h:outputLabel id=3D"nestedRegionSelectLabel" value=3D"Nes=
ted region" for=3D"nestedRegionSelect" />
-                <h:selectOneMenu id=3D"nestedRegionSelect" value=3D"#{a4jR=
egionBean.nestedExecute}">
-                    <f:selectItems value=3D"#{a4jRegionBean.executeOptions=
}" />
-                    <a4j:ajax event=3D"change" render=3D"nestedRegionSelec=
t" execute=3D"@this"/>
-                </h:selectOneMenu>
             </h:panelGrid>
 =

 =

@@ -93,8 +75,10 @@
                     <h:panelGrid columns=3D"2" >
                         Outer: <h:outputText id=3D"outerValueOutput" value=
=3D"#{a4jRegionBean.outerValue}" />
                         Region: <h:outputText id=3D"regionValueOutput" val=
ue=3D"#{a4jRegionBean.regionValue}" />
+                        Decoration: <h:outputText id=3D"decorationValueOut=
put" value=3D"#{a4jRegionBean.decorationValue}" />
+                        Insertion: <h:outputText id=3D"insertionValueOutpu=
t" value=3D"#{a4jRegionBean.insertionValue}" />
                         Nested region: <h:outputText id=3D"nestedRegionVal=
ueOutput" value=3D"#{a4jRegionBean.nestedRegionValue}" />
-                        Last executed link value: <h:outputText id=3D"last=
LinkOutput" value=3D"#{a4jRegionBean.lastExecutedLinkValue}" />
+                        Last executed button value: <h:outputText id=3D"la=
stButtonOutput" value=3D"#{a4jRegionBean.lastExecutedButtonValue}" />
                     </h:panelGrid>
                 </h:panelGroup>
             </fieldset>
@@ -104,32 +88,56 @@
             <br/>
             <br/>
 =

-            <h:inputText id=3D"outerValueInput" value=3D"#{a4jRegionBean.o=
uterValue}" />
+			<!--  OUTER -->
+			<h:panelGrid columns=3D"3">
+	            <h:inputText id=3D"outerValueInput" value=3D"#{a4jRegionBean.=
outerValue}" />
+	=

+	            <h:commandButton id=3D"outerValueButton" value=3D"Outer">
+	                <a4j:ajax id=3D"outerValueAjax" listener=3D"#{a4jRegionBe=
an.handleBehavior}" execute=3D"#{a4jRegionBean.outerExecute}" render=3D"out=
putValues" />
+	            </h:commandButton>
+	            =

+	            <h:selectOneMenu id=3D"outerSelect" value=3D"#{a4jRegionBean.=
outerExecute}">
+		            <f:selectItems value=3D"#{a4jRegionBean.executeOptions}" />
+		            <a4j:ajax event=3D"change" render=3D"outerSelect" execute=3D=
"@this"/>
+	            </h:selectOneMenu>
+            </h:panelGrid>
 =

-            <h:commandLink id=3D"outerValueLink" value=3D"Outer">
-                <a4j:ajax id=3D"outerValueAjax" listener=3D"#{a4jRegionBea=
n.handleBehavior}" execute=3D"#{a4jRegionBean.outerExecute}" render=3D"outp=
utValues" />
-            </h:commandLink>
-
+			<!-- REGION -->
             <fieldset>
                 <legend>Region</legend>
 =

+				=

                 <a4j:region id=3D"outerRegion">
-                    <h:inputText id=3D"regionValueInput" value=3D"#{a4jReg=
ionBean.regionValue}" />
+                	<h:panelGrid columns=3D"3">
+	                    <h:inputText id=3D"regionValueInput" value=3D"#{a4jRe=
gionBean.regionValue}" />
+	=

+	                    <h:commandButton id=3D"regionValueButton" value=3D"Re=
gion">
+	                        <a4j:ajax id=3D"regionValueAjax" listener=3D"#{a4=
jRegionBean.handleBehavior}" execute=3D"#{a4jRegionBean.execute}" render=3D=
"outputValues" />
+	                    </h:commandButton>
+	                    =

+	                    <h:selectOneMenu id=3D"regionSelect" value=3D"#{a4jRe=
gionBean.execute}">
+		                    <f:selectItems value=3D"#{a4jRegionBean.executeOptio=
ns}" />
+		                    <a4j:ajax event=3D"change" render=3D"regionSelect" e=
xecute=3D"@this"/>
+		                </h:selectOneMenu>
+	                </h:panelGrid>
+                    =

+                    <ui:decorate template=3D"nested-decoration.xhtml" />
+                    <ui:decorate template=3D"nested-insertion.xhtml" />
 =

-                    <h:commandLink id=3D"regionValueLink" value=3D"Region">
-                        <a4j:ajax id=3D"regionValueAjax" listener=3D"#{a4j=
RegionBean.handleBehavior}" execute=3D"#{a4jRegionBean.execute}" render=3D"=
outputValues" />
-                    </h:commandLink>
-
                     <fieldset>
                         <legend>Nested region</legend>
 =

                         <a4j:region id=3D"nestedRegion">
                             <h:inputText id=3D"nestedRegionValueInput" val=
ue=3D"#{a4jRegionBean.nestedRegionValue}" />
 =

-                            <h:commandLink id=3D"nestedRegionValueLink" va=
lue=3D"Nested region">
+                            <h:commandButton id=3D"nestedRegionValueButton=
" value=3D"Nested region">
                                 <a4j:ajax id=3D"nestedRegionValueAjax" lis=
tener=3D"#{a4jRegionBean.handleBehavior}" execute=3D"#{a4jRegionBean.nested=
Execute}" render=3D"outputValues" />
-                            </h:commandLink>
-
+                            </h:commandButton>
+							=

+							<h:selectOneMenu id=3D"nestedRegionSelect" value=3D"#{a4jRegionBean=
.nestedExecute}">
+			                    <f:selectItems value=3D"#{a4jRegionBean.executeOpti=
ons}" />
+			                    <a4j:ajax event=3D"change" render=3D"nestedRegionSe=
lect" execute=3D"@this"/>
+			                </h:selectOneMenu>
                         </a4j:region>
                     </fieldset>
                 </a4j:region>

Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfa=
ces/tests/metamer/ftest/a4jRegion/NestedRegionModel.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/te=
sts/metamer/ftest/a4jRegion/NestedRegionModel.java	2010-09-23 09:32:03 UTC =
(rev 19321)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/te=
sts/metamer/ftest/a4jRegion/NestedRegionModel.java	2010-09-23 11:19:07 UTC =
(rev 19322)
@@ -74,7 +74,7 @@
     }
 =

     public enum Component {
-        OUTER("Outer"), REGION("Region"), NESTED("Nested region");
+        OUTER("Outer"), REGION("Region"), NESTED("Nested region"), DECORAT=
ION("Decoration"), INSERTION("Insertion");
 =

         public final JQueryLocator select;
         public final JQueryLocator output;
@@ -88,7 +88,7 @@
             this.select =3D pjq("select[id$=3D{0}Select]").format(id);
             this.output =3D pjq("span[id$=3D{0}ValueOutput]").format(id);
             this.input =3D pjq("input:text[id$=3D{0}ValueInput]").format(i=
d);
-            this.link =3D pjq("a[id$=3D{0}ValueLink]").format(id);
+            this.link =3D pjq("input:submit[id$=3D{0}ValueButton]").format=
(id);
             this.executeOption =3D optionLabel(name);
         }
 =

@@ -105,7 +105,8 @@
 =

     public enum Execute {
         DEFAULT("default"), ALL("@all"), REGION("@region"), FORM("@form"),=
 THIS("@this"), COMPONENT_OUTER(
-            Component.OUTER), COMPONENT_REGION(Component.REGION), COMPONEN=
T_NESTED(Component.NESTED);
+            Component.OUTER), COMPONENT_REGION(Component.REGION), COMPONEN=
T_NESTED(Component.NESTED), COMPONENT_DECORATION(
+            Component.DECORATION), COMPONENT_INSERTION(Component.INSERTION=
);
 =

         public final OptionLocator<?> option;
         public final Component componentBase;

Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfa=
ces/tests/metamer/ftest/a4jRegion/TestNestedRegion.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/te=
sts/metamer/ftest/a4jRegion/TestNestedRegion.java	2010-09-23 09:32:03 UTC (=
rev 19321)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/te=
sts/metamer/ftest/a4jRegion/TestNestedRegion.java	2010-09-23 11:19:07 UTC (=
rev 19322)
@@ -1,6 +1,3 @@
-package org.richfaces.tests.metamer.ftest.a4jRegion;
-
-import static org.jboss.test.selenium.utils.URLUtils.buildUrl;
 /*************************************************************************=
******
  * JBoss, Home of Professional Open Source
  * Copyright 2010, Red Hat, Inc. and individual contributors
@@ -22,6 +19,9 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  *************************************************************************=
******/
+package org.richfaces.tests.metamer.ftest.a4jRegion;
+
+import static org.jboss.test.selenium.utils.URLUtils.buildUrl;
 import static org.jboss.test.selenium.utils.text.SimplifiedFormat.format;
 import static org.testng.Assert.assertEquals;
 =

@@ -88,9 +88,8 @@
         }
 =

         if (execute =3D=3D Execute.REGION) {
-            if (component =3D=3D Component.REGION) {
-                expectedChanges.add(Component.REGION);
-                expectedChanges.add(Component.NESTED);
+            if (EnumSet.of(Component.REGION, Component.INSERTION, Componen=
t.DECORATION).contains(component)) {
+                expectedChanges =3D EnumSet.complementOf(EnumSet.of(Compon=
ent.OUTER));
             } else if (component =3D=3D Component.NESTED) {
                 expectedChanges.add(Component.NESTED);
             }


--===============4328748331329928390==--