Implement tests to Music Blocks codebase. sugarlabs#4124

Mamatha1718 · Dec 26, 2024 · 9dd3af0 · 9dd3af0
1 parent a99c894
commit 9dd3af0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/js/utils/__tests__/mathutils.test.js b/js/utils/__tests__/mathutils.test.js
@@ -21,13 +21,20 @@ describe('MathUtility', () => {
         });
 
         test('throws error for invalid inputs', () => {
-            expect(() => MathUtility.doRandom('invalid', 10)).toThrow('NanError');
+            expect(() => MathUtility.doRandom('invalid', 10)).toThrow('NanError'); //Invalid solfage name
+            expect(() => MathUtility.doRandom(1, 'invalid')).toThrow('NanError'); //Invalid input
+        });
+
+        test('returns valid random solfege for octave', () => {
+            const result = MathUtility.doRandom('do', 'ti', 4);
+            expect(SOLFEGENAMES).toContain(result[0]); //Check if the result contains a valid solfage name 
+            expect(Number(result[1])).toBeGreaterThanOrEqual(4); //Ensure octave is valid
         });
     });
 
-    describe('doOneOf', () => {
+    describe('pickRandom', () => {
         test('returns either a or b', () => {
-            const result = MathUtility.doOneOf('a', 'b');
+            const result = MathUtility.pickRandom('a', 'b');
             expect(['a', 'b']).toContain(result);
         });
     });
@@ -125,5 +132,4 @@ describe('MathUtility', () => {
             expect(MathUtility.doInt(4.6)).toBe(5);
         });
     });
-});
-
+});
diff --git a/js/utils/mathutils.js b/js/utils/mathutils.js
@@ -38,7 +38,7 @@
  * NumberBlocks.js
  */
 class MathUtility {
-   /**
+    /**
      * Returns a random integer in a range.
      *
      * @static
@@ -74,7 +74,7 @@ class MathUtility {
             octave = octave === undefined ? 4 : octave;
 
             const broadScale = [];
-            for (const i of [octave, octave + 1]) {
+            for (const i of[octave, octave + 1]) {
                 for (let j = 0; j < SOLFEGENAMES.length; j++) {
                     broadScale.push(SOLFEGENAMES[j] + " " + i);
                 }
@@ -114,7 +114,7 @@ class MathUtility {
      * @param {*} b
      * @returns {*} - Either a or b.
      */
-    static doOneOf(a, b) {
+    static pickRandom(a, b) {
         return Math.random() < 0.5 ? a : b;
     }
 
@@ -229,7 +229,7 @@ class MathUtility {
         }
     }
 
-     /**
+    /**
      * Calculates Euclidean distance between (cursor x, cursor y) and (mouse 'x' and mouse 'y').
      *
      * @static
@@ -257,7 +257,7 @@ class MathUtility {
         }
     }
 
-   /**
+    /**
      * Returns a to the power of b.
      *
      * @static
@@ -290,7 +290,7 @@ class MathUtility {
         }
     }
 
-   /**
+    /**
      * Returns negative value (if number) or string in reverse (if string).
      *
      * @static
@@ -326,4 +326,4 @@ class MathUtility {
     }
 }
 // Ensure mathutils.js exports the MathUtility class
-module.exports = MathUtility;
+module.exports = MathUtility;