Skip to content

Glasgow | May-2025 | Adiyah Farhan | Sprint-3 #573

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 14 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
16 changes: 11 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,12 @@
// 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";
else if (angle > 0 && angle < 90) return "Acute angle";
else if (angle > 90 && angle < 180) return "Obtuse angle";
else if (angle === 180) return "Straight line";
else 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 @@ -43,14 +47,16 @@ 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);
// ====> write your test here, and then add a line to pass the test in the function above
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 line = getAngleType(180);
assertEquals(line, "Straight line");

// 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
const reflex = getAngleType(210);
assertEquals(reflex, "Reflex angle");
13 changes: 10 additions & 3 deletions 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,8 @@
// 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 (Math.abs(numerator) < denominator) return true;
else return false;
}

Choose a reason for hiding this comment

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

Can you see any way you could remove the extra else branch here?


// here's our helper again
Expand Down Expand Up @@ -40,14 +41,20 @@ 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);
// ====> 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?
// Negative Fraction check where numerator is greater than denominator
// Input: numerator = -8, denominator = 5
// target output: false
// Explanation: The fraction -8/5 is a improper fraction because the absolute value of the numerator (8) is greater than the denominator (7). The function should return false.
const negativeImproper = isProperFraction(-8, 7);
assertEquals(negativeImproper, false);
17 changes: 13 additions & 4 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,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.startsWith("10") ? "10" : card[0];
if (rank === "A") return 11;
else if (rank >= "2" && rank <= "9") return Number(rank);
else if (rank === "10" || rank === "J" || rank === "Q" || rank === "K")
return 10;
else return "Invalid Card rank";
}

// You need to write assertions for your function to check it works in different cases
Expand All @@ -25,27 +30,31 @@ function assertEquals(actualOutput, targetOutput) {
// 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);

// 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♥");
// ====> 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 faceCards = getCardValue("10♣");
assertEquals(faceCards, 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 invalidCards = getCardValue("14");
assertEquals(invalidCards, "Invalid Card rank");
18 changes: 7 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,14 @@
function getAngleType(angle) {
if (angle === 90) return "Right angle";
// replace with your completed function from key-implement

if (angle === 90) return "Right angle";
else if (angle > 0 && 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";
}








// 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: 12 additions & 3 deletions Sprint-3/2-mandatory-rewrite/1-get-angle-type.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,30 @@ test("should identify right angle (90°)", () => {
expect(getAngleType(90)).toEqual("Right angle");
});

// 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"
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 & <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 angles (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º & <360º)", () => {
expect(getAngleType(220)).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
// add your completed function from key-implement here
if (Math.abs(numerator) < denominator) return true;
else if (Math.abs(numerator) > denominator) return false;
else return false;
}

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 improper function", () => {
expect(isProperFraction(7, 5)).toEqual(false);
});

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

// Case 4: Identify Equal Numerator and Denominator:
test("should return false for equal Numerator and Denominator", () => {
expect(isProperFraction(7, 7)).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;
// replace with your code from key-implement
let rank = card[0];
if (rank === "A") return 11;
else if (rank >= "2" && rank <= "9") return Number(rank);
else if (rank == "10" || rank == "J" || rank == "Q" || rank == "K") return 10;
else return "Invalid Card rank";
}
module.exports = getCardValue;
module.exports = getCardValue;
18 changes: 15 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,23 @@
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 the numeric value corresponding to the rank", () => {
expect(getCardValue("2♣︎")).toEqual(2);
});
// Case 3: Handle Face Cards (J, Q, K):
test("should return the value 10, as these cards are worth 10 points each in blackjack", () => {
expect(getCardValue("J♠︎")).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 return Invalid card rank", () => {
expect(getCardValue("11")).toEqual("Invalid Card rank");
});
14 changes: 12 additions & 2 deletions Sprint-3/3-mandatory-practice/implement/count.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
function countChar(stringOfCharacters, findCharacter) {
return 5
// Find the number of times findCharacter appears in stringOfCharacters

let count = 0;
for (let i = 0; i < stringOfCharacters.length; i++) {
if (stringOfCharacters[i] === findCharacter) {
// Increment the count
count++;
}
}
// Return the count
return count;
}

module.exports = countChar;
module.exports = countChar;
18 changes: 18 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,21 @@ 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 character does not exist in the string", () => {
const str = "hello";
const char = "z";
const count = countChar(str, char);
expect(count).toEqual(0);
});

// Scenario: Case Sensitivity
// Given the input string str,
// And a character char that exists in the str with different cases (e.g., 'A' vs. 'a'),
// When the function is called with these inputs,
// Then it should return the count of occurrences of case-sensitive char
test("should count occurrences of a case-sensitive character with different cases", () => {
const str = "Hello";
const char = "h";
const count = countChar(str, char);
expect(count).toEqual(0);
});
22 changes: 20 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,23 @@
function getOrdinalNumber(num) {
return "1st";
let ordinal = "";
switch (true) {
case num == 1 || (num % 10 == 1 && num != 11):
ordinal = `${num}st`;
break;
case num == 11:
ordinal = `${num}th`;
break;
case num == 2 || num == 22:
ordinal = `${num}nd`;
break;
case num == 3 || (num % 10 == 3 && num != 13):
ordinal = `${num}rd`;
break;
default:
ordinal = `${num}th`;
break;
}
return ordinal;
}

module.exports = getOrdinalNumber;
module.exports = getOrdinalNumber;
61 changes: 59 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,62 @@ 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");
});

// Case 2: Identify the ordinal number for 11
// When the number is 11,
// Then the function should return "11th"
test("should return '11th' for 11", () => {
expect(getOrdinalNumber(11)).toEqual("11th");
});

// Case 3: Identify the ordinal number for numbers ending with 1
// When the number is 21,
// Then the function should return "21st"

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

// Case 4: Identify the ordinal number for 2
// When the number is 2,
// Then the function should return "2nd"
test("should return '2nd' for 2", () => {
expect(getOrdinalNumber(2)).toEqual("2nd");
});

// Case 5: Identify the ordinal number for 22
// When the number is 22,
// Then the function should return "22nd"
test("should return '22nd' for 22", () => {
expect(getOrdinalNumber(22)).toEqual("22nd");
});

// Case 6: Identify the ordinal number for 3
// When the number is 3,
// Then the function should return "3rd"
test("should return '3rd' for 3", () => {
expect(getOrdinalNumber(3)).toEqual("3rd");
});

// Case 7: Identify the ordinal number for numbers ending with 3
// When the number is 23,
// Then the function should return "23rd"
test("should return '23rd' for 23", () => {
expect(getOrdinalNumber(23)).toEqual("23rd");
});

// Case 8: Identify the ordinal number for 13
// When the number is 13,
// Then the function should return "13th"
test("should return '13th' for 13", () => {
expect(getOrdinalNumber(13)).toEqual("13th");
});

// Case 9: Identify the ordinal number for numbers ending with 4
// When the number is 4,
// Then the function should return "4th"
test("should return '4th' for 4", () => {
expect(getOrdinalNumber(24)).toEqual("24th");
});
Loading