Skip to content
Open
Show file tree
Hide file tree
Changes from 11 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,16 @@
function getAngleType(angle) {
if (angle === 90) {
return "Right angle";
} 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";
}
// Run the tests, work out what Case 2 is testing, and implement the required code here.
// Then keep going for the other cases, one at a time.

}

// The line below allows us to load the getAngleType function into tests in other files.
Expand Down Expand Up @@ -51,13 +58,18 @@ assertEquals(acute, "Acute angle");
// Then the function should return "Obtuse angle"
const obtuse = getAngleType(120);
// ====> write your test here, and then add a line to pass the test in the function above
assertEquals(obtuse, "Obtuse angle");

// Case 4: Identify Straight Angles:
// When the angle is exactly 180 degrees,
// Then the function should return "Straight angle"
// ====> write your test here, and then add a line to pass the test in the function above
const straight = getAngleType(180);
assertEquals(straight, "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"
// ====> write your test here, and then add a line to pass the test in the function above
// ====> write your test here, and then add a line to pass the test in the function above
const reflex = getAngleType(270);
assertEquals(reflex, "Reflex angle");
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@
// write one test at a time, and make it pass, build your solution up methodically

function isProperFraction(numerator, denominator) {
if (numerator < denominator) {
return true;
}

return numerator < denominator;
}

// The line below allows us to load the isProperFraction function into tests in other files.
Expand Down Expand Up @@ -47,13 +46,21 @@ assertEquals(improperFraction, false);
// 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);
// ====> complete with your assertion
assertEquals(negativeFraction, true);

// 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);
// ====> complete with your assertion
assertEquals(equalFraction, false);

// Stretch:
// What other scenarios could you test for?
// Zero Numerator check:
// Input: numerator = 0, denominator = 5
// target output: true
// Explanation: The fraction 0/5 is a proper fraction because the numerator (0) is less than the denominator (5). The function should return true.
const zeroNumerator = isProperFraction(0, 5);
assertEquals(zeroNumerator, true);
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,20 @@
// 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) {

const rank = card.slice(0, -1); // Extract rank before the suit

if (rank === "A") {
return 11;
} else if (["K", "Q", "J", "10"].includes(rank)) {
return 10;
} else if (!isNaN(rank) && Number(rank) >= 2 && Number(rank) <= 9) {
Comment on lines +15 to +17
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could have handled "10" in either the K/Q/J case, or the 2-9 case - which do you prefer? What advantages/disadvantages do you think each has?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hello,

Thank you for the feedback, I prefer to handle the "10" in the K/Q/J case. for clarity and explicitness, and to maintain semantical grouping since "10" has the same card value as the face cards. a disadvantage could be mixing string handling logic "K/Q/J" with numeric checking logic "10".

We can also handle "10" in the 2-9 case and the pros for this would be logical consistency the numeric branch handles anything numeric between 2-10. and its easier to extend if we ever want to adjust the ranges to include 1 or 11 or validate different ranges we just change the numeric branch. Disadvantages risk of mis-parsing since !isNaN(rank) is loose we might accidently accept strings like "10abc". Edge-case handling we need to make sure to handle trimming, ect. in case someone passes weird strings like "010" and " 10 ".

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good, thanks for sharing your thoughts!

Personally I prefer 10 to be included in the number case, because it leads to simpler code. In the numeric case, we already need an upper bound, so the difference between Number(rank) <= 9 and Number(rank) <= 10 is really small, whereas adding a whole extra element to the array we're checking is adding an extra piece: ["K", "Q", "J", "10"] vs ["K", "Q", "J"].

But you're right that there's not one obviously better answer - there are advantages and disadvantages to each :)

return Number(rank);
} else {
throw new Error('Invalid card rank: "${rank}"'); //rather than just "Invalid card rank" we can show the actual rank that was invalid
}


}

// The line below allows us to load the getCardValue function into tests in other files.
Expand Down Expand Up @@ -40,18 +51,41 @@ assertEquals(aceofSpades, 11);
// Then it should return the numeric value corresponding to the rank (e.g., "5" should return 5).
const fiveofHearts = getCardValue("5♥");
// ====> write your test here, and then add a line to pass the test in the function above
assertEquals(fiveofHearts, 5);

// 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 kingofDiamonds = getCardValue("K♦");
assertEquals(kingofDiamonds, 10);
const jackofClubs = getCardValue("J♣");
assertEquals(jackofClubs, 10);
const queenofHearts = getCardValue("Q♥");
assertEquals(queenofHearts, 10);
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 aceofClubs = getCardValue("A♣");
assertEquals(aceofClubs, 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."
const invalidCard = () => getCardValue("1♠");
// ====> write your test here, and then add a line to pass the test in the function above
try {
invalidCard();
console.assert(false, "Expected an error to be thrown for invalid card rank");
} catch (e) {
console.assert(
e.message === 'Invalid card rank: "${rank}"',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's a tension in testing between calculating expected values in tests (to avoid duplication), or hard-coding expected values (to make it really obvious that the test is correct).

Can you change this test so that it actually includes "1" in the expected error message:

Suggested change
e.message === 'Invalid card rank: "${rank}"',
e.message === 'Invalid card rank: "1"',

I think you'll find that the test is actually failing, so we should fix the code :)

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank for the feedback and I have now included "1" in the expected error message. I have run the test with a pass.

thank you for the suggested change.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just ran the test and it failed...

% node Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js
Assertion failed: Expected error message to be "Invalid card rank" but got "Invalid card rank: "${rank}""

Can you check again?

(Also, your Jest tests wouldn't catch this same bug, can you fix them up so they do as well?)

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for picking on that and being patient with me. test was not failing on my side because Jest’s .toThrow("Invalid card rank") only checks that the error message contains that substring, not that it matches exactly. now I have updated the code and it passes as it should.

`Expected error message to be "Invalid card rank" but got "${e.message}"`
);
}

Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,34 @@ 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 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 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° and <360°)", () => {
expect(getAngleType(270)).toEqual("Reflex angle");
});


// We can run this test file using the command `npx jest 1-get-angle-type.test.js`
// in the terminal. Making sure we are in the directory where this file is located.
// If we have Jest installed globally, you can simply run `jest 1-get-angle-type.test.js`
// instead. If you have added a test script to your package.json file, you can also run
// `npm test 1-get-angle-type.test.js` to execute the tests.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,22 @@ test("should return true for a proper fraction", () => {
});

// Case 2: Identify Improper Fractions:
test("should return false for an improper fraction", () => {
expect(isProperFraction(5, 3)).toEqual(false);
});

// Case 3: Identify Negative Fractions:
test("should return false for a negative fraction", () => {
expect(isProperFraction(-2, 3)).toEqual(false);
});

// Case 4: Identify Equal Numerator and Denominator:
test("should return false for equal numerator and denominator", () => {
expect(isProperFraction(4, 4)).toEqual(false);
});

// We can run this test file using the command `npx jest 2-is-proper-fraction.test.js`
// in the terminal. Making sure we are in the directory where this file is located.
// If we have Jest installed globally, you can simply run `jest 2-is-proper-fraction.test.js`
// instead. If you have added a test script to your package.json file, you can also run
// `npm test 2-is-proper-fraction.test.js` to execute the tests.
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,49 @@ test("should return 11 for Ace of Spades", () => {
});

// Case 2: Handle Number Cards (2-10):
test("should return correct value for number cards (2-10)", () => {
expect(getCardValue("2♣")).toEqual(2);
expect(getCardValue("5♦")).toEqual(5);
expect(getCardValue("10♥")).toEqual(10);
});

// Case 3: Handle Face Cards (J, Q, K):
test("should return 10 for face cards (J, Q, K)", () => {
expect(getCardValue("J♣")).toEqual(10);
expect(getCardValue("Q♦")).toEqual(10);
expect(getCardValue("K♥")).toEqual(10);
});
// Case 4: Handle Ace (A):
test("should return 11 for Ace (A)", () => {
expect(getCardValue("A♣")).toEqual(11);
expect(getCardValue("A♦")).toEqual(11);
expect(getCardValue("A♥")).toEqual(11);
});
// Case 5: Handle Invalid Cards:

test("should throw an error for invalid input '1♣'", () => {
expect(() => getCardValue("1♣")).toThrow("Invalid card");
});

test("should throw an error for invalid input '1♦'", () => {
expect(() => getCardValue("1♦")).toThrow("Invalid card");
});

test("should throw an error for invalid input 'B♥'", () => {
expect(() => getCardValue("B♥")).toThrow("Invalid card");
});

test("should throw an error for invalid input 'Z♠'", () => {
expect(() => getCardValue("Z♠")).toThrow("Invalid card");
});

test("should throw an error for empty string", () => {
expect(() => getCardValue("")).toThrow("Invalid card");
});


// We can run this test file using the command `npx jest 3-get-card-value.test.js`
// in the terminal. Making sure we are in the directory where this file is located.
// If we have Jest installed globally, you can simply run `3-get-card-value.test.js`
// instead. If you have added a test script to your package.json file, you can also run
// `npm test 3-get-card-value.test.js` to execute the tests.
Loading