London | 25-ITP-May | Houssam Lahlah | Sprint 3 | Coursework/sprint-3

Sprint-3/1-implement-and-rewrite-tests/implement/1-get-angle-type.js

@@ -8,11 +8,11 @@
 // Then, write the next test! :) Go through this process until all the cases are implemented
 
 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 "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";
 }
 
 // The line below allows us to load the getAngleType function into tests in other files.
@@ -46,18 +46,23 @@ assertEquals(right, "Right angle");
 const acute = getAngleType(45);
 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
+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
+const reflex = getAngleType(270);
+assertEquals(reflex, "Reflex angle");

Sprint-3/1-implement-and-rewrite-tests/implement/2-is-proper-fraction.js

@@ -8,9 +8,15 @@
 // write one test at a time, and make it pass, build your solution up methodically
 
 function isProperFraction(numerator, denominator) {
+<<<<<<< HEAD:Sprint-3/1-key-implement/2-is-proper-fraction.js
+  // Use absolute value of numerator to handle negatives
+    if (numerator < denominator) return true;
+    return false; // for all other cases
+=======
   if (numerator < denominator) {
     return true;
   }
+>>>>>>> 8f3d6cf2d1733da02a010f1a16c46b8b5ab4c491:Sprint-3/1-implement-and-rewrite-tests/implement/2-is-proper-fraction.js
 }
 
 // The line below allows us to load the isProperFraction function into tests in other files.
@@ -46,14 +52,28 @@ 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);
 
 // 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?
+
+// Other scenarios to test could include:
+
+// Cases where the numerator or denominator is zero (e.g., 0/5, 5/0) — 
+// especially to check for division by zero or invalid fractions.
+
+// Fractions with negative denominators (e.g., 3/-4) 
+// to see if the function handles sign correctly.
+
+// Very large numbers 
+// to check if the function works with large integers.
+
+// Non-integer inputs (e.g., decimals or strings) 
+// to test input validation (if applicable).

Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js

@@ -8,9 +8,18 @@
 // 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) {
+<<<<<<< HEAD:Sprint-3/1-key-implement/3-get-card-value.js
+  const rank = card.slice(0, -1); // remove the emoji 
+  if (rank === "A") return 11;
+  if (["K", "Q", "J", "10"].includes(rank)) return 10;
+  const number = Number(rank);
+  if (number >= 2 && number <= 9) return number;
+  throw new Error("Invalid card rank");
+=======
   if (rank === "A") {
     return 11;
   }
+>>>>>>> 8f3d6cf2d1733da02a010f1a16c46b8b5ab4c491:Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js
 }
 
 // The line below allows us to load the getCardValue function into tests in other files.
@@ -39,19 +48,36 @@ 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);
+
 
 // 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 jackofClubs = getCardValue("J♣");
+assertEquals(jackofClubs, 10);
+
+const queenofDiamonds = getCardValue("Q♦");
+assertEquals(queenofDiamonds, 10);
+
+const kingofHearts = getCardValue("K♥");
+assertEquals(kingofHearts, 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 aceofSpades = getCardValue("A♠");
+assertEquals(aceofSpades, 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."
+
+
+// getCardValue("Z♠"); // should throw "Invalid card rank"
+
+

Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/1-get-angle-type.test.js

@@ -6,21 +6,19 @@ test("should identify right angle (90°)", () => {
   expect(getAngleType(90)).toEqual("Right angle");
 });
 
-// REPLACE the comments with the tests
-// make your test descriptions as clear and readable as possible
+test("should identify acute angle (< 90°)", () => {
+  expect(getAngleType(45)).toEqual("Acute angle");
+});
 
-// Case 2: Identify Acute Angles:
-// When the angle is less than 90 degrees,
-// Then the function should return "Acute angle"
+test("should identify obtuse angle (> 90° and < 180°)", () => {
+  expect(getAngleType(120)).toEqual("Obtuse 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 straight angle (180°)", () => {
+  expect(getAngleType(180)).toEqual("Straight angle");
+});
 
-// Case 4: Identify Straight Angles:
-// When the angle is exactly 180 degrees,
-// Then the function should return "Straight angle"
+test("should identify reflex angle (> 180° and < 360°)", () => {
+  expect(getAngleType(270)).toEqual("Reflex 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"

Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js

@@ -7,7 +7,16 @@ 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);
+});

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

@@ -0,0 +1,14 @@
+function getAngleType(angle) {
+  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";
+  throw new Error("Invalid 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 have just written the CommonJS module.exports syntax for you
+
+module.exports = getAngleType;

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

@@ -0,0 +1,15 @@
+// Explanation:
+// It checks if the absolute value of the numerator 
+// is less than the absolute value of the denominator.
+
+
+function isProperFraction(numerator, denominator) {
+  if (denominator === 0) {
+    throw new Error("Denominator cannot be zero");
+  }
+
+  return Math.abs(numerator) < Math.abs(denominator);
+}
+
+module.exports = isProperFraction;
+

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

@@ -0,0 +1,14 @@
+function getCardValue(card) {
+  const rank = card.slice(0, -1); // remove suit
+
+  if (!rank) throw new Error(`Invalid card rank: ${card}`);
+
+  if (rank === "A") return 11;
+  if (["K", "Q", "J"].includes(rank)) return 10;
+  if (/^(?:[2-9]|10)$/.test(rank)) return Number(rank);
+
+  throw new Error(`Invalid card rank: ${card}`);
+}
+
+module.exports = getCardValue;
+

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

@@ -0,0 +1,40 @@
+const getCardValue = require("./3-get-card-value");
+
+// Case 1: Ace
+test("should return 11 for Ace", () => {
+  expect(getCardValue("A♠")).toEqual(11);
+  expect(getCardValue("A♥")).toEqual(11);
+});
+
+// Case 2: Number cards (sample of 2–10)
+test("should return the value of number cards (2, 5, 10)", () => {
+  expect(getCardValue("2♣")).toEqual(2);
+  expect(getCardValue("5♠")).toEqual(5);
+  expect(getCardValue("10♥")).toEqual(10);
+});
+
+// Case 3: Face cards (J, Q, K)
+test("should return 10 for face cards (J, Q, K)", () => {
+  ["J", "Q", "K"].forEach(rank => {
+    expect(getCardValue(`${rank}♠`)).toEqual(10);
+    expect(getCardValue(`${rank}♥`)).toEqual(10);
+  });
+});
+
+// Case 4: Invalid cards
+test("should throw an error for invalid card rank", () => {
+  const invalidCards = [
+    "Z♣",      // invalid letter
+    "0x02♠",   // invalid rank
+    "2.1♠",    // decimal
+    "0002♠",   // leading zeros
+    "",        // empty string
+    "♠"        // suit only
+  ];
+
+  invalidCards.forEach(card => {
+    expect(() => getCardValue(card)).toThrow("Invalid card rank");
+  });
+});
+
+

Sprint-3/2-practice-tdd/count.js

@@ -1,5 +1,15 @@
 function countChar(stringOfCharacters, findCharacter) {
+<<<<<<< HEAD:Sprint-3/3-mandatory-practice/implement/count.js
+  let count = 0;
+  for (let char of stringOfCharacters) {
+    if (char === findCharacter) {
+      count++;
+    }
+  }
+  return count;
+=======
   return 5
+>>>>>>> 8f3d6cf2d1733da02a010f1a16c46b8b5ab4c491:Sprint-3/2-practice-tdd/count.js
 }
 
 module.exports = countChar;

Sprint-3/2-practice-tdd/get-ordinal-number.test.js

@@ -9,5 +9,27 @@ const getOrdinalNumber = require("./get-ordinal-number");
 // Then the function should return "1st"
 
 test("should return '1st' for 1", () => {
+<<<<<<< HEAD:Sprint-3/3-mandatory-practice/implement/get-ordinal-number.test.js
+    expect(getOrdinalNumber(1)).toEqual("1st");
+    });
+
+test("should return '2nd' for 2", () => {
+  expect(getOrdinalNumber(2)).toEqual("2nd");
+});
+
+test("should return '3rd' for 3", () => {
+  expect(getOrdinalNumber(3)).toEqual("3rd");
+});
+
+test("should return '4th' for 4", () => {
+  expect(getOrdinalNumber(4)).toEqual("4th");
+});
+
+test("should return '11th' for 11", () => {
+  expect(getOrdinalNumber(11)).toEqual("11th");
+});
+
+=======
   expect(getOrdinalNumber(1)).toEqual("1st");
 });
+>>>>>>> 8f3d6cf2d1733da02a010f1a16c46b8b5ab4c491:Sprint-3/2-practice-tdd/get-ordinal-number.test.js

Sprint-3/2-practice-tdd/repeat.test.js

@@ -16,17 +16,46 @@ test("should repeat the string count times", () => {
   expect(repeatedStr).toEqual("hellohellohello");
 });
 
+    const repeat = require("./repeat");
+
+//   test("should repeat the string count times", () => {
+//    expect(repeat("hello", 3)).toEqual("hellohellohello");
+//    });
+
 // case: handle Count of 1:
 // 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 original string when count is 1", () => {
+  expect(repeat("hello", 1)).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 empty string when count is 0", () => {
+  expect(repeat("hello", 0)).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 error for negative count", () => {
+  expect(() => repeat("hello", -1)).toThrow("Count must be non-negative");
+});
+
+
+
+
+
+
+
+
+
+

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

@@ -0,0 +1,12 @@
+function getOrdinalNumber(num) {
+  const suffixes = ["th", "st", "nd", "rd"];
+  const value = num % 100;
+  if (value >= 11 && value <= 13) {
+    return num + "th";
+  }
+  const lastDigit = num % 10;
+  const suffix = suffixes[lastDigit] || "th";
+  return num + suffix;
+}
+
+module.exports = getOrdinalNumber;