Index: third_party/WebKit/LayoutTests/webaudio/Panner/pannernode-basic.html |
diff --git a/third_party/WebKit/LayoutTests/webaudio/Panner/pannernode-basic.html b/third_party/WebKit/LayoutTests/webaudio/Panner/pannernode-basic.html |
index 8c936c58f098664879a558d906353e81a22e8140..1e3cfb2f35fdaaf2a0334635ae8d2f3a0320bdd8 100644 |
--- a/third_party/WebKit/LayoutTests/webaudio/Panner/pannernode-basic.html |
+++ b/third_party/WebKit/LayoutTests/webaudio/Panner/pannernode-basic.html |
@@ -5,7 +5,7 @@ |
<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="../resources/audit.js"></script> |
</head> |
<body> |
@@ -14,165 +14,163 @@ |
var panner; |
var audit = Audit.createTaskRunner(); |
- audit.defineTask("initialize", function (done) { |
- context = new AudioContext(); |
- panner = context.createPanner(); |
- done(); |
+ audit.define("initialize", (task, should) => { |
+ should(() => { |
+ context = new AudioContext(); |
+ panner = context.createPanner(); |
+ }, "Initialize context and panner") |
+ .notThrow(); |
+ task.done(); |
}); |
- audit.defineTask("basic", function (done) { |
- var success = true; |
- |
- success = Should("panner.numberOfInputs", panner.numberOfInputs) |
- .beEqualTo(1) && success; |
- success = Should("panner.numberOfOutputs", panner.numberOfOutputs) |
- .beEqualTo(1) && success; |
- success = Should("panner.refDistance", panner.refDistance) |
- .beEqualTo(1) && success; |
+ audit.define("basic", (task, should) => { |
+ should(panner.numberOfInputs, "panner.numberOfInputs") |
+ .beEqualTo(1); |
+ should(panner.numberOfOutputs, "panner.numberOfOutputs") |
+ .beEqualTo(1); |
+ should(panner.refDistance, "panner.refDistance") |
+ .beEqualTo(1); |
panner.refDistance = 270.5; |
- success = Should("panner.refDistance = 270.5", panner.refDistance) |
- .beEqualTo(270.5) && success; |
- success = Should("panner.maxDistance", panner.maxDistance) |
- .beEqualTo(10000) && success; |
+ should(panner.refDistance, "panner.refDistance = 270.5") |
+ .beEqualTo(270.5); |
+ should(panner.maxDistance, "panner.maxDistance") |
+ .beEqualTo(10000); |
panner.maxDistance = 100.5; |
- success = Should("panner.maxDistance = 100.5", panner.maxDistance) |
- .beEqualTo(100.5) && success; |
- success = Should("panner.rolloffFactor", panner.rolloffFactor) |
- .beEqualTo(1) && success; |
+ should(panner.maxDistance, "panner.maxDistance = 100.5") |
+ .beEqualTo(100.5); |
+ should(panner.rolloffFactor, "panner.rolloffFactor") |
+ .beEqualTo(1); |
panner.rolloffFactor = 0.75; |
- success = Should("panner.rolloffFactor = 0.75", panner.rolloffFactor) |
- .beEqualTo(0.75) && success; |
- success = Should("panner.coneInnerAngle", panner.coneInnerAngle) |
- .beEqualTo(360) && success; |
+ should(panner.rolloffFactor, "panner.rolloffFactor = 0.75") |
+ .beEqualTo(0.75); |
+ should(panner.coneInnerAngle, "panner.coneInnerAngle") |
+ .beEqualTo(360); |
panner.coneInnerAngle = 240.5; |
- success = Should("panner.coneInnerAngle = 240.5", panner.coneInnerAngle) |
- .beEqualTo(240.5) && success; |
- success = Should("panner.coneOuterAngle", panner.coneOuterAngle) |
- .beEqualTo(360) && success; |
+ should(panner.coneInnerAngle, "panner.coneInnerAngle = 240.5") |
+ .beEqualTo(240.5); |
+ should(panner.coneOuterAngle, "panner.coneOuterAngle") |
+ .beEqualTo(360); |
panner.coneOuterAngle = 166.5; |
- success = Should("panner.coneOuterAngle = 166.5", panner.coneOuterAngle) |
- .beEqualTo(166.5) && success; |
- success = Should("panner.coneOuterGain", panner.coneOuterGain) |
- .beEqualTo(0) && success; |
+ should(panner.coneOuterAngle, "panner.coneOuterAngle = 166.5") |
+ .beEqualTo(166.5); |
+ should(panner.coneOuterGain, "panner.coneOuterGain") |
+ .beEqualTo(0); |
panner.coneOuterGain = 0.25; |
- success = Should("panner.coneOuterGain = 0.25", panner.coneOuterGain) |
- .beEqualTo(0.25) && success; |
- success = Should("panner.panningModel", panner.panningModel) |
- .beEqualTo("equalpower") && success; |
- success = Should("panner.distanceModel", panner.distanceModel) |
- .beEqualTo("inverse") && success; |
- |
- success = Should("panner.positionX", panner.positionX.value) |
- .beEqualTo(0) && success; |
- success = Should("panner.positionY", panner.positionY.value) |
- .beEqualTo(0) && success; |
- success = Should("panner.positionZ", panner.positionZ.value) |
- .beEqualTo(0) && success; |
- success = Should("panner.orientationX", panner.orientationX.value) |
- .beEqualTo(1) && success; |
- success = Should("panner.orientationY", panner.orientationY.value) |
- .beEqualTo(0) && success; |
- success = Should("panner.orientationZ", panner.orientationZ.value) |
- .beEqualTo(0) && success; |
- |
- Should("Basic Panner attribute tests", success) |
- .summarize("passed", "failed"); |
- |
- done(); |
+ should(panner.coneOuterGain, "panner.coneOuterGain = 0.25") |
+ .beEqualTo(0.25); |
+ should(panner.panningModel, "panner.panningModel") |
+ .beEqualTo("equalpower"); |
+ should(panner.distanceModel) |
+ .beEqualTo("inverse", "panner.distanceModel"); |
+ |
+ should(panner.positionX.value, "panner.positionX") |
+ .beEqualTo(0); |
+ should(panner.positionY.value, "panner.positionY") |
+ .beEqualTo(0); |
+ should(panner.positionZ.value, "panner.positionZ") |
+ .beEqualTo(0); |
+ should(panner.orientationX.value, "panner.orientationX") |
+ .beEqualTo(1); |
+ should(panner.orientationY.value, "panner.orientationY") |
+ .beEqualTo(0); |
+ should(panner.orientationZ.value, "panner.orientationZ") |
+ .beEqualTo(0); |
+ |
+ task.done(); |
}); |
- audit.defineTask("listener", function (done) { |
- var success = true; |
- |
- success = Should("listener.positionX", context.listener.positionX.value) |
- .beEqualTo(0) && success; |
- success = Should("listener.positionY", context.listener.positionY.value) |
- .beEqualTo(0) && success; |
- success = Should("listener.positionZ", context.listener.positionZ.value) |
- .beEqualTo(0) && success; |
- success = Should("listener.forwardX", context.listener.forwardX.value) |
- .beEqualTo(0) && success; |
- success = Should("listener.forwardY", context.listener.forwardY.value) |
- .beEqualTo(0) && success; |
- success = Should("listener.forwardZ", context.listener.forwardZ.value) |
- .beEqualTo(-1) && success; |
- success = Should("listener.upX", context.listener.upX.value) |
- .beEqualTo(0) && success; |
- success = Should("listener.upY", context.listener.upY.value) |
- .beEqualTo(1) && success; |
- success = Should("listener.upZ", context.listener.upZ.value) |
- .beEqualTo(0) && success; |
- |
- Should("Basic AudioListener attribute tests", success) |
- .summarize("passed", "failed"); |
- done(); |
+ audit.define("listener", (task, should) => { |
+ should(context.listener.positionX.value, "listener.positionX") |
+ .beEqualTo(0); |
+ should(context.listener.positionY.value, "listener.positionY") |
+ .beEqualTo(0); |
+ should(context.listener.positionZ.value, "listener.positionZ") |
+ .beEqualTo(0); |
+ should(context.listener.forwardX.value, "listener.forwardX") |
+ .beEqualTo(0); |
+ should(context.listener.forwardY.value, "listener.forwardY") |
+ .beEqualTo(0); |
+ should(context.listener.forwardZ.value, "listener.forwardZ") |
+ .beEqualTo(-1); |
+ should(context.listener.upX.value, "listener.upX") |
+ .beEqualTo(0); |
+ should(context.listener.upY.value, "listener.upY") |
+ .beEqualTo(1); |
+ should(context.listener.upZ.value, "listener.upZ") |
+ .beEqualTo(0); |
+ |
+ task.done(); |
}); |
- audit.defineTask("panning models", function (done) { |
+ audit.define("panning models", (task, should) => { |
// Check that the .panningModel attribute can be set to all legal values. |
var panningModels = ["equalpower", "HRTF"]; |
- var success = true; |
for (var i = 0; i < panningModels.length; ++i) { |
- success = Should('Set panner.panningModel = "' + panningModels[i] + '"', function () { |
- panner.panningModel = panningModels[i]; |
- }).notThrow() && success; |
- |
- success = Should('panner.panningModel = "' + panningModels[i] + '"', panner.panningModel) |
- .beEqualTo(panningModels[i]) && success; |
+ should(function () { |
+ panner.panningModel = panningModels[i]; |
+ }, |
+ 'Set panner.panningModel = "' + panningModels[i] + '"') |
+ .notThrow(); |
+ |
+ should(panner.panningModel, |
+ 'panner.panningModel = "' + panningModels[i] + '"') |
+ .beEqualTo(panningModels[i]); |
} |
- success = Should('panner.panningModel = "invalid"', function () { |
- panner.panningModel = "invalid"; |
- }).notThrow() && success; |
+ should(function () { |
+ panner.panningModel = "invalid"; |
+ }, |
+ 'panner.panningModel = "invalid"') |
+ .notThrow(); |
- success = Should("panner.panningModel after invalid setter", panner.panningModel) |
- .beEqualTo("HRTF") && success; |
+ should(panner.panningModel, |
+ "panner.panningModel after invalid setter") |
+ .beEqualTo("HRTF"); |
// Check that numerical values are no longer supported. We shouldn't throw and the value |
// shouldn't be changed. |
panner.panningModel = "HRTF"; |
- success = Should('panner.panningModel = 1', function () { |
+ should(function () { |
panner.panningModel = 1; |
- }).notThrow() && success; |
+ }, 'panner.panningModel = 1').notThrow(); |
- success = Should('panner.panningModel', panner.panningModel) |
- .beEqualTo("HRTF") && success; |
+ should(panner.panningModel, 'panner.panningModel') |
+ .beEqualTo("HRTF"); |
- Should("Basic Panner panning models tests", success) |
- .summarize("passed", "failed"); |
- done(); |
+ task.done(); |
}); |
- audit.defineTask("distance models", function (done) { |
+ audit.define("distance models", (task, should) => { |
// Check that the .panningModel attribute can be set to all legal values. |
var distanceModels = ["linear", "inverse", "exponential"]; |
- var success = true; |
for (var i = 0; i < distanceModels.length; ++i) { |
- success = Should('panner.distanceModel = "' + distanceModels[i] + '"', |
- function () { |
- panner.distanceModel = distanceModels[i]; |
- }).notThrow() && success; |
- |
- success = Should('panner.distanceModel = "' + distanceModels[i] + '"', panner |
- .distanceModel) |
- .beEqualTo(distanceModels[i]) && success; |
+ should( |
+ function () { |
+ panner.distanceModel = distanceModels[i]; |
+ }, |
+ 'panner.distanceModel = "' + distanceModels[i] + '"') |
+ .notThrow(); |
+ |
+ should(panner.distanceModel, |
+ 'panner.distanceModel = "' + distanceModels[i] + '"') |
+ .beEqualTo(distanceModels[i]); |
} |
- success = Should('panner.distanceModel = "invalid"', function () { |
- panner.distanceModel = "invalid"; |
- }).notThrow() && success; |
+ should(function () { |
+ panner.distanceModel = "invalid"; |
+ }, |
+ 'panner.distanceModel = "invalid"') |
+ .notThrow(); |
- success = Should("panner.distanceModel", panner.distanceModel) |
- .beEqualTo("exponential") && success; |
+ should(panner.distanceModel, "panner.distanceModel") |
+ .beEqualTo("exponential"); |
- Should("Basic Panner distance models tests", success) |
- .summarize("passed", "failed"); |
- done(); |
+ task.done(); |
}); |
- audit.runTasks(); |
+ audit.run(); |
</script> |
</body> |