Skip to content

London | May-2025 | Fatima_Zohra_Belkedari | Module Structuring and Testing Data | Sprint. 3 #629

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 28 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
696bb42
updating angle type.js
Farah-Stu Jun 27, 2025
4cc5106
fixing the proper fraciton.js
Farah-Stu Jun 27, 2025
22cab74
updating card value
Farah-Stu Jun 28, 2025
ed21e9d
update card value
Farah-Stu Jun 28, 2025
4d9bc3b
update angle type.test
Farah-Stu Jun 28, 2025
8f7c8a6
adding assertEqual line
Farah-Stu Jun 28, 2025
27e36c5
updating proper fraction file
Farah-Stu Jun 29, 2025
a97c923
updating the file
Farah-Stu Jun 29, 2025
cc9d7dc
updating the proper fraction test file
Farah-Stu Jun 29, 2025
bfee299
updating card file
Farah-Stu Jun 29, 2025
8f9221a
updating card test file
Farah-Stu Jun 29, 2025
d6a385f
update count file
Farah-Stu Jun 30, 2025
0c51d93
update count.test.js
Farah-Stu Jun 30, 2025
9c6607c
updating ordinal num file
Farah-Stu Jun 30, 2025
da6f74f
update ordinal num file test
Farah-Stu Jun 30, 2025
b15ce67
update repeat file
Farah-Stu Jun 30, 2025
401a0d1
update repeat test file
Farah-Stu Jun 30, 2025
d25287f
updating and returnig a valid message to the function
Farah-Stu Jul 11, 2025
ea3514b
returning a valid message to the code
Farah-Stu Jul 11, 2025
22db2cc
matching the description in the test file
Farah-Stu Jul 11, 2025
77294d9
updating
Farah-Stu Jul 11, 2025
6c4aa13
updating and testing numbers
Farah-Stu Jul 11, 2025
b0c9c31
updating file.js
Farah-Stu Jul 11, 2025
3000184
updadting the test file
Farah-Stu Jul 11, 2025
96eb260
updating the code
Farah-Stu Jul 12, 2025
19e006e
updating the card value code
Farah-Stu Jul 12, 2025
037bc34
updating the code with invalid card rank
Farah-Stu Jul 12, 2025
535e4ba
updating the file
Farah-Stu Jul 12, 2025
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
21 changes: 16 additions & 5 deletions Sprint-3/1-key-implement/1-get-angle-type.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,13 @@
// Then, write the next test! :) Go through this process until all the cases are implemented

function getAngleType(angle) {
if (angle === 90) return "Right angle";
// read to the end, complete line 36, then pass your test here
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
}

// we're going to use this helper function to make our assertions easier to read
Expand Down Expand Up @@ -42,15 +47,21 @@ 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"
// 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(260);
assertEquals(reflex, "Reflex angle");
console.log(getAngleType);
6 changes: 5 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,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);
}

// here's our helper again
Expand Down Expand Up @@ -41,13 +41,17 @@ 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?
const bothNegative = isProperFraction(-8, -10);
assertEquals(bothNegative, true);
25 changes: 24 additions & 1 deletion 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,13 @@
// 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) {
if (rank === "A") return 11;
const rank = card[0];
if (rank === "A") return 11;

if (["J", "Q", "K"].includes(rank)) return 10;
const number = Number(rank);
if (number >= 2 && number <= 10) return number;
throw new Error("Invalid card rank");
}

// You need to write assertions for your function to check it works in different cases
Expand All @@ -34,18 +40,35 @@ 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 JackOfDiamonds = getCardValue("J♦");
assertEquals(JackOfDiamonds, 10);

const QueenOfClubs = getCardValue("Q♣");
assertEquals(QueenOfClubs, 10);

const KingOfSpades = getCardValue("K♠");
assertEquals(KingOfSpades, 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."

try {
getCardValue("Z♣");
} catch (error) {
assertEquals(error.message, "Invalid card rank");
}
10 changes: 9 additions & 1 deletion Sprint-3/2-mandatory-rewrite/1-get-angle-type.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
function getAngleType(angle) {
if (angle<= 0 || angle >= 360) {
return "invalid angle";
}

if (angle === 90) return "Right angle";
// replace with your completed function from key-implement
if (angle > 0 && 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
21 changes: 19 additions & 2 deletions Sprint-3/2-mandatory-rewrite/1-get-angle-type.test.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
const getAngleType = require("./1-get-angle-type");

// Test cases for invalid angles
test("should return invalid angle for angles <=0 or angle >=360", ()=> {
expect(getAngleType(0)).toEqual("invalid angle");
expect(getAngleType(360)).toEqual("invalid angle");
});


test("should identify right angle (90°)", () => {
expect(getAngleType(90)).toEqual("Right angle");
});
Expand All @@ -10,15 +17,25 @@ 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(260)).toEqual("Reflex angle");
});
5 changes: 2 additions & 3 deletions Sprint-3/2-mandatory-rewrite/2-is-proper-fraction.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
function isProperFraction(numerator, denominator) {
if (numerator < denominator) return true;
// add your completed function from key-implement here
return Math.abs(numerator) < Math.abs(denominator);
}

module.exports = isProperFraction;
module.exports = isProperFraction;
20 changes: 15 additions & 5 deletions Sprint-3/2-mandatory-rewrite/2-is-proper-fraction.test.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,21 @@
const isProperFraction = require("./2-is-proper-fraction");

test("should return true for a proper fraction", () => {
expect(isProperFraction(2, 3)).toEqual(true);

test("should return false for improper fraction (5/2)", () => {
expect(isProperFraction(5, 2)).toEqual(false);
});


test("should return true for negative proper fraction (-4/7)", () => {
expect(isProperFraction(-4, 7)).toEqual(true);
});

// Case 2: Identify Improper Fractions:

// Case 3: Identify Negative Fractions:
test("should return false for equal numerator and denominator (3/3)", () => {
expect(isProperFraction(3, 3)).toEqual(false);
});


// Case 4: Identify Equal Numerator and Denominator:
test("should return true for both negative proper fraction (-8/-10)", () => {
expect(isProperFraction(-8, -10)).toEqual(true);
});
13 changes: 10 additions & 3 deletions Sprint-3/2-mandatory-rewrite/3-get-card-value.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
function getCardValue(card) {
// replace with your code from key-implement
return 11;
const rank = card.slice(0, -1);

if (rank === "A") return 11;
if (["J", "Q", "K"].includes(rank)) return 10;

if (/^(10|[2-9])$/.test(rank)) {
return Number(rank);
}
throw new Error("Invalid card rank");
}
module.exports = getCardValue;
module.exports = getCardValue;
31 changes: 27 additions & 4 deletions Sprint-3/2-mandatory-rewrite/3-get-card-value.test.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,34 @@
const getCardValue = require("./3-get-card-value");

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


// Case 2: Handle Number Cards (2-10):
test("should return number for number cards (2-10)",() => {
expect(getCardValue("2♠")).toEqual (2);
expect(getCardValue("10♣")).toEqual(10);
});
// Case 3: Handle Face Cards (J, Q, K):
test("should return 10 for face cards J, Q, K", () => {
["J", "Q", "K"].forEach(rank => {
expect(getCardValue (`${rank}♦`)).toEqual(10);
});
});



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

// Case 5: Handle Invalid Cards:
test("should throw error for invalid card rank", () => {
expect(() => getCardValue("L")).toThrow(new Error("Invalid card rank"));
});

// Case 6: should throw error for invalid numeric format:
test("should throw error for invalid numeric format", () => {
expect(() => getCardValue("0x02♠")).toThrow("Invalid card rank");
expect(() => getCardValue("2.1♠")).toThrow("Invalid card rank");
expect(() => getCardValue("2♠♠")).toThrow("Invalid card rank");
});
9 changes: 8 additions & 1 deletion Sprint-3/3-mandatory-practice/implement/count.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
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;
13 changes: 13 additions & 0 deletions Sprint-3/3-mandatory-practice/implement/count.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@ const countChar = require("./count");
// Given a string str and a single character char to search for,
// When the countChar function is called with these inputs,
// Then it should:
test("should count occurrences of a character in a string", () => {
const str = "coding is fun";
const char = "i";
const count = countChar(str, char);
expect(count).toEqual(2);
});

// Scenario: Multiple Occurrences
// Given the input string str,
Expand All @@ -22,3 +28,10 @@ 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 when no occurrences of a character are found", () => {
const str = "good morning";
const char = "l";
const count = countChar(str, char);
expect(count).toEqual(0);
});
24 changes: 22 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,25 @@
function getOrdinalNumber(num) {
return "1st";
const strNum= num.toString();
if(strNum.slice(-2)==="11") {
return strNum + "th";
}
if(strNum.slice(-2)==="12") {
return strNum + "th";
}
if(strNum.slice(-2)==="13") {
return strNum + "th";
}
if(strNum.slice(-1)==="1") {
return strNum + "st";
}
if(strNum.slice(-1)==="2") {
return strNum + "nd";
}
if(strNum.slice(-1)==="3") {
return strNum + "rd";
}

Comment on lines +2 to +21
Copy link
Contributor

Choose a reason for hiding this comment

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

  • If num is an integer, we could also use % to extract the last one or two digits from its value.

  • What should the function return when num is 10, 15, or 124?

Copy link
Author

Choose a reason for hiding this comment

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

If we use the number%10 we will get the last digit. In this case :
10 % 10 = 0
15 % 10 = 5
124 % 10 = 4

Copy link
Contributor

Choose a reason for hiding this comment

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

What does your function return when num is 10, 15, or 124?

Copy link
Author

Choose a reason for hiding this comment

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

number will return the remainder

Copy link
Author

Choose a reason for hiding this comment

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

10 % 10 = 0
15 % 10 = 5
124 % 10 = 4

}

module.exports = getOrdinalNumber;

module.exports = getOrdinalNumber;
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,26 @@ const getOrdinalNumber = require("./get-ordinal-number");
// When the number is 1,
// Then the function should return "1st"

test("should return '1st' for 1", () => {
test("append 'st' to numbers ending in 1" , () => {
expect(getOrdinalNumber(1)).toEqual("1st");
expect(getOrdinalNumber(21)).toEqual("21st");
expect(getOrdinalNumber(121)).toEqual("121st");
});

test("append 'nd' to numbers ending in 2, except those ending in 12", () => {
expect(getOrdinalNumber(2)).toEqual("2nd");
expect(getOrdinalNumber(22)).toEqual("22nd");
expect(getOrdinalNumber(132)).toEqual("132nd");
});

test("append 'rd' to numbers ending in 3 , except those ending in 13", () => {
expect(getOrdinalNumber(23)).toEqual("23rd");
expect(getOrdinalNumber(13)).toEqual("13th");
Copy link
Contributor

Choose a reason for hiding this comment

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

"except those ending in 13".

Numbers ending in 12, and 13 could be placed together with numbers ending in 11 in the same category.

expect(getOrdinalNumber(3)).toEqual("3rd");
});

test("should return '11th' for 11 , 12, 13", () => {
expect(getOrdinalNumber(11)).toEqual("11th");
expect(getOrdinalNumber(12)).toEqual("12th");
expect(getOrdinalNumber(13)).toEqual("13th");
});
Comment on lines +28 to +33
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 include this test to the script and then check if your function can pass this test:

    // Replace _______ by the value you expected
    test("should append '__' to number ending in 0, 4-9", () => {
        expect(getOrdinalNumber(124)).toEqual( _______ );
        expect(getOrdinalNumber(10)).toEqual( _______ );
        expect(getOrdinalNumber(99)).toEqual( _______ );   
    }); 

Copy link
Author

Choose a reason for hiding this comment

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

I applied this code and when I run the code it failed. But other codes they run properly .

10 changes: 7 additions & 3 deletions Sprint-3/3-mandatory-practice/implement/repeat.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
function repeat() {
return "hellohellohello";
function repeat(str, count) {
if (count < 0){
throw new Error("throw an error as negative counts are not valid");
}
return str.repeat(count);
}

module.exports = repeat;

module.exports = repeat;
Loading