diff --git a/implement-and-rewrite-tests/implement-tests-with-node-test/1-get-angle-type.test.js b/implement-and-rewrite-tests/implement-tests-with-node-test/1-get-angle-type.test.js index cf50f6cad..89c99f892 100644 --- a/implement-and-rewrite-tests/implement-tests-with-node-test/1-get-angle-type.test.js +++ b/implement-and-rewrite-tests/implement-tests-with-node-test/1-get-angle-type.test.js @@ -6,7 +6,51 @@ import { getAngleType } from "../implement/1-get-angle-type.js"; // TODO: Write tests to cover all cases, including boundary and invalid cases. // Example: Identify Right Angles -test("Classifies right angles", () => { +test("returns right angle for 90", () => { const right = getAngleType(90); assert.equal(right, "Right angle"); }); + +test("returns invalid angle for 0", () => { + const result = getAngleType(0); + assert.equal(result, "Invalid angle"); +}); + +test("returns acute angle for 1", () => { + const result = getAngleType(1); + assert.equal(result, "Acute angle"); +}); + +test("returns acute angle for 89", () => { + const result = getAngleType(89); + assert.equal(result, "Acute angle"); +}); +test("returns obtuse angle for 91", () => { + const result = getAngleType(91); + assert.equal(result, "Obtuse angle"); +}); + +test("returns obtuse angle for 179", () => { + const result = getAngleType(179); + assert.equal(result, "Obtuse angle"); +}); + +test("returns straight angle for 180", () => { + const result = getAngleType(180); + assert.equal(result, "Straight angle"); +}); + +test("returns reflex angle for 359", () => { + const result = getAngleType(359); + assert.equal(result, "Reflex angle"); +}); + +test("returns invalid angle for 360", () => { + const result = getAngleType(360); + assert.equal(result, "Invalid angle"); +}); + +test("returns invalid angle for -1", () => { + const result = getAngleType(-1); + assert.equal(result, "Invalid angle"); +}); diff --git a/implement-and-rewrite-tests/implement-tests-with-node-test/2-is-proper-fraction.test.js b/implement-and-rewrite-tests/implement-tests-with-node-test/2-is-proper-fraction.test.js index a29084605..5f1e43d70 100644 --- a/implement-and-rewrite-tests/implement-tests-with-node-test/2-is-proper-fraction.test.js +++ b/implement-and-rewrite-tests/implement-tests-with-node-test/2-is-proper-fraction.test.js @@ -10,3 +10,31 @@ test("Basic proper fraction", () => { // Example: 1/2 is a proper fraction assert.equal(isProperFraction(1, 2), true); }); + +test("returns true for -1 and -2", () => { + assert.equal(isProperFraction(-1, -2), true); +}); + +test("returns true for zero numerator", () => { + assert.equal(isProperFraction(0, 5), true); +}); + +test("returns false for zero denominator", () => { + assert.equal(isProperFraction(1, 0), false); +}); + +test("returns true for negative numerator and positive denominator", () => { + assert.equal(isProperFraction(-1, 2), true); +}); + +test("returns true for positive numerator and negative denominator", () => { + assert.equal(isProperFraction(1, -2), true); +}); + +test("returns false for equal numerator and denominator", () => { + assert.equal(isProperFraction(-2, 2), false); +}); + +test("returns false when absolute numerator is greater than denominator", () => { + assert.equal(isProperFraction(-3, 2), false); +}); diff --git a/implement-and-rewrite-tests/implement-tests-with-node-test/3-get-card-value.test.js b/implement-and-rewrite-tests/implement-tests-with-node-test/3-get-card-value.test.js index f5092d9b1..825fa56e4 100644 --- a/implement-and-rewrite-tests/implement-tests-with-node-test/3-get-card-value.test.js +++ b/implement-and-rewrite-tests/implement-tests-with-node-test/3-get-card-value.test.js @@ -3,14 +3,49 @@ import test from "node:test"; import { getCardValue } from "../implement/3-get-card-value.js"; -// TODO: Write tests to cover all outcomes, including throwing errors for invalid cards. - test("Valid single-digit card", () => { assert.equal(getCardValue("9♠"), 9); }); test("Arbitrary non-card string", () => { - assert.throws(() => getCardValue("invalid"), /Expected a number followed by a suit, but got "invalid"/, "Expected clear error"); + assert.throws( + () => getCardValue("invalid"), + /Invalid suit: "d"/, + "Expected clear error" + ); +}); + +test("return 11 for an ace in every suit", () => { + const suits = ["♠", "♥", "♦", "♣"]; + + for (const suit of suits) { + assert.equal(getCardValue(`A${suit}`), 11); + } +}); + +test("returns 10 for face cards in every suit", () => { + const faceCards = ["J", "Q", "K"]; + const suits = ["♠", "♥", "♦", "♣"]; + + for (const rank of faceCards) { + for (const suit of suits) { + assert.equal(getCardValue(`${rank}${suit}`), 10); + } + } }); -// TODO: What other invalid card cases can you think of? +test("returns the correct value for number cards", () => { + const numberCards = ["2", "3", "4", "5", "6", "7", "8", "9", "10"]; + + for (const rank of numberCards) { + assert.equal(getCardValue(`${rank}♣`), Number(rank)); + } +}); + +test("throws an error for an invalid suit", () => { + assert.throws(() => getCardValue("9X")); +}); + +test("throws an error for an invalid rank", () => { + assert.throws(() => getCardValue("1♣")); +}); diff --git a/implement-and-rewrite-tests/implement/1-get-angle-type.js b/implement-and-rewrite-tests/implement/1-get-angle-type.js index 8a6fba050..928be482b 100644 --- a/implement-and-rewrite-tests/implement/1-get-angle-type.js +++ b/implement-and-rewrite-tests/implement/1-get-angle-type.js @@ -17,5 +17,22 @@ // execute the code to ensure all tests pass. export function getAngleType(angle) { - // TODO: Implement this function + if (angle <= 0 || angle >= 360) { + return "Invalid angle"; + } + + if (angle < 90) { + return "Acute angle"; + } + if (angle === 90) { + return "Right angle"; + } + if (angle < 180) { + return "Obtuse angle"; + } + + if (angle === 180) { + return "Straight angle"; + } + return "Reflex angle"; } diff --git a/implement-and-rewrite-tests/implement/2-is-proper-fraction.js b/implement-and-rewrite-tests/implement/2-is-proper-fraction.js index f983800f0..91194267d 100644 --- a/implement-and-rewrite-tests/implement/2-is-proper-fraction.js +++ b/implement-and-rewrite-tests/implement/2-is-proper-fraction.js @@ -14,5 +14,5 @@ // execute the code to ensure all tests pass. export function isProperFraction(numerator, denominator) { - // TODO: Implement this function + return Math.abs(numerator) < Math.abs(denominator); } diff --git a/implement-and-rewrite-tests/implement/3-get-card-value.js b/implement-and-rewrite-tests/implement/3-get-card-value.js index 9614ab1ee..cba655825 100644 --- a/implement-and-rewrite-tests/implement/3-get-card-value.js +++ b/implement-and-rewrite-tests/implement/3-get-card-value.js @@ -24,5 +24,28 @@ // execute the code to ensure all tests pass. export function getCardValue(card) { - // TODO: Implement this function + if (typeof card !== "string" || card.length < 2) { + throw new Error(`Invalid card: "${card}"`); + } + + const rank = card.slice(0, -1); + const suit = card.slice(-1); + + if (!["♠", "♥", "♦", "♣"].includes(suit)) { + throw new Error(`Invalid suit: "${suit}"`); + } + + if (rank === "A") { + return 11; + } + + if (["J", "Q", "K"].includes(rank)) { + return 10; + } + + if (["2", "3", "4", "5", "6", "7", "8", "9", "10"].includes(rank)) { + return Number(rank); + } + + throw new Error(`Invalid rank: "${rank}"`); } diff --git a/practice-tdd/count.js b/practice-tdd/count.js index 5518c5712..0b461dfd4 100644 --- a/practice-tdd/count.js +++ b/practice-tdd/count.js @@ -1,3 +1,10 @@ export function countChar(stringOfCharacters, findCharacter) { - return 5 + let count = 0; + + for (const character of stringOfCharacters) { + if (character === findCharacter) { + count++; + } + } + return count; } diff --git a/practice-tdd/count.test.js b/practice-tdd/count.test.js index cb3aaae59..355944b99 100644 --- a/practice-tdd/count.test.js +++ b/practice-tdd/count.test.js @@ -22,3 +22,8 @@ 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 return 0 when character does not occur", () => { + const count = countChar("hello", "z"); + expect(count).toEqual(0); +}); diff --git a/practice-tdd/get-ordinal-number.js b/practice-tdd/get-ordinal-number.js index 5c6291f5e..fb702b33e 100644 --- a/practice-tdd/get-ordinal-number.js +++ b/practice-tdd/get-ordinal-number.js @@ -1,3 +1,16 @@ export function getOrdinalNumber(num) { - return "1st"; + const lastTwoDigits = num % 100; + const lastDigits = num % 10; + + if (lastTwoDigits >= 11 && lastTwoDigits <= 13) { + return `${num}th`; + } else if (lastDigits === 1) { + return `${num}st`; + } else if (lastDigits === 2) { + return `${num}nd`; + } else if (lastDigits === 3) { + return `${num}rd`; + } else { + return `${num}th`; + } } diff --git a/practice-tdd/get-ordinal-number.test.js b/practice-tdd/get-ordinal-number.test.js index e23174a18..9a48f7921 100644 --- a/practice-tdd/get-ordinal-number.test.js +++ b/practice-tdd/get-ordinal-number.test.js @@ -18,3 +18,27 @@ test("should append 'st' for numbers ending with 1, except those ending with 11" expect(getOrdinalNumber(21)).toEqual("21st"); expect(getOrdinalNumber(131)).toEqual("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(112)).toEqual("112th"); +}); + +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(113)).toEqual("113th"); +}); + +test("should append 'th' for other numbers", () => { + expect(getOrdinalNumber(4)).toEqual("4th"); + expect(getOrdinalNumber(24)).toEqual("24th"); + expect(getOrdinalNumber(114)).toEqual("114th"); +}); + +test("should append 'th' for numbers ending with 11, 12, 13", () => { + expect(getOrdinalNumber(11)).toEqual("11th"); + expect(getOrdinalNumber(12)).toEqual("12th"); + expect(getOrdinalNumber(13)).toEqual("13th"); +}); diff --git a/practice-tdd/repeat-str.js b/practice-tdd/repeat-str.js index af273f3b0..771ec82fe 100644 --- a/practice-tdd/repeat-str.js +++ b/practice-tdd/repeat-str.js @@ -1,5 +1,10 @@ -export function repeatStr() { - // 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"; +export function repeatStr(str, count) { + if (count < 0) { + throw new Error("Count cannot be negative"); + } + let result = ""; + for (let i = 0; i < count; i++) { + result += str; + } + return result; } diff --git a/practice-tdd/repeat-str.test.js b/practice-tdd/repeat-str.test.js index 8a7036102..895133fb8 100644 --- a/practice-tdd/repeat-str.test.js +++ b/practice-tdd/repeat-str.test.js @@ -16,6 +16,20 @@ test("should repeat the string count times", () => { expect(repeatedStr).toEqual("hellohellohello"); }); +test("should return the original string when count is 1", () => { + const str = "hello"; + const count = 1; + const repeatedStr = repeatStr(str, count); + expect(repeatedStr).toEqual("hello"); +}); + +test("should return an empty string when count is 0", () => { + const str = "hello"; + const count = 0; + const repeatedStr = repeatStr(str, count); + expect(repeatedStr).toEqual(""); +}); + // Case: handle count of 1: // Given a target string `str` and a `count` equal to 1, // When the repeatStr function is called with these inputs,