| Index: third_party/WebKit/LayoutTests/webaudio/constructor/biquadfilter.html
|
| diff --git a/third_party/WebKit/LayoutTests/webaudio/constructor/biquadfilter.html b/third_party/WebKit/LayoutTests/webaudio/constructor/biquadfilter.html
|
| index 2518bcb243ee81c676a121dba6565ae99f358836..37e96fa9326731f2db835698d244d5fa9d079769 100644
|
| --- a/third_party/WebKit/LayoutTests/webaudio/constructor/biquadfilter.html
|
| +++ b/third_party/WebKit/LayoutTests/webaudio/constructor/biquadfilter.html
|
| @@ -5,8 +5,8 @@
|
| <script src="../../resources/testharness.js"></script>
|
| <script src="../../resources/testharnessreport.js"></script>
|
| <script src="../resources/audit-util.js"></script>
|
| - <script src="../resources/audio-testing.js"></script>
|
| - <script src="audionodeoptions.js"></script>
|
| + <script src="../resources/audit.js"></script>
|
| + <script src="new-audionodeoptions.js"></script>
|
| </head>
|
|
|
| <body>
|
| @@ -15,110 +15,71 @@
|
|
|
| var audit = Audit.createTaskRunner();
|
|
|
| - audit.defineTask("initialize", function (taskDone) {
|
| - Should("context = new OfflineAudioContext(...)", function () {
|
| - context = new OfflineAudioContext(1, 1, 48000);
|
| - }).notThrow();
|
| -
|
| - taskDone();
|
| + audit.define('initialize', (task, should) => {
|
| + context = initializeContext(should);
|
| + task.done();
|
| });
|
|
|
| - audit.defineTask("invalid constructor", function (taskDone) {
|
| - var node;
|
| - var success = true;
|
| -
|
| - success = Should("new BiquadFilterNode()", function () {
|
| - node = new BiquadFilterNode();
|
| - }).throw("TypeError");
|
| - success = Should("new BiquadFilterNode(1)", function () {
|
| - node = new BiquadFilterNode(1) && success;
|
| - }).throw("TypeError");
|
| - success = Should("new BiquadFilterNode(context, 42)", function () {
|
| - node = new BiquadFilterNode(context, 42) && success;
|
| - }).throw("TypeError");
|
| -
|
| - Should("Invalid constructors", success)
|
| - .summarize(
|
| - "correctly threw errors",
|
| - "did not throw errors in all cases");
|
| -
|
| - taskDone();
|
| + audit.define('invalid constructor', (task, should) => {
|
| + testInvalidConstructor(should, 'BiquadFilterNode', context);
|
| + task.done();
|
| });
|
|
|
| - audit.defineTask("default constructor", function (taskDone) {
|
| - var node;
|
| - var success = true;
|
| -
|
| - success = Should("node = new BiquadFilterNode(context)", function () {
|
| - node = new BiquadFilterNode(context);
|
| - }).notThrow();
|
| - success = Should("node instanceof BiquadFilterNode", node instanceof BiquadFilterNode)
|
| - .beEqualTo(true) && success;
|
| -
|
| - // Test if attributes are set correctly to the defaults
|
| - success = Should("node.type", node.type)
|
| - .beEqualTo("lowpass") && success;
|
| - success = Should("node.Q.value", node.Q.value)
|
| - .beEqualTo(1) && success;
|
| - success = Should("node.detune.value", node.detune.value)
|
| - .beEqualTo(0) && success;
|
| - success = Should("node.frequency.value", node.frequency.value)
|
| - .beEqualTo(350) &&
|
| - success;
|
| - success = Should("node.gain.value", node.gain.value)
|
| - .beEqualTo(0) && success;
|
| -
|
| - Should("new BiquadFilterNode(context)", success)
|
| - .summarize(
|
| - "constructed node with correct attributes",
|
| - "did not construct correct node correctly")
|
| -
|
| - taskDone();
|
| + audit.define('default constructor', (task, should) => {
|
| + let prefix = 'node0';
|
| + let node = testDefaultConstructor(should, 'BiquadFilterNode', context, {
|
| + prefix: prefix,
|
| + numberOfInputs: 1,
|
| + numberOfOutputs: 1,
|
| + channelCount: 2,
|
| + channelCountMode: 'max',
|
| + channelInterpretation: 'speakers'
|
| + });
|
| +
|
| + testDefaultAttributes(should, node, prefix, [
|
| + {name: 'type', value: 'lowpass'}, {name: 'Q', value: 1},
|
| + {name: 'detune', value: 0}, {name: 'frequency', value: 350},
|
| + {name: 'gain', value: 0.0}
|
| + ]);
|
| +
|
| + task.done();
|
| });
|
|
|
| - audit.defineTask("test AudioNodeOptions", function (taskDone) {
|
| - testAudioNodeOptions(context, "BiquadFilterNode");
|
| - taskDone();
|
| + audit.define('test AudioNodeOptions', (task, should) => {
|
| + testAudioNodeOptions(should, context, 'BiquadFilterNode');
|
| + task.done();
|
| });
|
|
|
| - audit.defineTask("construct with options", function (taskDone) {
|
| + audit.define('construct with options', (task, should) => {
|
| var node;
|
| - var success = true;
|
| var options = {
|
| - type: "highpass",
|
| + type: 'highpass',
|
| frequency: 512,
|
| detune: 1,
|
| Q: 5,
|
| gain: 3,
|
| };
|
|
|
| - success = Should("node = new BiquadFilterNode(..., " + JSON.stringify(options) + ")", function () {
|
| - node = new BiquadFilterNode(context, options);
|
| - }).notThrow();
|
| + should(
|
| + () => {
|
| + node = new BiquadFilterNode(context, options);
|
| + },
|
| + 'node = new BiquadFilterNode(..., ' + JSON.stringify(options) + ')')
|
| + .notThrow();
|
|
|
| // Test that attributes are set according to the option values.
|
| - success = Should("node.type", node.type)
|
| - .beEqualTo(options.type) && success;
|
| - success = Should("node.frequency.value", node.frequency.value)
|
| - .beEqualTo(options.frequency) &&
|
| - success;
|
| - success = Should("node.detuen.value", node.detune.value)
|
| - .beEqualTo(options.detune) &&
|
| - success;
|
| - success = Should("node.Q.value", node.Q.value)
|
| - .beEqualTo(options.Q) && success;
|
| - success = Should("node.gain.value", node.gain.value)
|
| - .beEqualTo(options.gain) && success;
|
| -
|
| - Should("new BiquadFilterNode() with options", success)
|
| - .summarize(
|
| - "constructed with correct attributes",
|
| - "was not constructed correctly");
|
| -
|
| - taskDone();
|
| + should(node.type, 'node.type').beEqualTo(options.type);
|
| + should(node.frequency.value, 'node.frequency.value')
|
| + .beEqualTo(options.frequency);
|
| + should(node.detune.value, 'node.detuen.value')
|
| + .beEqualTo(options.detune);
|
| + should(node.Q.value, 'node.Q.value').beEqualTo(options.Q);
|
| + should(node.gain.value, 'node.gain.value').beEqualTo(options.gain);
|
| +
|
| + task.done();
|
| });
|
|
|
| - audit.runTasks();
|
| + audit.run();
|
| </script>
|
| </body>
|
| </html>
|
|
|