incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cframp...@apache.org
Subject svn commit: r1389556 - in /incubator/flex/sdk/branches/develop/mustella/tests/containers/TitleWindow: Mirroring/ Mirroring/baselines/ SWFs/
Date Mon, 24 Sep 2012 20:24:56 GMT
Author: cframpton
Date: Mon Sep 24 20:24:56 2012
New Revision: 1389556

URL: http://svn.apache.org/viewvc?rev=1389556&view=rev
Log:
Add spacers between the TitleWindows so that the tests run consistently no matter what order
they are run in.  The drop shadows were overlapping the adjacent components.

Modified:
    incubator/flex/sdk/branches/develop/mustella/tests/containers/TitleWindow/Mirroring/TitleWindow_Mirroring_tester1.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/containers/TitleWindow/Mirroring/baselines/TitleWindow_absolute_layout1.png
    incubator/flex/sdk/branches/develop/mustella/tests/containers/TitleWindow/Mirroring/baselines/TitleWindow_absolute_layout2.png
    incubator/flex/sdk/branches/develop/mustella/tests/containers/TitleWindow/Mirroring/baselines/TitleWindow_layout_rtl1.png
    incubator/flex/sdk/branches/develop/mustella/tests/containers/TitleWindow/Mirroring/baselines/TitleWindow_layout_rtl2.png
    incubator/flex/sdk/branches/develop/mustella/tests/containers/TitleWindow/Mirroring/baselines/TitleWindow_layout_rtl3.png
    incubator/flex/sdk/branches/develop/mustella/tests/containers/TitleWindow/Mirroring/baselines/TitleWindow_layout_style1.png
    incubator/flex/sdk/branches/develop/mustella/tests/containers/TitleWindow/Mirroring/baselines/TitleWindow_layout_style2.png
    incubator/flex/sdk/branches/develop/mustella/tests/containers/TitleWindow/SWFs/TitleWindow_Mirroring_Basic.mxml

Modified: incubator/flex/sdk/branches/develop/mustella/tests/containers/TitleWindow/Mirroring/TitleWindow_Mirroring_tester1.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/containers/TitleWindow/Mirroring/TitleWindow_Mirroring_tester1.mxml?rev=1389556&r1=1389555&r2=1389556&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/containers/TitleWindow/Mirroring/TitleWindow_Mirroring_tester1.mxml
(original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/containers/TitleWindow/Mirroring/TitleWindow_Mirroring_tester1.mxml
Mon Sep 24 20:24:56 2012
@@ -42,33 +42,6 @@
 	<!-- end of set of lines that must be in each unit test -->
 
 	<testCases>
-	    <TestCase testID="TitleWindow_layout_rtl1" description="TitleWindow with layoutDirection=rtl
" keywords="[TitleWindow, Mirroring]">
-		<setup>
-		    <ResetComponent target="tw2" className="mx.containers.TitleWindow" waitEvent="updateComplete"
waitTarget="tw2" />
-		    <SetProperty propertyName="title" value="My Title" target="tw2" />
-		    <SetProperty propertyName="showCloseButton" value="false" target="tw2" waitEvent="updateComplete"/>
-		    <WaitForLayoutManager/>
-		    <WaitForLayoutManager/>
-		</setup>
-		<body>
-		    <CompareBitmap target="tw2" url="../Mirroring/baselines/$testID.png" timeout="2500"
/>
-		</body>
-	    </TestCase>
-	   
-	   <TestCase testID="TitleWindow_layout_rtl2" description="TitleWindow with layoutDirection=rtl,
has content with ltr layout" keywords="[TitleWindow, Mirroring]">
-		<setup>
-		    <ResetComponent target="tw3" className="mx.containers.TitleWindow" waitEvent="updateComplete"
waitTarget="tw3" />
-		    <SetProperty propertyName="title" value="My Title3" target="tw3" />
-		    <SetProperty propertyName="showCloseButton" value="false" target="tw3" waitEvent="updateComplete"
waitTarget="tw3"/>
-		    <WaitForLayoutManager/>
-		    <WaitForLayoutManager/>
-		</setup>
-		<body>
-		    <CompareBitmap target="tw3" url="../Mirroring/baselines/$testID.png" timeout="2500"
/>
-		</body>
-	    </TestCase>
-
-
 	    <TestCase testID="TitleWindow_layout_closeButtonTrue1" description="TitleWindow showCloseButton=true,
layoutDirection=rtl" keywords="[TitleWindow, Mirroring]">
 		<setup>
 		    <ResetComponent target="tw" className="mx.containers.TitleWindow" waitEvent="updateComplete"
waitTarget="tw" />
@@ -84,18 +57,52 @@
 		    <CompareBitmap target="tw" url="../Mirroring/baselines/$testID.png" timeout="2500"
/>
 		</body>
 	    </TestCase>
+	    
 	    <TestCase testID="TitleWindow_layout_closeButtonClosed1" description="TitleWindow
showCloseButton=false,layoutDirection=rtl " keywords="[TitleWindow, Mirroring]">
 		<setup>
 		    <ResetComponent target="tw" className="mx.containers.TitleWindow" waitEvent="updateComplete"
waitTarget="tw" />
-		<SetProperty propertyName="title" value="My Title" target="tw" />
-		<SetProperty propertyName="showCloseButton" value="true" target="tw" />
-		<SetProperty propertyName="showCloseButton" value="false" target="tw" waitEvent="updateComplete"
waitTarget="tw"/>
+            <SetProperty propertyName="title" value="My Title" target="tw" />
+            <SetProperty propertyName="showCloseButton" value="true" target="tw" />
+            <SetProperty propertyName="showCloseButton" value="false" target="tw" waitEvent="updateComplete"
waitTarget="tw"/>
 		</setup>
 		<body>
 		    <CompareBitmap target="tw" url="../Mirroring/baselines/$testID.png" timeout="2500"
/>
 		</body>
 	    </TestCase>
-	    
+	
+	    <TestCase testID="TitleWindow_layout_rtl1" description="TitleWindow with layoutDirection=rtl
" keywords="[TitleWindow, Mirroring]">
+		<setup>
+		    <ResetComponent target="tw2" className="mx.containers.TitleWindow" waitEvent="updateComplete"
waitTarget="tw2" />
+		    <SetProperty propertyName="title" value="My Title" target="tw2" />
+		    <SetProperty propertyName="showCloseButton" value="false" target="tw2" waitEvent="updateComplete"/>
+		    <WaitForLayoutManager/>
+		</setup>
+		<body>
+		    <AssertPropertyValue target="tw2" propertyName="layoutDirection" value="rtl"/>
+		    <AssertPropertyValue target="ta2" propertyName="layoutDirection" value="rtl"/>
+		    <AssertPropertyValue target="chk1" propertyName="layoutDirection" value="rtl"/>
+		    <CompareBitmap target="tw2" url="../Mirroring/baselines/$testID.png" timeout="2500"
/>
+		    <ResetComponent target="tw2" className="mx.containers.TitleWindow" waitEvent="updateComplete"
waitTarget="tw2" />
+		</body>
+	    </TestCase>
+	   
+	   <TestCase testID="TitleWindow_layout_rtl2" description="TitleWindow with layoutDirection=rtl,
has content with ltr layout" keywords="[TitleWindow, Mirroring]">
+		<setup>
+		    <ResetComponent target="tw3" className="mx.containers.TitleWindow" waitEvent="updateComplete"
waitTarget="tw3" />
+		    <SetProperty propertyName="title" value="My Title3" target="tw3" />
+		    <SetProperty propertyName="showCloseButton" value="false" target="tw3" waitEvent="updateComplete"
waitTarget="tw3"/>
+		    <WaitForLayoutManager/>
+		</setup>
+		<body>
+		    <AssertPropertyValue target="chk31" propertyName="layoutDirection" value="rtl"/>
+		    <AssertPropertyValue target="vbox1" propertyName="layoutDirection" value="ltr"/>
+		    <AssertPropertyValue target="ti1" propertyName="layoutDirection" value="ltr"/>
+		    <AssertPropertyValue target="chk2" propertyName="layoutDirection" value="ltr"/>
+		    <CompareBitmap target="tw3" url="../Mirroring/baselines/$testID.png" timeout="2500"
/>
+		    <ResetComponent target="tw3" className="mx.containers.TitleWindow" waitEvent="updateComplete"
waitTarget="tw3" />
+		</body>
+	    </TestCase>
+    
 	   <TestCase testID="TitleWindow_layout_rtl3" description="TitleWindow with layoutDirection=rtl,
has content with ltr layout" keywords="[TitleWindow, Mirroring]">
 		<setup>
 		    <ResetComponent target="tw4" className="MyLayoutTestTW" waitEvent="updateComplete"
waitTarget="tw4" />
@@ -110,12 +117,12 @@
 		    <CompareBitmap target="tw4" url="../Mirroring/baselines/$testID.png" timeout="2500"
/>
 		</body>
 	    </TestCase>
-	    
+    
 	   <TestCase testID="TitleWindow_layout_style1" description="TitleWindow with layout
style set" keywords="[TitleWindow, Mirroring]">
 		<setup>
 		    <ResetComponent target="tw3" className="mx.containers.TitleWindow" waitEvent="updateComplete"
waitTarget="tw3" />
 		    <SetProperty propertyName="width" value="200" target="tw3" waitEvent="updateComplete"
waitTarget="tw3"/>
-         	    <SetProperty propertyName="height" value="150" target="tw3" waitEvent="updateComplete"
waitTarget="tw3"/>
+         	<SetProperty propertyName="height" value="150" target="tw3" waitEvent="updateComplete"
waitTarget="tw3"/>
 		</setup>
 		<body>
 		    <SetStyle target="tw3" styleName="styleName" value="myTWStyle1" waitEvent="updateComplete"/>
@@ -134,11 +141,11 @@
 		<setup>
 		    <ResetComponent target="tw3" className="mx.containers.TitleWindow" waitEvent="updateComplete"
waitTarget="tw3" />
 		    <SetProperty propertyName="width" value="200" target="tw3" waitEvent="updateComplete"
waitTarget="tw3"/>
-         	    <SetProperty propertyName="height" value="150" target="tw3" waitEvent="updateComplete"
waitTarget="tw3"/>
+         	<SetProperty propertyName="height" value="150" target="tw3" waitEvent="updateComplete"
waitTarget="tw3"/>
 		</setup>
 		<body>
 		    <SetProperty propertyName="text" value="test test" target="ta" waitEvent="updateComplete"
waitTarget="ta"/>
-         	    <SetStyle target="tw3" styleName="headerHeight" value="24"  waitEvent="updateComplete"/>
+         	<SetStyle target="tw3" styleName="headerHeight" value="24"  waitEvent="updateComplete"/>
 		    <SetStyle target="tw3" styleName="styleName" value="myTWStyle2" waitEvent="updateComplete"/>
 		    <AssertPropertyValue target="chk31" propertyName="layoutDirection" value="rtl"/>
 		    <AssertPropertyValue target="chk2" propertyName="layoutDirection" value="ltr"/>
@@ -154,7 +161,7 @@
 		</setup>
 		<body>
 		    <RunCode code="FlexGlobals.topLevelApplication.tw5.chk1.move(50,60)" waitTarget="tw5.chk1"
waitEvent="move"/>
-		    <Pause timeout="100"/>
+		    <WaitForLayoutManager/>
 		    <CompareBitmap target="tw5" url="../Mirroring/baselines/$testID.png" timeout="2500"
/>
 		</body>
 	    </TestCase>
@@ -165,7 +172,7 @@
 		</setup>
 		<body>
 		    <SetStyle target="tw5" styleName="styleName" value="myTWStyle2" waitEvent="updateComplete"/>
-		   <Pause timeout="100"/>
+		    <WaitForLayoutManager/>
 		    <CompareBitmap target="tw5" url="../Mirroring/baselines/$testID.png" timeout="2500"
/>
 		</body>
 	    </TestCase>

Modified: incubator/flex/sdk/branches/develop/mustella/tests/containers/TitleWindow/Mirroring/baselines/TitleWindow_absolute_layout1.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/containers/TitleWindow/Mirroring/baselines/TitleWindow_absolute_layout1.png?rev=1389556&r1=1389555&r2=1389556&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/containers/TitleWindow/Mirroring/baselines/TitleWindow_absolute_layout2.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/containers/TitleWindow/Mirroring/baselines/TitleWindow_absolute_layout2.png?rev=1389556&r1=1389555&r2=1389556&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/containers/TitleWindow/Mirroring/baselines/TitleWindow_layout_rtl1.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/containers/TitleWindow/Mirroring/baselines/TitleWindow_layout_rtl1.png?rev=1389556&r1=1389555&r2=1389556&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/containers/TitleWindow/Mirroring/baselines/TitleWindow_layout_rtl2.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/containers/TitleWindow/Mirroring/baselines/TitleWindow_layout_rtl2.png?rev=1389556&r1=1389555&r2=1389556&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/containers/TitleWindow/Mirroring/baselines/TitleWindow_layout_rtl3.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/containers/TitleWindow/Mirroring/baselines/TitleWindow_layout_rtl3.png?rev=1389556&r1=1389555&r2=1389556&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/containers/TitleWindow/Mirroring/baselines/TitleWindow_layout_style1.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/containers/TitleWindow/Mirroring/baselines/TitleWindow_layout_style1.png?rev=1389556&r1=1389555&r2=1389556&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/containers/TitleWindow/Mirroring/baselines/TitleWindow_layout_style2.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/containers/TitleWindow/Mirroring/baselines/TitleWindow_layout_style2.png?rev=1389556&r1=1389555&r2=1389556&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/containers/TitleWindow/SWFs/TitleWindow_Mirroring_Basic.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/containers/TitleWindow/SWFs/TitleWindow_Mirroring_Basic.mxml?rev=1389556&r1=1389555&r2=1389556&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/containers/TitleWindow/SWFs/TitleWindow_Mirroring_Basic.mxml
(original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/containers/TitleWindow/SWFs/TitleWindow_Mirroring_Basic.mxml
Mon Sep 24 20:24:56 2012
@@ -64,15 +64,6 @@
         dropShadowEnabled: true;
         dropShadowColor: #FF0000;
    }
-   .ltrStyle{
-   layoutDirection: "ltr";
-   direction:"ltr";
-   }
-   
-      .rtlStyle{
-      layoutDirection: "rtl";
-      direction:"rtl";
-   }
 </mx:Style>
 
 <mx:Style source="assets/myStyles2.css" />
@@ -82,22 +73,28 @@
     <mx:TextInput id="ta" />
     <mx:Button id="btn" label="click" />
 </mx:TitleWindow>
+<mx:Spacer height="25" width="25"/>
 <mx:HBox>
-    <mx:TitleWindow id="tw2" styleName="rtlStyle" showCloseButton="true" close="ta.text='close'"
>
+    <mx:TitleWindow id="tw2" layoutDirection="rtl" showCloseButton="true" close="ta.text='close'"
>
     	<mx:TextInput id="ta2" />
         <mx:CheckBox id="chk1" label="test checkBox"/>
     </mx:TitleWindow>
 
-    <mx:TitleWindow id="tw3" styleName="rtlStyle" showCloseButton="true"  >
+    <mx:Spacer height="25" width="25"/>
+
+    <mx:TitleWindow id="tw3" layoutDirection="rtl" showCloseButton="true"  >
     	<mx:CheckBox id="chk31" label="outter checkBox"/>
-    	<mx:VBox id="vbox1" styleName="ltrStyle">
+    	<mx:VBox id="vbox1" layoutDirection="ltr">
     	    <mx:TextInput id="ti1" text="this is a test"/>
             <mx:CheckBox id="chk2" label="inner checkBox"/>
         </mx:VBox>
     </mx:TitleWindow>
 </mx:HBox>
+<mx:Spacer height="25" width="25"/>
 <mx:VBox>
     <MyLayoutTestTW id="tw4" />	
+
+    <mx:Spacer height="25" width="25"/>
     
     <mx:Canvas id="canvas1" width="375" height="165" >
         	<MyTw5 id="tw5" />



Mime
View raw message