From 5301d86bbf01636ba288d2f86e133dfb60920dd3 Mon Sep 17 00:00:00 2001 From: Khaliun Baatarkhuu Date: Thu, 18 Jun 2026 12:39:20 +0100 Subject: [PATCH 1/8] Implement getAngleType function with tests Implemented the getAngleType function to classify angles and added tests for various angle types. --- .../implement/1-get-angle-type.js | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/Sprint-3/1-implement-and-rewrite-tests/implement/1-get-angle-type.js b/Sprint-3/1-implement-and-rewrite-tests/implement/1-get-angle-type.js index 9e05a871e2..82acf7a7fe 100644 --- a/Sprint-3/1-implement-and-rewrite-tests/implement/1-get-angle-type.js +++ b/Sprint-3/1-implement-and-rewrite-tests/implement/1-get-angle-type.js @@ -1,29 +1,20 @@ -// Implement a function getAngleType -// -// When given an angle in degrees, it should return a string indicating the type of angle: -// - "Acute angle" for angles greater than 0° and less than 90° -// - "Right angle" for exactly 90° -// - "Obtuse angle" for angles greater than 90° and less than 180° -// - "Straight angle" for exactly 180° -// - "Reflex angle" for angles greater than 180° and less than 360° -// - "Invalid angle" for angles outside the valid range. - -// Assumption: The parameter is a valid number. (You do not need to handle non-numeric inputs.) - -// Acceptance criteria: -// After you have implemented the function, write tests to cover all the cases, and -// execute the code to ensure all tests pass. function getAngleType(angle) { - // TODO: Implement this function + if (angle > 0 && angle < 90) { + return "Acute angle"; + } else if (angle === 90) { + return "Right angle"; + } else if (angle > 90 && angle < 180) { + return "Obtuse angle"; + } else if (angle === 180) { + return "Straight angle"; + } else if (angle > 180 && angle < 360) { + return "Reflex angle"; + } else { + return "Invalid angle"; + } } -// The line below allows us to load the getAngleType function into tests in other files. -// This will be useful in the "rewrite tests with jest" step. -module.exports = getAngleType; - -// This helper function is written to make our assertions easier to read. -// If the actual output matches the target output, the test will pass function assertEquals(actualOutput, targetOutput) { console.assert( actualOutput === targetOutput, @@ -31,7 +22,16 @@ function assertEquals(actualOutput, targetOutput) { ); } -// TODO: Write tests to cover all cases, including boundary and invalid cases. -// Example: Identify Right Angles -const right = getAngleType(90); -assertEquals(right, "Right angle"); +assertEquals(getAngleType(45), "Acute angle"); +assertEquals(getAngleType(90), "Right angle"); +assertEquals(getAngleType(120), "Obtuse angle"); +assertEquals(getAngleType(180), "Straight angle"); +assertEquals(getAngleType(270), "Reflex angle"); +assertEquals(getAngleType(360), "Invalid angle"); + +console.log("All tests finished"); + + + + + From cc9fd1040bc28a41f2e250401dd948747cbc8ff6 Mon Sep 17 00:00:00 2001 From: Khaliun Baatarkhuu Date: Thu, 18 Jun 2026 13:28:31 +0100 Subject: [PATCH 2/8] Enhance angle type tests in 1-get-angle-type.js Added additional tests for angle types including acute, right, obtuse, straight, reflex, and invalid angles. --- .../implement/1-get-angle-type.js | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/Sprint-3/1-implement-and-rewrite-tests/implement/1-get-angle-type.js b/Sprint-3/1-implement-and-rewrite-tests/implement/1-get-angle-type.js index 82acf7a7fe..be31221c6f 100644 --- a/Sprint-3/1-implement-and-rewrite-tests/implement/1-get-angle-type.js +++ b/Sprint-3/1-implement-and-rewrite-tests/implement/1-get-angle-type.js @@ -31,6 +31,30 @@ assertEquals(getAngleType(360), "Invalid angle"); console.log("All tests finished"); +//I have written some tests, passed them all on Devtools. Wrote some more below. + + +const acute = getAngleType(45); +assertEquals(acute, "Acute angle"); +const right = getAngleType(90); +assertEquals(right, "Right angle"); +const obtuse = getAngleType(120); +assertEquals(obtuse, "Obtuse angle"); +const straight = getAngleType(180); +assertEquals(straight, "Straight angle"); +const reflex = getAngleType(270); +assertEquals(reflex, "Reflex angle"); +const zero = getAngleType(0); +assertEquals(zero, "Invalid angle"); +const negative = getAngleType(-10); +assertEquals(negative, "Invalid angle"); +const fullTurn = getAngleType(360); +assertEquals(fullTurn, "Invalid angle"); +const tooLarge = getAngleType(400); +assertEquals(tooLarge, "Invalid angle"); + +console.log("All tests finished"); + From 97e20bec5b3018f505b8ead34bda91315b9e09d6 Mon Sep 17 00:00:00 2001 From: Khaliun Baatarkhuu Date: Thu, 18 Jun 2026 13:41:29 +0100 Subject: [PATCH 3/8] Implement isProperFraction function with tests Implemented the isProperFraction function and added tests for various cases. --- .../implement/2-is-proper-fraction.js | 30 ++++++------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/Sprint-3/1-implement-and-rewrite-tests/implement/2-is-proper-fraction.js b/Sprint-3/1-implement-and-rewrite-tests/implement/2-is-proper-fraction.js index 970cb9b641..b9d4736487 100644 --- a/Sprint-3/1-implement-and-rewrite-tests/implement/2-is-proper-fraction.js +++ b/Sprint-3/1-implement-and-rewrite-tests/implement/2-is-proper-fraction.js @@ -1,33 +1,21 @@ -// Implement a function isProperFraction, -// when given two numbers, a numerator and a denominator, it should return true if -// the given numbers form a proper fraction, and false otherwise. - -// Assumption: The parameters are valid numbers (not NaN or Infinity). - -// Note: If you are unfamiliar with proper fractions, please look up its mathematical definition. - -// Acceptance criteria: -// After you have implemented the function, write tests to cover all the cases, and -// execute the code to ensure all tests pass. function isProperFraction(numerator, denominator) { - // TODO: Implement this function + return numerator < denominator; } -// The line below allows us to load the isProperFraction function into tests in other files. -// This will be useful in the "rewrite tests with jest" step. -module.exports = isProperFraction; - -// Here's our helper again function assertEquals(actualOutput, targetOutput) { console.assert( actualOutput === targetOutput, `Expected ${actualOutput} to equal ${targetOutput}` ); } +assertEquals(isProperFraction(1, 2), true); +assertEquals(isProperFraction(3, 4), true); +assertEquals(isProperFraction(0, 5), true); -// TODO: Write tests to cover all cases. -// What combinations of numerators and denominators should you test? +assertEquals(isProperFraction(5, 5), false); -// Example: 1/2 is a proper fraction -assertEquals(isProperFraction(1, 2), true); +assertEquals(isProperFraction(7, 4), false); +assertEquals(isProperFraction(10, 3), false); + +console.log("All tests finished"); From 4b1e96a079ea1ea0fd22602a60de65735adfa17f Mon Sep 17 00:00:00 2001 From: Khaliun Baatarkhuu Date: Mon, 22 Jun 2026 19:38:41 +0100 Subject: [PATCH 4/8] Implement getCardValue function and add tests Implemented the getCardValue function to return the value of a card based on its rank and suit. Added assertions to test valid card values and handle errors for invalid cards. --- .../implement/3-get-card-value.js | 45 ++++++++++++++----- 1 file changed, 35 insertions(+), 10 deletions(-) diff --git a/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js b/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js index ff5c532e1d..4a408bd6fb 100644 --- a/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js +++ b/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js @@ -22,26 +22,51 @@ // execute the code to ensure all tests pass. function getCardValue(card) { - // TODO: Implement this function -} + const suits = ["♠", "♥", "♦", "♣"]; + + const values = { + A: 11, + J: 10, + Q: 10, + K: 10, + 2: 2, + 3: 3, + 4: 4, + 5: 5, + 6: 6, + 7: 7, + 8: 8, + 9: 9, + 10: 10, + }; + + const suit = card.slice(-1); + const rank = card.slice(0, -1); -// The line below allows us to load the getCardValue function into tests in other files. -// This will be useful in the "rewrite tests with jest" step. -module.exports = getCardValue; + if (!suits.includes(suit) || !(rank in values)) { + throw new Error("Invalid card"); + } + + return values[rank]; +} -// Helper functions to make our assertions easier to read. function assertEquals(actualOutput, targetOutput) { console.assert( actualOutput === targetOutput, `Expected ${actualOutput} to equal ${targetOutput}` ); } +assertEquals(getCardValue("A♠"), 11); +assertEquals(getCardValue("2♥"), 2); +assertEquals(getCardValue("9♣"), 9); +assertEquals(getCardValue("10♦"), 10); +assertEquals(getCardValue("J♠"), 10); +assertEquals(getCardValue("Q♥"), 10); +assertEquals(getCardValue("K♣"), 10); + +console.log("All valid card tests passed"); -// TODO: Write tests to cover all outcomes, including throwing errors for invalid cards. -// Examples: -assertEquals(getCardValue("9♠"), 9); -// Handling invalid cards try { getCardValue("invalid"); From a5c8e7dd046a285e8eb972acdf2c8b979521d3e2 Mon Sep 17 00:00:00 2001 From: Khaliun Baatarkhuu Date: Thu, 2 Jul 2026 09:39:28 +0100 Subject: [PATCH 5/8] Enhance tests for invalid card values Added additional test cases for invalid card values to ensure proper error handling. --- .../implement/3-get-card-value.js | 42 ++++++++++++++++--- 1 file changed, 37 insertions(+), 5 deletions(-) diff --git a/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js b/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js index 4a408bd6fb..170e61a74d 100644 --- a/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js +++ b/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js @@ -66,14 +66,46 @@ assertEquals(getCardValue("K♣"), 10); console.log("All valid card tests passed"); +// What other invalid card cases can you think of? try { - getCardValue("invalid"); + getCardValue("1♠"); + console.error("Error was not thrown for 1♠ 😢"); +} catch (e) { + console.log("Error thrown for 1♠ 🎉"); +} - // This line will not be reached if an error is thrown as expected - console.error("Error was not thrown for invalid card 😢"); +try { + getCardValue("11♠"); + console.error("Error was not thrown for 11♠ 😢"); } catch (e) { - console.log("Error thrown for invalid card 🎉"); + console.log("Error thrown for 11♠ 🎉"); } -// What other invalid card cases can you think of? +try { + getCardValue("A"); + console.error("Error was not thrown for A 😢"); +} catch (e) { + console.log("Error thrown for A 🎉"); +} + +try { + getCardValue("♠"); + console.error("Error was not thrown for ♠ 😢"); +} catch (e) { + console.log("Error thrown for ♠ 🎉"); +} + +try { + getCardValue("KH"); + console.error("Error was not thrown for KH 😢"); +} catch (e) { + console.log("Error thrown for KH 🎉"); +} + +try { + getCardValue(""); + console.error("Error was not thrown for empty string 😢"); +} catch (e) { + console.log("Error thrown for empty string 🎉"); +} From 567134846a5bf07483d9c0c3245ef91845cb83ad Mon Sep 17 00:00:00 2001 From: Khaliun Baatarkhuu Date: Thu, 2 Jul 2026 09:42:17 +0100 Subject: [PATCH 6/8] Rewrite tests for getAngleType using Jest --- .../1-get-angle-type.test.js | 35 ++++++++++++++----- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/1-get-angle-type.test.js b/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/1-get-angle-type.test.js index d777f348d3..15e40caa27 100644 --- a/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/1-get-angle-type.test.js +++ b/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/1-get-angle-type.test.js @@ -1,20 +1,39 @@ -// This statement loads the getAngleType function you wrote in the implement directory. -// We will use the same function, but write tests for it using Jest in this file. -const getAngleType = require("../implement/1-get-angle-type"); - -// TODO: Write tests in Jest syntax to cover all cases/outcomes, -// including boundary and invalid cases. // Case 1: Acute angles -test(`should return "Acute angle" when (0 < angle < 90)`, () => { - // Test various acute angles, including boundary cases +test('should return "Acute angle" when (0 < angle < 90)', () => { expect(getAngleType(1)).toEqual("Acute angle"); expect(getAngleType(45)).toEqual("Acute angle"); expect(getAngleType(89)).toEqual("Acute angle"); }); // Case 2: Right angle +test('should return "Right angle" when angle is 90', () => { + expect(getAngleType(90)).toEqual("Right angle"); +}); + // Case 3: Obtuse angles +test('should return "Obtuse angle" when (90 < angle < 180)', () => { + expect(getAngleType(91)).toEqual("Obtuse angle"); + expect(getAngleType(135)).toEqual("Obtuse angle"); + expect(getAngleType(179)).toEqual("Obtuse angle"); +}); + // Case 4: Straight angle +test('should return "Straight angle" when angle is 180', () => { + expect(getAngleType(180)).toEqual("Straight angle"); +}); + // Case 5: Reflex angles +test('should return "Reflex angle" when (180 < angle < 360)', () => { + expect(getAngleType(181)).toEqual("Reflex angle"); + expect(getAngleType(270)).toEqual("Reflex angle"); + expect(getAngleType(359)).toEqual("Reflex angle"); +}); + // Case 6: Invalid angles +test('should return "Invalid angle" for invalid values', () => { + expect(getAngleType(0)).toEqual("Invalid angle"); + expect(getAngleType(-1)).toEqual("Invalid angle"); + expect(getAngleType(360)).toEqual("Invalid angle"); + expect(getAngleType(361)).toEqual("Invalid angle"); +}); From 4ab6f5cf804e139edae82d7d2fc7b11437b4f11e Mon Sep 17 00:00:00 2001 From: Khaliun Baatarkhuu Date: Thu, 2 Jul 2026 09:44:02 +0100 Subject: [PATCH 7/8] Implement Jest tests for isProperFraction function Added comprehensive Jest tests for the isProperFraction function, covering special cases, positive and negative proper and improper fractions. --- .../2-is-proper-fraction.test.js | 40 +++++++++++++++---- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js b/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js index 7f087b2ba1..9788fa3aff 100644 --- a/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js +++ b/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js @@ -1,10 +1,36 @@ -// This statement loads the isProperFraction function you wrote in the implement directory. -// We will use the same function, but write tests for it using Jest in this file. -const isProperFraction = require("../implement/2-is-proper-fraction"); - -// TODO: Write tests in Jest syntax to cover all combinations of positives, negatives, zeros, and other categories. +// Special case: denominator is zero +test("should return false when denominator is zero", () => { + expect(isProperFraction(1, 0)).toEqual(false); +}); // Special case: numerator is zero -test(`should return false when denominator is zero`, () => { - expect(isProperFraction(1, 0)).toEqual(false); +test("should return true when numerator is zero and denominator is not zero", () => { + expect(isProperFraction(0, 5)).toEqual(true); + expect(isProperFraction(0, -5)).toEqual(true); +}); + +// Positive proper fractions +test("should return true for positive proper fractions", () => { + expect(isProperFraction(1, 2)).toEqual(true); + expect(isProperFraction(2, 5)).toEqual(true); +}); + +// Positive improper fractions +test("should return false for positive improper fractions", () => { + expect(isProperFraction(5, 2)).toEqual(false); + expect(isProperFraction(2, 2)).toEqual(false); +}); + +// Negative proper fractions +test("should return true for negative proper fractions", () => { + expect(isProperFraction(-1, 2)).toEqual(true); + expect(isProperFraction(1, -2)).toEqual(true); + expect(isProperFraction(-2, -5)).toEqual(true); +}); + +// Negative improper fractions +test("should return false for negative improper fractions", () => { + expect(isProperFraction(-5, 2)).toEqual(false); + expect(isProperFraction(5, -2)).toEqual(false); + expect(isProperFraction(-5, -2)).toEqual(false); }); From 390b39059a978fb6e279c928551c93741c6e273a Mon Sep 17 00:00:00 2001 From: Khaliun Baatarkhuu Date: Thu, 2 Jul 2026 09:45:43 +0100 Subject: [PATCH 8/8] Rewrite tests for getCardValue using Jest Updated test cases for getCardValue function to use Jest syntax, covering all card types including Aces, number cards, face cards, and invalid cards. --- .../3-get-card-value.test.js | 38 ++++++++++++------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js b/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js index cf7f9dae2e..9588e04aa7 100644 --- a/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js +++ b/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js @@ -1,20 +1,32 @@ -// This statement loads the getCardValue function you wrote in the implement directory. -// We will use the same function, but write tests for it using Jest in this file. -const getCardValue = require("../implement/3-get-card-value"); - -// TODO: Write tests in Jest syntax to cover all possible outcomes. // Case 1: Ace (A) -test(`Should return 11 when given an ace card`, () => { +test("should return 11 when given an ace card", () => { expect(getCardValue("A♠")).toEqual(11); }); -// Suggestion: Group the remaining test data into these categories: -// Number Cards (2-10) -// Face Cards (J, Q, K) -// Invalid Cards +// Case 2: Number cards (2-10) +test("should return the numeric value for number cards", () => { + expect(getCardValue("2♥")).toEqual(2); + expect(getCardValue("5♣")).toEqual(5); + expect(getCardValue("9♦")).toEqual(9); + expect(getCardValue("10♠")).toEqual(10); +}); -// To learn how to test whether a function throws an error as expected in Jest, -// please refer to the Jest documentation: -// https://jestjs.io/docs/expect#tothrowerror +// Case 3: Face cards (J, Q, K) +test("should return 10 for face cards", () => { + expect(getCardValue("J♠")).toEqual(10); + expect(getCardValue("Q♥")).toEqual(10); + expect(getCardValue("K♦")).toEqual(10); +}); + +// Case 4: Invalid cards +test("should throw an error for invalid cards", () => { + expect(() => getCardValue("invalid")).toThrow(); + expect(() => getCardValue("1♠")).toThrow(); + expect(() => getCardValue("11♠")).toThrow(); + expect(() => getCardValue("A")).toThrow(); + expect(() => getCardValue("♠")).toThrow(); + expect(() => getCardValue("KH")).toThrow(); + expect(() => getCardValue("")).toThrow(); +});