ITP_JAN | KATARZYNA_KAZIMIERCZUK | STRUCTURING_AND_TESTING_DATA | SPRINT_3

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

@@ -10,6 +10,11 @@
 function getAngleType(angle) {
    if (angle === 90) return "Right angle";
    // read to the end, complete line 36, then pass your test here
+   else if (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";
+
 }
 
 // we're going to use this helper function to make our assertions easier to read
@@ -43,14 +48,19 @@ 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"
+const straight = getAngleType(180);
+assertEquals(straight, 'Straight angle') 
 // ====> write your test here, and then add a line to pass the test in the function above
 
 // 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"
+const reflex = getAngleType(181)
+assertEquals(reflex, 'Reflex angle')
 // ====> write your test here, and then add a line to pass the test in the function above

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

@@ -8,8 +8,12 @@
 // write one test at a time, and make it pass, build your solution up methodically
 
 function isProperFraction(numerator, denominator) {
-    if (numerator < denominator) return true;
+   //check if numerator is negative or positive
+    numerator = numerator < 0 ? Math.abs(numerator) : numerator;
+    let result = numerator < denominator ? true : false;
+    return result;
 }
+//I understand this can be shorter as well return numerator < denominator without putting in variable, this is because it's easier for me
 
 // here's our helper again
 function assertEquals(actualOutput, targetOutput) {
@@ -40,14 +44,23 @@ 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?
+
+// Zero Numerator and Denominator check:
+// Input: numerator = 0, denominator = 4
+// target output: false
+// Explanation: The fraction 0/3 is not a proper fraction because the numerator is 0. The function should return false.
+const zeroFraction = isProperFraction(0, 3);
+assertEquals(equalFraction, false)

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

@@ -7,10 +7,37 @@
 // complete the rest of the tests and cases
 // 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 (card === "A") return 11;
+// }//   switch (rank) {
+//   case "A":
+//      return 11;
+//   break;
+// }
+
 function getCardValue(card) {
-    if (rank === "A") return 11;
+      if (card.slice(0, 2) == '10') {
+      return 10;
+      }
+      let rank = card.length > 2 ? card.slice(0,2) : card[0];
+
+      if (rank === 'A') {
+      return 11;
+      } else if (rank >= 2 && rank <= 9) {
+      return parseInt(rank);
+      } else if (rank === 'J' || rank === 'Q' || rank === 'K') {
+      return 10;
+      } else
+    //check if not valid
+  // const allCards = ['A', 'K', 'Q', 'J', '10', '9', '8', '7', '6', '5', '4', '3', '2'];
+  // if (!allCards.includes(card))  
+  // here i was getting errors when this condition was at the beginning, so instead I implemented if input oes not match then it is invalid
+      return "Invalid card rank"
+
 }
 
+
+
 // 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
 // if the actual output matches the target output, the test will pass
@@ -33,19 +60,26 @@ 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♥");
+assertEquals(fiveofHearts, 5);
 // ====> write your test here, and then add a line to pass the test in the function above
 
 // 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 tenofSpades = getCardValue("10♥");
+assertEquals(tenofSpades, 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 aceofSpadesS = 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."
+// // Then it should throw an error indicating "Invalid card rank."
+const invalid = getCardValue("c");
+assertEquals(invalid, 'Invalid card rank');

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

@@ -1,16 +1,12 @@
 function getAngleType(angle) {
   if (angle === 90) return "Right angle";
-  // replace with your completed function from key-implement
-
+  else if (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";
 }
 
 
-
-
-
-
-
-
 // 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 (< 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° < 120°)", () => {
+  expect(getAngleType(111)).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° < 360°)", () => {
+  expect(getAngleType(181)).toEqual("Reflex angle");
+});

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

@@ -1,6 +1,8 @@
 function isProperFraction(numerator, denominator) {
-    if (numerator < denominator) return true;
-    // add your completed function from key-implement here
+    numerator = numerator < 0 ? Math.abs(numerator) : numerator;
+    let result = numerator < denominator ? true : false;
+    return result;
 }
+// or shorter return numerator < denominator because it already returns a boolean 
 
 module.exports = isProperFraction;

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

@@ -5,7 +5,16 @@ test("should return true for a proper fraction", () => {
 });
 
 // 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 fraction", () => {
+  expect(isProperFraction(-4, 7)).toEqual(true);
+});
 
 // Case 4: Identify Equal Numerator and Denominator:
+test("should return false for an equal numerator and demnomiator fraction", () => {
+  expect(isProperFraction(3, 3)).toEqual(false);
+});

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

@@ -1,5 +1,18 @@
 function getCardValue(card) {
-    // replace with your code from key-implement
-    return 11;
+    if (card.slice(0, 2) == '10') {
+        return 10;
+        }
+
+        let rank = card.length > 2 ? card.slice(0,2) : card[0];
+
+        if (rank === 'A') {
+        return 11;
+        } else if (rank >= 2 && rank <= 9) {
+        return parseInt(rank);
+        } else if (rank === 'J' || rank === 'Q' || rank === 'K') {
+        return 10;
+        } else
+        return "Invalid card rank"
 }
+
 module.exports = getCardValue;

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

@@ -6,6 +6,26 @@ test("should return 11 for Ace of Spades", () => {
     });
 
 // Case 2: Handle Number Cards (2-10):
+test("return the numeric value corresponding to the rank for 2-10", () => {
+    const fiveofHearts = getCardValue("5♥");
+    expect(fiveofHearts).toEqual(5);
+    });
+
 // Case 3: Handle Face Cards (J, Q, K):
+test("return the value of 10 for J, Q, K", () => {
+    const kingofSpades = getCardValue("K♠");
+    expect(kingofSpades).toEqual(10);
+    });
+
 // Case 4: Handle Ace (A):
-// Case 5: Handle Invalid Cards:
+test("should return 11 for Ace of Spades single string", () => {
+    const ace = getCardValue("A");
+    expect(ace).toEqual(11);
+    });
+
+test("should throw an error for invalid rank", () => {
+    // Case 5: Handle Invalid Cards:
+    const invalid = getCardValue("?");
+    expect(invalid).toEqual('Invalid card rank');
+});
+

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

@@ -1,5 +1,18 @@
+// for (variable of iterable) {
+//     // code block to be executed
+//   }
 function countChar(stringOfCharacters, findCharacter) {
-    return 5
+    let count = 0;
+
+    if (stringOfCharacters.includes(findCharacter)) {
+
+        for (let letter of stringOfCharacters) {
+            if (letter === findCharacter) {
+                count +=1;
+            }
+        } return count;
+    } else 
+    return 0;
 }
 
-module.exports = countChar;
+module.exports = countChar;

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

@@ -1,9 +1,12 @@
+
+
 // implement a function countChar that counts the number of times a character occurs in a string
 const countChar = require("./count");
 // Given a string str and a single character char to search for,
 // When the countChar function is called with these inputs,
 // Then it should:
 
+
 // Scenario: Multiple Occurrences
 // Given the input string str,
 // And a character char that may occur multiple times with overlaps within str (e.g., 'a' in 'aaaaa'),
@@ -22,3 +25,11 @@ 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 count character as 0", () => {
+  const str = "hello";
+  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,19 @@
 function getOrdinalNumber(num) {
- return "1st";
-}
 
-module.exports = getOrdinalNumber;
+    let numString = num.toString()
+    let lastNum = numString.length >= 2 ? numString.slice(-2) : numString.slice(-1);
+
+    if (lastNum === '11' || lastNum === '12' || lastNum === '13') {
+        return `${num}th`
+    } else if (numString === '23') {
+        return '23rd'
+    }
+
+    if (lastNum === '1') return `${num}st`
+    else if (lastNum === '2') return `${num}nd`
+    else if (lastNum === '3') return `${num}rd`
+    else return `${num}th`
+
+    }
+
+module.exports = getOrdinalNumber;

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

@@ -11,3 +11,20 @@ const getOrdinalNumber = require("./get-ordinal-number");
 test("should return '1st' for 1", () => {
     expect(getOrdinalNumber(1)).toEqual("1st");
     });
+
+test("should return '2nd' for 2", () => {
+    expect(getOrdinalNumber(2)).toEqual("2nd");
+    });
+
+test("should return '13th' for 13", () => {
+    expect(getOrdinalNumber(13)).toEqual("13th");
+    });
+
+
+//Reasonable tests, and they pass! 
+// We might benefit from a couple more assertions here just to be sure, for example trying the number 23.
+
+test("should return '23rd' for 23", () => {
+    expect(getOrdinalNumber(23)).toEqual('23rd')
+});
+console.log(getOrdinalNumber(23));