Skip to content
Open
Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
node_modules
.DS_Store
.vscode
testing.js
**/.DS_Store
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,20 @@
// Then, write the next test! :) Go through this process until all the cases are implemented

function getAngleType(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";
}
if (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.
Expand Down Expand Up @@ -49,15 +61,20 @@ assertEquals(acute, "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"
const obtuse = getAngleType(120);
// ====> write your test here, and then add a line to pass the test in the function above
const obtuse = getAngleType(120);
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(300);
assertEquals(reflex, "Reflex angle");
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,13 @@
// write one test at a time, and make it pass, build your solution up methodically

function isProperFraction(numerator, denominator) {
if (numerator < denominator) {
if(typeof(numerator) != "number" || typeof(denominator) != "number") {
return "[ wrong input ]";
}
if (numerator < denominator ) {
return true;
}
return false;
}
Copy link
Contributor

Choose a reason for hiding this comment

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

In mathematics, -A/B == A/-B == -(A/B), and -A/-B == A/B for any integers A and B (B ≠ 0).
They represent a proper fraction if A < B and B ≠ 0.

So isProperFraction(-4, 3) should return false because 4 >= 3.

So isProperFraction(-2, 5) should return true because 2 < 5.

Consider comparing the absolute value of the numerator and the denominator instead.

In addition, to indicate errors, it is best practices to throw an error (instead of returning an error message).
If you have time, you should check out how to throw an error in JS.

Alternatively, you can choose to return false to indicate something is not a fraction.

Copy link
Author

Choose a reason for hiding this comment

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

I made the required changes, I used the method Math.abs() to fix the bug and used error throwing when inputs are not valid. also the function should return 0 when denominator is 0;


// The line below allows us to load the isProperFraction function into tests in other files.
Expand Down Expand Up @@ -47,13 +51,27 @@ 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?

// Try 0 and a negative number check:
// Input: numerator = -10, denominator = 0
// target output: true
const tryZero = isProperFraction(-10, 0);
assertEquals(tryZero, true);

// check if inputs are proper numbers
// Input: numerator = "hello", denominator = 4 (any number)
//target output: string "[ wrong input ]"
const tryString = isProperFraction("hello", 4);
assertEquals(tryString, "[ wrong input ]");
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,17 @@
// 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) {
let rank = card.slice(0, -1);
if (rank === "A") {
return 11;
}
if (rank === "J" || rank === "Q"|| rank === "K") {
return 10;
}
if ((rank => 2) && (rank <= 10)) {
return Number(rank);
}
Copy link
Contributor

Choose a reason for hiding this comment

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

In JavaScript, strings that represent valid numeric literals in the language can be safely converted to equivalent numbers. For examples, "0x02", "2.1", or "0002".

Does your function return the value you expected from each of the following function calls?

getCardValue("0x02♠");
getCardValue("2.1♠");
getCardValue("0002♠");

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 pointing that out. Yes, the function returns what is expected, but I used Math.floor() to exclude decimal numbers.

return "Invalid card rank.";
}

// The line below allows us to load the getCardValue function into tests in other files.
Expand Down Expand Up @@ -40,18 +48,25 @@ 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 faceCards = getCardValue("J♠");
assertEquals(faceCards, 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 ace = getCardValue("A♠");
assertEquals(ace, 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 invalidCards = getCardValue("hello");
assertEquals(invalidCards, "Invalid card rank.");
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@ test("should identify right angle (90°)", () => {
// 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 (less than 90°)", () => {
expect(getAngleType(80)).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 (greater than 90° and less than 180 )", () => {
expect(getAngleType(100)).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 (greater than 180° and less than 360°)", () => {
expect(getAngleType(181)).toEqual("Reflex angle");
});
Comment on lines 28 to 32
Copy link
Contributor

Choose a reason for hiding this comment

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

We could specify multiple expect(...) statements within each test() to cover multiple values that belong to the same case. For example,

test("should identify reflex angle (180 < angle < 360)", () => {
  expect(getAngleType(300)).toEqual("Reflex angle");
  expect(getAngleType(359.999)).toEqual("Reflex angle");
  expect(getAngleType(180.001)).toEqual("Reflex angle");
});

Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,16 @@ test("should return true for a proper fraction", () => {
});

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

// Case 3: Identify Negative Fractions:
test("should return true for a negative Fractions", () => {
expect(isProperFraction(-6, 4)).toEqual(true);
});
Copy link
Contributor

Choose a reason for hiding this comment

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

-6/4 is not a proper fraction.

You can test several "negative fractions in one test". For examples,

test("should return true for a negative Fractions", () => {
    expect(isProperFraction(-6, 4)).toEqual(false);
    expect(isProperFraction(-4, 6)).toEqual(true);
    expect(isProperFraction(6, -4)).toEqual(false);
    expect(isProperFraction(4, -6)).toEqual(true);   
    expect(isProperFraction(-6, -4)).toEqual(false);
    expect(isProperFraction(-4, -6)).toEqual(true);    
});

Copy link
Author

Choose a reason for hiding this comment

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

Done. I added more test cases to each category.


// Case 4: Identify Equal Numerator and Denominator:
test("should return false for an equal Fractions", () => {
expect(isProperFraction(7, 7)).toEqual(false);
});
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,25 @@ test("should return 11 for Ace of Spades", () => {
});

// Case 2: Handle Number Cards (2-10):
test("should return the number entered as input", () => {
const numberCards = getCardValue("4♠");
expect(numberCards).toEqual(4);
});

Comment on lines 11 to 16
Copy link
Contributor

Choose a reason for hiding this comment

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

When preparing tests, we should ensure the tests cover all possible cases. If we specify a test for individual card, we will need about 53 tests to cover all possible cases. Instead, we could consider classifying all possible values into different categories, and then within each category we test some samples.

For example, one possible category for getCardValue() is, "should return the value of number cards (2-10)", and we can prepare the test as

test("should return the value of number cards (2-10)", () => {
    expect(getCardValue("2♣︎")).toEqual(2);
    expect(getCardValue("5♠")).toEqual(5);
    expect(getCardValue("10♥")).toEqual(10);
    // Note: We could also use a loop to check all values from 2 to 10.
});

Copy link
Author

Choose a reason for hiding this comment

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

Ok. I changed the code and added more test cases + added different statements using for loop to test numbers from 2 to 10

// Case 3: Handle Face Cards (J, Q, K):
test("should return 10 for face cards J Q K", () => {
const faceCards = getCardValue("Q♠");
expect(faceCards).toEqual(10);
});

// Case 4: Handle Ace (A):
test("should return 11 after entering Ace A", () => {
const handleAce = getCardValue("A♠");
expect(handleAce).toEqual(11);
});

// Case 5: Handle Invalid Cards:
test(`should return string ("Invalid card rank.") for invalid inputs`, () => {
const invalidCards = getCardValue("HelloWorld!");
expect(invalidCards).toEqual("Invalid card rank.");
});
7 changes: 6 additions & 1 deletion Sprint-3/2-practice-tdd/count.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
function countChar(stringOfCharacters, findCharacter) {
return 5
let output = 0;
for( let i=0; i <= stringOfCharacters.length; i++ ) {
if(stringOfCharacters[i] === findCharacter)
output++;
}
return output;
}

module.exports = countChar;
6 changes: 6 additions & 0 deletions Sprint-3/2-practice-tdd/count.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,9 @@ 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 return 0 if there are no occurrences at all", () => {
const str = "Hello World!";
const char = "a";
const count = countChar(str, char);
expect(count).toEqual(0);
});
Loading