From 3aad207fb6794a3c9845a5f5521e9be184a78404 Mon Sep 17 00:00:00 2001 From: Elena Vasileia Date: Wed, 29 Oct 2025 19:35:28 +0100 Subject: [PATCH 01/10] Continued the function and testing Implemented angle type identification for acute, obtuse, straight, and reflex angles. Completed the code. Tests run normally. --- .../implement/1-get-angle-type.js | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 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 ca1dfe7f2..1a54bc080 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 @@ -11,8 +11,21 @@ function getAngleType(angle) { if (angle === 90) { return "Right angle"; } - // Run the tests, work out what Case 2 is testing, and implement the required code here. - // Then keep going for the other cases, one at a time. + 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"; + } + + // Run the tests, work out what Case 2 is testing, and implement the required code here. + // Then keep going for the other cases, one at a time. } // The line below allows us to load the getAngleType function into tests in other files. @@ -50,14 +63,17 @@ assertEquals(acute, "Acute angle"); // 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 +assertEquals(obtuse, "Obtuse angle"); // ====> write your test here, and then add a line to pass the test in the function above // Case 4: Identify Straight Angles: // When the angle is exactly 180 degrees, // 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"); // ====> write your test here, and then add a line to pass the test in the function above // 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 +const reflex = getAngleType(250); // ====> write your test here, and then add a line to pass the test in the function above +assertEquals(reflex, "Reflex angle"); +// ====> write your test here, and then add a line to pass the test in the function above From db7d5f55a4ca2ae7f0c831b532f5f7aa81a850a2 Mon Sep 17 00:00:00 2001 From: Elena Vasileia Date: Wed, 29 Oct 2025 20:11:01 +0100 Subject: [PATCH 02/10] Refactor isProperFraction and add test assertions Updated isProperFraction function to use absolute values for proper fraction checks and added assertions for various test cases. --- .../implement/2-is-proper-fraction.js | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 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 a4739af77..69ef57bae 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 @@ -8,9 +8,10 @@ // write one test at a time, and make it pass, build your solution up methodically function isProperFraction(numerator, denominator) { - if (numerator < denominator) { + if (Math.abs(numerator) < Math.abs(denominator)) { return true; } + return false; } // The line below allows us to load the isProperFraction function into tests in other files. @@ -46,14 +47,20 @@ assertEquals(improperFraction, false); // target output: true // 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); // ====> complete with your assertion // Equal Numerator and Denominator check: // Input: numerator = 3, denominator = 3 // target output: false // 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); // ====> complete with your assertion // Stretch: // What other scenarios could you test for? +//Negative Denominator check: +// Input: numerator = 3, denominator = -7 +// target output: true +// Explanation: The fraction 3/-7 is a proper fraction because the absolute value of the numerator (3) is less than the absolute value of the denominator (7). The function should return true. +const negativeDenominator = isProperFraction(3, -7); +assertEquals(negativeDenominator, true); // ====> complete with your assertion From aa2b8c15dfacc37feb6aa2db80249b07b48041d0 Mon Sep 17 00:00:00 2001 From: Elena Vasileia Date: Wed, 29 Oct 2025 20:37:53 +0100 Subject: [PATCH 03/10] Refactor getCardValue and add test cases Refactor getCardValue function to handle card ranks and add tests for various cases including face cards and invalid cards. --- .../implement/3-get-card-value.js | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 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 266525d1b..6a4d9ee8e 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 @@ -8,9 +8,17 @@ // 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) { + const rank = card.slice(0, -1); // Extract rank by removing the last character (emoji) if (rank === "A") { return 11; } + if (rank === "K" || rank === "Q" || rank === "J" || rank === "10") { + return 10; + } + if (rank >= 2 && rank <= 9) { + return Number(rank); + } + return "Invalid card rank."; } // The line below allows us to load the getCardValue function into tests in other files. @@ -39,19 +47,23 @@ assertEquals(aceofSpades, 11); // 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 +assertEquals(fiveofHearts, 5); // ====> write your test here, and then add a line to pass the test in the function above // 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 faceCard = getCardValue("K♦"); +assertEquals(faceCard, 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); //But that is already covered in the first test // 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." +const invalidCard = getCardValue("13♠"); +assertEquals(invalidCard, "Invalid card rank."); From 309e8bb22e6e6023547c711651d9bb3aeaf41641 Mon Sep 17 00:00:00 2001 From: Pythia Date: Fri, 31 Oct 2025 16:10:13 +0100 Subject: [PATCH 04/10] Add tests for acute, obtuse, straight, and reflex angles in getAngleType --- .../rewrite-tests-with-jest/1-get-angle-type.test.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 4a92a3e82..4cdf054a8 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 @@ -12,15 +12,27 @@ 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(270)).toEqual("Reflex angle"); +}); From 21bcb1a168e5a864ff58653d1fd791bd3adde8f6 Mon Sep 17 00:00:00 2001 From: Pythia Date: Fri, 31 Oct 2025 16:28:58 +0100 Subject: [PATCH 05/10] Added tests for all cases of proper/improper fractions --- .../2-is-proper-fraction.test.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) 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 caf08d15b..186dbbe0c 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 @@ -7,7 +7,21 @@ test("should return true for a proper fraction", () => { }); // Case 2: Identify Improper Fractions: +test("should return false for an improper fraction", () => { + expect(isProperFraction(5, 2)).toEqual(false); +}); // Case 3: Identify Negative Fractions: +test("should return true for a negative proper fraction", () => { + expect(isProperFraction(-4, 7)).toEqual(true); +}); // Case 4: Identify Equal Numerator and Denominator: +test("should return false when numerator equals denominator", () => { + expect(isProperFraction(3, 3)).toEqual(false); +}); + +// Stretch Case: Negative Denominator check +test("should return true for a proper fraction with a negative denominator", () => { + expect(isProperFraction(3, -7)).toEqual(true); +}); From a42cf18ea19d337cff6f3c9585c5d7c823eb3147 Mon Sep 17 00:00:00 2001 From: Pythia Date: Fri, 31 Oct 2025 16:42:05 +0100 Subject: [PATCH 06/10] Added the jest tests for all card value options --- .../3-get-card-value.test.js | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) 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 04418ff72..416d5a0ae 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 @@ -8,6 +8,25 @@ test("should return 11 for Ace of Spades", () => { }); // Case 2: Handle Number Cards (2-10): +test("should return 5 for 5 of Hearts", () => { + const fiveofHearts = getCardValue("5♥"); + expect(fiveofHearts).toEqual(5); +}); + // Case 3: Handle Face Cards (J, Q, K): +test("should return 10 for King of Diamonds", () => { + const faceCard = getCardValue("K♦"); + expect(faceCard).toEqual(10); +}); + // Case 4: Handle Ace (A): +test("should return 11 for Ace of Clubs", () => { + const ace = getCardValue("A♣"); + expect(ace).toEqual(11); +}); + // Case 5: Handle Invalid Cards: +test("should return 'Invalid card rank.' for invalid card '13♠'", () => { + const invalidCard = getCardValue("13♠"); + expect(invalidCard).toEqual("Invalid card rank."); +}); From 0c45a31063e6a7b14de5b63c5f317c03112ba201 Mon Sep 17 00:00:00 2001 From: Pythia Date: Fri, 31 Oct 2025 17:19:08 +0100 Subject: [PATCH 07/10] Wrote tests on some scenarios and completed the function to pass the tests --- Sprint-3/2-practice-tdd/count.js | 2 +- Sprint-3/2-practice-tdd/count.test.js | 30 +++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/Sprint-3/2-practice-tdd/count.js b/Sprint-3/2-practice-tdd/count.js index 95b6ebb7d..26a4575e6 100644 --- a/Sprint-3/2-practice-tdd/count.js +++ b/Sprint-3/2-practice-tdd/count.js @@ -1,5 +1,5 @@ function countChar(stringOfCharacters, findCharacter) { - return 5 + return stringOfCharacters.split(findCharacter).length - 1; } module.exports = countChar; diff --git a/Sprint-3/2-practice-tdd/count.test.js b/Sprint-3/2-practice-tdd/count.test.js index 42baf4b4b..1774e3cd2 100644 --- a/Sprint-3/2-practice-tdd/count.test.js +++ b/Sprint-3/2-practice-tdd/count.test.js @@ -22,3 +22,33 @@ 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 character does not exist in string", () => { + const str = "AAAAA"; + const char = "a"; + const count = countChar(str, char); + expect(count).toEqual(0); +}); + +// Scenario: Single Occurrence +// Given the input string str, +// And a character char that occurs exactly once within str, +// When the function is called with these inputs, +// Then it should return 1, indicating a single occurrence of char in str. +test("should return 1 when character occurs once in string", () => { + const str = "Hello"; + const char = "H"; + const count = countChar(str, char); + expect(count).toEqual(1); +}); + +// Scenario: Empty String +// Given an empty input string str, +// And any character char, +// When the function is called with these inputs, +// Then it should return 0, indicating that no occurrences of char were found in the empty str. +test("should return 0 when input string is empty", () => { + const str = ""; + const char = "a"; + const count = countChar(str, char); + expect(count).toEqual(0); +}); From a798e54591d91401ddd5ae3fe675cee0089d4a7c Mon Sep 17 00:00:00 2001 From: Pythia Date: Fri, 31 Oct 2025 17:23:39 +0100 Subject: [PATCH 08/10] Added more tests (my VScode is also proposing some so not all of these are of my original thought) --- Sprint-3/2-practice-tdd/count.test.js | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/Sprint-3/2-practice-tdd/count.test.js b/Sprint-3/2-practice-tdd/count.test.js index 1774e3cd2..2bb9b75a6 100644 --- a/Sprint-3/2-practice-tdd/count.test.js +++ b/Sprint-3/2-practice-tdd/count.test.js @@ -52,3 +52,27 @@ test("should return 0 when input string is empty", () => { const count = countChar(str, char); expect(count).toEqual(0); }); + +// Scenario: Special Characters +// Given the input string str containing special characters, +// And a special character char to search for, +// When the function is called with these inputs, +// Then it should correctly count the occurrences of the special character char in str. +test("should count occurrences of special characters", () => { + const str = "!@#$$%^&*()_+!"; + const char = "!"; + const count = countChar(str, char); + expect(count).toEqual(2); +}); + +// Scenario: Case Sensitivity +// Given the input string str containing both uppercase and lowercase letters, +// And a character char to search for, +// When the function is called with these inputs, +// Then it should treat char as case-sensitive and only count occurrences that match the exact case in str. +test("should treat character search as case-sensitive", () => { + const str = "aAaAaA"; + const char = "a"; + const count = countChar(str, char); + expect(count).toEqual(3); +}); From b21cdd4689322be03c241c06a22072c935642a5a Mon Sep 17 00:00:00 2001 From: Pythia Date: Fri, 31 Oct 2025 17:35:09 +0100 Subject: [PATCH 09/10] Copied function from my prep case, added tests and fixed typos after running the tests --- Sprint-3/2-practice-tdd/get-ordinal-number.js | 19 ++++++++-- .../2-practice-tdd/get-ordinal-number.test.js | 35 +++++++++++++++++++ 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/Sprint-3/2-practice-tdd/get-ordinal-number.js b/Sprint-3/2-practice-tdd/get-ordinal-number.js index f95d71db1..13bba01c6 100644 --- a/Sprint-3/2-practice-tdd/get-ordinal-number.js +++ b/Sprint-3/2-practice-tdd/get-ordinal-number.js @@ -1,5 +1,20 @@ -function getOrdinalNumber(num) { - return "1st"; +function getOrdinalNumber(n) { + const rem100 = n % 100; + if (rem100 >= 11 && rem100 <= 13) { + return n + "th"; + } + + const rem10 = n % 10; + if (rem10 === 1) { + return n + "st"; + } + if (rem10 === 2) { + return n + "nd"; + } + if (rem10 === 3) { + return n + "rd"; + } + return n + "th"; } module.exports = getOrdinalNumber; diff --git a/Sprint-3/2-practice-tdd/get-ordinal-number.test.js b/Sprint-3/2-practice-tdd/get-ordinal-number.test.js index dfe4b6091..66c3bbd33 100644 --- a/Sprint-3/2-practice-tdd/get-ordinal-number.test.js +++ b/Sprint-3/2-practice-tdd/get-ordinal-number.test.js @@ -11,3 +11,38 @@ const getOrdinalNumber = require("./get-ordinal-number"); test("should return '1st' for 1", () => { expect(getOrdinalNumber(1)).toEqual("1st"); }); + +// Case 2: Identify the ordinal number for 2 +// When the number is 2, +// Then the function should return "2nd" +test("should return '2nd' for 2", () => { + expect(getOrdinalNumber(2)).toEqual("2nd"); +}); + +// Case 3: Identify the ordinal number for 3 +// When the number is 3, +// Then the function should return "3rd" +test("should return '3rd' for 3", () => { + expect(getOrdinalNumber(3)).toEqual("3rd"); +}); + +// Case 4: Identify the ordinal number for 4 +// When the number is 4, +// Then the function should return "4th" +test("should return '4th' for 4", () => { + expect(getOrdinalNumber(4)).toEqual("4th"); +}); + +// Case 5: Identify the ordinal number for 11 +// When the number is 11, +// Then the function should return "11th" +test("should return '11th' for 11", () => { + expect(getOrdinalNumber(11)).toEqual("11th"); +}); + +// Case 6: Identify the ordinal number for 22 +// When the number is 22, +// Then the function should return "22nd" +test("should return '22nd' for 22", () => { + expect(getOrdinalNumber(22)).toEqual("22nd"); +}); From 7a6c0b3e8e8fe1b05f9f438e3babc9d9465021e6 Mon Sep 17 00:00:00 2001 From: Pythia Date: Fri, 31 Oct 2025 18:28:09 +0100 Subject: [PATCH 10/10] Filled the function, wrote the tests, explored what .toThrow does, fixed it back to .toEqual --- Sprint-3/2-practice-tdd/repeat.js | 9 ++++++--- Sprint-3/2-practice-tdd/repeat.test.js | 22 ++++++++++++++++++++-- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/Sprint-3/2-practice-tdd/repeat.js b/Sprint-3/2-practice-tdd/repeat.js index 00e60d7f3..df1bac0ef 100644 --- a/Sprint-3/2-practice-tdd/repeat.js +++ b/Sprint-3/2-practice-tdd/repeat.js @@ -1,5 +1,8 @@ -function repeat() { - return "hellohellohello"; +function repeatStr(str, count) { + if (count < 0) { + return "Count must be a non-negative integer"; + } + return str.repeat(count); } -module.exports = repeat; +module.exports = repeatStr; diff --git a/Sprint-3/2-practice-tdd/repeat.test.js b/Sprint-3/2-practice-tdd/repeat.test.js index 34097b09c..4690f6280 100644 --- a/Sprint-3/2-practice-tdd/repeat.test.js +++ b/Sprint-3/2-practice-tdd/repeat.test.js @@ -1,5 +1,5 @@ // Implement a function repeat -const repeat = require("./repeat"); +const repeatStr = require("./repeat"); // Given a target string str and a positive integer count, // When the repeat function is called with these inputs, // Then it should: @@ -12,7 +12,7 @@ const repeat = require("./repeat"); test("should repeat the string count times", () => { const str = "hello"; const count = 3; - const repeatedStr = repeat(str, count); + const repeatedStr = repeatStr(str, count); expect(repeatedStr).toEqual("hellohellohello"); }); @@ -20,13 +20,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 the original string when count is 1", () => { + const str = "world"; + const count = 1; + const repeatedStr = repeatStr(str, count); + expect(repeatedStr).toEqual("world"); +}); // 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 an empty string when count is 0", () => { + const str = "test"; + const count = 0; + const repeatedStr = repeatStr(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 return an error message for negative count", () => { + const str = "error"; + const count = -2; + const repeatedStr = repeatStr(str, count); + expect(repeatedStr).toEqual("Count must be a non-negative integer"); +});