modified excercise

Author: Enice-Codes

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

@@ -66,4 +66,5 @@ const invalid1 = getAngleType(-10);
 assertEquals(invalid1, 'Invalid angle');
 
 const invalid2 = getAngleType(400);
-assertEquals(invalid2, 'Invalid angle');
+assertEquals(invalid2, 'Invalid angle');
+

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

@@ -9,23 +9,21 @@
 // Acceptance criteria:
 // After you have implemented the function, write tests to cover all the cases, and
 // execute the code to ensure all tests pass.
-
 function isProperFraction(numerator, denominator) {
-  // TODO: Implement this function
-  if (denominator === 0){
-    return fasle;
-  
+  if (denominator === 0) {
+    return false;
   }
-  if (numerator < denominator && numerator > 0){
+  if (numerator < denominator && numerator >= 0) {
     return true;
   }
   return false;
 }
 
-// The line below allows us to load the isProperFraction function into tests in other files.
-// This will be useful in the "rewrite tests with jest" step.
 module.exports = isProperFraction;
 
+// The line below allows us to load the isProperFraction function into tests in other files.
+// This will be useful in the "rewrite tests with jest" step
+
 // Here's our helper again
 function assertEquals(actualOutput, targetOutput) {
   console.assert(
@@ -49,5 +47,3 @@ assertEquals(isProperFraction(6, 5), false);
 // example: 0/5 is a proper fraction
 assertEquals(isProperFraction(0, 5), true);
 
-// example: 5/0 is not a proper fraction
-assertEquals(isProperFraction(5, 0), false);

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

@@ -20,28 +20,30 @@
 // Acceptance criteria:
 // After you have implemented the function, write tests to cover all the cases, and
 // execute the code to ensure all tests pass.
-
 function getCardValue(card) {
-  // TODO: Implement this function
-  if(card === "A♠" || card === "A♥" || card === "A♦" || card === "A♣"){
-    return 11;
-  }
-  else if(card === "J♠" || card === "J♥" || card === "J♦" || card === "J♣" || card === "Q♠" || card === "Q♥" || card === "Q♦" || card === "Q♣" || card === "K♠" || card === "K♥" || card === "K♦" || card === "K♣"){
-    return 10;
-  }
-  else if(card === "2♠" || card === "2♥" || card === "2♦" || card === "2♣"){
-    return 2;
-  }
-  else if(card === "3♠" || card === "3♥" || card === "3♦" || card === "3♣"){
-    return 3;
+  if (typeof card !== "string") {
+    throw new Error("Invalid card");
   }
-  else {
+
+  const suits = ["♠", "♥", "♦", "♣"];
+  const suit = card.slice(-1);
+  const rank = card.slice(0, -1);
+
+  if (!suits.includes(suit)) {
     throw new Error("Invalid card");
   }
+
+  if (rank === "A") return 11;
+  if (rank === "J" || rank === "Q" || rank === "K") return 10;
+
+  const num = Number(rank);
+  if (Number.isInteger(num) && num >= 2 && num <= 10 && String(num) === rank) {
+    return num;
+  }
+
+  throw new Error("Invalid card");
 }
 
-// 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;
 
 // Helper functions to make our assertions easier to read.
@@ -72,23 +74,45 @@ assertEquals(getCardValue("Q♦"), 10);
 assertEquals(getCardValue("K♥"), 10);
 assertEquals(getCardValue("2♠"), 2);
 assertEquals(getCardValue("3♥"), 3);
-
+ 
 // What other valid card cases can you think of?
-function assertEqual(func, valid message){
- try{
+function assertValid(func, description) {
+  try {
   func();
-  console.log("Valid card test passed ");
- }
+    console.log(`Valid card test passed: ${description}`);
+  } catch (e) {
+    console.error(`Valid card test FAILED (threw unexpectedly): ${description} - ${e.message}`);
+  }
+}
+
 // What other invalid card cases can you think of?
- function  assertThrows(func, errorMessage) {
+ function assertThrows(func, description) {
   try {
     func();
-    console.error("Error was not thrown ");
+    console.error(`Error was not thrown for: ${description}`);
   } catch (e) {
-    if (e.message === errorMessage) {
-      console.log("Error thrown as expected ");
-    } else {
-      console.error(`Unexpected error message: ${e.message}`);
-    }
+    console.log(`Error thrown as expected for: ${description}`);
   }
-}
+}
+ 
+// What other valid card cases can you think of?
+assertValid(() => assertEquals(getCardValue("10♦"), 10), "10♦ (double-digit rank)");
+assertValid(() => assertEquals(getCardValue("A♣"), 11), "A♣");
+assertValid(() => assertEquals(getCardValue("K♠"), 10), "K♠");
+assertValid(() => assertEquals(getCardValue("7♥"), 7), "7♥");
+assertValid(() => assertEquals(getCardValue("2♦"), 2), "2♦");
+ 
+// What other invalid card cases can you think of?
+assertThrows(() => getCardValue(""), "empty string");
+assertThrows(() => getCardValue("1♠"), "rank 1 doesn't exist");
+assertThrows(() => getCardValue("11♠"), "rank 11 doesn't exist");
+assertThrows(() => getCardValue("A"), "missing suit");
+assertThrows(() => getCardValue("♠"), "missing rank");
+assertThrows(() => getCardValue("AS"), "letter suit instead of emoji");
+assertThrows(() => getCardValue("a♠"), "lowercase rank");
+assertThrows(() => getCardValue("K♠ "), "trailing whitespace");
+assertThrows(() => getCardValue(null), "null input");
+assertThrows(() => getCardValue(10), "number input");
+ 
+console.log("\nAll tests completed.");
+ 

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

@@ -1,41 +1,42 @@
 // This statement loads the getAngleType function you wrote in the implement directory.
 // We will use the same function, but write tests for it using Jest in this file.
 const getAngleType = require("../implement/1-get-angle-type");
-
 // TODO: Write tests in Jest syntax to cover all cases/outcomes,
 // including boundary and invalid cases.
 
 // Case 1: Acute angles
-test(`should return "Acute angle" when (0 < angle && angle  < 90)`, () => {
-  // Test various acute angles, including boundary cases
+test(`should return "Acute angle" when (0 < angle && angle < 90)`, () => {
   expect(getAngleType(1)).toEqual("Acute angle");
   expect(getAngleType(45)).toEqual("Acute angle");
   expect(getAngleType(89)).toEqual("Acute angle");
 });
 
 // Case 2: Right angle
-test (`should return "right angle" when (angle === 90)`,() => {
-  // testing various angles ,including boundary cases
-  expect( getAngleType(90)).toEqual("right angle");
-  });
+test(`should return "Right angle" when (angle === 90)`, () => {
+  expect(getAngleType(90)).toEqual("Right angle");
+});
+
 // Case 3: Obtuse angles
 test (`should return "obtuse angle" when (90 < angle && angle < 180)`, () => {
 expect(getAngleType(91)).toEqual("obtuse angle");
 expect(getAngleType(125)).toEqual("obtuse angle");
 expect(getAngleType(172)).toEqual("obtuse angle");
 });
+
 // Case 4: Straight angle
-test(`should return "straight angle" when (angle === 180)`, () => {
-  expect(getAngleType(180)).toEqual("straight angle");
+test(`should return "Straight angle" when (angle === 180)`, () => {
+  expect(getAngleType(180)).toEqual("Straight angle");
 });
-// Case 5: Reflex angles\
-test(`should return "reflex angle" when (180 < angle && angle < 360)`, () => {
-  expect(getAngleType(181)).toEqual("reflex angle");
-  expect(getAngleType(270)).toEqual("reflex angle");
-  expect(getAngleType(359)).toEqual("reflex angle");
+
+// Case 5: Reflex angles
+test(`should return "Reflex angle" when (180 < angle && angle < 360)`, () => {
+  expect(getAngleType(181)).toEqual("Reflex angle");
+  expect(getAngleType(270)).toEqual("Reflex angle");
+  expect(getAngleType(359)).toEqual("Reflex angle");
 });
+
 // Case 6: Invalid angles
 test(`should return "Invalid angle" when (angle < 0 || angle > 360)`, () => {
   expect(getAngleType(-1)).toEqual("Invalid angle");
   expect(getAngleType(361)).toEqual("Invalid angle");
-});
+});

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

@@ -14,11 +14,10 @@ test(` should return true when the numerator is one and denominator is greater t
   expect(isProperFraction(1, 2)).toEqual(true);
 });
 // special case : denominator is negative to the numerator
-test(`should return false when the denominator is negative and the numerator is positive`, () => {
-  expect(isProperFraction(1, -2)).toEqual(false);
+test(`should return false when denominator is zero`, () => {
+  expect(isProperFraction(1, 0)).toEqual(false);
 });
 
-// special case : denominator  is negative to the numerator
-test(`should return false when the numerator is negative and the denominator is positive`, () => {
-  expect(isProperFraction(-1, 2)).toEqual(false);
-});
+test(`should return true when the numerator is one and denominator is greater than one`, () => {
+  expect(isProperFraction(1, 2)).toEqual(true);
+});

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

@@ -25,7 +25,7 @@ test(`Should return the correct value when given a number card`, () => {
 
 // Case 4: Invalid Cards
 test(`Should throw an error when given an invalid card`, () => {
-  expect(() => getCardValue("invalid")).toThrow("Invalid card");
+  expect(() => getCardValue("invalid")).toThrow(new Error("Invalid card"));
 });
 
 // To learn how to test whether a function throws an error as expected in Jest,

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

@@ -1,15 +1,23 @@
 function getOrdinalNumber(num) {
-  return "1st";
+  const lastdigit= num % 10 
+  switch (lastdigit){
+    case 1: 
+    console.log("st");
+    return `${num}st`;
+
+    case 2 :
+    console.log("nd");
+    return `${num}nd`;
+
+case 3:
+  console.log("rd");
+ return `${num}rd`;
+
+
+}
 }
 
-module.exports = getOrdinalNumber;
- test(`works with any number ending with 1, except for 11. For all other numbers, it should return the number followed by "th"  with exceptions to 2 and 3 `, () => {
-   expect(getOrdinalNumber(1)).toBe("1st");
-   expect(getOrdinalNumber(2)).toBe("2nd");
-   expect(getOrdinalNumber(3)).toBe("3rd");
-   expect(getOrdinalNumber(4)).toBe("4th");
-   expect(getOrdinalNumber(11)).toBe("11th");
-   expect(getOrdinalNumber(12)).toBe("12th");
- });
 
+module.exports = getOrdinalNumber;
+ 
 

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

@@ -1,4 +1,6 @@
 const getOrdinalNumber = require("./get-ordinal-number");
+
+  
 // In this week's prep, we started implementing getOrdinalNumber.
 
 // Continue testing and implementing getOrdinalNumber for additional cases.
@@ -14,19 +16,24 @@ const getOrdinalNumber = require("./get-ordinal-number");
 // When the number ends with 1, except those ending with 11,
 // Then the function should return a string by appending "st" to the number.
 test("should append 'st' for numbers ending with 1, except those ending with 11", () => {
-  expect(getOrdinalNumber(1)).toEqual("1st");
-  expect(getOrdinalNumber(31)).toEqual("31st");
-  expect(getOrdinalNumber(131)).toEqual("131st");
+  expect(getOrdinalNumber(1)).toBe("1st");
+  expect(getOrdinalNumber(21)).toBe("21st");
+  expect(getOrdinalNumber(131)).toBe("131st");
+
 });
- test(`should append 'nd' for numbers ending with 2 except those ending with 12 `, () => {
-  expect(getOrdinalNumber(2)).toEqual("2nd");
-  expect(getOrdinalNumber(22)).toEqual("22nd");
-  expect(getOrdinalNumber(132)).toEqual("132nd");   
+
+// case 2: Numbers ending with 2 ,but not 12
+ test("should append 'nd' for numbers ending with 2 ,except those ending with 12 ", () => {
+  expect(getOrdinalNumber(2)).toBe("2nd");
+  expect(getOrdinalNumber(22)).toBe("22nd");
+  expect(getOrdinalNumber(132)).toBe("132nd");
 });
 
- test(`should append 'rd' for numbers ending with 3 except those ending with 13 `, () => {
-  expect(getOrdinalNumber(3)).toEqual("3rd");
-  expect(getOrdinalNumber(23)).toEqual("23rd");
-  expect(getOrdinalNumber(143)).toEqual("143rd");
+// case 3 : Numbers ending with 3 ,but not 13 
+test("should append 'rd'for numbers ending with 3 ,except those ending with 13 ", () => {
+  expect(getOrdinalNumber(3)).toBe("3rd");
+  expect(getOrdinalNumber(23)).toBe("23rd");
+  expect(getOrdinalNumber(133)).toBe("133rd");
+
 });
- 
+

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

@@ -1,7 +1,24 @@
-function repeatStr() {
+function repeatStr(str, num) {
+  if (num < 0) {
+    throw new Error("Count cannot be negative");
+  }
+
+
+let result = "";
+for (let i=0; i < num; i ++){
+  result += str;
+}
+
+return result;
+
+}
+
+console.log(repeatStr("hello",3));
   // Your implementation of this function must *not* call String.prototype.repeat (https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/repeat).
   // The goal is to re-implement that function, not to use it.
-  return "hellohellohello";
-}
+
+
 
 module.exports = repeatStr;
+
+

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

@@ -21,12 +21,30 @@ test("should repeat the string count times", () => {
 // When the repeatStr function is called with these inputs,
 // Then it should return the original `str` without repetition.
 
+test("should return the original str without repetition", () => {
+  const str = "hello";
+  const count = 1;
+  const repeatedStr = repeatStr(str, count);
+  expect(repeatedStr).toEqual("hello");
+});
+
 // Case: Handle count of 0:
 // Given a target string `str` and a `count` equal to 0,
 // When the repeatStr function is called with these inputs,
 // Then it should return an empty string.
 
+test("should return an empty string", () => {
+  const str = "hello";
+  const count = 0;
+  const repeatedStr = repeatStr(str, count);
+  expect(repeatedStr).toEqual("");
+});
+
 // Case: Handle negative count:
 // Given a target string `str` and a negative integer `count`,
 // When the repeatStr function is called with these inputs,
 // Then it should throw an error, as negative counts are not valid.
+
+test("should throw an error because negative counts are not valid", () => {
+  expect(() => repeatStr("hello", -3 )).toThrow();
+});