LONDON-JAN-25 | ANDREI FILIPPOV | Module-Structuring-and-Testing-Data | WEEK 3

.gitignore

@@ -1,4 +1,6 @@
 node_modules
 .DS_Store
 .vscode
-**/.DS_Store
+**/.DS_Store
+package-lock.json
+Sprint-3/3-mandatory-practice/implement/fffff.test.js

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
+  else if (angle < 90 && angle > 0) return "Acute angle";
+  else if (angle > 90 && angle < 180) return "Obtuse angle";
+  else if (angle === 180) return "Straight angle";
+  else if (angle > 180 && angle < 360) return "Reflex angle";
 }
 
 // we're going to use this helper function to make our assertions easier to read
@@ -43,14 +47,21 @@ 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);
+assertEquals(obtuse, "Obtuse angle");
 // ====> write your test here, and then add a line to pass the test in the function above
 
 // 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(200);
+assertEquals(reflex, "Reflex angle");

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

@@ -8,7 +8,8 @@
 // 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 (Math.abs(numerator) < Math.abs(denominator)) return true; 
+    else return false;
 }
 
 // here's our helper again
@@ -40,14 +41,20 @@ 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);
+assertEquals(negativeFraction, true);
 // ====> complete with your assertion
 
 // 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);
+assertEquals(equalFraction, false);
+
 // ====> complete with your assertion
 
 // Stretch:
 // What other scenarios could you test for?
+
+const improperNegativeFraction = isProperFraction(-5, 2);
+assertEquals(improperNegativeFraction, false);

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

@@ -8,7 +8,16 @@
 // 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;
+  rank = card.slice(0, -1);
+  if (rank === "A") return 11;
+  else if (rank === "J" || rank === "Q" || rank === "K") return 10;
+  else if (
+    Number.isInteger(+(rank)) &&
+    Number(rank) < 10 &&
+    Number(rank) > 1 
+  )
+    return Number(rank);
+  else return "Invalid card rank.";
 }
 
 // You need to write assertions for your function to check it works in different cases
@@ -25,27 +34,38 @@ function assertEquals(actualOutput, targetOutput) {
 // 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
+const fiveOfHearts = getCardValue("5♥");
+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 jackOfSpades = getCardValue("J♠");
+assertEquals(jackOfSpades, 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."
+const invalid = getCardValue("five of hearts");
+assertEquals(invalid, "Invalid card rank.");
+
+const invalidNumber = getCardValue("12♥");
+assertEquals(invalidNumber, "Invalid card rank.");
+
+const FloatNumber = getCardValue("5.123♥");
+assertEquals(FloatNumber, "Invalid card rank.");

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
-
+  // read to the end, complete line 36, then pass your test here
+  else if (angle < 90 && angle > 0) return "Acute angle";
+  else if (angle > 90 && angle < 180) return "Obtuse angle";
+  else if (angle === 180) return "Straight angle";
+  else if (angle > 180 && angle < 360) return "Reflex angle";
 }
 
 
@@ -10,7 +13,6 @@ function getAngleType(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

@@ -10,15 +10,24 @@ test("should identify right angle (90°)", () => {
 // 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 (<90°)", () => {
+  expect(getAngleType(60)).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°)", () => {
+  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(200)).toEqual("Reflex angle");
+});

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

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

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

@@ -5,7 +5,14 @@ test("should return true for a proper fraction", () => {
 });
 
 // Case 2: Identify Improper Fractions:
-
+test("should return false for an improper proper fraction", () => {
+  expect(isProperFraction(3, 2)).toEqual(false);
+});
 // Case 3: Identify Negative Fractions:
-
+test("should return false for an improper proper fraction", () => {
+  expect(isProperFraction(-2, 3)).toEqual(true);
+});
 // Case 4: Identify Equal Numerator and Denominator:
+test("should return false for an improper proper fraction", () => {
+  expect(isProperFraction(3, 3)).toEqual(false);
+});

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

@@ -1,5 +1,14 @@
 function getCardValue(card) {
-    // replace with your code from key-implement
-    return 11;
+  rank = card.slice(0, -1);
+  if (rank === "A") return 11;
+  else if (rank === "J" || rank === "Q" || rank === "K") return 10;
+  else if (
+    typeof Number(rank) == "number" &&
+    Number(rank) > 1 &&
+    Number(rank) < 10
+  )
+    return Number(rank);
+  else return "Invalid card rank.";
 }
-module.exports = getCardValue;
+
+module.exports = getCardValue;

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

@@ -1,11 +1,25 @@
 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 number for 9 of Spades", () => {
+  const aceofSpades = getCardValue("9♠");
+  expect(aceofSpades).toEqual(9);
+});
 // Case 3: Handle Face Cards (J, Q, K):
+test("should return 10 for J of Spades", () => {
+  const aceofSpades = getCardValue("J♠");
+  expect(aceofSpades).toEqual(10);
+});
 // Case 4: Handle Ace (A):
+
 // Case 5: Handle Invalid Cards:
+test("should return 'Invalid card rank.' for invalid input", () => {
+  const aceofSpades = getCardValue("6478♠");
+  expect(aceofSpades).toEqual("Invalid card rank.");
+});

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

@@ -1,5 +1,7 @@
 function countChar(stringOfCharacters, findCharacter) {
-    return 5
-}
+  charList = stringOfCharacters.split("");
+  count = charList.filter((char) => char == findCharacter);
 
-module.exports = countChar;
+  return count.length;
+}
+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 no occurrences of a character in a string", () => {
+  const str = "bbbbbbb";
+  const char = "a";
+  const count = countChar(str, char);
+  expect(count).toEqual(0);
+});

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

@@ -1,5 +1,15 @@
 function getOrdinalNumber(num) {
- return "1st";
+  numToString = String(num);
+  lastDigit = numToString[numToString.length - 1]
+  if (lastDigit == 1 && num != 11) {
+    return `${num}st`;
+  } else if (lastDigit == 2 && num != 12) {
+    return `${num}nd`;
+  } else if (lastDigit == 3 && num != 13) {
+    return `${num}rd`;
+  } else {
+    return `${num}th`;
+  }
 }
 
-module.exports = getOrdinalNumber;
+module.exports = getOrdinalNumber;

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

@@ -9,5 +9,17 @@ const getOrdinalNumber = require("./get-ordinal-number");
 // Then the function should return "1st"
 
 test("should return '1st' for 1", () => {
-    expect(getOrdinalNumber(1)).toEqual("1st");
-    });
+  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 '12th' for 12", () => {
+  expect(getOrdinalNumber(12)).toEqual("12th");
+});
+test("should return '32nd' for 32", () => {
+  expect(getOrdinalNumber(32)).toEqual("32nd");
+});

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

@@ -1,5 +1,11 @@
-function repeat() {
-    return "hellohellohello";
+function repeat(str, count) {
+  if (count >= 0) {
+    return str.repeat(count);
+  } else if (count < 0) {
+    return "invalid number";
+  } else {
+    return "invalid input";
+  }
 }
 
-module.exports = repeat;
+module.exports = repeat;

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

@@ -10,23 +10,39 @@ const repeat = require("./repeat");
 // Then it should repeat the str count times and return a new string containing the repeated str values.
 
 test("should repeat the string count times", () => {
-    const str = "hello";
-    const count = 3;
-    const repeatedStr = repeat(str, count);
-    expect(repeatedStr).toEqual("hellohellohello");
-    });
+  const str = "hello";
+  const count = 3;
+  const repeatedStr = repeat(str, count);
+  expect(repeatedStr).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("shouldn't repeat the string for count 1", () => {
+  const str = "hello";
+  const count = 1;
+  const repeatedStr = repeat(str, count);
+  expect(repeatedStr).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 for count 0", () => {
+  const str = "hello";
+  const count = 0;
+  const repeatedStr = repeat(str, count);
+  expect(repeatedStr).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 return error if count less then 0", () => {
+  const str = "hello";
+  const count = -1;
+  const repeatedStr = repeat(str, count);
+  expect(repeatedStr).toEqual("invalid number");
+});