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 @@ -8,8 +8,20 @@
// Then, write the next test! :) Go through this process until all the cases are implemented

function getAngleType(angle) {
if(angle === 180){
return "Straight angle"
}
if(angle > 90 && angle < 180){
return "Obtuse angle"
}
if (angle === 90) {
return "Right angle";
}
if (angle < 90) {
return "Acute angle";
}
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.
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(200);
assertEquals(reflex,"Reflex angle")
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,19 @@
// write one test at a time, and make it pass, build your solution up methodically

function isProperFraction(numerator, denominator) {
if (numerator < denominator) {
if (Math.abs(numerator) < Math.abs(denominator)) {
return true;
}
if (Math.abs(numerator) >= Math.abs(denominator)) {
return false;
}

if (isNaN(numerator)|| isNaN(denominator)) {

Choose a reason for hiding this comment

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

Spacing again before the ||

return false;
}
}


// The line below allows us to load the isProperFraction function into tests in other files.
// This will be useful in the "rewrite tests with jest" step.
module.exports = isProperFraction;
Expand Down Expand Up @@ -46,14 +54,23 @@ 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?

//Numerator or Denominator not a number
//Input: numerator=NaN, denominator=3
// target output: false
// Explanation: the fraction NaN/3 is not a proper fraction because the numerator is not a number.The function should return false.
const notANumberFraction=isProperFraction(NaN,3);
assertEquals(notANumberFraction,false)
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,18 @@
// 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);
const numberRank=Number(rank)
if(numberRank>=2 && numberRank<10){
return numberRank;
}
if(rank==="10" || rank==="J" || rank==="Q" || rank==="K"){

Choose a reason for hiding this comment

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

Formatting: it is usually preferred to give equality checks with a space, so rank === "10" instead of rank==="10".

return 10
}
if (rank === "A") {
return 11;
}
return "Invalid card rank.";
}

// The line below allows us to load the getCardValue function into tests in other files.
Expand All @@ -26,32 +35,53 @@ function assertEquals(actualOutput, targetOutput) {
`Expected ${actualOutput} to equal ${targetOutput}`
);
}

function invalidCardRank(actualOutput, targetOutput) {
console.assert(
actualOutput === targetOutput,
"Invalid card rank"
);
}
// Acceptance criteria:

// Given a card string in the format "A♠" (representing a card in blackjack - the last character will always be an emoji for a suit, and all characters before will be a number 2-10, or one letter of J, Q, K, A),
// Given a card string in the format "A♠" (representing a card in blackjack - the last character will always be an emoji for a suit, and all characters before will
// be a number 2-10, or one letter of J, Q, K, A),
// When the function getCardValue is called with this card string as input,
// Then it should return the numerical card value
const aceofSpades = getCardValue("A♠");
assertEquals(aceofSpades, 11);
// const aceofSpades = getCardValue("A♠");
// assertEquals(aceofSpades, 11);

// Handle Number Cards (2-10):
// Given a card with a rank between "2" and "9",
// 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)

const sixofHearts = getCardValue("6♥");
assertEquals(sixofHearts, 6);
// ====> 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 faceCards = getCardValue("J♥");
assertEquals(faceCards,10)

assertEquals(getCardValue("Q♥"),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 aceofSpades = getCardValue("A♠");
assertEquals(aceofSpades, 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("m");
invalidCardRank(invalidCard, "Invalid card rank.");
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,21 @@ 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"

// 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 acute angle (angle<90°)", () => {
expect(getAngleType(80)).toEqual("Acute angle");
});

test("should identify obtuse angle (angle>90°)", () => {
expect(getAngleType(110)).toEqual("Obtuse angle");
});


test("should identify straight angle (angle<180°)", () => {
expect(getAngleType(180)).toEqual("Straight angle");
});

// Case 4: Identify Straight Angles:
// When the angle is exactly 180 degrees,
// Then the function should return "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 (angle>180°)", () => {
expect(getAngleType(190)).toEqual("Reflex angle");
});
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 a improper fraction", () => {
expect(isProperFraction(4, 3)).toEqual(false);
});

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

// Case 4: Identify Equal Numerator and Denominator:
test("should return false for equal numerator and denominator", () => {
expect(isProperFraction(2, 2)).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 3 for 3 of Spades", () => {
const threeOfSpades = getCardValue("3♠");
expect(threeOfSpades).toEqual(3);
});

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

// Case 4: Handle Ace (A):
test("should return 11 for Ace of Spades", () => {
const aceofSpades = getCardValue("A♠");
expect(aceofSpades).toEqual(11);
});

// Case 5: Handle Invalid Cards:
test("should return invalid card for g of spades", () => {
const gOfSpades = getCardValue("g♠");
expect(gOfSpades).toEqual("Invalid card rank.");
});
28 changes: 26 additions & 2 deletions Sprint-3/3-stretch/password-validator.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,30 @@
function passwordValidator(password) {
return password.length < 5 ? false : true
//console.log(password !== password.toUpperCase());
let password2=password.split("")
console.log(password2);
let newPassword=[];
// if (
// password.length >= 5 &&
// password !== password.toLowerCase() &&
// password !== password.toUpperCase()

// ) {
// return true;
// }
for(element of password2){
if (
password2.length >= 5 &&
/[A-Za-z]/.test(password2)

) {
return true;
}
}

return false;
}


module.exports = passwordValidator;
console.log(passwordValidator("434398866"));

module.exports = passwordValidator;
38 changes: 36 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,46 @@ 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", () => {
// Arrange
const password = "12345";
const password = "As?123";
// Act
const result = isValidPassword(password);
// Assert
expect(result).toEqual(true);
}
);
);
test("password has at least 5 characters", () => {
const password = "As?3";
const result = isValidPassword(password);
expect(result).toEqual(false);
});

test("password has at least one English uppercase letter (A-Z)", () => {
const password = "As?123";
const result = isValidPassword(password);
expect(result).toEqual(true);
});
test("password has at least one English uppercase letter (A-Z)", () => {
const password = "s?123";
const result = isValidPassword(password);
expect(result).toEqual(false);
});

test("password has at least one English lowercase letter (a-z)", () => {
const password = "'aK763";
const result = isValidPassword(password);
expect(result).toEqual(true);
});
test("password has at least one English lowercase letter (a-z)", () => {
const password = "QWE<25365";
const result = isValidPassword(password);
expect(result).toEqual(false);
});

test("password has at least one number 0-9", () => {
const password = "QWE<25365";
const result = isValidPassword(password);
expect(result).toEqual(true);
});
Loading