ZA | ITP-May | Dawud Vermeulen | Sprint-3 | Module-Structuring-and-Testing-Data

.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-1/1-key-exercises/1-count.js

@@ -1,6 +1,11 @@
-let count = 0;
+let count = 0; 
 
 count = count + 1;
+// count is being reassigned a new value of count + 1
+count++;
+count += 1;  
+count +1;
+// all these increment 1
 
 // Line 1 is a variable declaration, creating the count variable with an initial value of 0
 // Describe what line 3 is doing, in particular focus on what = is doing

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

@@ -8,7 +8,27 @@
 // Then, write the next test! :) Go through this process until all the cases are implemented
 
 function getAngleType(angle) {
-   if (angle === 90) return "Right angle";
+   if (angle < 0 || angle >= 360) { 
+    return "Invalid angle. Angle must be between 0 and 360 degrees.";
+   }
+
+   if (angle < 90) {
+    return "Acute angle";
+   }
+
+   if (angle === 90) {
+    return "Right 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
 }
 
@@ -44,13 +64,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

@@ -41,13 +41,18 @@ 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?
+// test for zero ovs
+const zeroFraction = isProperFraction(0, 2);
+assertEquals(zeroFraction, false);

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

@@ -8,44 +8,56 @@
 // 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.slice(0, -1); 
+        if (rank === "A") return 11;
+            else if (rank === "J", "Q", "K") return 10;
+                else if (rank >= "2" && rank <= "10") return rank;
+                    else throw new Error("Invalid card rank.");
+                    }
 
-// You need to write assertions for your function to check it works in different cases
-// we're going to use this helper function to make our assertions easier to read
-// if the actual output matches the target output, the test will pass
-function assertEquals(actualOutput, targetOutput) {
-  console.assert(
-    actualOutput === targetOutput,
-    `Expected ${actualOutput} to equal ${targetOutput}`
-  );
-}
-// Acceptance criteria:
+                    // You need to write assertions for your function to check it works in different cases
+                    // we're going to use this helper function to make our assertions easier to read
+                    // if the actual output matches the target output, the test will pass
+                    function assertEquals(actualOutput, targetOutput) {
+                      console.assert(
+                          actualOutput === targetOutput,
+                              `Expected ${actualOutput} to equal ${targetOutput}`
+                                );
+                                  return console.log('Test passed: ', actualOutput, 'equals', targetOutput);
+                                  }
+                                  // Acceptance criteria:
 
-// Given a card string in the format "A♠" (representing a card in blackjack - the last character will always be an emoji for a suit, and all characters before will be a number 2-10, or one letter of J, Q, K, A),
-// When the function getCardValue is called with this card string as input,
-// Then it should return the numerical card value
-const aceofSpades = getCardValue("A♠");
-assertEquals(aceofSpades, 11);
+                                  // Given a card string in the format "A♠" (representing a card in blackjack - the last character will always be an emoji for a suit, and all characters before will be a number 2-10, or one letter of J, Q, K, A),
+                                  // When the function getCardValue is called with this card string as input,
+                                  // Then it should return the numerical card value
+                                  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
+                                  // 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♥");
+                                  assertEquals(fiveofHearts, 5);
+                                  // ====> write your test here, and then add a line to pass the test in the function above
+                                  const nineofDiamonds = getCardValue("9♦");
+                                  assertEquals(nineofDiamonds, 9);
 
-// 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.
+                                  // 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 tenofSpades = getCardValue("10♠");
+                                  assertEquals(tenofSpades, 10);
+                                  const jackofClubs = getCardValue("J♣");
+                                  assertEquals(jackofClubs, 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.
+                                  // 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.
 
-// 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."
+                                  // 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."

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

@@ -1,6 +1,27 @@
 function getAngleType(angle) {
-  if (angle === 90) return "Right angle";
-  // replace with your completed function from key-implement
+  if (angle < 0 || angle >= 360) { 
+    return "Invalid angle. Angle must be between 0 and 360 degrees.";
+   }
+
+   if (angle < 90) {
+    return "Acute angle";
+   }
+
+   if (angle === 90) {
+    return "Right 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

@@ -4,6 +4,21 @@ test("should identify right angle (90°)", () => {
   expect(getAngleType(90)).toEqual("Right angle");
 });
 
+test("should identify acute angle (90°)", () => {
+  expect(getAngleType(45)).toEqual("Acute angle");
+});
+
+test("should identify obtuse angle (120°)", () => {
+  expect(getAngleType(120)).toEqual("Obtuse angle");
+});
+
+test("should identify Straight angle (180°)", () => {
+  expect(getAngleType(180)).toEqual("Straight angle");
+});
+
+test("should identify a reflex angle (270°)", () => {
+  expect(getAngleType(270)).toEqual("Reflex angle");
+});
 // REPLACE the comments with the tests
 // make your test descriptions as clear and readable as possible
 

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

@@ -1,5 +1,6 @@
 function isProperFraction(numerator, denominator) {
-    if (numerator < denominator) return true;
+    if (numerator < 0 || denominator < 0) return false;
+    return numerator < denominator;
     // add your completed function from key-implement here
 }
 

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

@@ -6,6 +6,17 @@ test("should return true for a proper fraction", () => {
 
 // Case 2: Identify Improper Fractions:
 
+test("should return false for an improper fraction", () => {
+  expect(isProperFraction(6, 3)).toEqual(false);
+});
 // Case 3: Identify Negative Fractions:
 
+test("should return false for a negative fraction", () => {
+  expect(isProperFraction(-1,9)).toEqual(false);
+  expect(isProperFraction(1, -9)).toEqual(false);
+});
 // Case 4: Identify Equal Numerator and Denominator:
+
+test("should return false for equal numerator and denominator", () => {
+  expect(isProperFraction(9, 9)).toEqual(false);
+})

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

@@ -1,5 +1,11 @@
 function getCardValue(card) {
     // replace with your code from key-implement
-    return 11;
+    const rank = card.slice(0, -1); // works to extract the rank and ignores the suit
+        if (rank === "A") return 11 //works
+        else if (["J", "Q", "K", "10"].includes(rank)) 
+            {return 10} // doesnt work
+        else if (/^[2-9]$/.test(rank)) {
+            return Number(rank)} // this resturns a string not a number and therefore fails.10 doesnt need to be here it can be in line 5. this doesnt work, refactor.
+        else { throw new Error("Invalid card rank.");} // this is right but doesnt work as expected
 }
 module.exports = getCardValue;

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

@@ -1,11 +1,26 @@
 const getCardValue = require("./3-get-card-value");
 
+// Case 4: Handle Ace (A):
 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 3 for 3 of clubs", () => {
+    const threeOfClubs = getCardValue("3♣");
+    expect (threeOfClubs).toEqual(3);
+});
 // Case 3: Handle Face Cards (J, Q, K):
-// Case 4: Handle Ace (A):
+test("should return 10 for King of Hearts and Queen of Diamonds", () => {
+    const kingOfHearts = getCardValue("K♥");
+    expect(kingOfHearts).toEqual(10);
+    const queenOfDiamonds = getCardValue("Q♦");
+    expect(queenOfDiamonds).toEqual(10);
+});
+
+
 // Case 5: Handle Invalid Cards:
+test("should throw an error for invalid card", () => {
+    expect(() => getCardValue("Z♠")).toThrow("Invalid card rank."); //not sure how to write this test
+});

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

@@ -1,5 +1,11 @@
 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;

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 if character does not exist", () => {
+  const str = "bye bye baby";
+  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,8 @@
 function getOrdinalNumber(num) {
- return "1st";
+    if (num === 1) return "1st";
+    if (num === 2) return "2nd";
+    if (num === 3) return "3rd";
+    return num + "th"; // handles all cases >= 4
 }
 
 module.exports = getOrdinalNumber;

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");
+}); //currently fails
+
+test("should return '3rd' for 3", () => {
+    expect(getOrdinalNumber(3)).toEqual("3rd");
+});
+
+test("should return '4th' for 4", () => {
+    expect(getOrdinalNumber(4)).toEqual("4th");
+});

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("count must be a positive integer");
+    }
+    // return str * count; numbers and strings dont mix.
+    return str.repeat(count);
 }
 
 module.exports = repeat;