Skip to content
Open
Show file tree
Hide file tree
Changes from all 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 @@ -11,6 +11,22 @@ function getAngleType(angle) {
if (angle === 90) {
return "Right angle";
}
Copy link

Choose a reason for hiding this comment

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

@HannaOdud Great job! You’ve implemented all five cases correctly. Your logic is solid and the code reads clearly

Copy link
Author

Choose a reason for hiding this comment

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

Thanks a lot!

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";
}
else {
return "invalid angle";
}

Copy link

Choose a reason for hiding this comment

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

@HannaOdud Any thoughts on how we might handle invalid angles (like negatives or values over 360)?

Copy link
Author

Choose a reason for hiding this comment

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

Thanks, I have changed it.

// 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 @@ -50,14 +66,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"
// ====> 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(190);
assertEquals(reflex, "Reflex angle" );
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@
// 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 (Math.abs(numerator) < Math.abs(denominator))
Copy link

Choose a reason for hiding this comment

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

Nice!!!!
Well done @HannaOdud

Copy link
Author

Choose a reason for hiding this comment

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

Thanks!

}

// The line below allows us to load the isProperFraction function into tests in other files.
Expand Down Expand Up @@ -46,14 +44,21 @@ 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?
const bothNegativeProperFraction = isProperFraction(-3, -5);
assertEquals(bothNegativeProperFraction,true);
//
const bothNegativeNotProperFraction = isProperFraction(-6, -5);
assertEquals(bothNegativeNotProperFraction,false);
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,23 @@
// 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);
let intPart;
if (!isNaN(rank)){
intPart = parseInt(rank);
}
if (rank === "A") {
return 11;
}
else if (intPart >= 2 && intPart && intPart < 11){
return parseInt(rank)
}
else if(["J", "Q", "K"].includes(rank)) {
return 10;
}
else{
throw new Error("Invalid card rank.");
}
}

// The line below allows us to load the getCardValue function into tests in other files.
Expand Down Expand Up @@ -39,19 +53,34 @@ 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 cardOfJ = getCardValue("J♥");
assertEquals(cardOfJ, 10);
const cardOfQ = getCardValue("Q♠");
assertEquals(cardOfQ, 10);
const cardOfK = getCardValue("K♠");
assertEquals(cardOfK, 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 aceOfHeart = getCardValue("A♥");
assertEquals(aceOfHeart, 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."
try {
Copy link

Choose a reason for hiding this comment

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

You’re on the right track with try...catch, but assertEquals won’t run because the function throws an error first.
To actually test that an error happens, you can rewrite it like this:

try {
  getCardValue("W♥");
  console.log("❌ Test failed: no error thrown");
} catch (error) {
  assertEquals(error.message, "Invalid card rank.");
}

This way, you’re checking that the error message matches exactly what your function throws.

getCardValue("W♥");
console.log("❌ Test failed: no error thrown");
} catch (error) {
assertEquals(error.message, "Invalid card rank.");
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,28 @@ 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 less then 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 greater then 90", () => {
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 that = 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 then 180 and less then 360", () => {
expect(getAngleType(220)).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 improper fraction", () => {
expect(isProperFraction(5, 2)).toEqual(false);
});

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

// Case 4: Identify Equal Numerator and Denominator:
test("should return false for Equal Numerator fraction", () => {
expect(isProperFraction(3, 3)).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("Handle Number Cards (2-10)", () => {
const fiveofHearts = getCardValue("5♥");
expect(fiveofHearts).toEqual(5);
});
// Case 3: Handle Face Cards (J, Q, K):
test("Case 3: Handle Face Cards (J, Q, K)", () => {
const cardOfJ = getCardValue("J♥");
expect(cardOfJ).toEqual(10);
});
// Case 4: Handle Ace (A):
test("Case 4: Handle Face Cards (J, Q, K)", () => {
const aceOfHeart = getCardValue("A♥");
expect(aceOfHeart).toEqual(11);
});
// Case 5: Handle Invalid Cards:
test("Case 5: Handle Invalid Cards", () => {
expect(() => { getCardValue("21♠") }).toThrow("Invalid card rank.");
});




4 changes: 4 additions & 0 deletions Sprint-3/3-stretch/find.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ console.log(find("code your future", "z"));
// Pay particular attention to the following:

// a) How the index variable updates during the call to find
// it changes during each iteration of cycle. (index++)
// b) What is the if statement used to check
// in this example it check where is character in "str" and return its index.
// c) Why is index++ being used?
// to change index value during iteration
// d) What is the condition index < str.length used for?
// its a condition for while statement, cycle will repeat until statement is true
24 changes: 23 additions & 1 deletion Sprint-3/3-stretch/password-validator.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,27 @@
function passwordValidator(password) {
return password.length < 5 ? false : true
//return password.length < 5 ? false : true
const prevPasswords = ["Aa0Cc!ZzB#b91", "Aa0Cc!ZzB#b92","Aa0Cc!ZzB#b93"]
let result = true
if (password.length < 5){
result = false
}
const hasUppercase = /[A-Z]/.test(password);
const hasLowercase = /[a-z]/.test(password);
if (!hasLowercase || !hasUppercase){
result = false;
}
const hasNumber = /[0-9]/.test(password);
if (!hasNumber){
result = false
}
const hasSymbol =/[!#$%.*&]/.test(password);
if (!hasSymbol){
result = false
}
if (prevPasswords.includes(password)){
result = false
}
return result
}


Expand Down
34 changes: 32 additions & 2 deletions Sprint-3/3-stretch/password-validator.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,42 @@ To be valid, a password must:
You must breakdown this problem in order to solve it. Find one test case first and get that working
*/
const isValidPassword = require("./password-validator");
test("password has at least 5 characters", () => {
test("Password has at least 5 characters", () => {
// Arrange
const password = "12345";
const password = "Cc#1";
// Act
const result = isValidPassword(password);
// Assert
expect(result).toEqual(false);
}
);
test("Have at least one English uppercase letter (A-Z)", () => {
const password = "AaBb5%Cc#11Zz";
const result = isValidPassword(password);
expect(result).toEqual(true);
}
);
test("Have at least one English lowercase letter (a-z)", () => {
const password = "AaBbCcZ2#z";
const result = isValidPassword(password);
expect(result).toEqual(true);
}
);
test("Have at least one number (0-9)", () => {
const password = "1Aa0CcZz!Bb9";
const result = isValidPassword(password);
expect(result).toEqual(true);
}
);
test("Have at least one of the following non-alphanumeric symbols:", () => {
const password = "Aa0Cc!ZzB#b9";
const result = isValidPassword(password);
expect(result).toEqual(true);
}
);
test("Must not be any previous password in the passwords array.", () => {
const password = "Aa0Cc!ZzB#b9";
const result = isValidPassword(password);
expect(result).toEqual(true);
}
);
Loading