From 696bb42de90f0fc331685202d4f4c6350a4b89cb Mon Sep 17 00:00:00 2001 From: Farah-Stu Date: Fri, 27 Jun 2025 23:56:40 +0100 Subject: [PATCH 01/30] updating angle type.js --- Sprint-3/1-key-implement/1-get-angle-type.js | 21 +++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/Sprint-3/1-key-implement/1-get-angle-type.js b/Sprint-3/1-key-implement/1-get-angle-type.js index 08d1f0cba..64c1181ba 100644 --- a/Sprint-3/1-key-implement/1-get-angle-type.js +++ b/Sprint-3/1-key-implement/1-get-angle-type.js @@ -8,8 +8,13 @@ // Then, write the next test! :) Go through this process until all the cases are implemented function getAngleType(angle) { - if (angle === 90) return "Right angle"; - // read to the end, complete line 36, then pass your test here + if (angle === 90) return "Right angle"; + if (angle < 90) return "Acute angle"; + if (angle > 90 && angle < 180) return "Obtuse angle"; + if (angle === 180) return "Straight angle"; + if (angle > 180 && angle < 360) return "Reflex angle"; + + // read to the end, complete line 36, then pass your test here } // we're going to use this helper function to make our assertions easier to read @@ -42,15 +47,21 @@ assertEquals(acute, "Acute angle"); // Case 3: Identify Obtuse Angles: // When the angle is greater than 90 degrees and less than 180 degrees, // Then the function should return "Obtuse angle" -const obtuse = getAngleType(120); // ====> write your test here, and then add a line to pass the test in the function above +const obtuse = getAngleType(120); +assertEquals(obtuse, "Obtuse angle"); // Case 4: Identify Straight Angles: // When the angle is exactly 180 degrees, -// Then the function should return "Straight angle" +// Then the function should return "Straight angle"å // ====> write your test here, and then add a line to pass the test in the function above +const straight = getAngleType(180); +assertEquals(straight, "Straight angle"); // Case 5: Identify Reflex Angles: // When the angle is greater than 180 degrees and less than 360 degrees, // Then the function should return "Reflex angle" -// ====> write your test here, and then add a line to pass the test in the function above \ No newline at end of file +// ====> write your test here, and then add a line to pass the test in the function above +const reflex = getAngleType(260); +assertEquals(reflex, "Reflex angle"); +console.log(getAngleType); \ No newline at end of file From 4cc51068250ecf43cbec8c1e2be70f3bca3f6750 Mon Sep 17 00:00:00 2001 From: Farah-Stu Date: Fri, 27 Jun 2025 23:57:39 +0100 Subject: [PATCH 02/30] fixing the proper fraciton.js --- Sprint-3/1-key-implement/2-is-proper-fraction.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Sprint-3/1-key-implement/2-is-proper-fraction.js b/Sprint-3/1-key-implement/2-is-proper-fraction.js index 91583e941..ead332e03 100644 --- a/Sprint-3/1-key-implement/2-is-proper-fraction.js +++ b/Sprint-3/1-key-implement/2-is-proper-fraction.js @@ -8,7 +8,8 @@ // write one test at a time, and make it pass, build your solution up methodically function isProperFraction(numerator, denominator) { - if (numerator < denominator) return true; + return Math.abs(numerator) < Math.abs(denominator); +; } // here's our helper again @@ -41,6 +42,7 @@ assertEquals(improperFraction, false); // Explanation: The fraction -4/7 is a proper fraction because the absolute value of the numerator (4) is less than the denominator (7). The function should return true. const negativeFraction = isProperFraction(-4, 7); // ====> complete with your assertion +assertEquals(negativeFraction, true); // Equal Numerator and Denominator check: // Input: numerator = 3, denominator = 3 @@ -49,5 +51,9 @@ const negativeFraction = isProperFraction(-4, 7); const equalFraction = isProperFraction(3, 3); // ====> complete with your assertion +assertEquals(equalFraction, false); + // Stretch: // What other scenarios could you test for? +const bothNegative=isProperFraction(-8, -10); +assertEquals(bothNegative, true); From 22cab748279060cd2cc3f39e46928d9e5d0730cc Mon Sep 17 00:00:00 2001 From: Farah-Stu Date: Sat, 28 Jun 2025 12:13:17 +0100 Subject: [PATCH 03/30] updating card value --- Sprint-3/1-key-implement/3-get-card-value.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Sprint-3/1-key-implement/3-get-card-value.js b/Sprint-3/1-key-implement/3-get-card-value.js index aa1cc9f90..abd773f21 100644 --- a/Sprint-3/1-key-implement/3-get-card-value.js +++ b/Sprint-3/1-key-implement/3-get-card-value.js @@ -28,17 +28,23 @@ function assertEquals(actualOutput, targetOutput) { const aceofSpades = getCardValue("A♠"); assertEquals(aceofSpades, 11); + // Handle Number Cards (2-10): // Given a card with a rank between "2" and "9", // When the function is called with such a card, // Then it should return the numeric value corresponding to the rank (e.g., "5" should return 5). const fiveofHearts = getCardValue("5♥"); // ====> write your test here, and then add a line to pass the test in the function above +if(rank===) +assertEquals(fiveofHearts, 5); // Handle Face Cards (J, Q, K): // Given a card with a rank of "10," "J," "Q," or "K", // When the function is called with such a card, // Then it should return the value 10, as these cards are worth 10 points each in blackjack. +const faceCards= getCardValue(J,Q,K); +assertEquals(faceCards, 10); +console.log(J,Q,K) // Handle Ace (A): // Given a card with a rank of "A", From ed21e9db3cc34df7e8f61efefa2fc4715c58b6ea Mon Sep 17 00:00:00 2001 From: Farah-Stu Date: Sat, 28 Jun 2025 12:13:40 +0100 Subject: [PATCH 04/30] update card value --- Sprint-3/1-key-implement/3-get-card-value.js | 29 ++++++++++++++++---- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/Sprint-3/1-key-implement/3-get-card-value.js b/Sprint-3/1-key-implement/3-get-card-value.js index abd773f21..cdbc40a56 100644 --- a/Sprint-3/1-key-implement/3-get-card-value.js +++ b/Sprint-3/1-key-implement/3-get-card-value.js @@ -8,7 +8,13 @@ // write one test at a time, and make it pass, build your solution up methodically // just make one change at a time -- don't rush -- programmers are deep and careful thinkers function getCardValue(card) { - if (rank === "A") return 11; + const rank = card[0]; + if (rank === "A") return 11; + + if (["J", "Q", "K"].includes(rank)) return 10; + const number = Number(rank); + if (number >= 2 && number <= 10) return number; + throw new Error("Invalid card rank"); } // You need to write assertions for your function to check it works in different cases @@ -28,30 +34,41 @@ function assertEquals(actualOutput, targetOutput) { const aceofSpades = getCardValue("A♠"); assertEquals(aceofSpades, 11); - // Handle Number Cards (2-10): // Given a card with a rank between "2" and "9", // When the function is called with such a card, // Then it should return the numeric value corresponding to the rank (e.g., "5" should return 5). const fiveofHearts = getCardValue("5♥"); // ====> write your test here, and then add a line to pass the test in the function above -if(rank===) assertEquals(fiveofHearts, 5); // Handle Face Cards (J, Q, K): // Given a card with a rank of "10," "J," "Q," or "K", // When the function is called with such a card, // Then it should return the value 10, as these cards are worth 10 points each in blackjack. -const faceCards= getCardValue(J,Q,K); -assertEquals(faceCards, 10); -console.log(J,Q,K) +const JackOfDiamonds = getCardValue("J♦"); +assertEquals(JackOfDiamonds, 10); + +const QueenOfClubs = getCardValue("Q♣"); +assertEquals(QueenOfClubs, 10); + +const KingOfSpades = getCardValue("K♠"); +assertEquals(KingOfSpades, 10); // Handle Ace (A): // Given a card with a rank of "A", // When the function is called with an Ace, // Then it should, by default, assume the Ace is worth 11 points, which is a common rule in blackjack. +const Ace = getCardValue("A♠"); +assertEquals(Ace, 11); // Handle Invalid Cards: // Given a card with an invalid rank (neither a number nor a recognized face card), // When the function is called with such a card, // Then it should throw an error indicating "Invalid card rank." + +try { + getCardValue("Z♣"); +} catch (error) { + assertEquals(error.message, "Invalid card rank"); +} From 4d9bc3bcd312ce5bd8fca33886d83dd148307e55 Mon Sep 17 00:00:00 2001 From: Farah-Stu Date: Sat, 28 Jun 2025 14:20:09 +0100 Subject: [PATCH 05/30] update angle type.test --- .../2-mandatory-rewrite/1-get-angle-type.test.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Sprint-3/2-mandatory-rewrite/1-get-angle-type.test.js b/Sprint-3/2-mandatory-rewrite/1-get-angle-type.test.js index b62827b7c..7ed0b0a36 100644 --- a/Sprint-3/2-mandatory-rewrite/1-get-angle-type.test.js +++ b/Sprint-3/2-mandatory-rewrite/1-get-angle-type.test.js @@ -10,15 +10,25 @@ test("should identify right angle (90°)", () => { // Case 2: Identify Acute Angles: // When the angle is less than 90 degrees, // Then the function should return "Acute angle" +test("should identify acute angle (<90°)", () => { + expect(getAngleType(45)).toEqual("Acute angle"); +}); // Case 3: Identify Obtuse Angles: // When the angle is greater than 90 degrees and less than 180 degrees, // Then the function should return "Obtuse angle" - +test("should identify obtuse angle(<90° and <180°)", () => { + expect(getAngleType(120)).toEqual("Obtuse angle"); +}); // Case 4: Identify Straight Angles: // When the angle is exactly 180 degrees, // Then the function should return "Straight angle" - +test("should identify straight angle (180°)", () => { + expect(getAngleType(180)).toEqual("Straight angle"); +}); // Case 5: Identify Reflex Angles: // When the angle is greater than 180 degrees and less than 360 degrees, // Then the function should return "Reflex angle" +test("should identify reflex angle (>180° and <360°)", () => { + expect(getAngleType(260)).toEqual("Reflex angle"); +}); From 8f7c8a632ea66cba159499ba9f8ff6f1e846ac34 Mon Sep 17 00:00:00 2001 From: Farah-Stu Date: Sat, 28 Jun 2025 14:42:58 +0100 Subject: [PATCH 06/30] adding assertEqual line --- Sprint-3/1-key-implement/2-is-proper-fraction.js | 1 - Sprint-3/2-mandatory-rewrite/1-get-angle-type.js | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Sprint-3/1-key-implement/2-is-proper-fraction.js b/Sprint-3/1-key-implement/2-is-proper-fraction.js index ead332e03..de8ba65a8 100644 --- a/Sprint-3/1-key-implement/2-is-proper-fraction.js +++ b/Sprint-3/1-key-implement/2-is-proper-fraction.js @@ -50,7 +50,6 @@ assertEquals(negativeFraction, true); // Explanation: The fraction 3/3 is not a proper fraction because the numerator is equal to the denominator. The function should return false. const equalFraction = isProperFraction(3, 3); // ====> complete with your assertion - assertEquals(equalFraction, false); // Stretch: diff --git a/Sprint-3/2-mandatory-rewrite/1-get-angle-type.js b/Sprint-3/2-mandatory-rewrite/1-get-angle-type.js index d61254bd7..7b0127ef5 100644 --- a/Sprint-3/2-mandatory-rewrite/1-get-angle-type.js +++ b/Sprint-3/2-mandatory-rewrite/1-get-angle-type.js @@ -1,6 +1,10 @@ function getAngleType(angle) { if (angle === 90) return "Right angle"; // replace with your completed function from key-implement +if (angle < 90) return "Acute angle"; + if (angle > 90 && angle < 180) return "Obtuse angle"; + if (angle === 180) return "Straight angle"; + if (angle > 180 && angle < 360) return "Reflex angle"; } From 27e36c541ba5be406349b0492d07460843260376 Mon Sep 17 00:00:00 2001 From: Farah-Stu Date: Sun, 29 Jun 2025 21:00:03 +0100 Subject: [PATCH 07/30] updating proper fraction file --- Sprint-3/1-key-implement/2-is-proper-fraction.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Sprint-3/1-key-implement/2-is-proper-fraction.js b/Sprint-3/1-key-implement/2-is-proper-fraction.js index de8ba65a8..e8e472fa6 100644 --- a/Sprint-3/1-key-implement/2-is-proper-fraction.js +++ b/Sprint-3/1-key-implement/2-is-proper-fraction.js @@ -9,7 +9,6 @@ function isProperFraction(numerator, denominator) { return Math.abs(numerator) < Math.abs(denominator); -; } // here's our helper again @@ -54,5 +53,5 @@ assertEquals(equalFraction, false); // Stretch: // What other scenarios could you test for? -const bothNegative=isProperFraction(-8, -10); +const bothNegative = isProperFraction(-8, -10); assertEquals(bothNegative, true); From a97c923a8a5b32e295e3fe1789de5853fbbd2cf8 Mon Sep 17 00:00:00 2001 From: Farah-Stu Date: Sun, 29 Jun 2025 21:00:27 +0100 Subject: [PATCH 08/30] updating the file --- Sprint-3/2-mandatory-rewrite/2-is-proper-fraction.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Sprint-3/2-mandatory-rewrite/2-is-proper-fraction.js b/Sprint-3/2-mandatory-rewrite/2-is-proper-fraction.js index 9836fe398..e41c5b5f1 100644 --- a/Sprint-3/2-mandatory-rewrite/2-is-proper-fraction.js +++ b/Sprint-3/2-mandatory-rewrite/2-is-proper-fraction.js @@ -1,6 +1,5 @@ function isProperFraction(numerator, denominator) { - if (numerator < denominator) return true; - // add your completed function from key-implement here + return Math.abs(numerator) < Math.abs(denominator); } -module.exports = isProperFraction; \ No newline at end of file +module.exports = isProperFraction; From cc9d7dcbbf65d689d9e62087053ce69350455ef0 Mon Sep 17 00:00:00 2001 From: Farah-Stu Date: Sun, 29 Jun 2025 21:00:53 +0100 Subject: [PATCH 09/30] updating the proper fraction test file --- .../2-is-proper-fraction.test.js | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/Sprint-3/2-mandatory-rewrite/2-is-proper-fraction.test.js b/Sprint-3/2-mandatory-rewrite/2-is-proper-fraction.test.js index ff1cc8173..d44d23545 100644 --- a/Sprint-3/2-mandatory-rewrite/2-is-proper-fraction.test.js +++ b/Sprint-3/2-mandatory-rewrite/2-is-proper-fraction.test.js @@ -1,11 +1,21 @@ const isProperFraction = require("./2-is-proper-fraction"); -test("should return true for a proper fraction", () => { - expect(isProperFraction(2, 3)).toEqual(true); + +test("should return false for improper fraction (5/2)", () => { + expect(isProperFraction(5, 2)).toEqual(false); +}); + + +test("should return true for negative proper fraction (-4/7)", () => { + expect(isProperFraction(-4, 7)).toEqual(true); }); -// Case 2: Identify Improper Fractions: -// Case 3: Identify Negative Fractions: +test("should return false for equal numerator and denominator (3/3)", () => { + expect(isProperFraction(3, 3)).toEqual(false); +}); + -// Case 4: Identify Equal Numerator and Denominator: +test("should return true for both negative proper fraction (-8/-10)", () => { + expect(isProperFraction(-8, -10)).toEqual(true); +}); \ No newline at end of file From bfee29986b323befeaa22105559e6aee64abbcbc Mon Sep 17 00:00:00 2001 From: Farah-Stu Date: Mon, 30 Jun 2025 00:33:08 +0100 Subject: [PATCH 10/30] updating card file --- Sprint-3/2-mandatory-rewrite/3-get-card-value.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Sprint-3/2-mandatory-rewrite/3-get-card-value.js b/Sprint-3/2-mandatory-rewrite/3-get-card-value.js index 0d95d3736..af3bf2265 100644 --- a/Sprint-3/2-mandatory-rewrite/3-get-card-value.js +++ b/Sprint-3/2-mandatory-rewrite/3-get-card-value.js @@ -1,5 +1,10 @@ function getCardValue(card) { - // replace with your code from key-implement - return 11; + const rank = card; + + if (rank === "A") return 11; + if (["J", "Q", "K"].includes(rank)) return 10; + const number = Number(rank); + if (number >= 2 && number <= 10) return number; + throw new Error("Invalid card rank"); } -module.exports = getCardValue; \ No newline at end of file +module.exports = getCardValue; From 8f9221ad273a0e58ff2b807cae98605899484451 Mon Sep 17 00:00:00 2001 From: Farah-Stu Date: Mon, 30 Jun 2025 00:33:24 +0100 Subject: [PATCH 11/30] updating card test file --- .../3-get-card-value.test.js | 29 ++++++++++++++++--- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/Sprint-3/2-mandatory-rewrite/3-get-card-value.test.js b/Sprint-3/2-mandatory-rewrite/3-get-card-value.test.js index 03a8e2f34..41e0ef564 100644 --- a/Sprint-3/2-mandatory-rewrite/3-get-card-value.test.js +++ b/Sprint-3/2-mandatory-rewrite/3-get-card-value.test.js @@ -1,11 +1,32 @@ const getCardValue = require("./3-get-card-value"); -test("should return 11 for Ace of Spades", () => { - const aceofSpades = getCardValue("A♠"); - expect(aceofSpades).toEqual(11); - }); + // Case 2: Handle Number Cards (2-10): +test("should return number for number cards (2-10)",() => { + expect(getCardValue("2")).toEqual (2); + expect(getCardValue("10")).toEqual(10); +}); // Case 3: Handle Face Cards (J, Q, K): +test("should return 10 for Jack of Diamonds", () => { + expect(getCardValue ("J")).toEqual(10); +}); + +test("should return 10 for Queen of Clubs", () => { + expect(getCardValue("Q")).toEqual(10); +}); + +test("should return 10 for King of Spades", () => { + expect(getCardValue("K")).toEqual(10); +}); + // Case 4: Handle Ace (A): +test("should return 11 for Ace", () => { + expect(getCardValue("A")).toEqual(11); +}); + // Case 5: Handle Invalid Cards: +test("should throw error for invalid card rank", () => { + expect(() => getCardValue("L")).toThrow(new Error("Invalid card rank")); +}); + From d6a385ff05e4a2de4488929c247e7a12c4983a5a Mon Sep 17 00:00:00 2001 From: Farah-Stu Date: Mon, 30 Jun 2025 22:34:17 +0100 Subject: [PATCH 12/30] update count file --- Sprint-3/3-mandatory-practice/implement/count.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Sprint-3/3-mandatory-practice/implement/count.js b/Sprint-3/3-mandatory-practice/implement/count.js index fce249650..708c4d093 100644 --- a/Sprint-3/3-mandatory-practice/implement/count.js +++ b/Sprint-3/3-mandatory-practice/implement/count.js @@ -1,5 +1,12 @@ function countChar(stringOfCharacters, findCharacter) { - return 5 + let count = 0; + for (let i = 0; i < stringOfCharacters.length; i++) { + if (stringOfCharacters[i] === findCharacter) { + count++; + } + } + return count; } + module.exports = countChar; \ No newline at end of file From 0c51d93c748f4dfde34c9e8727bee8d7060effb6 Mon Sep 17 00:00:00 2001 From: Farah-Stu Date: Mon, 30 Jun 2025 22:34:36 +0100 Subject: [PATCH 13/30] update count.test.js --- .../3-mandatory-practice/implement/count.test.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Sprint-3/3-mandatory-practice/implement/count.test.js b/Sprint-3/3-mandatory-practice/implement/count.test.js index 42baf4b4b..892e1b843 100644 --- a/Sprint-3/3-mandatory-practice/implement/count.test.js +++ b/Sprint-3/3-mandatory-practice/implement/count.test.js @@ -3,6 +3,12 @@ const countChar = require("./count"); // Given a string str and a single character char to search for, // When the countChar function is called with these inputs, // Then it should: +test("should count occurrences of a character in a string", () => { + const str = "coding is fun"; + const char = "i"; + const count = countChar(str, char); + expect(count).toEqual(2); +}); // Scenario: Multiple Occurrences // Given the input string str, @@ -22,3 +28,10 @@ test("should count multiple occurrences of a character", () => { // And a character char that does not exist within the case-sensitive str, // When the function is called with these inputs, // Then it should return 0, indicating that no occurrences of the char were found in the case-sensitive str. + +test("should return 0 when no occurrences of a character are found", () => { + const str = "good morning"; + const char = "l"; + const count = countChar(str, char); + expect(count).toEqual(0); +}); From 9c6607c586e884e498710be4d18e3a2ce8fc8913 Mon Sep 17 00:00:00 2001 From: Farah-Stu Date: Tue, 1 Jul 2025 00:06:55 +0100 Subject: [PATCH 14/30] updating ordinal num file --- .../implement/get-ordinal-number.js | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/Sprint-3/3-mandatory-practice/implement/get-ordinal-number.js b/Sprint-3/3-mandatory-practice/implement/get-ordinal-number.js index 24f528b0d..22aedfc4c 100644 --- a/Sprint-3/3-mandatory-practice/implement/get-ordinal-number.js +++ b/Sprint-3/3-mandatory-practice/implement/get-ordinal-number.js @@ -1,5 +1,25 @@ function getOrdinalNumber(num) { - return "1st"; + const strNum= num.toString(); + if(strNum.slice(-2)==="11") { + return strNum + "th"; + } +if(strNum.slice(-2)==="12") { + return strNum + "th"; + } +if(strNum.slice(-2)==="13") { + return strNum + "th"; + } +if(strNum.slice(-1)==="1") { + return strNum + "st"; + } +if(strNum.slice(-1)==="2") { + return strNum + "nd"; + } +if(strNum.slice(-1)==="3") { + return strNum + "rd"; + } + } -module.exports = getOrdinalNumber; \ No newline at end of file + +module.exports = getOrdinalNumber; From da6f74fe569a5fc7a2050dcb51509ddb31763dae Mon Sep 17 00:00:00 2001 From: Farah-Stu Date: Tue, 1 Jul 2025 00:07:11 +0100 Subject: [PATCH 15/30] update ordinal num file test --- .../implement/get-ordinal-number.test.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Sprint-3/3-mandatory-practice/implement/get-ordinal-number.test.js b/Sprint-3/3-mandatory-practice/implement/get-ordinal-number.test.js index 6d55dfbb4..4e39d43a7 100644 --- a/Sprint-3/3-mandatory-practice/implement/get-ordinal-number.test.js +++ b/Sprint-3/3-mandatory-practice/implement/get-ordinal-number.test.js @@ -11,3 +11,15 @@ const getOrdinalNumber = require("./get-ordinal-number"); test("should return '1st' for 1", () => { expect(getOrdinalNumber(1)).toEqual("1st"); }); + + test("should return '2nd' for 2", () => { + expect(getOrdinalNumber(2)).toEqual("2nd"); + }); + + test("should return '23rd' for 23", () => { + expect(getOrdinalNumber(23)).toEqual("23rd"); + }); + + test("should return '11th' for 11", () => { + expect(getOrdinalNumber(11)).toEqual("11th"); + }); From b15ce672adbd1a833a283caf0794ab481506853d Mon Sep 17 00:00:00 2001 From: Farah-Stu Date: Tue, 1 Jul 2025 00:51:04 +0100 Subject: [PATCH 16/30] update repeat file --- Sprint-3/3-mandatory-practice/implement/repeat.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Sprint-3/3-mandatory-practice/implement/repeat.js b/Sprint-3/3-mandatory-practice/implement/repeat.js index 621f9bd35..73bbbd589 100644 --- a/Sprint-3/3-mandatory-practice/implement/repeat.js +++ b/Sprint-3/3-mandatory-practice/implement/repeat.js @@ -1,5 +1,9 @@ -function repeat() { - return "hellohellohello"; +function repeat(str, count) { + if (count < 0){ + throw new Error("throw an error as negative counts are not valid"); + } + return str.repeat(count); } -module.exports = repeat; \ No newline at end of file + +module.exports = repeat; From 401a0d1ee087df21bcb9271e2f317dececf522f2 Mon Sep 17 00:00:00 2001 From: Farah-Stu Date: Tue, 1 Jul 2025 00:51:22 +0100 Subject: [PATCH 17/30] update repeat test file --- .../implement/repeat.test.js | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/Sprint-3/3-mandatory-practice/implement/repeat.test.js b/Sprint-3/3-mandatory-practice/implement/repeat.test.js index 8a4ab42ef..2726c5f25 100644 --- a/Sprint-3/3-mandatory-practice/implement/repeat.test.js +++ b/Sprint-3/3-mandatory-practice/implement/repeat.test.js @@ -3,12 +3,19 @@ const repeat = require("./repeat"); // Given a target string str and a positive integer count, // When the repeat function is called with these inputs, // Then it should: +test("should return positive integer count", () => { + const str = "hello"; + const count = 3; + const repeatedStr=repeat(str,count); + expect(repeatedStr).toEqual("hellohellohello"); +}); // case: repeat String: // Given a target string str and a positive integer count, // When the repeat function is called with these inputs, // Then it should repeat the str count times and return a new string containing the repeated str values. + test("should repeat the string count times", () => { const str = "hello"; const count = 3; @@ -20,13 +27,31 @@ test("should repeat the string count times", () => { // Given a target string str and a count equal to 1, // When the repeat function is called with these inputs, // Then it should return the original str without repetition, ensuring that a count of 1 results in no repetition. +test("should return a target string when count equals 1", () => { + const str = "hello"; + const count = 1; + const repeatedStr = repeat(str, count); + expect(repeatedStr).toEqual("hello"); + }); // case: Handle Count of 0: // Given a target string str and a count equal to 0, // When the repeat function is called with these inputs, // Then it should return an empty string, ensuring that a count of 0 results in an empty output. +test("should return target string when count equals 0", () => { + const str = "hello"; + const count = 0; + const repeatedStr = repeat(str, count); + expect(repeatedStr).toEqual(""); +}); // case: Negative Count: // Given a target string str and a negative integer count, // When the repeat function is called with these inputs, // Then it should throw an error or return an appropriate error message, as negative counts are not valid. +test("should throw an error as negative integer counts are not valid", () => { + const str= "hello"; + const count= -3; + expect(() => repeat(str, count)).toThrow("throw an error as negative counts are not valid"); +}); + From d25287fc282c4b2b134c93c82810963aee83bd6f Mon Sep 17 00:00:00 2001 From: Farah-Stu Date: Fri, 11 Jul 2025 16:00:01 +0100 Subject: [PATCH 18/30] updating and returnig a valid message to the function --- Sprint-3/2-mandatory-rewrite/1-get-angle-type.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Sprint-3/2-mandatory-rewrite/1-get-angle-type.js b/Sprint-3/2-mandatory-rewrite/1-get-angle-type.js index 7b0127ef5..56123a202 100644 --- a/Sprint-3/2-mandatory-rewrite/1-get-angle-type.js +++ b/Sprint-3/2-mandatory-rewrite/1-get-angle-type.js @@ -1,12 +1,16 @@ function getAngleType(angle) { + if (angle<= 0 || angle >= 360) { + return "invalid angle"; + } + if (angle === 90) return "Right angle"; // replace with your completed function from key-implement -if (angle < 90) return "Acute angle"; +if (angle > 0 && angle < 90) return "Acute angle"; if (angle > 90 && angle < 180) return "Obtuse angle"; if (angle === 180) return "Straight angle"; if (angle > 180 && angle < 360) return "Reflex angle"; + } -} From ea3514b08107b502fa185c36a7d1b2a8cb43388e Mon Sep 17 00:00:00 2001 From: Farah-Stu Date: Fri, 11 Jul 2025 16:00:15 +0100 Subject: [PATCH 19/30] returning a valid message to the code --- Sprint-3/2-mandatory-rewrite/1-get-angle-type.test.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Sprint-3/2-mandatory-rewrite/1-get-angle-type.test.js b/Sprint-3/2-mandatory-rewrite/1-get-angle-type.test.js index 7ed0b0a36..9a73649c4 100644 --- a/Sprint-3/2-mandatory-rewrite/1-get-angle-type.test.js +++ b/Sprint-3/2-mandatory-rewrite/1-get-angle-type.test.js @@ -1,5 +1,12 @@ const getAngleType = require("./1-get-angle-type"); +// Test cases for invalid angles + test("should return invalid angle for angles <=0 or angle >=360", ()=> { + expect(getAngleType(0)).toEqual("invalid angle"); + expect(getAngleType(360)).toEqual("invalid angle"); + }); + + test("should identify right angle (90°)", () => { expect(getAngleType(90)).toEqual("Right angle"); }); From 22db2cc8b0c3eb0f7805256310d878d882611e89 Mon Sep 17 00:00:00 2001 From: Farah-Stu Date: Fri, 11 Jul 2025 20:56:41 +0100 Subject: [PATCH 20/30] matching the description in the test file --- Sprint-3/3-mandatory-practice/implement/repeat.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sprint-3/3-mandatory-practice/implement/repeat.test.js b/Sprint-3/3-mandatory-practice/implement/repeat.test.js index 2726c5f25..5924edc3d 100644 --- a/Sprint-3/3-mandatory-practice/implement/repeat.test.js +++ b/Sprint-3/3-mandatory-practice/implement/repeat.test.js @@ -38,7 +38,7 @@ test("should return a target string when count equals 1", () => { // Given a target string str and a count equal to 0, // When the repeat function is called with these inputs, // Then it should return an empty string, ensuring that a count of 0 results in an empty output. -test("should return target string when count equals 0", () => { +test("should return empt string when count equals 0", () => { const str = "hello"; const count = 0; const repeatedStr = repeat(str, count); From 77294d933e7fbcdcf266cc5fddd227d5640f1f2f Mon Sep 17 00:00:00 2001 From: Farah-Stu Date: Fri, 11 Jul 2025 22:20:32 +0100 Subject: [PATCH 21/30] updating --- Sprint-3/2-mandatory-rewrite/3-get-card-value.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Sprint-3/2-mandatory-rewrite/3-get-card-value.js b/Sprint-3/2-mandatory-rewrite/3-get-card-value.js index af3bf2265..2a84bab64 100644 --- a/Sprint-3/2-mandatory-rewrite/3-get-card-value.js +++ b/Sprint-3/2-mandatory-rewrite/3-get-card-value.js @@ -8,3 +8,5 @@ function getCardValue(card) { throw new Error("Invalid card rank"); } module.exports = getCardValue; +const value= getCardValue("A"); +console.log(typeof value==="number"); \ No newline at end of file From 6c4aa13170c06559c4b09bd650606fbf4907cb47 Mon Sep 17 00:00:00 2001 From: Farah-Stu Date: Fri, 11 Jul 2025 22:21:34 +0100 Subject: [PATCH 22/30] updating and testing numbers --- .../implement/get-ordinal-number.test.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Sprint-3/3-mandatory-practice/implement/get-ordinal-number.test.js b/Sprint-3/3-mandatory-practice/implement/get-ordinal-number.test.js index 4e39d43a7..dbf453e90 100644 --- a/Sprint-3/3-mandatory-practice/implement/get-ordinal-number.test.js +++ b/Sprint-3/3-mandatory-practice/implement/get-ordinal-number.test.js @@ -8,16 +8,22 @@ const getOrdinalNumber = require("./get-ordinal-number"); // When the number is 1, // Then the function should return "1st" -test("should return '1st' for 1", () => { + test("append 'st' to numbers ending in 1" , () => { expect(getOrdinalNumber(1)).toEqual("1st"); + expect(getOrdinalNumber(21)).toEqual("21st"); + expect(getOrdinalNumber(121)).toEqual("121st"); }); - test("should return '2nd' for 2", () => { + test("append 'nd' to numbers ending in 2, except those ending in 12", () => { expect(getOrdinalNumber(2)).toEqual("2nd"); + expect(getOrdinalNumber(22)).toEqual("22nd"); + expect(getOrdinalNumber(132)).toEqual("132nd"); }); - test("should return '23rd' for 23", () => { + test("append 'rd' to numbers ending in 3 , except those ending in 13", () => { expect(getOrdinalNumber(23)).toEqual("23rd"); + expect(getOrdinalNumber(13)).toEqual("13th"); + expect(getOrdinalNumber(3)).toEqual("3rd"); }); test("should return '11th' for 11", () => { From b0c9c31b1139e00b3c6b74c64e29ddb21b1d3402 Mon Sep 17 00:00:00 2001 From: Farah-Stu Date: Sat, 12 Jul 2025 00:03:35 +0100 Subject: [PATCH 23/30] updating file.js --- Sprint-3/2-mandatory-rewrite/3-get-card-value.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Sprint-3/2-mandatory-rewrite/3-get-card-value.js b/Sprint-3/2-mandatory-rewrite/3-get-card-value.js index 2a84bab64..571597672 100644 --- a/Sprint-3/2-mandatory-rewrite/3-get-card-value.js +++ b/Sprint-3/2-mandatory-rewrite/3-get-card-value.js @@ -1,6 +1,5 @@ function getCardValue(card) { - const rank = card; - + const rank = card.slice(0, -1); if (rank === "A") return 11; if (["J", "Q", "K"].includes(rank)) return 10; const number = Number(rank); @@ -8,5 +7,3 @@ function getCardValue(card) { throw new Error("Invalid card rank"); } module.exports = getCardValue; -const value= getCardValue("A"); -console.log(typeof value==="number"); \ No newline at end of file From 3000184dbf33538ab1e57d373d73dafe3c14a8a7 Mon Sep 17 00:00:00 2001 From: Farah-Stu Date: Sat, 12 Jul 2025 00:03:49 +0100 Subject: [PATCH 24/30] updadting the test file --- .../2-mandatory-rewrite/3-get-card-value.test.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Sprint-3/2-mandatory-rewrite/3-get-card-value.test.js b/Sprint-3/2-mandatory-rewrite/3-get-card-value.test.js index 41e0ef564..ca8e4d2d5 100644 --- a/Sprint-3/2-mandatory-rewrite/3-get-card-value.test.js +++ b/Sprint-3/2-mandatory-rewrite/3-get-card-value.test.js @@ -4,25 +4,25 @@ const getCardValue = require("./3-get-card-value"); // Case 2: Handle Number Cards (2-10): test("should return number for number cards (2-10)",() => { - expect(getCardValue("2")).toEqual (2); - expect(getCardValue("10")).toEqual(10); + expect(getCardValue("2♠")).toEqual (2); + expect(getCardValue("10♣")).toEqual(10); }); // Case 3: Handle Face Cards (J, Q, K): test("should return 10 for Jack of Diamonds", () => { - expect(getCardValue ("J")).toEqual(10); + expect(getCardValue ("J♦")).toEqual(10); }); test("should return 10 for Queen of Clubs", () => { - expect(getCardValue("Q")).toEqual(10); + expect(getCardValue("Q♣")).toEqual(10); }); test("should return 10 for King of Spades", () => { - expect(getCardValue("K")).toEqual(10); + expect(getCardValue("K♠")).toEqual(10); }); // Case 4: Handle Ace (A): test("should return 11 for Ace", () => { - expect(getCardValue("A")).toEqual(11); + expect(getCardValue("A♦")).toEqual(11); }); // Case 5: Handle Invalid Cards: From 96eb260c464a80fe200e3f20e42fa0ae48901914 Mon Sep 17 00:00:00 2001 From: Farah-Stu Date: Sat, 12 Jul 2025 10:16:56 +0100 Subject: [PATCH 25/30] updating the code --- .../3-mandatory-practice/implement/get-ordinal-number.test.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Sprint-3/3-mandatory-practice/implement/get-ordinal-number.test.js b/Sprint-3/3-mandatory-practice/implement/get-ordinal-number.test.js index dbf453e90..a7f4bffd3 100644 --- a/Sprint-3/3-mandatory-practice/implement/get-ordinal-number.test.js +++ b/Sprint-3/3-mandatory-practice/implement/get-ordinal-number.test.js @@ -26,6 +26,8 @@ const getOrdinalNumber = require("./get-ordinal-number"); expect(getOrdinalNumber(3)).toEqual("3rd"); }); - test("should return '11th' for 11", () => { + test("should return '11th' for 11 , 12, 13", () => { expect(getOrdinalNumber(11)).toEqual("11th"); + expect(getOrdinalNumber(12)).toEqual("12th"); + expect(getOrdinalNumber(13)).toEqual("13th"); }); From 19e006e21794d08d327cc5ea1fc0aa37dc8ae8fa Mon Sep 17 00:00:00 2001 From: Farah-Stu Date: Sat, 12 Jul 2025 10:33:36 +0100 Subject: [PATCH 26/30] updating the card value code --- .../2-mandatory-rewrite/3-get-card-value.test.js | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/Sprint-3/2-mandatory-rewrite/3-get-card-value.test.js b/Sprint-3/2-mandatory-rewrite/3-get-card-value.test.js index ca8e4d2d5..ee7bff763 100644 --- a/Sprint-3/2-mandatory-rewrite/3-get-card-value.test.js +++ b/Sprint-3/2-mandatory-rewrite/3-get-card-value.test.js @@ -8,17 +8,13 @@ test("should return number for number cards (2-10)",() => { expect(getCardValue("10♣")).toEqual(10); }); // Case 3: Handle Face Cards (J, Q, K): -test("should return 10 for Jack of Diamonds", () => { - expect(getCardValue ("J♦")).toEqual(10); +test("should return 10 for face cards J, Q, K", () => { + ["J", "Q", "K"].forEach(rank => { + expect(getCardValue (`${rank}♦`)).toEqual(10); + }); }); -test("should return 10 for Queen of Clubs", () => { - expect(getCardValue("Q♣")).toEqual(10); -}); -test("should return 10 for King of Spades", () => { - expect(getCardValue("K♠")).toEqual(10); -}); // Case 4: Handle Ace (A): test("should return 11 for Ace", () => { @@ -29,4 +25,3 @@ test("should return 11 for Ace", () => { test("should throw error for invalid card rank", () => { expect(() => getCardValue("L")).toThrow(new Error("Invalid card rank")); }); - From 037bc3403422155cecb0ea806e4a63ba07059d7b Mon Sep 17 00:00:00 2001 From: Farah-Stu Date: Sat, 12 Jul 2025 10:48:03 +0100 Subject: [PATCH 27/30] updating the code with invalid card rank --- Sprint-3/2-mandatory-rewrite/3-get-card-value.test.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Sprint-3/2-mandatory-rewrite/3-get-card-value.test.js b/Sprint-3/2-mandatory-rewrite/3-get-card-value.test.js index ee7bff763..63e5f0300 100644 --- a/Sprint-3/2-mandatory-rewrite/3-get-card-value.test.js +++ b/Sprint-3/2-mandatory-rewrite/3-get-card-value.test.js @@ -25,3 +25,10 @@ test("should return 11 for Ace", () => { test("should throw error for invalid card rank", () => { expect(() => getCardValue("L")).toThrow(new Error("Invalid card rank")); }); + +// Case 6: should throw error for invalid numeric format: +test("should throw error for invalid numeric format", () => { + expect(() => getCardValue("0x02♠")).toThrow("Invalid card rank"); + expect(() => getCardValue("2.1♠")).toThrow("Invalid card rank"); + expect(() => getCardValue("2♠♠")).toThrow("Invalid card rank"); +}); \ No newline at end of file From 535e4ba2ebbe64bb70a3769b15a1daa89ab6a7bc Mon Sep 17 00:00:00 2001 From: Farah-Stu Date: Sat, 12 Jul 2025 10:48:12 +0100 Subject: [PATCH 28/30] updating the file --- Sprint-3/2-mandatory-rewrite/3-get-card-value.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Sprint-3/2-mandatory-rewrite/3-get-card-value.js b/Sprint-3/2-mandatory-rewrite/3-get-card-value.js index 571597672..1d4217f01 100644 --- a/Sprint-3/2-mandatory-rewrite/3-get-card-value.js +++ b/Sprint-3/2-mandatory-rewrite/3-get-card-value.js @@ -1,9 +1,12 @@ function getCardValue(card) { const rank = card.slice(0, -1); + if (rank === "A") return 11; if (["J", "Q", "K"].includes(rank)) return 10; - const number = Number(rank); - if (number >= 2 && number <= 10) return number; + + if (/^(10|[2-9])$/.test(rank)) { + return Number(rank); + } throw new Error("Invalid card rank"); } module.exports = getCardValue; From 96888f8d093bc6ef8ad95294d75a428cf0e8c6ef Mon Sep 17 00:00:00 2001 From: Farah-Stu Date: Sun, 13 Jul 2025 23:32:12 +0100 Subject: [PATCH 29/30] updating the. file --- .../implement/get-ordinal-number.test.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Sprint-3/3-mandatory-practice/implement/get-ordinal-number.test.js b/Sprint-3/3-mandatory-practice/implement/get-ordinal-number.test.js index a7f4bffd3..d31e70bb3 100644 --- a/Sprint-3/3-mandatory-practice/implement/get-ordinal-number.test.js +++ b/Sprint-3/3-mandatory-practice/implement/get-ordinal-number.test.js @@ -31,3 +31,9 @@ const getOrdinalNumber = require("./get-ordinal-number"); expect(getOrdinalNumber(12)).toEqual("12th"); expect(getOrdinalNumber(13)).toEqual("13th"); }); +test("should append 'th' to numbers ending in 0, 4, 9", () => { + expect(getOrdinalNumber(124)).toEqual( "124th" ); + expect(getOrdinalNumber(10)).toEqual( "10th" ); + expect(getOrdinalNumber(99)).toEqual( "99th" ); + }); + \ No newline at end of file From eece3867f0f11ad13abbaaef30d2943944912376 Mon Sep 17 00:00:00 2001 From: Farah-Stu Date: Sun, 13 Jul 2025 23:32:26 +0100 Subject: [PATCH 30/30] updating the file --- Sprint-3/3-mandatory-practice/implement/get-ordinal-number.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Sprint-3/3-mandatory-practice/implement/get-ordinal-number.js b/Sprint-3/3-mandatory-practice/implement/get-ordinal-number.js index 22aedfc4c..7dcd416ef 100644 --- a/Sprint-3/3-mandatory-practice/implement/get-ordinal-number.js +++ b/Sprint-3/3-mandatory-practice/implement/get-ordinal-number.js @@ -19,6 +19,7 @@ if(strNum.slice(-1)==="3") { return strNum + "rd"; } + return strNum + "th"; }