Skip to content

London | ITP-May-25 | Anuar Duisenbek | Module-Structuring-and-Testing-Data | Sprint-3 #648

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 13 commits into
base: main
Choose a base branch
from
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
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
.idea/
.vscode
**/.DS_Store
12 changes: 9 additions & 3 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,11 @@
// 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";

Choose a reason for hiding this comment

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

This function look good.

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";
}

// we're going to use this helper function to make our assertions easier to read
Expand Down Expand Up @@ -43,14 +46,17 @@ 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
16 changes: 15 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) {
throw new Error("Denominator cannot be zero");
}
return Math.abs(numerator) < Math.abs(denominator);

Choose a reason for hiding this comment

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

Glad that you used a concise statement for this function.

How would you handle situations where the denominator is 0?

Copy link
Author

@AnuarBey AnuarBey Jul 18, 2025

Choose a reason for hiding this comment

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

@Amundeep-Dhaliwal
In mathematics, division by zero is not allowed. I might throw an error to let the user know something went wrong :)

}

// here's our helper again
Expand Down Expand Up @@ -40,14 +43,25 @@ 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 zeroNumerator = isProperFraction(0, 0);
assertEquals(zeroNumerator, true);

const negativeDenominator = isProperFraction(2, -8);
assertEquals(negativeDenominator, true);

const negativeImproper = isProperFraction(-5, -2);
assertEquals(negativeImproper, false);
26 changes: 25 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,12 @@
// 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;
let rank = card.slice(0, -1);
if (rank === "A") return 11;
if (rank === "K" || rank === "Q" || rank === "J" || rank === "10") return 10;
if (Number(rank) >= 2 && Number(rank) <= 9 && rank.length === 1)

Choose a reason for hiding this comment

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

This looks good.

return Number(rank);
throw Error("Invalid card rank");
}

// You need to write assertions for your function to check it works in different cases
Expand Down Expand Up @@ -39,13 +44,32 @@ const fiveofHearts = getCardValue("5♥");
// 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 kingOfHearts = getCardValue("K♥");
assertEquals(kingOfHearts, 10);

const jackOfSpades = getCardValue("J♠");
assertEquals(jackOfSpades, 10);

const queenOfDiamonds = getCardValue("Q♦");
assertEquals(queenOfDiamonds, 10);

const tenOfDiamonds = getCardValue("10♦");
assertEquals(tenOfDiamonds, 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("X♠");
console.log("Test failed: should have thrown an error");
} catch (e) {
assertEquals(e.message, "Invalid card rank");
}

Choose a reason for hiding this comment

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

Appreciate the innovation on this one.

17 changes: 6 additions & 11 deletions Sprint-3/2-mandatory-rewrite/1-get-angle-type.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,13 @@
function getAngleType(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";
}








// Don't get bogged down in this detail
// Jest uses CommonJS module syntax by default as it's quite old
// We will upgrade our approach to ES6 modules in the next course module, so for now
// We will upgrade our approach to ES6 modules in the next course module, so for now
// we have just written the CommonJS module.exports syntax for you
module.exports = getAngleType;
module.exports = getAngleType;
15 changes: 15 additions & 0 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,30 @@ 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 angles (<90°)", () => {
expect(getAngleType(1)).toEqual("Acute angle");
expect(getAngleType(15)).toEqual("Acute angle");
expect(getAngleType(45)).toEqual("Acute angle");
expect(getAngleType(89)).toEqual("Acute angle");

Choose a reason for hiding this comment

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

It would be good to have more expect statements here.

For example, the function should output an acute angle for 1, 15 and 45.

});

// 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 right angles (between 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 (between 180° and 360°)", () => {
expect(getAngleType(280)).toEqual("Reflex angle");
});
8 changes: 5 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,8 @@
function isProperFraction(numerator, denominator) {
if (numerator < denominator) return true;
// add your completed function from key-implement here
if (denominator === 0) {
throw new Error("Denominator cannot be zero");
}
return Math.abs(numerator) < Math.abs(denominator);
}

module.exports = isProperFraction;
module.exports = isProperFraction;
9 changes: 9 additions & 0 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,16 @@ test("should return true for a proper fraction", () => {
});

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

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

// Case 4: Identify Equal Numerator and Denominator:
test("should return true for equal numerator and denominator", () => {
expect(isProperFraction(3, 3)).toEqual(false);
});
10 changes: 7 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,9 @@
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 === "K" || rank === "Q" || rank === "J" || rank === "10") return 10;
if (Number(rank) >= 2 && Number(rank) <= 9 && rank.length === 1)
return Number(rank);
throw Error("Invalid card rank");
}
module.exports = getCardValue;
module.exports = getCardValue;
32 changes: 29 additions & 3 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,37 @@
const getCardValue = require("./3-get-card-value");

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

// Case 2: Handle Number Cards (2-10):
test("should return 7 for Seven of Hearts", () => {
expect(getCardValue("7♥")).toEqual(7);
});
test("should return 10 for Ten of Diamonds", () => {
expect(getCardValue("10♦")).toEqual(10);
});

// Case 3: Handle Face Cards (J, Q, K):
test("should return 10 for Jack of Clubs", () => {
expect(getCardValue("J♣")).toEqual(10);
});
test("should return 10 for Queen of Diamonds", () => {
expect(getCardValue("Q♦")).toEqual(10);
});
test("should return 10 for King of Hearts", () => {
expect(getCardValue("K♥")).toEqual(10);

Choose a reason for hiding this comment

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

These tests look good, there is good coverage.

});

// Case 4: Handle Ace (A):
test("should return 11 for Ace of Hearts", () => {
expect(getCardValue("A♥")).toEqual(11);
});
// Case 5: Handle Invalid Cards:
test("should throw an error for invalid card rank", () => {
expect(() => getCardValue("X♠")).toThrow("Invalid card rank");
});
test("should throw an error for empty string", () => {
expect(() => getCardValue("")).toThrow("Invalid card rank");
});
12 changes: 9 additions & 3 deletions 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
function countChar(str, char) {
let count = 0;
for (let i = 0; i < str.length; i++) {
if (str[i] === char) {
count++;
}
}
return count;
}

module.exports = countChar;
module.exports = countChar;
15 changes: 15 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,18 @@ 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 there are no occurrences", () => {

Choose a reason for hiding this comment

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

We could add more test cases, for example:

Counting the number of a in aaa
Counting the number of e in excellent

expect(countChar("hello", "z")).toEqual(0);
});

test("should count multiple 'a' in 'aaa'", () => {
expect(countChar("aaa", "a")).toEqual(3);
});

test("should count 'e' in 'excellent'", () => {
expect(countChar("excellent", "e")).toEqual(3);
});

test("should return 0 when there are no occurrences", () => {
expect(countChar("excellent", "E")).toEqual(0);
});
12 changes: 10 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,13 @@
function getOrdinalNumber(num) {
return "1st";
const lastTwoDigits = num % 100;
if (lastTwoDigits >= 11 && lastTwoDigits <= 13) {
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`;

Choose a reason for hiding this comment

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

This implementation looks nice.

}

module.exports = getOrdinalNumber;
module.exports = getOrdinalNumber;
28 changes: 26 additions & 2 deletions Sprint-3/3-mandatory-practice/implement/get-ordinal-number.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,29 @@ const getOrdinalNumber = require("./get-ordinal-number");
// Then the function should return "1st"

test("should return '1st' for 1", () => {
expect(getOrdinalNumber(1)).toEqual("1st");
});
expect(getOrdinalNumber(1)).toEqual("1st");
});

test("should return '2nd' for 2", () => {
expect(getOrdinalNumber(2)).toEqual("2nd");
}); //currently fails

test("should return '3rd' for 3", () => {
expect(getOrdinalNumber(3)).toEqual("3rd");
});

test("should return '4th' for 4", () => {
expect(getOrdinalNumber(4)).toEqual("4th");
});

Choose a reason for hiding this comment

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

Testing on 11, 12, 13 would also be good for coverage.


test("should return '11th' for 11", () => {
expect(getOrdinalNumber(11)).toEqual("11th");
});

test("should return '12th' for 12", () => {
expect(getOrdinalNumber(12)).toEqual("12th");
});

test("should return '13th' for 13", () => {
expect(getOrdinalNumber(13)).toEqual("13th");
});
9 changes: 6 additions & 3 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("Count must be non-negative");
}
return str.repeat(count);
}

module.exports = repeat;
module.exports = repeat;
Loading