Chromium Code Reviews Chromium Code Reviews
Issue 1140723003:
Implement suspend() and resume() for OfflineAudioContext (Closed)
Base URL: https://chromium.googlesource.com/chromium/blink.git@master| Index: LayoutTests/webaudio/audiocontext-suspend-resume.html |
| diff --git a/LayoutTests/webaudio/audiocontext-suspend-resume.html b/LayoutTests/webaudio/audiocontext-suspend-resume.html |
| index 8c16380b9a6cc867460b063fafd397231b770ddd..04d1b42d162dfe3797afb0ca515f0975921c48a2 100644 |
| --- a/LayoutTests/webaudio/audiocontext-suspend-resume.html |
| +++ b/LayoutTests/webaudio/audiocontext-suspend-resume.html |
| @@ -9,128 +9,47 @@ |
| <body> |
| <script> |
| - description("Test suspend/resume for an (offline) AudioContext"); |
| + description("Test suspend/resume for an AudioContext"); |
| window.jsTestIsAsync = true; |
| - var offlineContext; |
| - var osc; |
| - var p1; |
| - var p2; |
| - var p3; |
| - |
| - var sampleRate = 44100; |
| - var durationInSeconds = 1; |
| + var context = new AudioContext(); |
| var audit = Audit.createTaskRunner(); |
| - // Convenience function that returns a function that calls the |passFailFunc| |
| - // with the given |message|. The |passFailFunc| should be either |testPassed| |
| - // or |testFailed|. |
| - function handlePromise(passFailFunc, message) { |
| - return function () { |
| - passFailFunc(message); |
| - }; |
| - } |
| - |
| - // Task: test suspend(). |
| - audit.defineTask('test-suspend', function (done) { |
| - |
| - // Test suspend/resume. Ideally this test is best with a online |
| - // AudioContext, but content shell doesn't really have a working online |
| - // AudioContext. Hence, use an OfflineAudioContext. Not all possible |
| - // scenarios can be easily checked with an offline context instead of an |
| - // online context. |
| - |
| - // Create an audio context with an oscillator. |
| - shouldNotThrow("offlineContext = new OfflineAudioContext(1, durationInSeconds * sampleRate, sampleRate)"); |
| - osc = offlineContext.createOscillator(); |
| - osc.connect(offlineContext.destination); |
| - |
| - // Verify the state. |
| - shouldBeEqualToString("offlineContext.state", "suspended"); |
| - |
| - // Multiple calls to suspend() should not be a problem. But we can't test |
| - // that on an offline context. Thus, check that suspend() on an |
| - // OfflineAudioContext rejects the promise. |
| - shouldNotThrow("p1 = offlineContext.suspend()"); |
| - shouldBeType("p1", "Promise"); |
| - p1.then( |
| - handlePromise(testFailed, "offlineContext.suspend() should have been rejected for an offline context"), |
| - function (e) { |
| - if (e.name === "InvalidAccessError") { |
| - testPassed( |
| - "offlineContext.suspend() was correctly rejected: " + e); |
| - } else { |
| - testFailed( |
| - "offlineContext.suspend() was correctly rejected but expected InvalidAccessError, not: " + e); |
| - } |
| - } |
| - ).then(done); |
| + // Task: check the method interface. |
| + audit.defineTask('interface', function (done) { |
| + Should('typeof context.suspend()', typeof context.suspend).beEqualTo('function'); |
| + Should('typeof context.resume()', typeof context.resume).beEqualTo('function'); |
| + done(); |
| }); |
| + // Task: check the promise resolution. |
| + audit.defineTask('promise-resolution', function (done) { |
| + Should('context.suspend()', context.suspend()).beResolved().then(done); |
| - // Task: test resume(). |
| - audit.defineTask('test-resume', function (done) { |
| - |
| - // Multiple calls to resume should not be a problem. But we can't test |
| - // that on an offline context. Thus, check that resume() on an |
| - // OfflineAudioContext rejects the promise. |
| - shouldNotThrow("p2 = offlineContext.resume()"); |
| - shouldBeType("p2", "Promise"); |
| - |
| - // Resume doesn't actually resume an offline context |
| - shouldBeEqualToString("offlineContext.state", "suspended"); |
| - p2.then( |
| - handlePromise(testFailed, "offlineContext.resume() should have been rejected for an offline context"), |
| - function (e) { |
| - if (e.name === "InvalidAccessError") { |
| - testPassed( |
| - "offlineContext.resume() was correctly rejected: " + e); |
| - } else { |
| - testFailed( |
| - "offlineContext.resume() was correctly rejected but expected InvalidAccessError, not: " + e); |
| - } |
| - } |
| - ).then(done); |
| + // Resuming the context cannot be tested with the trybot or the Content |
| + // Shell because it requires the physical audio device to run. |
| }); |
| - // Task: test the state after context closed. |
| - audit.defineTask('test-after-close', function (done) { |
| + // Task: test corner cases. |
| + audit.defineTask('corner-cases', function (done) { |
| - // Render the offline context. |
| - osc.start(); |
| + // Resuming the context cannot be tested with the trybot or the Content |
| + // Shell because it requires the physical audio device to run. |
|
Raymond Toy
2015/06/16 17:57:09
This comment seems irrelevant to the following cod
hongchan
2015/06/16 21:31:20
Done.
|
| - // Test suspend/resume in tested promise pattern. We don't care about the |
| - // actual result of the offline rendering. |
| - shouldNotThrow("p3 = offlineContext.startRendering()"); |
| - p3.then(function () { |
| - shouldBeEqualToString("offlineContext.state", "closed"); |
| + Should('Calling multiple context.suspend()', function() { |
| + context.suspend(); |
| + context.suspend(); |
| + }).notThrow(); |
| - // suspend() should be rejected on a closed context. |
| - offlineContext.suspend().then( |
| - handlePromise(testFailed, "offlineContext.suspend() on a closed context not rejected"), |
| - function (e) { |
| - if (e.name === "InvalidAccessError") { |
| - testPassed("offlineContext.suspend() on a closed context rejected: " + e); |
| - } else { |
| - testFailed("offlineContext.suspend() on a closed context rejected but expected InvalidAccessError, not: " + e); |
| - } |
| - } |
| - ).then(function () { |
| - // resume() should be rejected on closed context. |
| - offlineContext.resume().then( |
| - handlePromise(testFailed, "offlineContext.resume() on a closed context not rejected"), |
| - function (e) { |
| - if (e.name === "InvalidAccessError") { |
| - testPassed("offlineContext.resume() on a closed context rejected: " + e); |
| - } else { |
| - testFailed("offlineContext.resume() on a closed context rejected but expected InvalidAccessError, not: " + e); |
| - } |
| - } |
| - ).then(done); |
| - }); |
| + context.close().then(function () { |
| + Should('Calling context.suspend() after close()', context.suspend()) |
| + .beRejected(); |
| + Should('Calling context.resume() after close()', context.resume()) |
| + .beRejected().then(done); |
| }); |
| + |
| }); |
| audit.defineTask('finish-test', function (done) { |
| @@ -139,9 +58,9 @@ |
| }); |
| audit.runTasks( |
| - 'test-suspend', |
| - 'test-resume', |
| - 'test-after-close', |
| + 'interface', |
| + 'promise-resolution', |
| + 'corner-cases', |
| 'finish-test' |
| ); |
