Glasgow | 25-ITP-SEP | Shreef Ibrahim | Sprint 3 | Coursework

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

@@ -10,9 +10,17 @@
 function getAngleType(angle) {
   if (angle === 90) {
     return "Right angle";
+  } else if (angle > 0 && angle < 90) {
+    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";
+  } else {
+    return "Invalid 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.
 }
 
 // The line below allows us to load the getAngleType function into tests in other files.
@@ -50,14 +58,17 @@ 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(181);
+assertEquals(reflex, "Reflex angle");

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

@@ -8,9 +8,7 @@
 // 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);
 }
 
 // The line below allows us to load the isProperFraction function into tests in other files.
@@ -46,14 +44,26 @@ 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);
-// ====> complete with your assertion
+assertEquals(equalFraction, false);
 
 // Stretch:
 // What other scenarios could you test for?
+const negativeDenominator = isProperFraction(4, -7);
+assertEquals(negativeDenominator, true);
+
+const zeroNumerator = isProperFraction(0, 3);
+assertEquals(zeroNumerator, true);
+
+const zeroDenominator = isProperFraction(4, 0);
+assertEquals(zeroDenominator, false);
+
+const zero = isProperFraction(0, 0);
+assertEquals(zero, false);

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

@@ -8,11 +8,25 @@
 // 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) {
+  let rank = card.slice(0, card.length - 1);
   if (rank === "A") {
     return 11;
   }
+
+  if (["J", "Q", "K", "10"].includes(rank)) {
+    return 10;
+  }
+  const number = parseInt(rank);
+  if (number >= 2 && number <= 9) {
+    return number;
+  }
+  return "Invalid card rank";
 }
 
+let car = "10♠";
+
+let ran = car.slice(0, -1);
+console.log(ran);
 // The line below allows us to load the getCardValue function into tests in other files.
 // This will be useful in the "rewrite tests with jest" step.
 module.exports = getCardValue;
@@ -28,7 +42,9 @@ function assertEquals(actualOutput, 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),
+// 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♠");
@@ -39,19 +55,25 @@ 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 faceCards = getCardValue("J♣");
+assertEquals(faceCards, 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 ace = getCardValue("A");
+assertEquals(ace, "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."
+const invalidCard = getCardValue("BJ");
+assertEquals(invalidCard, "Invalid card rank");

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

@@ -6,21 +6,24 @@ 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 return 'Acute angle' when the angle is less than 90 degrees", () => {
+  expect(getAngleType(89)).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 return 'Obtuse angle' When the angle is greater than 90 degrees and less than 180 degrees", () => {
+  expect(getAngleType(100)).toEqual("Obtuse angle");
+});
 
 // Case 4: Identify Straight Angles:
-// When the angle is exactly 180 degrees,
-// Then the function should return "Straight angle"
+
+test("should return 'Straight angle' When the angle is exactly 180 degrees,", () => {
+  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 return 'Reflex angle' When the angle is greater than 180 degrees and less than 360 degrees,", () => {
+  expect(getAngleType(181)).toEqual("Reflex angle");
+});

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

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

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

@@ -8,6 +8,22 @@ test("should return 11 for Ace of Spades", () => {
 });
 
 // Case 2: Handle Number Cards (2-10):
+test("Should return numeric value(8) for Number Cards (2-10)", () => {
+  const aceofSpades = getCardValue("8♠");
+  expect(aceofSpades).toEqual(8);
+});
 // Case 3: Handle Face Cards (J, Q, K):
+test("should return the value 10,  a card with a rank of ('10', 'J', 'Q', or 'K')", () => {
+  const aceofSpades = getCardValue("K♠");
+  expect(aceofSpades).toEqual(10);
+});
 // Case 4: Handle Ace (A):
+test("should return the value 11,for a card with a rank of 'A' ", () => {
+  const aceofSpades = getCardValue("A♣");
+  expect(aceofSpades).toEqual(11);
+});
 // Case 5: Handle Invalid Cards:
+test("should throw an error,with an invalid rank 'OL'", () => {
+  const aceofSpades = getCardValue("OL");
+  expect(aceofSpades).toBe("Invalid card rank");
+});

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

@@ -1,5 +1,11 @@
-function countChar(stringOfCharacters, findCharacter) {
-  return 5
+function countChar(stringOfCharacters, findChar) {
+  let count = 0;
+  for (const char of stringOfCharacters) {
+    if (char === findChar) {
+      count++;
+    }
+  }
+  return count;
 }
 
 module.exports = countChar;

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

@@ -11,14 +11,26 @@ 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 char = "a";
+  const str = "shreef redwan hamed";
+  const char = "e";
   const count = countChar(str, char);
-  expect(count).toEqual(5);
+  expect(count).toEqual(4);
 });
 
 // Scenario: No Occurrences
 // Given the input string str,
 // 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("no char should return 0", () => {
+  const str = "redwan";
+  const char = "b";
+  const count = countChar(str, char);
+  expect(count).toEqual(0);
+});
+test("no char should return 0", () => {
+  const str = "cyf";
+  const char = "k";
+  const count = countChar(str, char);
+  expect(count).toEqual(0);
+});

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

@@ -1,5 +1,21 @@
 function getOrdinalNumber(num) {
-  return "1st";
+  const last2Digit = num % 100;
+  const last1Digit = num % 10;
+
+  if (last2Digit >= 11 && last2Digit <= 13) {
+    return num + "th";
+  }
+
+  switch (last1Digit) {
+    case 1:
+      return num + "st";
+    case 2:
+      return num + "nd";
+    case 3:
+      return num + "rd";
+    default:
+      return num + "th";
+  }
 }
 
 module.exports = getOrdinalNumber;

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

@@ -11,3 +11,17 @@ const getOrdinalNumber = require("./get-ordinal-number");
 test("should return '1st' for 1", () => {
   expect(getOrdinalNumber(1)).toEqual("1st");
 });
+test("should return '22nd' for 22", () => {
+  expect(getOrdinalNumber(22)).toEqual("22nd");
+});
+
+test("should return '3th' for 3", () => {
+  expect(getOrdinalNumber(3)).toEqual("3rd");
+});
+test("should return '23rd' for 23", () => {
+  expect(getOrdinalNumber(23)).toEqual("23rd");
+});
+
+test("should return '100th' for 100", () => {
+  expect(getOrdinalNumber(100)).toEqual("100th");
+});

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

@@ -1,5 +1,7 @@
-function repeat() {
-  return "hellohellohello";
+function repeat(str, count) {
+  if (count < 0) {
+    return "Count must be non-negative";
+  }
+  return str.repeat(count);
 }
-
 module.exports = repeat;

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

@@ -21,12 +21,31 @@ test("should repeat the string count times", () => {
 // 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 the original str without repetition", () => {
+  const str = "shreef";
+  const count = 1;
+  const repeatedStr = repeat(str, count);
+  expect(repeatedStr).toEqual("shreef");
+});
+
 // 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 an empty string", () => {
+  const str = "ahmed";
+  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 throw an error or return an appropriate error message", () => {
+  const str = "jone";
+  const count = -5;
+  const repeatedStr = repeat(str, count);
+  expect(repeatedStr).toBe("Count must be non-negative");
+});

Sprint-3/3-stretch/find.js

@@ -9,9 +9,8 @@ function find(str, char) {
   }
   return -1;
 }
-
-console.log(find("code your future", "u"));
-console.log(find("code your future", "z"));
+// console.log(find("code your future", "u"));
+// console.log(find("code your future", "z"));
 
 // The while loop statement allows us to do iteration - the repetition of a certain number of tasks according to some condition
 // See the docs https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/while
@@ -20,6 +19,11 @@ console.log(find("code your future", "z"));
 // Pay particular attention to the following:
 
 // a) How the index variable updates during the call to find
+// It will keep track of our current position in the string  starting from 0 and increases by 1 on each loop iteration
+// intil character is found or the loop reache the end of the string
 // b) What is the if statement used to check
+// It is checking if the character at the current index in str is equal to char.
 // c) Why is index++ being used?
+//It is used to update the index during each iteration so the loop moves to the next character.
 // d) What is the condition index < str.length used for?
+// This ensure the loop keeps running until index reaches the length of the string, so we do not go past the last character.