London | ITP-May-2025 | Adnaan Abo | 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

@@ -10,6 +10,10 @@
 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 "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(270);
+assertEquals(reflex, "Reflex angle");

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

@@ -8,9 +8,16 @@
 // write one test at a time, and make it pass, build your solution up methodically
 
 function isProperFraction(numerator, denominator) {
-    if (numerator < denominator) return true;
+    // A proper fraction is defined as a fraction where the numerator is less than the denominator.
+    // If the numerator is greater than or equal to the denominator, it is not a proper fraction.
+    return Math.abs(numerator) < Math.abs(denominator);
+    // We use Math.abs to handle negative numerators, as a negative numerator can still be considered a proper fraction if its absolute value is less than the denominator.
+    // For example, -4/7 is a proper fraction because the absolute value of -4 (which is 4) is less than 7.
+    // Similarly, 2/3 is a proper fraction because 2 is less than 3.
+    // However, 5/2 is not a proper fraction because 5 is greater than 2, and 3/3 is not a proper fraction
 }
 
+
 // here's our helper again
 function assertEquals(actualOutput, targetOutput) {
   console.assert(
@@ -41,13 +48,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?
+// Zero Numerator check:
+// Input: numerator = 0, denominator = 5
+// target output: true
+// Explanation: The fraction 0/5 is a proper fraction because the numerator is zero, which is less than the denominator. The function should return true.
+const zeroNumerator = isProperFraction(0, 5);
+// ====> complete with your assertion
+assertEquals(zeroNumerator, true);
+

Sprint-3/1-key-implement/3-get-card-value.js

@@ -8,7 +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) {
-    if (rank === "A") return 11;
+  // Extract the rank from the card string
+  const rank = card.slice(0, -1); // Get all characters except the last
+  if (rank === "A") return 11;
+  if (!isNaN(rank)) {
+    // If the rank is a number (2-10)
+    return parseInt(rank, 10); // Convert to integer
+  }
+  if (["J", "Q", "K"].includes(rank)) {
+    // If the rank is a face card or 10
+    return 10; // All face cards and 10 are worth 10 points
+  }
+  throw new Error("Invalid card rank"); // If the rank is not recognized, throw an
 }
 
 // You need to write assertions for your function to check it works in different cases
@@ -34,18 +45,42 @@ 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);
+
 
 // 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 jackOfClubs = getCardValue("J♣");
+assertEquals(jackOfClubs, 10);
+const queenOfSpades = getCardValue("Q♠");
+assertEquals(queenOfSpades, 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 aceOfDiamonds = getCardValue("A♦");
+assertEquals(aceOfDiamonds, 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 {
+  const invalidCard = getCardValue("Z♣");
+} catch (error) {
+  assertEquals(error.message, "Invalid card rank");
+
+  // If the error is thrown, the test passes
+  console.log("Invalid card test passed");
+} finally {
+  // This block runs regardless of whether the try block succeeded or failed
+  console.log("All tests completed.");
+} 
+

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

@@ -1,7 +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";
 }
 
 

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

@@ -8,17 +8,29 @@ test("should identify right angle (90°)", () => {
 // make your test descriptions as clear and readable as possible
 
 // Case 2: Identify Acute Angles:
+test("should identify acute angle (< 90°)", () => {
+  expect(getAngleType(45)).toEqual("Acute angle");
+});
 // When the angle is less than 90 degrees,
 // Then the function should return "Acute angle"
 
 // Case 3: Identify Obtuse Angles:
+test("should identify obtuse angle (> 90° and < 180°)", () => {
+  expect(getAngleType(120)).toEqual("Obtuse angle");
+});
 // When the angle is greater than 90 degrees and less than 180 degrees,
 // Then the function should return "Obtuse angle"
 
 // Case 4: Identify Straight Angles:
+test("should identify straight angle (180°)", () => {
+  expect(getAngleType(180)).toEqual("Straight angle");
+});
 // When the angle is exactly 180 degrees,
 // Then the function should return "Straight angle"
 
 // Case 5: Identify Reflex Angles:
+test("should identify reflex angle (> 180° and < 360°)", () => {
+  expect(getAngleType(270)).toEqual("Reflex angle");
+});
 // When the angle is greater than 180 degrees and less than 360 degrees,
 // Then the function should return "Reflex angle"

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

@@ -1,6 +1,22 @@
 function isProperFraction(numerator, denominator) {
-    if (numerator < denominator) return true;
     // add your completed function from key-implement here
+    // A proper fraction is a fraction where the absolute value of the numerator is less than the absolute value of the denominator
+    if (Math.sign(numerator) === -1 && Math.sign(denominator) === -1) {
+        return true; // both negative, so the fraction is proper
+    }
+    if (Math.sign(numerator) === 1 && Math.sign(denominator) === 1) {
+        return numerator < denominator; // both positive, check if numerator is less than denominator
+    }
+    if (Math.sign(numerator) === -1 && Math.sign(denominator) === 1) {
+        return false; // negative numerator and positive denominator, not a proper fraction
+    }
+    if (Math.sign(numerator) === 1 && Math.sign(denominator) === -1) {
+        return false; // positive numerator and negative denominator, not a proper fraction
+    }
+    return false; // if none of the above conditions are met, return false
+    // Note: The function assumes that the denominator is not zero, as division by zero is
+    // undefined in mathematics. If you want to handle that case, you can add a check
+    // for denominator === 0 and return an appropriate value or throw an error.
 }
 
 module.exports = isProperFraction;

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

@@ -5,7 +5,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, 3)).toEqual(false);
+});
 
 // Case 3: Identify Negative Fractions:
+test("should return true for a negative proper fraction", () => {
+  expect(isProperFraction(-2, 3)).toEqual(false);
+});
 
 // Case 4: Identify Equal Numerator and Denominator:
+test("should return false for a fraction with equal numerator and denominator", () => {
+  expect(isProperFraction(3, 3)).toEqual(false);
+});

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

@@ -1,5 +1,17 @@
 function getCardValue(card) {
-    // replace with your code from key-implement
-    return 11;
+  // Extract the rank from the card string
+  const rank = card.slice(0, -1); // Get all characters except the last
+  if (rank === "A") return 11;
+  if (!isNaN(rank)) {
+    // If the rank is a number (2-10)
+    return parseInt(rank, 10); // Convert to integer
+  }
+  if (["J", "Q", "K"].includes(rank)) {
+    // If the rank is a face card or 10
+    return 10; // All face cards and 10 are worth 10 points
+  }
+  throw new Error("Invalid card rank"); // If the rank is not recognized, throw an
+
 }
+
 module.exports = getCardValue;

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

@@ -6,6 +6,29 @@ 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 Jack of Diamonds", () => {
+    const jackOfDiamonds = getCardValue("J♦");
+    expect(jackOfDiamonds).toEqual(10);
+});
+test("should return 10 for Queen of Spades", () => {
+    const queenOfSpades = getCardValue("Q♠");
+    expect(queenOfSpades).toEqual(10);
+});
+test("should return 10 for King of Hearts", () => {
+    const kingOfHearts = getCardValue("K♥");
+    expect(kingOfHearts).toEqual(10);
+});
 // Case 4: Handle Ace (A):
+test("should return 11 for Ace of Clubs", () => {
+    const aceOfClubs = getCardValue("A♣");
+    expect(aceOfClubs).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,16 @@
 function countChar(stringOfCharacters, findCharacter) {
-    return 5
+  let count = 0; // Initialize a counter
+  for (let i = 0; i < stringOfCharacters.length; i++) { // Loop through each character in the string
+    // If the current character matches the character we are looking for, increment the counter
+    // This is a case-sensitive comparison
+    // If you want a case-insensitive comparison, you can convert both to lower case
+    // or upper case before comparing
+    if (stringOfCharacters[i] === findCharacter) { // Check if the character matches
+      // Increment the count if it matches
+      count++; // Increment the counter
+    }
+  }
+  return count; // Return the total count of matching characters
 }
 
 module.exports = countChar;

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

@@ -22,3 +22,9 @@ 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 = "yyyyy";
+  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,32 @@
 function getOrdinalNumber(num) {
- return "1st";
+  // Function to convert a number to its ordinal representation
+  if (num <= 0 || !Number.isInteger(num)) {
+    throw new Error("Input must be a number"); // Validate input: must be a positive integer
+  }
+
+  const lastTwoDigits = num % 100; // Get the last two digits of the number
+  if (lastTwoDigits >= 11 && lastTwoDigits <= 13) {
+    return num + `th`; // Special case for 11, 12, and 13
+  }
+
+  const lastDigit = num % 10; // Get the last digit of the number
+
+  const suffixes = { [1]: "st", [2]: "nd", [3]: "rd" }; // Define suffixes for 1st, 2nd, and 3rd
+  const suffix = suffixes[lastDigit] || "th"; // Default to "th
+  return num + suffix; // Return the number with its ordinal suffix
 }
 
-module.exports = getOrdinalNumber;
+// Given a number num,
+
+// console.log(getOrdinalNumber(1)); // "1st"
+// console.log(getOrdinalNumber(2)); // "2nd"
+// console.log(getOrdinalNumber(3)); // "3rd"
+// console.log(getOrdinalNumber(4)); // "4th"
+// console.log(getOrdinalNumber(11)); // "11th"
+// console.log(getOrdinalNumber(12)); // "12th"
+// console.log(getOrdinalNumber(13)); // "13th"
+// console.log(getOrdinalNumber(21)); // "21st"
+// console.log(getOrdinalNumber(112)); // "22nd"
+// console.log(getOrdinalNumber(113)); // "23rd"
+
+module.exports = getOrdinalNumber;