Modifying audio-testing.js to support testharness.js.

This CL is to support the new testharness.js within audio-testing.js, but also keep the backward compatibility for js-test.js. The summary on changes: * Should() utility: _testPassed, _testFailed, and _assert now call assert_true() method from testharness.js when it's available. The success or error messages are printed out properly. * Audit task runner: now it initializes and finalizes the test suite for testharness.js. See the unit test included in the CL to see how it works. TEST=webaudio/unit-test-audio-testing.html BUG=634359 Review-Url: https://codereview.chromium.org/2212023002 Cr-Commit-Position: refs/heads/master@{#409948}
marcosholgado · Aug 5, 2016 · f908584 · f908584
1 parent 5a09829
commit f908584
Show file tree

Hide file tree

Showing 51 changed files with 278 additions and 67 deletions.
diff --git a/third_party/WebKit/LayoutTests/webaudio/audiobuffer-getChannelData.html b/third_party/WebKit/LayoutTests/webaudio/audiobuffer-getChannelData.html
@@ -1,10 +1,10 @@
 <!doctype html>
 <html>
   <head>
+    <script src="../resources/js-test.js"></script>
     <script src="resources/compatibility.js"></script>
     <script src="resources/audio-testing.js"></script>
     <script src="resources/audioparam-testing.js"></script>
-    <script src="../resources/js-test.js"></script>
     <title>Test AudioBuffer.getChannelData() Returns the Same Object</title>
   </head>
 

diff --git a/third_party/WebKit/LayoutTests/webaudio/audiobuffer-resample.html b/third_party/WebKit/LayoutTests/webaudio/audiobuffer-resample.html
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
   <head>
+    <script src="../resources/js-test.js"></script>
     <script src="resources/compatibility.js"></script>
     <script src="resources/audio-testing.js"></script>
-    <script src="../resources/js-test.js"></script>
   </head>
 
   <body>

diff --git a/third_party/WebKit/LayoutTests/webaudio/audiobuffersource-grain.html b/third_party/WebKit/LayoutTests/webaudio/audiobuffersource-grain.html
@@ -2,9 +2,9 @@
 <html>
   <head>
     <title>Test Start Grain with Delayed Buffer Setting </title>
+    <script src="../resources/js-test.js"></script>
     <script src="resources/compatibility.js"></script>
     <script src="resources/audio-testing.js"></script>
-    <script src="../resources/js-test.js"></script>
   </head>
 
   <body>

diff --git a/third_party/WebKit/LayoutTests/webaudio/audiobuffersource-loop-comprehensive.html b/third_party/WebKit/LayoutTests/webaudio/audiobuffersource-loop-comprehensive.html
@@ -2,10 +2,10 @@
 
 <html>
 <head>
-<script src="resources/audio-testing.js"></script>
+<script src="../resources/js-test.js"></script>
 <script src="resources/compatibility.js"></script>
+<script src="resources/audio-testing.js"></script>
 <script src="resources/audiobuffersource-testing.js"></script>
-<script src="../resources/js-test.js"></script>
 </head>
 
 <body>

diff --git a/third_party/WebKit/LayoutTests/webaudio/audiobuffersource-one-sample-loop.html b/third_party/WebKit/LayoutTests/webaudio/audiobuffersource-one-sample-loop.html
@@ -2,9 +2,9 @@
 <html>
   <head>
     <title>Test AudioBufferSourceNode With Looping a Single-Sample Buffer</title>
+    <script src="../resources/js-test.js"></script>
     <script src="resources/compatibility.js"></script>
     <script src="resources/audio-testing.js"></script>
-    <script src="../resources/js-test.js"></script>
   </head>
 
   <body>

diff --git a/third_party/WebKit/LayoutTests/webaudio/audiobuffersource-start.html b/third_party/WebKit/LayoutTests/webaudio/audiobuffersource-start.html
@@ -2,10 +2,10 @@
 
 <html>
 <head>
+<script src="../resources/js-test.js"></script>
 <script src="resources/compatibility.js"></script>
 <script src="resources/audio-testing.js"></script>
 <script src="resources/audiobuffersource-testing.js"></script>
-<script src="../resources/js-test.js"></script>
 </head>
 
 <body>

diff --git a/third_party/WebKit/LayoutTests/webaudio/audiocontext-close-basic.html b/third_party/WebKit/LayoutTests/webaudio/audiocontext-close-basic.html
@@ -2,9 +2,9 @@
 <html>
   <head>
     <title>Test AudioContext.close() closes many contexts</title>
+    <script src="../resources/js-test.js"></script>
     <script src="resources/compatibility.js"></script>
     <script src="resources/audio-testing.js"></script>
-    <script src="../resources/js-test.js"></script>
   </head>
 
   <body>

diff --git a/third_party/WebKit/LayoutTests/webaudio/audioparam-connect-audioratesignal.html b/third_party/WebKit/LayoutTests/webaudio/audioparam-connect-audioratesignal.html
@@ -11,9 +11,9 @@
 
 <html>
 <head>
+<script src="../resources/js-test.js"></script>
 <script src="resources/compatibility.js"></script>
 <script src="resources/audio-testing.js"></script>
-<script src="../resources/js-test.js"></script>
 
 </head>
 <body>

diff --git a/third_party/WebKit/LayoutTests/webaudio/audioparam-exponentialRampToValueAtTime.html b/third_party/WebKit/LayoutTests/webaudio/audioparam-exponentialRampToValueAtTime.html
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
   <head>
+    <script src="../resources/js-test.js"></script>
     <script src="resources/compatibility.js"></script>
     <script src="resources/audio-testing.js"></script>
     <script src="resources/audioparam-testing.js"></script>
-    <script src="../resources/js-test.js"></script>
     <title>Test AudioParam.exponentialRampToValueAtTime</title>
   </head>
 

diff --git a/third_party/WebKit/LayoutTests/webaudio/audioparam-linearRampToValueAtTime.html b/third_party/WebKit/LayoutTests/webaudio/audioparam-linearRampToValueAtTime.html
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
+<script src="../resources/js-test.js"></script>
 <script src="resources/compatibility.js"></script>
 <script src="resources/audio-testing.js"></script>
 <script src="resources/audioparam-testing.js"></script>
-<script src="../resources/js-test.js"></script>
 <title>Test AudioParam.linearRampToValueAtTime</title>
 </head>
 

diff --git a/third_party/WebKit/LayoutTests/webaudio/audioparam-sampling.html b/third_party/WebKit/LayoutTests/webaudio/audioparam-sampling.html
@@ -1,10 +1,10 @@
 <!doctype html>
 <html>
   <head>
+    <script src="../resources/js-test.js"></script>
     <script src="resources/compatibility.js"></script>
     <script src="resources/audio-testing.js"></script>
     <script src="resources/audioparam-testing.js"></script>
-    <script src="../resources/js-test.js"></script>
     <title>Test Sampling of LinearRampToValueAtTime</title>
   </head>
 

diff --git a/third_party/WebKit/LayoutTests/webaudio/audioparam-setTargetAtTime-sampling.html b/third_party/WebKit/LayoutTests/webaudio/audioparam-setTargetAtTime-sampling.html
@@ -1,10 +1,10 @@
 <!doctype html>
 <html>
   <head>
+    <script src="../resources/js-test.js"></script>
     <script src="resources/compatibility.js"></script>
     <script src="resources/audio-testing.js"></script>
     <script src="resources/audioparam-testing.js"></script>
-    <script src="../resources/js-test.js"></script>
     <title>Test Sampling for SetTargetAtTime</title>
   </head>
 

diff --git a/third_party/WebKit/LayoutTests/webaudio/audioparam-setTargetAtTime.html b/third_party/WebKit/LayoutTests/webaudio/audioparam-setTargetAtTime.html
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
+<script src="../resources/js-test.js"></script>
 <script src="resources/compatibility.js"></script>
 <script src="resources/audio-testing.js"></script>
 <script src="resources/audioparam-testing.js"></script>
-<script src="../resources/js-test.js"></script>
 <title>Test AudioParam.setTargetAtTime</title>
 </head>
 

diff --git a/third_party/WebKit/LayoutTests/webaudio/audioparam-setValueAtTime.html b/third_party/WebKit/LayoutTests/webaudio/audioparam-setValueAtTime.html
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
+<script src="../resources/js-test.js"></script>
 <script src="resources/compatibility.js"></script>
 <script src="resources/audio-testing.js"></script>
 <script src="resources/audioparam-testing.js"></script>
-<script src="../resources/js-test.js"></script>
 </head>
 
 <body>

diff --git a/third_party/WebKit/LayoutTests/webaudio/audioparam-setValueCurve-duration.html b/third_party/WebKit/LayoutTests/webaudio/audioparam-setValueCurve-duration.html
@@ -1,10 +1,10 @@
 <!doctype html>
 <html>
   <head>
+    <script src="../resources/js-test.js"></script>
     <script src="resources/compatibility.js"></script>
     <script src="resources/audio-testing.js"></script>
     <script src="resources/audioparam-testing.js"></script>
-    <script src="../resources/js-test.js"></script>
     <title>Test setValueCurveAtTime with Huge Duration</title>
   </head>
 

diff --git a/third_party/WebKit/LayoutTests/webaudio/audioparam-setValueCurveAtTime.html b/third_party/WebKit/LayoutTests/webaudio/audioparam-setValueCurveAtTime.html
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
+<script src="../resources/js-test.js"></script>
 <script src="resources/compatibility.js"></script>
 <script src="resources/audio-testing.js"></script>
 <script src="resources/audioparam-testing.js"></script>
-<script src="../resources/js-test.js"></script>
 <title>Test AudioParam.setValueCurveAtTime</title>
 </head>
 

diff --git a/third_party/WebKit/LayoutTests/webaudio/audioparam-summingjunction.html b/third_party/WebKit/LayoutTests/webaudio/audioparam-summingjunction.html
@@ -7,10 +7,10 @@
 
 <html>
 <head>
+<script src="../resources/js-test.js"></script>
 <script src="resources/compatibility.js"></script>
 <script src="resources/audio-testing.js"></script>
 <script src="resources/mix-testing.js"></script>
-<script src="../resources/js-test.js"></script>
 
 </head>
 <body>

diff --git a/third_party/WebKit/LayoutTests/webaudio/audioparam-update-value-attribute.html b/third_party/WebKit/LayoutTests/webaudio/audioparam-update-value-attribute.html
@@ -1,10 +1,10 @@
 <!doctype html>
 <html>
   <head>
+    <script src="../resources/js-test.js"></script>
     <script src="resources/compatibility.js"></script>
     <script src="resources/audio-testing.js"></script>
     <script src="resources/audio-param.js"></script>
-    <script src="../resources/js-test.js"></script>
     <title>Updating of Value Attribute from Timeline</title>
   </head>
 

diff --git a/third_party/WebKit/LayoutTests/webaudio/audiosource-time-limits.html b/third_party/WebKit/LayoutTests/webaudio/audiosource-time-limits.html
@@ -1,10 +1,10 @@
 <!doctype html>
 <html>
   <head>
+    <script src="../resources/js-test.js"></script>
     <script src="resources/compatibility.js"></script>
     <script src="resources/audio-testing.js"></script>
     <script src="resources/audioparam-testing.js"></script>
-    <script src="../resources/js-test.js"></script>
     <title>Test Scheduled Sources with Huge Time Limits</title>
   </head>
 

diff --git a/third_party/WebKit/LayoutTests/webaudio/biquad-allpass.html b/third_party/WebKit/LayoutTests/webaudio/biquad-allpass.html
@@ -2,9 +2,9 @@
 
 <html>
 <head>
+<script src="../resources/js-test.js"></script>
 <script src="resources/compatibility.js"></script>
 <script src="resources/audio-testing.js"></script>
-<script src="../resources/js-test.js"></script>
 <script src="resources/biquad-filters.js"></script>
 <script src="resources/biquad-testing.js"></script>
 </head>

diff --git a/third_party/WebKit/LayoutTests/webaudio/biquad-bandpass.html b/third_party/WebKit/LayoutTests/webaudio/biquad-bandpass.html
@@ -2,9 +2,9 @@
 
 <html>
 <head>
+<script src="../resources/js-test.js"></script>
 <script src="resources/compatibility.js"></script>
 <script src="resources/audio-testing.js"></script>
-<script src="../resources/js-test.js"></script>
 <script src="resources/biquad-filters.js"></script>
 <script src="resources/biquad-testing.js"></script>
 </head>

diff --git a/third_party/WebKit/LayoutTests/webaudio/biquad-getFrequencyResponse.html b/third_party/WebKit/LayoutTests/webaudio/biquad-getFrequencyResponse.html
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
+<script src="../resources/js-test.js"></script>
 <script src="resources/compatibility.js"></script>
 <script src="resources/audio-testing.js"></script>
 <script src="resources/biquad-filters.js"></script>
 <script src="resources/biquad-testing.js"></script>
-<script src="../resources/js-test.js"></script>
 </head>
 
 <body>

diff --git a/third_party/WebKit/LayoutTests/webaudio/biquad-highpass.html b/third_party/WebKit/LayoutTests/webaudio/biquad-highpass.html
@@ -2,9 +2,9 @@
 
 <html>
 <head>
+<script src="../resources/js-test.js"></script>
 <script src="resources/compatibility.js"></script>
 <script src="resources/audio-testing.js"></script>
-<script src="../resources/js-test.js"></script>
 <script src="resources/biquad-filters.js"></script>
 <script src="resources/biquad-testing.js"></script>
 </head>

diff --git a/third_party/WebKit/LayoutTests/webaudio/biquad-highshelf.html b/third_party/WebKit/LayoutTests/webaudio/biquad-highshelf.html
@@ -2,9 +2,9 @@
 
 <html>
 <head>
+<script src="../resources/js-test.js"></script>
 <script src="resources/compatibility.js"></script>
 <script src="resources/audio-testing.js"></script>
-<script src="../resources/js-test.js"></script>
 <script src="resources/biquad-filters.js"></script>
 <script src="resources/biquad-testing.js"></script>
 </head>

diff --git a/third_party/WebKit/LayoutTests/webaudio/biquad-lowpass.html b/third_party/WebKit/LayoutTests/webaudio/biquad-lowpass.html
@@ -2,9 +2,9 @@
 
 <html>
 <head>
+<script src="../resources/js-test.js"></script>
 <script src="resources/compatibility.js"></script>
 <script src="resources/audio-testing.js"></script>
-<script src="../resources/js-test.js"></script>
 <script src="resources/biquad-filters.js"></script>
 <script src="resources/biquad-testing.js"></script>
 </head>

diff --git a/third_party/WebKit/LayoutTests/webaudio/biquad-lowshelf.html b/third_party/WebKit/LayoutTests/webaudio/biquad-lowshelf.html
@@ -2,9 +2,9 @@
 
 <html>
 <head>
+<script src="../resources/js-test.js"></script>
 <script src="resources/compatibility.js"></script>
 <script src="resources/audio-testing.js"></script>
-<script src="../resources/js-test.js"></script>
 <script src="resources/biquad-filters.js"></script>
 <script src="resources/biquad-testing.js"></script>
 </head>

diff --git a/third_party/WebKit/LayoutTests/webaudio/biquad-notch.html b/third_party/WebKit/LayoutTests/webaudio/biquad-notch.html
@@ -2,9 +2,9 @@
 
 <html>
 <head>
+<script src="../resources/js-test.js"></script>
 <script src="resources/compatibility.js"></script>
 <script src="resources/audio-testing.js"></script>
-<script src="../resources/js-test.js"></script>
 <script src="resources/biquad-filters.js"></script>
 <script src="resources/biquad-testing.js"></script>
 </head>

diff --git a/third_party/WebKit/LayoutTests/webaudio/biquad-peaking.html b/third_party/WebKit/LayoutTests/webaudio/biquad-peaking.html
@@ -2,9 +2,9 @@
 
 <html>
 <head>
+<script src="../resources/js-test.js"></script>
 <script src="resources/compatibility.js"></script>
 <script src="resources/audio-testing.js"></script>
-<script src="../resources/js-test.js"></script>
 <script src="resources/biquad-filters.js"></script>
 <script src="resources/biquad-testing.js"></script>
 </head>

diff --git a/third_party/WebKit/LayoutTests/webaudio/convolution-mono-mono.html b/third_party/WebKit/LayoutTests/webaudio/convolution-mono-mono.html
@@ -2,9 +2,9 @@
 
 <html>
 <head>
-<script src="resources/compatibility.js"></script>
-<script type="text/javascript" src="resources/audio-testing.js"></script>
 <script src="../resources/js-test.js"></script>
+<script src="resources/compatibility.js"></script>
+<script src="resources/audio-testing.js"></script>
 <script src="resources/convolution-testing.js"></script>
 </head>
 

diff --git a/third_party/WebKit/LayoutTests/webaudio/convolver-setBuffer-null.html b/third_party/WebKit/LayoutTests/webaudio/convolver-setBuffer-null.html
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
+<script src="../resources/js-test.js"></script>
 <script src="resources/compatibility.js"></script>
 <script src="resources/audio-testing.js"></script>
-<script src="../resources/js-test.js"></script>
 </head>
 
 <body>

diff --git a/third_party/WebKit/LayoutTests/webaudio/distance-exponential.html b/third_party/WebKit/LayoutTests/webaudio/distance-exponential.html
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
   <head>
+    <script src="../resources/js-test.js"></script>
     <script src="resources/compatibility.js"></script>
     <script src="resources/audio-testing.js"></script>
-    <script src="../resources/js-test.js"></script>
     <script src="resources/distance-model-testing.js"></script>
   </head>
 

diff --git a/third_party/WebKit/LayoutTests/webaudio/distance-inverse.html b/third_party/WebKit/LayoutTests/webaudio/distance-inverse.html
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
   <head>
+    <script src="../resources/js-test.js"></script>
     <script src="resources/compatibility.js"></script>
     <script src="resources/audio-testing.js"></script>
-    <script src="../resources/js-test.js"></script>
     <script src="resources/distance-model-testing.js"></script>
   </head>
 

diff --git a/third_party/WebKit/LayoutTests/webaudio/distance-linear.html b/third_party/WebKit/LayoutTests/webaudio/distance-linear.html
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
   <head>
+    <script src="../resources/js-test.js"></script>
     <script src="resources/compatibility.js"></script>
     <script src="resources/audio-testing.js"></script>
-    <script src="../resources/js-test.js"></script>
     <script src="resources/distance-model-testing.js"></script>
   </head>
 

diff --git a/third_party/WebKit/LayoutTests/webaudio/dom-exceptions.html b/third_party/WebKit/LayoutTests/webaudio/dom-exceptions.html
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
+<script src="../resources/js-test.js"></script>
 <script src="resources/compatibility.js"></script>
 <script src="resources/audio-testing.js"></script>
-<script src="../resources/js-test.js"></script>
 <script src="resources/biquad-testing.js"></script>
 </head>