Skip to content

LONDON_JAN25 | KHALIL ALI | STRUCTURING_AND_TESTING_DATA | SPRINT 3 | WEEK 6 #388

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 20 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 13 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
12 changes: 10 additions & 2 deletions Sprint-3/1-key-implement/1-get-angle-type.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@

function getAngleType(angle) {
if (angle === 90) return "Right angle";
if(angle < 90) return "Acute angle";
if(angle > 90 && angle < 180) return "Obtuse angle";
if (angle === 180)return "Straight angle";
if (angle > 180 && angle < 360) return "Reflex angle";
// read to the end, complete line 36, then pass your test here
}

Expand Down Expand Up @@ -43,14 +47,18 @@ 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(270);
assertEquals(reflex, "Reflex angle");
9 changes: 8 additions & 1 deletion Sprint-3/1-key-implement/2-is-proper-fraction.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@
// write one test at a time, and make it pass, build your solution up methodically

function isProperFraction(numerator, denominator) {
if (numerator < denominator) return true;
if (denominator === 0) return "Error: Denominator cannot be 0";
if (Math.abs(numerator) < denominator) return true;
if (Math.abs(numerator) >= denominator) return false;

}

// here's our helper again
Expand Down Expand Up @@ -40,14 +43,18 @@ 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 denominatorIsZero = isProperFraction(3, 0);
assertEquals(denominatorIsZero,"Error: Denominator cannot be 0");
17 changes: 17 additions & 0 deletions Sprint-3/1-key-implement/3-get-card-value.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@
// 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 === "10" || rank === "j" || rank === "Q" || rank === "K") return 10;
if (rank >2 && rank <=9) return Number(rank);
else throw new Error ("Invalid card rank");
}

// You need to write assertions for your function to check it works in different cases
Expand All @@ -33,19 +37,32 @@ 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 queenofDiamonds = getCardValue("Q♦");
assertEquals(queenofDiamonds, 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."

try {
const other = getCardValue("X♠")
} catch (badCard) {
console.log(badCard.message);
}
5 changes: 4 additions & 1 deletion Sprint-3/2-mandatory-rewrite/1-get-angle-type.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
function getAngleType(angle) {
if (angle === 90) return "Right angle";
// replace with your completed function from key-implement
if(angle < 90) return "Acute angle";
if(angle > 90 && angle < 180) return "Obtuse angle";
if (angle === 180)return "Straight angle";
if (angle > 180 && angle < 360) return "Reflex angle";

}

Expand Down
15 changes: 13 additions & 2 deletions Sprint-3/2-mandatory-rewrite/1-get-angle-type.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,26 @@ 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° but < 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° but < 360°)", () => {
expect(getAngleType(270)).toEqual("Reflex angle");
});
Copy link
Contributor

Choose a reason for hiding this comment

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

We can 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° but < 360°)", () => {
  expect(getAngleType(300)).toEqual("Reflex angle");
  expect(getAngleType(359.999)).toEqual("Reflex angle");
  expect(getAngleType(180.001)).toEqual("Reflex angle");
});

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 your comment.
I added more examples to make a more comprehensive test.

3 changes: 3 additions & 0 deletions Sprint-3/2-mandatory-rewrite/2-is-proper-fraction.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
function isProperFraction(numerator, denominator) {
if (numerator < denominator) return true;
// add your completed function from key-implement here
if (denominator === 0) return "Error: Denominator cannot be 0";
if (Math.abs(numerator) < denominator) return true;
if (Math.abs(numerator) >= denominator) 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.

We can also design the function to return false when the denominator is zero. Technically, anything divided by zero is not a proper fraction.

Denominator can also be negative. Mathematically speaking, 2/-3 and -2/-3 are proper fractions.

For any value that is not a proper fraction, we can just return false without an if-statement.

Copy link
Author

Choose a reason for hiding this comment

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

you are right,
now it is more concise and readable.

}

module.exports = isProperFraction;
11 changes: 9 additions & 2 deletions Sprint-3/2-mandatory-rewrite/2-is-proper-fraction.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,14 @@ test("should return true for a proper fraction", () => {
});

// Case 2: Identify Improper Fractions:

test("should return false if the numerator is greater than or equal to the denominator", () => {
expect(isProperFraction(5, 2)).toEqual(false);
});
// Case 3: Identify Negative Fractions:

test("should return true if the numerator is negative", () => {
expect(isProperFraction(-4, 7)).toEqual(true);
});
// Case 4: Identify Equal Numerator and Denominator:
test("should return false if the numerator and denominator are equal", () => {
expect(isProperFraction(3, 3)).toEqual(false);
});
9 changes: 7 additions & 2 deletions Sprint-3/2-mandatory-rewrite/3-get-card-value.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
function getCardValue(card) {
// replace with your code from key-implement
return 11;
}
let rank = card.slice(0,-1);
if (rank === "A") return 11;
if (rank === "10" || rank === "j" || rank === "Q" || rank === "K") return 10;
if (rank >2 && rank <=9) return Number(rank);
else throw new Error ("Invalid card rank");
}

module.exports = getCardValue;
12 changes: 12 additions & 0 deletions Sprint-3/2-mandatory-rewrite/3-get-card-value.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,15 @@ test("should return 11 for Ace of Spades", () => {
// Case 3: Handle Face Cards (J, Q, K):
// Case 4: Handle Ace (A):
// Case 5: Handle Invalid Cards:
test("should return 5 for 5♥", () => {
expect(getCardValue("5♥")).toEqual(5);
});
test("should return 10 for Q♦", () => {
expect(getCardValue("Q♦")).toEqual(10);
});
test("should return 11 for A♣", () => {
expect(getCardValue("A♣")).toEqual(11);
});
test('should throw "Invalid card rank" for X♠', () => {
expect(() => getCardValue("X♠")).toThrow("Invalid card rank");
});
Copy link
Contributor

Choose a reason for hiding this comment

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

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

getCardValue("010♠");
getCardValue("02♠");
getCardValue("0x02♠");
getCardValue("2.1♠")

Copy link
Author

Choose a reason for hiding this comment

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

I fixed the bug.
now it returns like expected.

8 changes: 7 additions & 1 deletion Sprint-3/3-mandatory-practice/implement/count.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
function countChar(stringOfCharacters, findCharacter) {
return 5
let count = 0;
for (let i = 0; i < stringOfCharacters.length; i++) {
if (stringOfCharacters[i] === findCharacter) {
count++;
}
}
return count;
}

module.exports = countChar;
6 changes: 6 additions & 0 deletions Sprint-3/3-mandatory-practice/implement/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 count multiple occurrences of a character", () => {
Copy link
Contributor

Choose a reason for hiding this comment

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

This description does not seem to match the test specified.

Copy link
Author

Choose a reason for hiding this comment

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

I fixed the description

const str = "aaaaa";
const char = "b";
const count = countChar(str, char);
expect(count).toEqual(0);
});
17 changes: 15 additions & 2 deletions Sprint-3/3-mandatory-practice/implement/get-ordinal-number.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
function getOrdinalNumber(num) {
return "1st";
}
if (num === 11 || num === 12 || num === 13) {
Copy link
Contributor

Choose a reason for hiding this comment

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

The ordinal numbers of 111, 312, 9913 are "111th", "312th", "9913th".

Copy link
Author

Choose a reason for hiding this comment

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

I fixed the bug.
I added more examples to the test function.

return `${num}th`;
}
const lastDigit = num % 10;
if (lastDigit === 1) {
return `${num}st`;
}
if (lastDigit === 2) {
return `${num}nd`;
}
if (lastDigit === 3) {
return `${num}rd`;
}
return `${num}th`;
}

module.exports = getOrdinalNumber;
12 changes: 12 additions & 0 deletions Sprint-3/3-mandatory-practice/implement/get-ordinal-number.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,15 @@ const getOrdinalNumber = require("./get-ordinal-number");
test("should return '1st' for 1", () => {
expect(getOrdinalNumber(1)).toEqual("1st");
});
test("should return '2nd' for 2", () => {
expect(getOrdinalNumber(2)).toEqual("2nd");
});
test("should return '3rd' for 3", () => {
expect(getOrdinalNumber(3)).toEqual("3rd");
});
Copy link
Contributor

Choose a reason for hiding this comment

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

We can also generalise the test to include all numbers that ends with 3 but not with 13 as

test("should append suffix 'rd' to numbers ending with 3, except those end with 13", () => {
    expect(getOrdinalNumber(3)).toEqual("3rd");
    expect(getOrdinalNumber(23)).toEqual("23rd");
    expect(getOrdinalNumber(93)).toEqual("93rd");    
    expect(getOrdinalNumber(143)).toEqual("143rd");
});

Copy link
Author

Choose a reason for hiding this comment

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

I added more examples to the test function.

test("should return '4th' for 4", () => {
expect(getOrdinalNumber(4)).toEqual("4th");
});
test("should return '11th' for 11", () => {
expect(getOrdinalNumber(11)).toEqual("11th");
});
7 changes: 5 additions & 2 deletions Sprint-3/3-mandatory-practice/implement/repeat.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
function repeat() {
return "hellohellohello";
function repeat(str,count) {
if(count < 0 ) throw new Error ("Negative counts are not valid");
if(count === 0) return "";
if(count === 1) return str;
return str.repeat(count);
}

module.exports = repeat;
10 changes: 9 additions & 1 deletion Sprint-3/3-mandatory-practice/implement/repeat.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,21 @@ test("should repeat the string count times", () => {
// Given a target string str and a count equal to 1,
// When the repeat function is called with these inputs,
// Then it should return the original str without repetition, ensuring that a count of 1 results in no repetition.
test("should return the string when count is 1",()=>{
expect( repeat("hello", 1)).toEqual("hello");
});

// case: Handle Count of 0:
// Given a target string str and a count equal to 0,
// When the repeat function is called with these inputs,
// Then it should return an empty string, ensuring that a count of 0 results in an empty output.

test("should return empty string when count is 0",()=>{
expect( repeat("hello", 0)).toBe("");
});
// case: Negative Count:
// Given a target string str and a negative integer count,
// When the repeat function is called with these inputs,
// Then it should throw an error or return an appropriate error message, as negative counts are not valid.
test("should throw an Error 'Negative counts are not valid' when count is negative",()=>{
expect( ()=> repeat("hello",-1)).toThrow('Negative counts are not valid');
});
37 changes: 37 additions & 0 deletions Sprint-3/4-stretch-investigate/card-validator.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
const isValidNumber = (cardNum) => {
Copy link
Contributor

Choose a reason for hiding this comment

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

Because of the limited precision of number type in JavaScript, I would assume cardNum is of type string.

Copy link
Author

Choose a reason for hiding this comment

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

I fixed it.

const StrCardNum = cardNum.toString();
Copy link
Contributor

Choose a reason for hiding this comment

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

Common convention is to start a variable name with a lowercase letter. Uppercase camel case is usually applied to Class or Type names.

Copy link
Author

Choose a reason for hiding this comment

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

I changed it.

if (StrCardNum.length !== 16 || !/^\d+$/.test(StrCardNum)) {
return false;
}
let allSame = true;
for (let i = 1; i < 16; i++) {
if (StrCardNum[0] !== StrCardNum[i]) {
allSame = false;
break;
}
}
if (allSame) {
return false;
}
if (cardNum % 2 !== 0) {
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.

This approach is not safe. For example, 9999888877776665 % 2 == 0 is true.

Can you replace this check so that it will work on any 16 digit credit card number (regardless if the number is represented as a string or a value of type number)?

Copy link
Author

Choose a reason for hiding this comment

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

to check the last digit whether even or odd

let sum = 0;
digitsArray = StrCardNum.split('');
for (let i = 0; i < 16; i++) {
sum += digitsArray[i];
}
if (sum <= 16) {
return false;
}
return true;
}

// Here are the rules for a valid number:

// - Number must be 16 digits, all of them must be numbers.
// - You must have at least two different digits represented (all of the digits cannot be the same).
// - The final digit must be even.
// - The sum of all the digits must be greater than 16.

module.exports = isValidNumber;
29 changes: 29 additions & 0 deletions Sprint-3/4-stretch-investigate/card-validator.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
const isValidNumber = require("./card-validator");

test('Should return false if the digits are not 16', () => {
expect(isValidNumber(222222222222222)).toBe(false);
});

test('Should return false if the 16 digits are not all numbers', () => {
expect(isValidNumber(222222222222222.)).toBe(false);
});

test('Should return false if the 16 digits are the same', () => {
expect(isValidNumber(2222222222222222)).toBe(false);
});

test('Should return false if the final digit is not even', () => {
expect(isValidNumber(2222222222222221)).toBe(false);
});

test('Should return false if the sum < 16', () => {
expect(isValidNumber(1011111111111111)).toBe(false);
Copy link
Contributor

Choose a reason for hiding this comment

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

  • Can you try also expect(isValidNumber(1111111111111110)).toBe(false);? It can reveal a bug in your code.

  • Also, 1111111111111110 is a more suitable test value than 1011111111111111 in this test case. Can you figure out why?

Copy link
Author

Choose a reason for hiding this comment

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

I fixed the bug.
I think because 1111111111111110 is even and the sum of all digits is<16.

});




// - Number must be 16 digits, all of them must be numbers.
// - You must have at least two different digits represented (all of the digits cannot be the same).
// - The final digit must be even.
// - The sum of all the digits must be greater than 16.
Loading