London | May 2025 | Halimatou Saddiyaa | Module-Structuring-and-Testing-Data | Sprint 3

.github/pull_request_template.md

@@ -2,11 +2,11 @@
 
 You must title your PR like this:
 
-COHORT_NAME | FIRST_NAME LAST_NAME | REPO_NAME | WEEK
+REGION | COHORT_NAME | FIRST_NAME LAST_NAME | PROJ_NAME
 
 For example,
 
-NW4 | Carol Owen | HTML-CSS-Module | Week1
+London | May-2025 | Carol Owen | Sprint-1
 
 Complete the task list below this message.
 If your PR is rejected, check the task list.
@@ -18,7 +18,7 @@ If your PR is rejected, check the task list.
 Self checklist
 
 - [ ] I have committed my files one by one, on purpose, and for a reason
-- [ ] I have titled my PR with COHORT_NAME | FIRST_NAME LAST_NAME | REPO_NAME | WEEK 
+- [ ] I have titled my PR with REGION | COHORT_NAME | FIRST_NAME LAST_NAME | PROJ_NAME
 - [ ] I have tested my changes
 - [ ] My changes follow the [style guide](https://curriculum.codeyourfuture.io/guides/contributing/)
 - [ ] My changes meet the [requirements](./README.md) of this task

Sprint-3/1-key-implement/1-get-angle-type.js

@@ -8,8 +8,12 @@
 // 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";
+  // read to the end, complete line 36, then pass your test here
+  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";
 }
 
 // we're going to use this helper function to make our assertions easier to read
@@ -44,13 +48,18 @@ assertEquals(acute, "Acute angle");
 // 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");
 
 // 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");
 
 // 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
+// ====> write your test here, and then add a line to pass the test in the function above
+const reflex = getAngleType(190);
+assertEquals(reflex, "Reflex angle");

Sprint-3/1-key-implement/2-is-proper-fraction.js

@@ -8,7 +8,11 @@
 // write one test at a time, and make it pass, build your solution up methodically
 
 function isProperFraction(numerator, denominator) {
-    if (numerator < denominator) return true;
+  if (numerator < denominator) return true;
+  if (numerator >= denominator) return false;
+  if (numerator < 0 && Math.abs(numerator) < denominator) return true;
+  if (numerator === denominator) return false;
+  if (numerator < 0 && Math.abs(numerator) >= denominator) return false;
 }
 
 // here's our helper again
@@ -41,13 +45,23 @@ 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
 // 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);
 
 // Stretch:
 // What other scenarios could you test for?
+
+// Negative Improper Fraction check:
+// Input: numerator = -6, denominator = 4
+// target output: false
+// Explanation: The fraction -6/4 is not a proper fraction because the absolute value of the
+// numerator (6) is greater than the denominator (4). The function should return false.
+const negativeImproperFraction = isProperFraction(-6, 4);
+assertEquals(negativeImproperFraction, false);

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;
+  let rank = card.slice(0, -1);
+
+  if (rank === "A") return 11;
+  if (rank >= "2" && rank <= "9") return parseInt(rank);
+  if (["10", "J", "Q", "K"].includes(rank)) return 10;
+
+  throw Error("Invalid card rank");
 }
 
 // You need to write assertions for your function to check it works in different cases
@@ -34,18 +40,41 @@ assertEquals(aceofSpades, 11);
 // 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);
+
+const fourofHearts = getCardValue("4♥");
+assertEquals(fourofHearts, 4);
 
 // 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 tenofDiamonds = getCardValue("10♦");
+assertEquals(tenofDiamonds, 10);
+
+const valueofJ = getCardValue("J♠");
+assertEquals(valueofJ, 10);
+
+const valueofQ = getCardValue("Q♥");
+assertEquals(valueofQ, 10);
+
+const valueofK = getCardValue("K♣");
+assertEquals(valueofK, 10);
 
 // Handle Ace (A):
-// Given a card with a rank of "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 allAce = getCardValue("A♠");
+assertEquals(allAce, 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♠");
+  console.assert(false, "Expected error was not thrown");
+} catch (e) {
+  assertEquals(e.message, "Invalid card rank");
+}

Sprint-3/2-mandatory-rewrite/1-get-angle-type.js

@@ -1,18 +1,14 @@
 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";
 }
 
-
-
-
-
-
-
-
 // Don't get bogged down in this detail
 // Jest uses CommonJS module syntax by default as it's quite old
-// We will upgrade our approach to ES6 modules in the next course module, so for now 
+// We will upgrade our approach to ES6 modules in the next course module, so for now
 // we have just written the CommonJS module.exports syntax for you
-module.exports = getAngleType;
+module.exports = getAngleType;

Sprint-3/2-mandatory-rewrite/1-get-angle-type.test.js

@@ -11,14 +11,30 @@ test("should identify right angle (90°)", () => {
 // 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(190)).toEqual("Reflex angle");
+});

Sprint-3/2-mandatory-rewrite/2-is-proper-fraction.js

@@ -1,6 +1,9 @@
 function isProperFraction(numerator, denominator) {
-    if (numerator < denominator) return true;
-    // add your completed function from key-implement here
+  if (numerator < denominator) return true;
+  // add your completed function from key-implement here
+  if (numerator >= denominator) return false;
+  if (numerator < 0 && Math.abs(numerator) < denominator) return true;
+  if (numerator === denominator) return false;
 }
 
-module.exports = isProperFraction;
+module.exports = isProperFraction;

Sprint-3/2-mandatory-rewrite/2-is-proper-fraction.test.js

@@ -6,6 +6,18 @@ 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 for equal numerator and denominator", () => {
+  expect(isProperFraction(3, 3)).toEqual(false);
+});

Sprint-3/2-mandatory-rewrite/3-get-card-value.js

@@ -1,5 +1,12 @@
 function getCardValue(card) {
-    // replace with your code from key-implement
-    return 11;
+  // replace with your code from key-implement
+  let rank = card.slice(0, -1);
+
+  if (rank === "A") return 11;
+  if (rank >= "2" && rank <= "9") return parseInt(rank);
+  if (["10", "J", "Q", "K"].includes(rank)) return 10;
+
+  throw Error("Invalid card rank");
 }
-module.exports = getCardValue;
+
+module.exports = getCardValue;

Sprint-3/2-mandatory-rewrite/3-get-card-value.test.js

@@ -1,11 +1,53 @@
 const getCardValue = require("./3-get-card-value");
 
 test("should return 11 for Ace of Spades", () => {
-    const aceofSpades = getCardValue("A♠");
-    expect(aceofSpades).toEqual(11);
-    });
+  const aceofSpades = getCardValue("A♠");
+  expect(aceofSpades).toEqual(11);
+});
 
 // Case 2: Handle Number Cards (2-10):
+
+test("should return 5 for Five of Hearts", () => {
+  const fiveofHearts = getCardValue("5♥");
+  expect(fiveofHearts).toEqual(5);
+});
+
+test("should return 4 for Four of Hearts", () => {
+  const fourofHearts = getCardValue("4♥");
+  expect(fourofHearts).toEqual(4);
+});
+
 // Case 3: Handle Face Cards (J, Q, K):
+
+test("should return 10 for Ten of Diamonds", () => {
+  const tenofDiamonds = getCardValue("10♦");
+  expect(tenofDiamonds).toEqual(10);
+});
+
+test("should return 10 for Value of J", () => {
+  const valueofJ = getCardValue("J♠");
+  expect(valueofJ).toEqual(10);
+});
+
+test("should return 10 for Value of Q", () => {
+  const valueofQ = getCardValue("Q♥");
+  expect(valueofQ).toEqual(10);
+});
+
+test("should return 10 for Value of K", () => {
+  const valueofK = getCardValue("K♣");
+  expect(valueofK).toEqual(10);
+});
+
 // Case 4: Handle Ace (A):
+
+test("should return 11 for All Ace", () => {
+  const allAce = getCardValue("A♠");
+  expect(allAce).toEqual(11);
+});
+
 // Case 5: Handle Invalid Cards:
+
+test("should throw an error for invalid card rank", () => {
+  expect(() => getCardValue("Z♠")).toThrow("Invalid card rank");
+});

Sprint-3/3-mandatory-practice/implement/count.js

@@ -1,5 +1,9 @@
 function countChar(stringOfCharacters, findCharacter) {
-    return 5
+  let count = 0;
+  for (let c of stringOfCharacters) {
+    if (c === findCharacter) count++;
+  }
+  return count;
 }
 
-module.exports = countChar;
+module.exports = countChar;

Sprint-3/3-mandatory-practice/implement/count.test.js

@@ -22,3 +22,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 character does not exist in the string", () => {
+  const str = "london";
+  const char = "z";
+  const count = countChar(str, char);
+  expect(count).toEqual(0);
+});

Sprint-3/3-mandatory-practice/implement/get-ordinal-number.js

@@ -1,5 +1,18 @@
 function getOrdinalNumber(num) {
- return "1st";
+  const remainderTens = num % 10;
+  const remainderHundreds = num % 100;
+
+  if (remainderHundreds >= 11 && remainderHundreds <= 13) {
+    return `${num}th`;
+  }
+
+  if (remainderTens === 1) return `${num}st`;
+
+  if (remainderTens === 2) return `${num}nd`;
+
+  if (remainderTens === 3) return `${num}rd`;
+
+  return `${num}th`;
 }
 
-module.exports = getOrdinalNumber;
+module.exports = getOrdinalNumber;