(chore) : Changed test filing structure

Signed-off-by: Abhijay Jain <[email protected]>
processing · Jan 20, 2023 · 49a6f89 · 49a6f89
1 parent de83cd8
commit 49a6f89
Show file tree

Hide file tree

Showing 33 changed files with 96 additions and 132 deletions.
diff --git a/test/index.html b/test/index.html
@@ -1,16 +1,53 @@
 <html>
-  <head>
-    <meta charset="utf-8" />
-    <title>TESTS</title>
-    <script src="../lib/p5.js"></script>
-    <script src="../lib/p5.sound.js"></script>
-    <link rel="stylesheet" href="../node_modules/mocha/mocha.css" />
-    <script src="../node_modules/mocha/mocha.js"></script>
-    <script src="../node_modules/chai/chai.js"></script>
-    <script src="../node_modules/sinon/pkg/sinon.js"></script>
-  </head>
-  <body>
-    <div id="mocha"></div>
-    <script src="./setup.js" type="module"></script>
-  </body>
-</html>
+
+<head>
+  <meta charset="utf-8" />
+  <title>TESTS</title>
+  <link rel="stylesheet" href="../node_modules/mocha/mocha.css" />
+  <script src="../lib/p5.js"></script>
+  <script src="../lib/p5.sound.js"></script>
+</head>
+
+<body>
+  <div id="mocha"></div>
+  <script src="../node_modules/mocha/mocha.js" type="text/javascript" charset="utf-8"></script>
+  <script src="../node_modules/chai/chai.js"></script>
+  <script src="../node_modules/sinon/pkg/sinon.js"></script>
+  <script src="./setup.js"></script>
+
+  <script src="./tests.js" type="text/javascript"></script>
+
+  <script type="text/javascript">
+    const startTest = () => {
+      let test_has_run = false;
+      document.getElementById('mocha').innerHTML = 'click to begin tests';
+
+      // chromes autoplay policy requires a user interaction
+      // before the audiocontext can activate
+      const mousePressed = () => {
+        if (!test_has_run) {
+          document.getElementById('mocha').innerHTML = '';
+          p5._throwValidationErrors = true;
+          p5.prototype.outputVolume(0);
+          p5.prototype.userStartAudio();
+          mocha.run();
+          test_has_run = true;
+        }
+      };
+      document.addEventListener('click', mousePressed, false);
+    };
+
+    //operating p5 in instance mode ( read more about it here -  https://github.com/processing/p5.js/wiki/Global-and-instance-mode )
+    const s = (sketch) => {
+      sketch.setup = () => {
+        mocha.reporter('html');
+        mocha.setup('bdd');
+        const expect = chai.expect;
+        startTest();
+      };
+    };
+
+    new p5(s);
+  </script>
+</body>
+</html>
diff --git a/test/setup.js b/test/setup.js
@@ -1,31 +1,8 @@
-const startTest = () => {
-  //dynamic importing the modules , this ensures that tests must run after audioWorklet processors have been loaded properly
-  import('./tests.js');
+mocha.setup('bdd');
 
-  let test_has_run = false;
+new p5();
+p5._throwValidationErrors = true;
+p5.prototype.outputVolume(0);
+p5.prototype.userStartAudio();
 
-  document.getElementById('mocha').innerHTML = 'click to begin tests';
-
-  // chromes autoplay policy requires a user interaction
-  // before the audiocontext can activate
-  const mousePressed = () => {
-    if (!test_has_run) {
-      document.getElementById('mocha').innerHTML = '';
-      p5.prototype.outputVolume(0);
-      p5.prototype.userStartAudio();
-      mocha.run();
-      test_has_run = true;
-    }
-  };
-  document.addEventListener('click', mousePressed, false);
-};
-
-//operating p5 in instance mode ( read more about it here -  https://github.com/processing/p5.js/wiki/Global-and-instance-mode )
-const s = (sketch) => {
-  sketch.setup = () => {
-    mocha.setup('bdd');
-    startTest();
-  };
-};
-
-new p5(s);
+const expect = chai.expect;
diff --git a/test/tests.js b/test/tests.js
@@ -1,31 +1,38 @@
-import('./tests/main.js');
-import('./tests/p5.Helpers.js');
-import('./tests/p5.PeakDetect.js');
-import('./tests/p5.OnsetDetect.js');
-import('./tests/p5.Distortion.js');
-import('./tests/p5.AudioContext.js');
-import('./tests/p5.Looper.js');
-import('./tests/p5.Metro.js');
-import('./tests/p5.Effect.js');
-import('./tests/p5.Filter.js');
-import('./tests/p5.Gain.js');
-import('./tests/p5.FFT.js');
-import('./tests/p5.SoundLoop.js');
-import('./tests/p5.Compressor.js');
-import('./tests/p5.EQ.js');
-import('./tests/p5.AudioIn.js');
-import('./tests/p5.AudioVoice.js');
-import('./tests/p5.MonoSynth.js');
-import('./tests/p5.PolySynth.js');
-import('./tests/p5.SoundRecorder.js');
-import('./tests/p5.SoundFile.js');
-import('./tests/p5.Amplitude.js');
-import('./tests/p5.Oscillator.js');
-import('./tests/p5.Envelope.js');
-import('./tests/p5.Pulse.js');
-import('./tests/p5.Noise.js');
-import('./tests/p5.Panner.js');
-import('./tests/p5.Panner3d.js');
-import('./tests/p5.Delay.js');
-import('./tests/p5.Reverb.js');
-import('./tests/p5.Listener3d.js');
+let spec = [
+  './tests/main.js',
+  './tests/p5.Helpers.js',
+  './tests/p5.PeakDetect.js',
+  './tests/p5.OnsetDetect.js',
+  './tests/p5.Distortion.js',
+  './tests/p5.AudioContext.js',
+  './tests/p5.Looper.js',
+  './tests/p5.Metro.js',
+  './tests/p5.Effect.js',
+  './tests/p5.Filter.js',
+  './tests/p5.Gain.js',
+  './tests/p5.FFT.js',
+  './tests/p5.SoundLoop.js',
+  './tests/p5.Compressor.js',
+  './tests/p5.EQ.js',
+  './tests/p5.AudioIn.js',
+  './tests/p5.AudioVoice.js',
+  './tests/p5.MonoSynth.js',
+  './tests/p5.PolySynth.js',
+  './tests/p5.SoundRecorder.js',
+  './tests/p5.SoundFile.js',
+  './tests/p5.Amplitude.js',
+  './tests/p5.Oscillator.js',
+  './tests/p5.Envelope.js',
+  './tests/p5.Pulse.js',
+  './tests/p5.Noise.js',
+  './tests/p5.Panner.js',
+  './tests/p5.Panner3d.js',
+  './tests/p5.Delay.js',
+  './tests/p5.Reverb.js',
+  './tests/p5.Listener3d.js',
+];
+
+spec.map((file) => {
+  var string = ['<script src="./', file, '" type="text/javascript" ></script>'];
+  document.write(string.join(''));
+});
diff --git a/test/tests/main.js b/test/tests/main.js
@@ -1,4 +1,3 @@
-const expect = chai.expect;
 describe('main output', function () {
   it('can initiate main class', function () {
     expect(p5.soundOut.input).to.have.property('gain');

diff --git a/test/tests/p5.Amplitude.js b/test/tests/p5.Amplitude.js
@@ -1,5 +1,3 @@
-const expect = chai.expect;
-
 describe('p5.Amplitude', function () {
   this.timeout(1000);
 

diff --git a/test/tests/p5.AudioContext.js b/test/tests/p5.AudioContext.js
@@ -1,5 +1,3 @@
-const expect = chai.expect;
-
 describe('p5.AudioContext', function () {
   describe('getAudioContext', function () {
     it('returns a audioContext', function () {

diff --git a/test/tests/p5.AudioIn.js b/test/tests/p5.AudioIn.js
@@ -1,5 +1,3 @@
-const expect = chai.expect;
-
 describe('p5.AudioIn', function () {
   let mic;
   beforeEach(function () {

diff --git a/test/tests/p5.AudioVoice.js b/test/tests/p5.AudioVoice.js
@@ -1,5 +1,3 @@
-const expect = chai.expect;
-
 describe('p5.AudioVoice', function () {
   it('can be created and disposed', function () {
     let av = new p5.AudioVoice();

diff --git a/test/tests/p5.Compressor.js b/test/tests/p5.Compressor.js
@@ -1,5 +1,3 @@
-const expect = chai.expect;
-
 describe('p5.Compressor', function () {
   it('can be created and disposed', function () {
     let compressor = new p5.Compressor();

diff --git a/test/tests/p5.Delay.js b/test/tests/p5.Delay.js
@@ -1,5 +1,3 @@
-const expect = chai.expect;
-
 describe('p5.Delay', function () {
   let noise = new p5.Noise();
   it('can be created', function (done) {

diff --git a/test/tests/p5.Distortion.js b/test/tests/p5.Distortion.js
@@ -1,5 +1,3 @@
-const expect = chai.expect;
-
 describe('p5.Distortion', function () {
   it('can be created and disposed', function () {
     let distortion = new p5.Distortion();

diff --git a/test/tests/p5.EQ.js b/test/tests/p5.EQ.js
@@ -1,5 +1,3 @@
-const expect = chai.expect;
-
 describe('p5.EQ', function () {
   it('can be created and disposed', function () {
     const origSoundArrayLength = p5.soundOut.soundArray.length;

diff --git a/test/tests/p5.Effect.js b/test/tests/p5.Effect.js
@@ -1,5 +1,3 @@
-const expect = chai.expect;
-
 describe('p5.Effect', function () {
   it('can be created and disposed', function () {
     const effect = new p5.Effect();

diff --git a/test/tests/p5.Envelope.js b/test/tests/p5.Envelope.js
@@ -1,5 +1,3 @@
-const expect = chai.expect;
-
 describe('p5.Envelope', function () {
   it('can be created and disposed without any arguments', function () {
     let envelope = new p5.Envelope();

diff --git a/test/tests/p5.FFT.js b/test/tests/p5.FFT.js
@@ -1,5 +1,3 @@
-const expect = chai.expect;
-
 describe('p5.FFT', function () {
   it('can be created and disposed', function () {
     let fft = new p5.FFT();

diff --git a/test/tests/p5.Filter.js b/test/tests/p5.Filter.js
@@ -1,5 +1,3 @@
-const expect = chai.expect;
-
 describe('p5.Filter', function () {
   it('can be created and disposed', function () {
     let filter = new p5.Filter();

diff --git a/test/tests/p5.Gain.js b/test/tests/p5.Gain.js
@@ -1,4 +1,3 @@
-const expect = chai.expect;
 let gain;
 
 describe('p5.Gain', function () {

diff --git a/test/tests/p5.Helpers.js b/test/tests/p5.Helpers.js
@@ -1,5 +1,3 @@
-const expect = chai.expect;
-
 describe('Helpers functions', function () {
   it('sampleRate can get sample rate', function () {
     expect(p5.prototype.sampleRate()).to.be.a('number');

diff --git a/test/tests/p5.Listener3d.js b/test/tests/p5.Listener3d.js
@@ -1,5 +1,3 @@
-const expect = chai.expect;
-
 describe('p5.Listener3D', function () {
   let listener3d;
   it('can be created', function () {

diff --git a/test/tests/p5.Looper.js b/test/tests/p5.Looper.js
@@ -1,5 +1,3 @@
-const expect = chai.expect;
-
 describe('p5.Looper', function () {
   it('setBPM sets the BPM for all parts', function () {
     let part1 = new p5.Part();

diff --git a/test/tests/p5.Metro.js b/test/tests/p5.Metro.js
@@ -1,4 +1,3 @@
-const expect = chai.expect;
 let metro;
 
 describe('p5.Metro', function () {

diff --git a/test/tests/p5.MonoSynth.js b/test/tests/p5.MonoSynth.js
@@ -1,5 +1,3 @@
-const expect = chai.expect;
-
 describe('p5.MonoSynth', function () {
   it('can be created and disposed', function () {
     const monoSynth = new p5.MonoSynth();

diff --git a/test/tests/p5.Noise.js b/test/tests/p5.Noise.js
@@ -1,5 +1,3 @@
-const expect = chai.expect;
-
 describe('p5.Noise', function () {
   it('can be created and disposed', function () {
     let noise = new p5.Noise();

diff --git a/test/tests/p5.OnsetDetect.js b/test/tests/p5.OnsetDetect.js
@@ -1,5 +1,3 @@
-const expect = chai.expect;
-
 describe('p5.OnsetDetect', function () {
   it('can be initalized ', function () {
     const onsetDetect = new p5.OnsetDetect(40, 120, 0.8, () => {});

diff --git a/test/tests/p5.Oscillator.js b/test/tests/p5.Oscillator.js
@@ -1,5 +1,3 @@
-const expect = chai.expect;
-
 describe('p5.Oscillator', function () {
   this.timeout(1000);
 

diff --git a/test/tests/p5.Panner.js b/test/tests/p5.Panner.js
@@ -1,5 +1,3 @@
-// const expect = chai.expect;
-
 describe('p5.Panner', function () {
   let ac, output, input;
   beforeEach(function () {

diff --git a/test/tests/p5.Panner3d.js b/test/tests/p5.Panner3d.js
@@ -1,5 +1,3 @@
-const expect = chai.expect;
-
 describe('p5.Panner3d', function () {
   it('can be created and disposed', function () {
     let panner3d = new p5.Panner3D();

diff --git a/test/tests/p5.PeakDetect.js b/test/tests/p5.PeakDetect.js
@@ -1,5 +1,3 @@
-const expect = chai.expect;
-
 describe('p5.PeakDetect', function () {
   it('can be initialized without any arguments', function () {
     const peakDetect = new p5.PeakDetect();

diff --git a/test/tests/p5.PolySynth.js b/test/tests/p5.PolySynth.js
@@ -1,5 +1,3 @@
-const expect = chai.expect;
-
 describe('p5.PolySynth', function () {
   const audioContext = p5.prototype.getAudioContext();
 

diff --git a/test/tests/p5.Pulse.js b/test/tests/p5.Pulse.js
@@ -1,5 +1,3 @@
-const expect = chai.expect;
-
 describe('p5.Pulse', function () {
   it('can be created without any arguments', function () {
     let pulse = new p5.Pulse();

diff --git a/test/tests/p5.Reverb.js b/test/tests/p5.Reverb.js
@@ -1,5 +1,3 @@
-const expect = chai.expect;
-
 p5.prototype.soundFormats('mp3', 'ogg');
 let soundFile = p5.prototype.loadSound('./testAudio/drum');
 

diff --git a/test/tests/p5.SoundLoop.js b/test/tests/p5.SoundLoop.js
@@ -1,5 +1,3 @@
-const expect = chai.expect;
-
 describe('p5.SoundLoop', function () {
   it('can be initialized without any arguments', function () {
     let sloop = new p5.SoundLoop();

diff --git a/test/tests/p5.SoundRecorder.js b/test/tests/p5.SoundRecorder.js
@@ -1,5 +1,3 @@
-const expect = chai.expect;
-
 describe('p5.SoundRecorder', function () {
   let inputSoundFile;
   let writeFileSub;