You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cf...@apache.org on 2012/10/05 21:34:27 UTC
svn commit: r1394745 - in
/incubator/flex/sdk/branches/develop/mustella/tests/PerModuleStyles/merging:
./ baselines/
Author: cframpton
Date: Fri Oct 5 19:34:26 2012
New Revision: 1394745
URL: http://svn.apache.org/viewvc?rev=1394745&view=rev
Log:
Remove os specific baselines which aren't needed.
Removed:
incubator/flex/sdk/branches/develop/mustella/tests/PerModuleStyles/merging/baselines/checkModuleWithIsolateStylesOff@mac.png
incubator/flex/sdk/branches/develop/mustella/tests/PerModuleStyles/merging/baselines/styleMergingChain_module@mac.png
incubator/flex/sdk/branches/develop/mustella/tests/PerModuleStyles/merging/baselines/styleMergingSwfModule@mac.png
incubator/flex/sdk/branches/develop/mustella/tests/PerModuleStyles/merging/baselines/styleMergingSwfModule_swf@mac.png
incubator/flex/sdk/branches/develop/mustella/tests/PerModuleStyles/merging/baselines/styleMergingSwfViaModule@mac.png
incubator/flex/sdk/branches/develop/mustella/tests/PerModuleStyles/merging/baselines/styleMergingVariousSelectors@mac.png
incubator/flex/sdk/branches/develop/mustella/tests/PerModuleStyles/merging/baselines/styleMergingVariousSelectors_module@mac.png
Modified:
incubator/flex/sdk/branches/develop/mustella/tests/PerModuleStyles/merging/checkMergingModuleViaSwf.mxml
incubator/flex/sdk/branches/develop/mustella/tests/PerModuleStyles/merging/checkMergingSwfModule.mxml
incubator/flex/sdk/branches/develop/mustella/tests/PerModuleStyles/merging/checkMergingVariousCssSelectors.mxml
Modified: incubator/flex/sdk/branches/develop/mustella/tests/PerModuleStyles/merging/checkMergingModuleViaSwf.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/PerModuleStyles/merging/checkMergingModuleViaSwf.mxml?rev=1394745&r1=1394744&r2=1394745&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/PerModuleStyles/merging/checkMergingModuleViaSwf.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/PerModuleStyles/merging/checkMergingModuleViaSwf.mxml Fri Oct 5 19:34:26 2012
@@ -55,13 +55,9 @@
<RunCode code="application.iniit2();" waitTarget="mod_loader" waitEvent="ready" />
- <Pause timeout="2000" />
+ <Pause timeout="2000" />
- <CompareBitmap url="../merging/baselines/" target="mod_loader" numColorVariances="6" ignoreMaxColorVariance="true">
-
- <ConditionalValue os="mac" />
- </CompareBitmap>
-
+ <CompareBitmap url="../merging/baselines/$testID.png" target="mod_loader" numColorVariances="6" ignoreMaxColorVariance="true"/>
</body>
</TestCase>
Modified: incubator/flex/sdk/branches/develop/mustella/tests/PerModuleStyles/merging/checkMergingSwfModule.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/PerModuleStyles/merging/checkMergingSwfModule.mxml?rev=1394745&r1=1394744&r2=1394745&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/PerModuleStyles/merging/checkMergingSwfModule.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/PerModuleStyles/merging/checkMergingSwfModule.mxml Fri Oct 5 19:34:26 2012
@@ -68,11 +68,7 @@
<Pause timeout="1000" />
- <CompareBitmap url="../merging/baselines/$testID.png" target="appPanel" numColorVariances="4" ignoreMaxColorVariance="true" >
-
- <ConditionalValue os="mac" />
-
- </CompareBitmap>
+ <CompareBitmap url="../merging/baselines/$testID.png" target="appPanel" numColorVariances="4" ignoreMaxColorVariance="true" />
</body>
@@ -97,12 +93,7 @@
<body>
- <CompareBitmap url="../merging/baselines/$testID.png" target="swf_loader" numColorVariances="4" ignoreMaxColorVariance="true">
-
-
- <ConditionalValue os="mac" />
-
- </CompareBitmap>
+ <CompareBitmap url="../merging/baselines/$testID.png" target="swf_loader" numColorVariances="4" ignoreMaxColorVariance="true"/>
</body>
Modified: incubator/flex/sdk/branches/develop/mustella/tests/PerModuleStyles/merging/checkMergingVariousCssSelectors.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/PerModuleStyles/merging/checkMergingVariousCssSelectors.mxml?rev=1394745&r1=1394744&r2=1394745&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/PerModuleStyles/merging/checkMergingVariousCssSelectors.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/PerModuleStyles/merging/checkMergingVariousCssSelectors.mxml Fri Oct 5 19:34:26 2012
@@ -40,10 +40,7 @@
<body>
<Pause timeout="1000" />
- <CompareBitmap url="../merging/baselines/" target="groupId" numColorVariances="6" ignoreMaxColorVariance="true">
- <ConditionalValue os="mac" />
- </CompareBitmap>
-
+ <CompareBitmap url="../merging/baselines/$testID.png" target="groupId" numColorVariances="6" ignoreMaxColorVariance="true"/>
</body>
</TestCase>
@@ -57,9 +54,7 @@
<Pause timeout="2000" />
- <CompareBitmap url="../merging/baselines/" target="mod_loader" numColorVariances="12" ignoreMaxColorVariance="true">
- <ConditionalValue os="mac" />
- </CompareBitmap>
+ <CompareBitmap url="../merging/baselines/$testID.png" target="mod_loader" numColorVariances="12" ignoreMaxColorVariance="true"/>
</body>
</TestCase>
@@ -73,9 +68,7 @@
<RunCode code="application.iniit2();" waitTarget="mod_loader" waitEvent="ready" />
<Pause timeout="2000" />
- <CompareBitmap url="../merging/baselines/" target="mod_loader" numColorVariances="12" ignoreMaxColorVariance="true">
- <ConditionalValue os="mac" />
- </CompareBitmap>
+ <CompareBitmap url="../merging/baselines/$testID.png" target="mod_loader" numColorVariances="12" ignoreMaxColorVariance="true"/>
</body>