Transferred all of my changes to the updated foldersand removed all other subfolders.

Author: ahmadehsas

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

@@ -8,15 +8,14 @@
 // write one test at a time, and make it pass, build your solution up methodically
 
 function isProperFraction(numerator, denominator) {
-<<<<<<<< HEAD:Sprint-3/implement/2-is-proper-fraction.js
   if (Math.abs(numerator) < denominator) return true; // This version of code works correctly for proper and negative fractions.
   if (Math.abs(numerator) >= Math.abs(denominator)) return false;
   if (Math.abs(numerator) === Math.abs(denominator)) return false;
-========
+
   if (numerator < denominator) {
     return true;
   }
->>>>>>>> main:Sprint-3/1-implement-and-rewrite-tests/implement/2-is-proper-fraction.js
+
 }
 
 // The line below allows us to load the isProperFraction function into tests in other files.

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

@@ -8,7 +8,6 @@
 // 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) {
-<<<<<<<< HEAD:Sprint-3/implement/3-get-card-value.js
   const rank = card.slice(0, -1); // get the rank (before the suit symbol)
 
   if (!isNaN(rank)) {
@@ -26,16 +25,17 @@ function getCardValue(card) {
 }
 
 // if the rank is not a number or a face card, throw an error(invalid card rank).
-========
-  if (rank === "A") {
-    return 11;
-  }
-}
+
+  // if (rank === "x") {
+  //   return 11;
+  // }
+
+
 
 // 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;
->>>>>>>> main:Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js
+
 
 // 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
@@ -85,8 +85,8 @@ assertEquals(kingofSpades, 10);
 // 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 {
-  getCardValue("Z♠");
-} catch (error) {
-  console.log("Caught error:", error.message); // Should say "Invalid card rank"
-}
+// try {
+//   getCardValue("Z♠");
+// } catch (error) {
+//   console.log("Caught error:", error.message); // Should say "Invalid card rank"
+// }

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

@@ -12,15 +12,33 @@ 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(45)).toEqual("Acute angle");
+});
+// Case 2: identify Acute Angles, When the angle is less than 90 degrees, than the function should return "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° and < 180°)", () => {
+  expect(getAngleType(120)).toEqual("Obtuse angle");
+});
+// Case 3: identify Obtuse Angles, When the angle is greater than 90 degrees and less than 180 degrees, than the function should return "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 4: identify Straight Angles, When the angle is exactly 180 degrees, than the function should return "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(270)).toEqual("Reflex angle");
+});
+// Case 5: identify Reflex Angles, When the angle is greater than 180 degrees and less than 360 degrees, the function should return "Reflex Angle".
+

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

@@ -7,7 +7,21 @@ test("should return true for a proper fraction", () => {
 });
 
 // Case 2: Identify Improper Fractions:
+est("should return false for improper fractions", () => {
+  const improperFraction = isProperFraction(5, 2);
+  expect(improperFraction).toEqual(false);
+});
 
 // Case 3: Identify Negative Fractions:
+test("should return true for negative fractions", () => {
+  const negativeFraction = isProperFraction(-4, 7);
+  expect(negativeFraction).toEqual(true);
+});
+
 
 // Case 4: Identify Equal Numerator and Denominator:
+test("should return false for equal numerator and denominator", () => {
+  const equalFraction = isProperFraction(3, 3);
+  expect(equalFraction).toEqual(false);
+});
+

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

@@ -2,12 +2,58 @@
 // We will use the same function, but write tests for it using Jest in this file.
 const getCardValue = require("../implement/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);
 });
 
 // Case 2: Handle Number Cards (2-10):
+test("should return correct values for number cards", () => {
+  expect(getCardValue("5♥")).toEqual(5);
+  expect(getCardValue("10♦")).toEqual(10);
+});
+
+
 // Case 3: Handle Face Cards (J, Q, K):
-// Case 4: Handle Ace (A):
+test("should return for face cards J, Q, K", () => {
+  expect(getCardValue("J♣")).toEqual(10);
+  expect(getCardValue("Q♦")).toEqual(10);
+  expect(getCardValue("K♠")).toEqual(10);
+});
+
+
+
 // Case 5: Handle Invalid Cards:
+test("throws an error or invalid card", () => {
+  expect(() => getCardValue("Z♠")).toThrow("Invalid card");
+});
+
+test("should throw error for malformed numeric input", () => {
+  expect(() => getCardValue("2.9999♠")).toThrow("Invalid card rank");
+});
+
+test("should throw error for repeated characters in rank", () => {
+  expect(() => getCardValue("3AAAA♠")).toThrow("Invalid card rank");
+});
+
+test("should throw error for number beyond valid range", () => {
+  expect(() => getCardValue("11♠")).toThrow("Invalid card rank");
+});
+
+test("should throw error for missing suit", () => {
+  expect(() => getCardValue("Q")).toThrow("Invalid card rank");
+});
+
+test("should throw error for non-string input", () => {
+  expect(() => getCardValue(5)).toThrow("Card must be a string");
+});
+
+// try {
+// getCardValue("Z♠");
+//} catch (error) {
+// console.log("Caught error:", error.message);
+//}
+
+

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

@@ -1,5 +1,16 @@
 function countChar(stringOfCharacters, findCharacter) {
-  return 5
+  let count = 0; // start a count with 0
+  for (let char of stringOfCharacters) {
+    // repeat for each character in the string
+    if (char === findCharacter) {
+      // check if the character matches the one we are looking for.
+      count++; // if it does increase the count by 1.
+    }
+  }
+
+  return count;
+  
 }
+console.log(countChar("aAaAaAaAa", "a")); // example usage should return 5.
 
 module.exports = countChar;

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

@@ -1,5 +1,20 @@
 function getOrdinalNumber(num) {
-  return "1st";
+  let ord = "th";
+
+  if (n % 10 == 1 && n % 100 != 11) {
+    ord = "st";
+  } else if (n % 10 == 2 && n % 100 != 12) {
+    ord = "nd";
+  } else if (n % 10 == 3 && n % 100 != 13) {
+    ord = "rd";
+  }
+
+  return n + ord;
 }
+console.log(getOrdinalNumber(1)); // The output should be "1st"
+
+// in this function, we got the ordinal number for 1.
+// we used a simple if statement to check if the number is 1 and return "1st".
+
 
 module.exports = getOrdinalNumber;

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

@@ -8,6 +8,46 @@ const getOrdinalNumber = require("./get-ordinal-number");
 // When the number is 1,
 // Then the function should return "1st"
 
-test("should return '1st' for 1", () => {
+
+test("append 'st' to numbers ending in 1, except those ending in 11", () => {
   expect(getOrdinalNumber(1)).toEqual("1st");
+  expect(getOrdinalNumber(21)).toEqual("21st");
+  expect(getOrdinalNumber(121)).toEqual("121st");
+});
+
+test("appends 'nd' to numbers ending in 2, except those ending in 12", () => {
+  expect(getOrdinalNumber(2)).toEqual("2nd");
+  expect(getOrdinalNumber(22)).toEqual("22nd");
+});
+
+test("appends 'rd' to numbers ending in 3, except those ending in 13", () => {
+  expect(getOrdinalNumber(3)).toEqual("3rd");
+  expect(getOrdinalNumber(23)).toEqual("23rd");
 });
+
+test("appends 'th' to numbers ending in 11, 12, or 13 and all others not ending in 1, 2, or 3", () => {
+  expect(getOrdinalNumber(11)).toEqual("11th");
+  expect(getOrdinalNumber(12)).toEqual("12th");
+  expect(getOrdinalNumber(13)).toEqual("13th");
+  expect(getOrdinalNumber(111)).toEqual("111th");
+  expect(getOrdinalNumber(112)).toEqual("112th");
+  expect(getOrdinalNumber(113)).toEqual("113th");
+
+  //general `th` cases
+
+  expect(getOrdinalNumber(0)).toEqual("0th");
+  expect(getOrdinalNumber(4)).toEqual("4th");
+  expect(getOrdinalNumber(10)).toEqual("10th");
+  expect(getOrdinalNumber(24)).toEqual("24th");
+  expect(getOrdinalNumber(100)).toEqual("100th");
+  expect(getOrdinalNumber(104)).toEqual("104th");
+});
+
+test("handles edge cases for higher numbers", () => {
+  expect(getOrdinalNumber(1011)).toEqual("1011th");
+  expect(getOrdinalNumber(1012)).toEqual("1012th");
+  expect(getOrdinalNumber(1013)).toEqual("1013th");
+  expect(getOrdinalNumber(1021)).toEqual("1021st");
+  expect(getOrdinalNumber(1022)).toEqual("1022nd");
+  expect(getOrdinalNumber(1023)).toEqual("1023rd");
+});