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/02 21:18:20 UTC
svn commit: r1393117 - in
/incubator/flex/sdk/branches/develop/mustella/tests/components/VideoDisplay:
Events/ Methods/ Properties/ SWFs/ SWFs/assets/
Author: cframpton
Date: Tue Oct 2 19:18:20 2012
New Revision: 1393117
URL: http://svn.apache.org/viewvc?rev=1393117&view=rev
Log:
Windows does not seem to like relative source paths like ../../../../Assets/Video/file.flv so moved them back to local assets folder.
Added:
incubator/flex/sdk/branches/develop/mustella/tests/components/VideoDisplay/SWFs/assets/caltrain.flv (with props)
incubator/flex/sdk/branches/develop/mustella/tests/components/VideoDisplay/SWFs/assets/short.flv (with props)
incubator/flex/sdk/branches/develop/mustella/tests/components/VideoDisplay/SWFs/assets/video.flv (with props)
Modified:
incubator/flex/sdk/branches/develop/mustella/tests/components/VideoDisplay/Events/VideoEventTester.mxml
incubator/flex/sdk/branches/develop/mustella/tests/components/VideoDisplay/Methods/VideoMethodTester.mxml
incubator/flex/sdk/branches/develop/mustella/tests/components/VideoDisplay/Properties/VideoPropertyTester.mxml
incubator/flex/sdk/branches/develop/mustella/tests/components/VideoDisplay/SWFs/VideoMain.mxml
incubator/flex/sdk/branches/develop/mustella/tests/components/VideoDisplay/SWFs/VideoMainComp.mxml
Modified: incubator/flex/sdk/branches/develop/mustella/tests/components/VideoDisplay/Events/VideoEventTester.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/VideoDisplay/Events/VideoEventTester.mxml?rev=1393117&r1=1393116&r2=1393117&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/components/VideoDisplay/Events/VideoEventTester.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/components/VideoDisplay/Events/VideoEventTester.mxml Tue Oct 2 19:18:20 2012
@@ -89,7 +89,7 @@
<ResetComponent target="vd" className="mx.controls.VideoDisplay" waitEvent="updateComplete" waitTarget="vd" />
<SetProperty propertyName="autoPlay" value="false" target="vd" />
<SetProperty propertyName="cuePointManagerClass" valueExpression="value=mx.controls.videoClasses.CuePointManager" target="vd" />
- <SetProperty propertyName="source" target="vd" value="../../../../Assets/Video/video.flv" />
+ <SetProperty propertyName="source" target="vd" value="assets/video.flv" />
<SetProperty target="vd" propertyName="cuePoints" valueExpression="value=ASCuePoints" />
</setup>
<body>
@@ -104,7 +104,7 @@
<ResetComponent target="vd" className="mx.controls.VideoDisplay" waitEvent="updateComplete" waitTarget="vd" />
<SetProperty propertyName="cuePointManagerClass" valueExpression="value=mx.controls.videoClasses.CuePointManager" target="vd" />
<SetProperty propertyName="autoPlay" value="false" target="vd" />
- <SetProperty propertyName="source" target="vd" value="../../../../Assets/Video/video.flv" />
+ <SetProperty propertyName="source" target="vd" value="assets/video.flv" />
<SetProperty target="vd" propertyName="cuePoints" valueExpression="value=ASCuePoints" />
</setup>
<body>
@@ -130,7 +130,7 @@
<TestCase testID="myTest_events_complete" keywords="[VideoDisplay, events, complete]">
<setup>
<ResetComponent target="vd" className="mx.controls::VideoDisplay" waitEvent="updateComplete" waitTarget="vd"/>
- <SetProperty target="vd" propertyName="source" value="../../../../Assets/Video/short.flv" waitEvent="ready" waitTarget="vd" />
+ <SetProperty target="vd" propertyName="source" value="assets/short.flv" waitEvent="ready" waitTarget="vd" />
</setup>
<body>
<AssertEvent target="vd" eventName="complete" eventClass="mx.events::VideoEvent" timeout="6000"/>
@@ -140,7 +140,7 @@
<TestCase testID="myTest_events_playheadUpdate" keywords="[VideoDisplay, events, playheadUpdate]">
<setup>
<ResetComponent target="vd" className="mx.controls::VideoDisplay" waitEvent="updateComplete" waitTarget="vd"/>
- <SetProperty target="vd" propertyName="source" value="../../../../Assets/Video/video.flv" waitEvent="ready" waitTarget="vd" />
+ <SetProperty target="vd" propertyName="source" value="assets/video.flv" waitEvent="ready" waitTarget="vd" />
</setup>
<body>
<SetProperty target="vd" propertyName="playheadTime" value="2" />
@@ -154,7 +154,7 @@
</setup>
<body>
<SetProperty target="vd" propertyName="autoPlay" value="false" />
- <SetProperty target="vd" propertyName="source" value="../../../../Assets/Video/caltrain.flv" />
+ <SetProperty target="vd" propertyName="source" value="assets/caltrain.flv" />
<RunCode code="application.vd.load()" />
<AssertEvent target="vd" eventName="progress" eventClass="flash.events::ProgressEvent" timeout="6000" />
</body>
@@ -163,7 +163,7 @@
<setup>
<ResetComponent target="vd" className="mx.controls::VideoDisplay" waitEvent="updateComplete" waitTarget="vd"/>
<SetProperty target="vd" propertyName="autoPlay" value="false" />
- <SetProperty target="vd" propertyName="source" value="../../../../Assets/Video/video.flv" />
+ <SetProperty target="vd" propertyName="source" value="assets/video.flv" />
</setup>
<body>
<RunCode code="application.vd.load()" waitEvent="ready" waitTarget="vd" />
@@ -173,7 +173,7 @@
<TestCase testID="myTest_events_stateChange" keywords="[VideoDisplay, events, stateChange]">
<setup>
<ResetComponent target="vd" className="mx.controls::VideoDisplay" waitEvent="updateComplete" waitTarget="vd"/>
- <SetProperty target="vd" propertyName="source" value="../../../../Assets/Video/video.flv" waitEvent="updateComplete" waitTarget="vd" />
+ <SetProperty target="vd" propertyName="source" value="assets/video.flv" waitEvent="updateComplete" waitTarget="vd" />
</setup>
<body>
<RunCode code="application.vd.pause()" waitEvent="stateChange" waitTarget="vd" />
@@ -183,7 +183,7 @@
<TestCase testID="myTest_events_autoRewind" keywords="[VideoDisplay, events, autoRewind]">
<setup>
<ResetComponent target="vd" className="mx.controls::VideoDisplay" waitEvent="updateComplete" waitTarget="vd"/>
- <SetProperty target="vd" propertyName="source" value="../../../../Assets/Video/short.flv" waitEvent="ready" waitTarget="vd" />
+ <SetProperty target="vd" propertyName="source" value="assets/short.flv" waitEvent="ready" waitTarget="vd" />
</setup>
<body>
<AssertEvent target="vd" eventName="rewind" eventClass="mx.events::VideoEvent" timeout="6000"/>
Modified: incubator/flex/sdk/branches/develop/mustella/tests/components/VideoDisplay/Methods/VideoMethodTester.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/VideoDisplay/Methods/VideoMethodTester.mxml?rev=1393117&r1=1393116&r2=1393117&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/components/VideoDisplay/Methods/VideoMethodTester.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/components/VideoDisplay/Methods/VideoMethodTester.mxml Tue Oct 2 19:18:20 2012
@@ -54,7 +54,7 @@
<TestCase testID="myTest_methods_controls" keywords="[VideoDisplay, methods, play, pause, stop]">
<setup>
<ResetComponent target="vd" className="mx.controls::VideoDisplay" />
- <SetProperty target="vd" propertyName="source" value="../../../../Assets/Video/video.flv" waitEvent="ready" waitTarget="vd" />
+ <SetProperty target="vd" propertyName="source" value="assets/video.flv" waitEvent="ready" waitTarget="vd" />
</setup>
<body>
<AssertPropertyValue target="vd" propertyName="state" value="playing" />
@@ -70,7 +70,7 @@
<TestCase testID="myTest_methods_controls_airOnly" keywords="[VideoDisplay, methods, play, pause, stop]">
<setup>
<ResetComponent target="vd" className="mx.controls::VideoDisplay" />
- <SetProperty target="vd" propertyName="source" value="../../../../Assets/Video/video.flv" waitEvent="ready" waitTarget="vd" />
+ <SetProperty target="vd" propertyName="source" value="assets/video.flv" waitEvent="ready" waitTarget="vd" />
</setup>
<body>
<AssertPropertyValue target="vd" propertyName="state" value="buffering" />
@@ -86,18 +86,18 @@
</body>
</TestCase>
- <!-- FIXME: video loads and runs to the end, but complete event does not seem to be dispatched.
+ <!-- FIXME: video loads and runs to the end, but complete event does not seem to be dispatched.
<TestCase testID="myTest_methods_load" keywords="[VideoDisplay, methods, load]">
<setup>
<ResetComponent target="vd" className="mx.controls::VideoDisplay" />
<SetProperty target="vd" propertyName="width" value="350"/>
<SetProperty target="vd" propertyName="height" value="250"/>
- <SetProperty target="vd" propertyName="source" value="../../../../Assets/Video/video.flv" waitEvent="updateComplete" waitTarget="vd" />
+ <SetProperty target="vd" propertyName="source" value="assets/video.flv" waitEvent="updateComplete" waitTarget="vd" />
</setup>
<body>
<RunCode code="application.vd.stop();"/>
<SetProperty target="vd" propertyName="autoPlay" value="false"/>
- <SetProperty target="vd" propertyName="source" value="../../../../Assets/Video/caltrain.flv" />
+ <SetProperty target="vd" propertyName="source" value="assets/caltrain.flv" />
<RunCode code="application.vd.load()" waitEvent="ready" waitTarget="vd" />
<RunCode code="application.vd.play()"/>
<AssertEvent target="vd" eventName="complete" eventClass="mx.events::VideoEvent"/>
Modified: incubator/flex/sdk/branches/develop/mustella/tests/components/VideoDisplay/Properties/VideoPropertyTester.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/VideoDisplay/Properties/VideoPropertyTester.mxml?rev=1393117&r1=1393116&r2=1393117&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/components/VideoDisplay/Properties/VideoPropertyTester.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/components/VideoDisplay/Properties/VideoPropertyTester.mxml Tue Oct 2 19:18:20 2012
@@ -58,7 +58,7 @@
<TestCase testID="myTest_property_autoPlay_True" keywords="[VideoDisplay, property, autoPlay, true]">
<setup>
<ResetComponent target="vd" className="mx.controls::VideoDisplay" waitEvent="updateComplete" waitTarget="vd"/>
- <SetProperty target="vd" propertyName="source" value="../../../../Assets/Video/video.flv" waitEvent="ready" waitTarget="vd" />
+ <SetProperty target="vd" propertyName="source" value="assets/video.flv" waitEvent="ready" waitTarget="vd" />
</setup>
<body>
<AssertPropertyValue target="vd" propertyName="state" value="playing" />
@@ -68,7 +68,7 @@
<TestCase testID="myTest_property_autoPlay_True_airOnly" keywords="[VideoDisplay, property, autoPlay, true]">
<setup>
<ResetComponent target="vd" className="mx.controls::VideoDisplay" waitEvent="updateComplete" waitTarget="vd"/>
- <SetProperty target="vd" propertyName="source" value="../../../../Assets/Video/video.flv" waitEvent="ready" waitTarget="vd" />
+ <SetProperty target="vd" propertyName="source" value="assets/video.flv" waitEvent="ready" waitTarget="vd" />
</setup>
<body>
<!--
@@ -84,10 +84,10 @@
<setup>
<ResetComponent target="vd" className="mx.controls::VideoDisplay" waitEvent="updateComplete" waitTarget="vd"/>
<SetProperty target="vd" propertyName="autoPlay" value="false" />
- <SetProperty target="vd" propertyName="source" value="../../../../Assets/Video/video.flv" />
+ <SetProperty target="vd" propertyName="source" value="assets/video.flv"/>
</setup>
<body>
- <RunCode code="application.vd.load()" waitEvent="ready" waitTarget="vd" />
+ <RunCode code="application.vd.load()" waitEvent="ready" waitTarget="vd" timeout="50000"/>
<AssertPropertyValue target="vd" propertyName="state" value="stopped" />
</body>
</TestCase>
@@ -95,7 +95,7 @@
<TestCase testID="myTest_property_bytesLoaded" keywords="[VideoDisplay, property, bytesLoaded]">
<setup>
<ResetComponent target="vd" className="mx.controls::VideoDisplay" waitEvent="updateComplete" waitTarget="vd"/>
- <SetProperty target="vd" propertyName="source" value="../../../../Assets/Video/video.flv" waitEvent="ready" waitTarget="vd" />
+ <SetProperty target="vd" propertyName="source" value="assets/video.flv" waitEvent="ready" waitTarget="vd" />
</setup>
<body>
<AssertPropertyValue target="vd" propertyName="bytesLoaded" valueExpression ="value=application.vd.bytesTotal" />
@@ -105,7 +105,7 @@
<TestCase testID="myTest_property_default_height_width" keywords="[VideoDisplay, property, default, height, width]">
<setup>
<ResetComponent target="vd" className="mx.controls::VideoDisplay" waitEvent="updateComplete" waitTarget="vd" />
- <SetProperty target="vd" propertyName="source" value="../../../../Assets/Video/video.flv" waitEvent="updateComplete" waitTarget="vd"/>
+ <SetProperty target="vd" propertyName="source" value="assets/video.flv" waitEvent="updateComplete" waitTarget="vd"/>
</setup>
<body>
<WaitForEffectsToEnd/>
@@ -118,7 +118,7 @@
<setup>
<ResetComponent target="vd" className="mx.controls::VideoDisplay" waitEvent="updateComplete" waitTarget="vd" />
<SetProperty target="vd" propertyName="autoPlay" value="false" />
- <SetProperty target="vd" propertyName="source" value="../../../../Assets/Video/video.flv" />
+ <SetProperty target="vd" propertyName="source" value="assets/video.flv" />
</setup>
<body>
<AssertPropertyValue target="vd" propertyName="playheadTime" value="0" />
@@ -134,7 +134,7 @@
<SetProperty target="vd" propertyName="autoPlay" value="false" />
<SetProperty target="vd" propertyName="width" value="400" />
<SetProperty target="vd" propertyName="height" value="400" />
- <SetProperty target="vd" propertyName="source" value="../../../../Assets/Video/video.flv" />
+ <SetProperty target="vd" propertyName="source" value="assets/video.flv" />
</setup>
<body>
<SetProperty target="vd" propertyName="maintainAspectRatio" value="true" waitEvent="updateComplete" waitTarget="vd" />
@@ -149,7 +149,7 @@
<SetProperty target="vd" propertyName="autoPlay" value="false" />
<SetProperty target="vd" propertyName="width" value="400" />
<SetProperty target="vd" propertyName="height" value="400" />
- <SetProperty target="vd" propertyName="source" value="../../../../Assets/Video/video.flv" />
+ <SetProperty target="vd" propertyName="source" value="assets/video.flv" />
</setup>
<body>
<SetProperty target="vd" propertyName="maintainAspectRatio" value="false" />
@@ -165,7 +165,7 @@
<SetProperty target="vd" propertyName="maintainAspectRatio" value="false" />
<SetProperty target="vd" propertyName="width" value="250" />
<SetProperty target="vd" propertyName="height" value="275" />
- <SetProperty target="vd" propertyName="source" value="../../../../Assets/Video/video.flv" />
+ <SetProperty target="vd" propertyName="source" value="assets/video.flv" />
<RunCode code="application.vd.load()" waitEvent="ready" waitTarget="vd"/>
</setup>
<body>
@@ -177,7 +177,7 @@
<setup>
<ResetComponent target="vd" className="mx.controls::VideoDisplay" waitEvent="updateComplete" waitTarget="vd" />
<SetProperty target="vd" propertyName="autoPlay" value="false" />
- <SetProperty target="vd" propertyName="source" value="../../../../Assets/Video/video.flv" />
+ <SetProperty target="vd" propertyName="source" value="assets/video.flv" />
<RunCode code="application.vd.load()" waitEvent="ready" waitTarget="vd"/>
</setup>
<body>
@@ -192,7 +192,7 @@
<TestCase testID="myTest_property_state" keywords="[VideoDisplay, property, state]">
<setup>
<ResetComponent target="vd" className="mx.controls::VideoDisplay" waitEvent="updateComplete" waitTarget="vd" />
- <SetProperty target="vd" propertyName="source" value="../../../../Assets/Video/video.flv" waitEvent="ready" waitTarget="vd" />
+ <SetProperty target="vd" propertyName="source" value="assets/video.flv" waitEvent="ready" waitTarget="vd" />
</setup>
<body>
<AssertPropertyValue target="vd" propertyName="state" value="playing" />
@@ -210,7 +210,7 @@
<TestCase testID="myTest_property_state_airOnly" keywords="[VideoDisplay, property, state]">
<setup>
<ResetComponent target="vd" className="mx.controls::VideoDisplay" waitEvent="updateComplete" waitTarget="vd" />
- <SetProperty target="vd" propertyName="source" value="../../../../Assets/Video/video.flv" waitEvent="ready" waitTarget="vd" />
+ <SetProperty target="vd" propertyName="source" value="assets/video.flv" waitEvent="ready" waitTarget="vd" />
</setup>
<body>
<!--
@@ -235,7 +235,7 @@
<ResetComponent target="vd" className="mx.controls::VideoDisplay" waitEvent="updateComplete" waitTarget="vd" />
<SetProperty target="vd" propertyName="width" value="400" />
<SetProperty target="vd" propertyName="height" value="400" />
- <SetProperty target="vd" propertyName="source" value="../../../../Assets/Video/video.flv" waitEvent="ready" waitTarget="vd" />
+ <SetProperty target="vd" propertyName="source" value="assets/video.flv" waitEvent="ready" waitTarget="vd" />
</setup>
<body>
<AssertPropertyValue target="vd" propertyName="height" value="400" />
@@ -249,7 +249,7 @@
<ResetComponent target="vd" className="mx.controls::VideoDisplay" waitEvent="updateComplete" waitTarget="vd" />
<SetProperty target="vd" propertyName="autoPlay" value="false" />
<SetProperty target="vd" propertyName="autoRewind" value="false" />
- <SetProperty target="vd" propertyName="source" value="../../../../Assets/Video/short.flv" />
+ <SetProperty target="vd" propertyName="source" value="assets/short.flv" />
</setup>
<body>
<RunCode code="application.vd.play()" waitEvent="stateChange" waitTarget="vd" timeout="3000" />
@@ -260,7 +260,7 @@
<TestCase testID="myTest_property_volume" keywords="[VideoDisplay, property, volume]">
<setup>
<ResetComponent target="vd" className="mx.controls::VideoDisplay" waitEvent="updateComplete" waitTarget="vd" />
- <SetProperty target="vd" propertyName="source" value="../../../../Assets/Video/video.flv" waitEvent="ready" waitTarget="vd" />
+ <SetProperty target="vd" propertyName="source" value="assets/video.flv" waitEvent="ready" waitTarget="vd" />
</setup>
<body>
<AssertPropertyValue target="vd" propertyName="volume" value="0.75" />
Modified: incubator/flex/sdk/branches/develop/mustella/tests/components/VideoDisplay/SWFs/VideoMain.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/VideoDisplay/SWFs/VideoMain.mxml?rev=1393117&r1=1393116&r2=1393117&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/components/VideoDisplay/SWFs/VideoMain.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/components/VideoDisplay/SWFs/VideoMain.mxml Tue Oct 2 19:18:20 2012
@@ -18,7 +18,7 @@
-->
<mx:Application backgroundColor="0xFFFFFF" xmlns:mx="http://www.adobe.com/2006/mxml" xmlns="*" width="600" height="600" layout="vertical" >
- <mx:VideoDisplay id="vd" cuePointManagerClass="mx.controls.videoClasses.CuePointManager" autoPlay="false" source="../../../../Assets/Video/video.flv">
+ <mx:VideoDisplay id="vd" cuePointManagerClass="mx.controls.videoClasses.CuePointManager" autoPlay="false" source="assets/video.flv">
<mx:cuePoints>
<mx:Array>
<mx:Object name="CompileCue0" time="1.00"/>
Modified: incubator/flex/sdk/branches/develop/mustella/tests/components/VideoDisplay/SWFs/VideoMainComp.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/VideoDisplay/SWFs/VideoMainComp.mxml?rev=1393117&r1=1393116&r2=1393117&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/components/VideoDisplay/SWFs/VideoMainComp.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/components/VideoDisplay/SWFs/VideoMainComp.mxml Tue Oct 2 19:18:20 2012
@@ -18,7 +18,7 @@
-->
<mx:VideoDisplay xmlns:mx="http://www.adobe.com/2006/mxml" cuePointManagerClass="mx.controls.videoClasses.CuePointManager"
- autoPlay="false" source="../../../../Assets/Video/video.flv">
+ autoPlay="false" source="assets/video.flv">
<mx:cuePoints>
<mx:Array>
<mx:Object name="CompileCue0" time="1.00"/>
Added: incubator/flex/sdk/branches/develop/mustella/tests/components/VideoDisplay/SWFs/assets/caltrain.flv
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/VideoDisplay/SWFs/assets/caltrain.flv?rev=1393117&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/flex/sdk/branches/develop/mustella/tests/components/VideoDisplay/SWFs/assets/caltrain.flv
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/flex/sdk/branches/develop/mustella/tests/components/VideoDisplay/SWFs/assets/short.flv
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/VideoDisplay/SWFs/assets/short.flv?rev=1393117&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/flex/sdk/branches/develop/mustella/tests/components/VideoDisplay/SWFs/assets/short.flv
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/flex/sdk/branches/develop/mustella/tests/components/VideoDisplay/SWFs/assets/video.flv
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/VideoDisplay/SWFs/assets/video.flv?rev=1393117&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/flex/sdk/branches/develop/mustella/tests/components/VideoDisplay/SWFs/assets/video.flv
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream