ZA | ITP May 25 | OBERT TILIMANDZI| MODULE-STRUCTURING AND TESTING DATA | SPRINT 3

Sprint-1/1-key-exercises/1-count.js

@@ -4,3 +4,4 @@ count = count + 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
+// Answer: "count + 1" is a value being assigned to the variable count and "=" is the assignement operator used to assign values to a variable

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

@@ -8,10 +8,16 @@
 // 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";
+  if (angle < 90 && angle > 0) 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";
+  return "Invalid angle";
 }
 
+   // read to the end, complete line 36, then pass your test here
+
 // 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) {
@@ -43,14 +49,20 @@ 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");
 
 // 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");
+
+
+
+module.exports = getAngleType; // added export

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

@@ -8,17 +8,18 @@
 // write one test at a time, and make it pass, build your solution up methodically
 
 function isProperFraction(numerator, denominator) {
-    if (numerator < denominator) return true;
+     return Math.abs(numerator) < Math.abs(denominator);
 }
 
 // here's our helper again
 function assertEquals(actualOutput, targetOutput) {
-  console.assert(
-    actualOutput === targetOutput,
+     console.assert(actualOutput === targetOutput,
+
     `Expected ${actualOutput} to equal ${targetOutput}`
   );
 }
 
+
 // Acceptance criteria:
 
 // Proper Fraction check:
@@ -40,14 +41,13 @@ 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?

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

@@ -8,7 +8,12 @@
 // 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" || rank == "A") return 11;
+    if (rank >= "2" && rank <= "9") return Number(rank);
+    if (rank === "10" || rank ==="Q"|| rank === "J" || rank === "K") return 10; 
+    return "Invalid card rank";
 }
 
 // You need to write assertions for your function to check it works in different cases
@@ -32,8 +37,8 @@ assertEquals(aceofSpades, 11);
 // 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
+const fiveofHearts = getCardValue("3♥");
+assertEquals(fiveofHearts, 3);
 
 // Handle Face Cards (J, Q, K):
 // Given a card with a rank of "10," "J," "Q," or "K",
@@ -48,4 +53,7 @@ const fiveofHearts = getCardValue("5♥");
 // 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."
+// Then it should throw an error indicating "Invalid card rank.assertEquals(getCardValue("Q♣"), 10);  // face card
+assertEquals(getCardValue("10♦"), 10); // 10
+assertEquals(getCardValue("9♠"), 9);   // number card
+assertEquals(getCardValue("B♦"), "Invalid card rank"); // invalid

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

@@ -0,0 +1,11 @@
+const getAngleType = require('./getAngleType');
+
+describe('getAngleType', () => {
+  test('returns Right angle for 90', () => {
+    expect(getAngleType(90)).toBe('Right angle');
+  });
+
+  test('returns Acute angle for 45', () => {
+    expect(getAngleType(45)).toBe('Acute angle');
+  });
+});

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

@@ -1,16 +1,14 @@
 function getAngleType(angle) {
   if (angle === 90) return "Right angle";
-  // replace with your completed function from key-implement
-
+  if (angle < 90 && angle > 0) 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";
+  return "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 

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

@@ -4,21 +4,18 @@ 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
-
-// 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 (less than 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 (greater than 90° and less than 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 (greater than 180° and less than 360°)", () => {
+  expect(getAngleType(270)).toEqual("Reflex angle");
+});

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

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

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

@@ -4,8 +4,14 @@ test("should return true for a proper fraction", () => {
   expect(isProperFraction(2, 3)).toEqual(true);
 });
 
-// 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,11 @@
 function getCardValue(card) {
-    // replace with your code from key-implement
-    return 11;
+    const rank = card.slice(0, -1)
+
+    if (rank === "A" || rank == "A") return 11;
+    if (rank >= "2" && rank <= "9") return Number(rank);
+    if (rank === "10" || rank ==="Q"|| rank === "J" || rank === "K") return 10; 
+    return "Invalid card rank";
 }
+
+
 module.exports = getCardValue;

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

@@ -1,5 +1,15 @@
 function countChar(stringOfCharacters, findCharacter) {
-    return 5
+    let countString = 0;
+
+    for(let i = 0; i < stringOfCharacters.length; i++) {
+        if (stringOfCharacters[i] === findCharacter) {
+      countString++;
+    }
+    }
+    return countString++;
 }
 
-module.exports = countChar;
+module.exports = countChar;
+
+// how many times a charactor appears in a string
+// what are the inputs and outputs

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

@@ -11,10 +11,10 @@ const countChar = require("./count");
 // Then it should correctly count overlapping occurrences of char (e.g., 'a' appears five times in 'aaaaa').
 
 test("should count multiple occurrences of a character", () => {
-  const str = "aaaaa";
+  const str = "aaaaaaa";
   const char = "a";
   const count = countChar(str, char);
-  expect(count).toEqual(5);
+  expect(count).toEqual(7);
 });
 
 // Scenario: No Occurrences

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

@@ -1,5 +1,11 @@
 function getOrdinalNumber(num) {
- return "1st";
-}
+    const lastNumber = num % 10; 
+    const secondLastNumber = num % 100;
 
+    if(secondLastNumber === 11 || secondLastNumber === 12 || secondLastNumber === 13) {
+
+        return num + "th";
+    }   
+    return num + "th"; // this will return all the other number + th
+}
 module.exports = getOrdinalNumber;

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

@@ -8,6 +8,22 @@ const getOrdinalNumber = require("./get-ordinal-number");
 // When the number is 1,
 // Then the function should return "1st"
 
-test("should return '1st' for 1", () => {
+    test("should return '1st' for 1", () => {
     expect(getOrdinalNumber(1)).toEqual("1st");
     });
+
+    test("should return '3rd' for 3rd", () => {
+    expect(getOrdinalNumber(3)).toEqual("3rd");
+    });
+
+     test("should return '10th' for 10", () => {
+    expect(getOrdinalNumber(10)).toEqual("10th");
+    });
+
+    test("should return '4th' for 4", () => {
+    expect(getOrdinalNumber(4)).toEqual("4th");
+    });
+
+    test("should return '499th' for 499", () => {
+    expect(getOrdinalNumber(499)).toEqual("499th");
+    });

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

@@ -1,5 +1,14 @@
-function repeat() {
-    return "hellohellohello";
-}
+function repeat(str, count) {
+    let repeatedStr = ""; // stores the string
+
+    if(count < 0) return "this is an invalid count";
+    if(count === 0) return "";
+    // check errors before function runs
 
+    for (let i = 0; i < count; i++) {
+    repeatedStr = repeatedStr + str;
+}  
+    return repeatedStr;
+}
+console.log(repeat("hi there... ", 5));
 module.exports = repeat;

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

@@ -11,9 +11,9 @@ const repeat = require("./repeat");
 
 test("should repeat the string count times", () => {
     const str = "hello";
-    const count = 3;
+    const count = 6;
     const repeatedStr = repeat(str, count);
-    expect(repeatedStr).toEqual("hellohellohello");
+    expect(repeatedStr).toEqual("hellohellohellohellohellohello");
     });
 
 // case: handle Count of 1: