diff --git a/Sprint-3/1-implement-and-rewrite-tests/implement/1-get-angle-type.js b/Sprint-3/1-implement-and-rewrite-tests/implement/1-get-angle-type.js index 9e05a871e..714e24abf 100644 --- a/Sprint-3/1-implement-and-rewrite-tests/implement/1-get-angle-type.js +++ b/Sprint-3/1-implement-and-rewrite-tests/implement/1-get-angle-type.js @@ -15,7 +15,22 @@ // execute the code to ensure all tests pass. function getAngleType(angle) { - // TODO: Implement this function + if (angle < 90) { + return "Acute angle"; + } + if (angle === 90) { + return "Right angle"; + } + if (angle < 180) { + return "Obtuse angle"; + } + if (angle === 180) { + return "Straight angle"; + } + if (angle <= 360) { + return "Reflex angle"; + } + return "Invalid angle"; } // The line below allows us to load the getAngleType function into tests in other files. @@ -33,5 +48,20 @@ function assertEquals(actualOutput, targetOutput) { // TODO: Write tests to cover all cases, including boundary and invalid cases. // Example: Identify Right Angles +const acute = getAngleType(70); +assertEquals(acute, "Acute angle"); + const right = getAngleType(90); assertEquals(right, "Right angle"); + +const obtuse = getAngleType(95); +assertEquals(obtuse, "Obtuse angle"); + +const straight = getAngleType(180); +assertEquals(straight, "Straight angle"); + +const reflex = getAngleType(280); +assertEquals(reflex, "Reflex angle"); + +const invalid = getAngleType(180); +assertEquals(invalid, "Invalid angle"); diff --git a/Sprint-3/1-implement-and-rewrite-tests/implement/2-is-proper-fraction.js b/Sprint-3/1-implement-and-rewrite-tests/implement/2-is-proper-fraction.js index 970cb9b64..f4378f883 100644 --- a/Sprint-3/1-implement-and-rewrite-tests/implement/2-is-proper-fraction.js +++ b/Sprint-3/1-implement-and-rewrite-tests/implement/2-is-proper-fraction.js @@ -11,7 +11,8 @@ // execute the code to ensure all tests pass. function isProperFraction(numerator, denominator) { - // TODO: Implement this function + if (denominator === 0) return false; + return numerator < denominator ? true : false; } // The line below allows us to load the isProperFraction function into tests in other files. @@ -31,3 +32,8 @@ function assertEquals(actualOutput, targetOutput) { // Example: 1/2 is a proper fraction assertEquals(isProperFraction(1, 2), true); +assertEquals(isProperFraction(2, 1), false); +assertEquals(isProperFraction(0, 0), false); +assertEquals(isProperFraction(-0, 0), false); +assertEquals(isProperFraction(-5, 4), true); +assertEquals(isProperFraction(-4, -5), false); diff --git a/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js b/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js index c7559e787..7797abf41 100644 --- a/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js +++ b/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js @@ -22,7 +22,39 @@ // execute the code to ensure all tests pass. function getCardValue(card) { - // TODO: Implement this function + const rank = [ + "A", + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10", + "J", + "Q", + "K", + ]; + const suit = ["♠", "♥", "♦", "♣"]; + + const cardValue = card.slice(0, -1); + console.log("card value: " + cardValue); + const cardSuit = card[card.length - 1]; + + if (!rank.includes(cardValue) || !suit.includes(cardSuit)) { + throw new Error("invalid input"); + } + + if ("A" === cardValue) { + return 11; + } + if (["J", "Q", "K"].includes(cardValue)) { + return 10; + } + + return Number(cardValue); } // The line below allows us to load the getCardValue function into tests in other files. @@ -40,6 +72,13 @@ function assertEquals(actualOutput, targetOutput) { // TODO: Write tests to cover all outcomes, including throwing errors for invalid cards. // Examples: assertEquals(getCardValue("9♠"), 9); +assertEquals(getCardValue("A♠"), 11); +assertEquals(getCardValue("J♠"), 10); +assertEquals(getCardValue("K♠"), 10); +assertEquals(getCardValue("Q♠"), 10); +assertEquals(getCardValue("2♠"), 2); +assertEquals(getCardValue("5♠"), 5); +assertEquals(getCardValue("10♠"), 10); // Handling invalid cards try { diff --git a/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/1-get-angle-type.test.js b/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/1-get-angle-type.test.js index d777f348d..44e3052a9 100644 --- a/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/1-get-angle-type.test.js +++ b/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/1-get-angle-type.test.js @@ -11,6 +11,34 @@ test(`should return "Acute angle" when (0 < angle < 90)`, () => { expect(getAngleType(1)).toEqual("Acute angle"); expect(getAngleType(45)).toEqual("Acute angle"); expect(getAngleType(89)).toEqual("Acute angle"); + expect(getAngleType(95)).not.toEqual("Acute angle"); +}); +test(`should return "Right angle" when angle is 90)`, () => { + // Test various acute angles, including boundary cases + expect(getAngleType(90)).toEqual("Right angle"); + expect(getAngleType(45)).not.toEqual("Right angle"); + expect(getAngleType(99)).not.toEqual("Right angle"); +}); + +test(`should return "Obtuse angle" when (90 < angle < 180)`, () => { + // Test various acute angles, including boundary cases + expect(getAngleType(90)).not.toEqual("Obtuse angle"); + expect(getAngleType(100)).toEqual("Obtuse angle"); + expect(getAngleType(180)).not.toEqual("Obtuse angle"); + expect(getAngleType(200)).not.toEqual("Obtuse angle"); +}); + +test(`should return "Straight angle" when (angle is 180)`, () => { + // Test various acute angles, including boundary cases + expect(getAngleType(179)).not.toEqual("Straight angle"); + expect(getAngleType(180)).toEqual("Straight angle"); + expect(getAngleType(181)).not.toEqual("Straight angle"); +}); +test(`should return "Reflex angle" when (180 < angle < 361)`, () => { + // Test various acute angles, including boundary cases + expect(getAngleType(179)).not.toEqual("Reflex angle"); + expect(getAngleType(371)).not.toEqual("Reflex angle"); + expect(getAngleType(200)).toEqual("Reflex angle"); }); // Case 2: Right angle diff --git a/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js b/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js index 7f087b2ba..7258b5ece 100644 --- a/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js +++ b/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js @@ -7,4 +7,33 @@ const isProperFraction = require("../implement/2-is-proper-fraction"); // Special case: numerator is zero test(`should return false when denominator is zero`, () => { expect(isProperFraction(1, 0)).toEqual(false); + expect(isProperFraction(0, 0)).toEqual(false); + expect(isProperFraction(-1, 0)).toEqual(false); +}); + +test(`should return true when numerator and denominator both positive and numerator < denominator`, () => { + expect(isProperFraction(1, 2)).toEqual(true); + expect(isProperFraction(4, 5)).toEqual(true); + expect(isProperFraction(2, 3)).toEqual(true); +}); + +test(`should return true when numerator and denominator both negative and numerator < denominator`, () => { + expect(isProperFraction(-3, -2)).toEqual(true); +}); + +test(`should return true when numerator is negative and numerator < denominator`, () => { + expect(isProperFraction(-3, 2)).toEqual(true); +}); + +test(`should return false when numerator > denominator`, () => { + expect(isProperFraction(2, 1)).toEqual(false); +}); + +test(`should return false when numerator > denominator, negative nums`, () => { + expect(isProperFraction(-1, -2)).toEqual(false); +}); + +test(`should return false when numerator == denominator`, () => { + expect(isProperFraction(-2, -2)).toEqual(false); + expect(isProperFraction(2, 2)).toEqual(false); }); diff --git a/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js b/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js index cf7f9dae2..d7287feac 100644 --- a/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js +++ b/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js @@ -13,8 +13,27 @@ test(`Should return 11 when given an ace card`, () => { // Number Cards (2-10) // Face Cards (J, Q, K) // Invalid Cards +test(`Should return 10 when given a K, Q or J card`, () => { + expect(getCardValue("K♠")).toEqual(10); + expect(getCardValue("Q♠")).toEqual(10); + expect(getCardValue("J♠")).toEqual(10); +}); + +test(`Should return the number of the card given a numeric card card`, () => { + expect(getCardValue("10♠")).toEqual(10); + expect(getCardValue("2♠")).toEqual(2); + expect(getCardValue("3♠")).toEqual(3); +}); + +test(`Should throw an error if invalid card`, () => { + expect(() => { + getCardValue("2😬"); + }).toThrow(); + expect(() => { + getCardValue("22♠"); + }).toThrow(); +}); // To learn how to test whether a function throws an error as expected in Jest, // please refer to the Jest documentation: // https://jestjs.io/docs/expect#tothrowerror - diff --git a/Sprint-3/2-practice-tdd/count.js b/Sprint-3/2-practice-tdd/count.js index 95b6ebb7d..c39faabe2 100644 --- a/Sprint-3/2-practice-tdd/count.js +++ b/Sprint-3/2-practice-tdd/count.js @@ -1,5 +1,11 @@ function countChar(stringOfCharacters, findCharacter) { - return 5 + let total = 0; + for (const char of stringOfCharacters) { + if (char === findCharacter) { + total += 1; + } + } + return total; } module.exports = countChar; diff --git a/Sprint-3/2-practice-tdd/count.test.js b/Sprint-3/2-practice-tdd/count.test.js index 179ea0ddf..2b8e28ae3 100644 --- a/Sprint-3/2-practice-tdd/count.test.js +++ b/Sprint-3/2-practice-tdd/count.test.js @@ -22,3 +22,21 @@ test("should count multiple occurrences of a character", () => { // And a character `char` that does not exist within `str`. // When the function is called with these inputs, // Then it should return 0, indicating that no occurrences of `char` were found. +test("should count zero occurrences of a character", () => { + const str = "aaaaa"; + const char = "b"; + const count = countChar(str, char); + expect(count).toEqual(0); +}); + +// Scenario: Non-consecutive occurrances +// Given the input string `str`, +// And a character `char` that appears in more than one block within `str`. +// When the function is called with these inputs, +// Then it should return the number of total occurrances. +test("should count non-contiguous occurrences of a character", () => { + const str = "aaaaabba"; + const char = "a"; + const count = countChar(str, char); + expect(count).toEqual(6); +}); diff --git a/Sprint-3/2-practice-tdd/get-ordinal-number.js b/Sprint-3/2-practice-tdd/get-ordinal-number.js index f95d71db1..378f4b832 100644 --- a/Sprint-3/2-practice-tdd/get-ordinal-number.js +++ b/Sprint-3/2-practice-tdd/get-ordinal-number.js @@ -1,5 +1,19 @@ function getOrdinalNumber(num) { - return "1st"; + // 11 is a special case + if (num === 11) { + return "11th"; + } + const lastDigit = num % 10; + switch (lastDigit) { + case 1: + return String(num) + "st"; + case 2: + return String(num) + "nd"; + case 3: + return String(num) + "rd"; + default: + return String(num) + "th"; + } } module.exports = getOrdinalNumber; diff --git a/Sprint-3/2-practice-tdd/get-ordinal-number.test.js b/Sprint-3/2-practice-tdd/get-ordinal-number.test.js index adfa58560..08136cb0f 100644 --- a/Sprint-3/2-practice-tdd/get-ordinal-number.test.js +++ b/Sprint-3/2-practice-tdd/get-ordinal-number.test.js @@ -18,3 +18,41 @@ test("should append 'st' for numbers ending with 1, except those ending with 11" expect(getOrdinalNumber(21)).toEqual("21st"); expect(getOrdinalNumber(131)).toEqual("131st"); }); + +// Case 2: Numbers ending with 2 +// When the number ends with 2 +// Then the function should return a string by appending "nd" to the number. +test("should append 'nd' for numbers ending with 2", () => { + expect(getOrdinalNumber(2)).toEqual("2nd"); + expect(getOrdinalNumber(22)).toEqual("22nd"); + expect(getOrdinalNumber(132)).toEqual("132nd"); +}); + +// Case 3: Numbers ending with 3 +// When the number ends with 3 +// Then the function should return a string by appending "rd" to the number. +test("should append 'rd' for numbers ending with 3", () => { + expect(getOrdinalNumber(3)).toEqual("3rd"); + expect(getOrdinalNumber(23)).toEqual("23rd"); + expect(getOrdinalNumber(223)).toEqual("223rd"); +}); + +// Case 4: the general(ish) case +// When numbers end with 0, 4, 5, 6, 7, 8, 9 +// The function should return a string by appending "th" to the number +test("should append 'th' for numbers ending with 0, 4, 5, 6, 7, 8, 9", () => { + expect(getOrdinalNumber(10)).toEqual("10th"); + expect(getOrdinalNumber(24)).toEqual("24th"); + expect(getOrdinalNumber(25)).toEqual("25th"); + expect(getOrdinalNumber(46)).toEqual("46th"); + expect(getOrdinalNumber(57)).toEqual("57th"); + expect(getOrdinalNumber(78)).toEqual("78th"); + expect(getOrdinalNumber(89)).toEqual("89th"); +}); + +// Case 5: The special case of 11 +// When the number is 11 +// Then the function should return a string by appending "th" to the number. +test("should append 'th' for 11", () => { + expect(getOrdinalNumber(11)).toEqual("11th"); +}); diff --git a/Sprint-3/2-practice-tdd/repeat-str.js b/Sprint-3/2-practice-tdd/repeat-str.js index 3838c7b00..255cdaee7 100644 --- a/Sprint-3/2-practice-tdd/repeat-str.js +++ b/Sprint-3/2-practice-tdd/repeat-str.js @@ -1,5 +1,18 @@ -function repeatStr() { - return "hellohellohello"; +function repeatStr(str, count) { + if (count < 0) { + throw new Error("invalid input: negative number"); + } + if (count === 1) { + return str; + } + + if (count === 0) { + return ""; + } + + if (count > 1) { + return str.repeat(count); + } } module.exports = repeatStr; diff --git a/Sprint-3/2-practice-tdd/repeat-str.test.js b/Sprint-3/2-practice-tdd/repeat-str.test.js index a3fc1196c..8f818ad74 100644 --- a/Sprint-3/2-practice-tdd/repeat-str.test.js +++ b/Sprint-3/2-practice-tdd/repeat-str.test.js @@ -8,8 +8,7 @@ const repeatStr = require("./repeat-str"); // Given a target string `str` and a positive integer `count` greater than 1, // When the repeatStr function is called with these inputs, // Then it should return a string that contains the original `str` repeated `count` times. - -test("should repeat the string count times", () => { +test("should repeat the string 3 times", () => { const str = "hello"; const count = 3; const repeatedStr = repeatStr(str, count); @@ -20,13 +19,30 @@ test("should repeat the string count times", () => { // Given a target string `str` and a `count` equal to 1, // When the repeatStr function is called with these inputs, // Then it should return the original `str` without repetition. +test("should not repeat string with a count of 1", () => { + 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 empty string with a count of 0", () => { + 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 error when count < 0", () => { + const str = "hello"; + const count = -2; + expect(() => repeatStr(str, count)).toThrow(); +});