Skip to content

London|May 2025|Alexandru Pocovnicu|Coursework/sprint 3 #639

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 31 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
301ccc0
d
alexandru-pocovnicu Jun 16, 2025
aee8b64
i have written the test and completed the code accordingly
alexandru-pocovnicu Jun 17, 2025
76d10a5
created the tests and added new lines of code
alexandru-pocovnicu Jun 17, 2025
ae4f944
wrote assertions and completed the code accordingly
alexandru-pocovnicu Jun 17, 2025
e282ccf
replaced the comments with jest test cases
alexandru-pocovnicu Jun 18, 2025
d81fcbb
added the completed function
alexandru-pocovnicu Jun 18, 2025
777b1e7
CREATED TEST CASES FOR THE FUNCTION
alexandru-pocovnicu Jun 18, 2025
9dcbdca
replaced code with mine
alexandru-pocovnicu Jun 18, 2025
02ba073
written all the test cases, all passed
alexandru-pocovnicu Jun 18, 2025
7aab1ad
replaced with my code
alexandru-pocovnicu Jun 18, 2025
5eb2d42
wrote the second test
alexandru-pocovnicu Jun 18, 2025
743ea0a
updated the code
alexandru-pocovnicu Jun 18, 2025
cabdf43
implemented and tested additional cases
alexandru-pocovnicu Jun 18, 2025
5889529
updated the code to cover the test cases
alexandru-pocovnicu Jun 18, 2025
244fe2e
wrote the test cases
alexandru-pocovnicu Jun 18, 2025
3b0d529
updated the code according to the test cases
alexandru-pocovnicu Jun 18, 2025
66ab144
wrote the test cases
alexandru-pocovnicu Jun 18, 2025
93f777e
wrote the code according to test cases
alexandru-pocovnicu Jun 18, 2025
9e994f7
adjusted tests and code according to review
alexandru-pocovnicu Jul 16, 2025
46128d9
added a few more tests for edge cases
alexandru-pocovnicu Jul 16, 2025
dd284bc
simplified the code by adding else
alexandru-pocovnicu Jul 16, 2025
c20a08d
check for angles<0
alexandru-pocovnicu Jul 17, 2025
9ba4e9f
return false instead of NaN
alexandru-pocovnicu Jul 17, 2025
816bd57
added stricter rule for what rank can be
alexandru-pocovnicu Jul 17, 2025
83a5879
added tests for more invalid card ranks
alexandru-pocovnicu Jul 17, 2025
c2bb55d
updated tests and code to include all possibilities
alexandru-pocovnicu Jul 17, 2025
cdbc4b1
created a for loop to test the card from 2-10
alexandru-pocovnicu Jul 17, 2025
56922bb
generalised test for j q k
alexandru-pocovnicu Jul 17, 2025
8b04dcb
filter out non-numbers and non-integers
alexandru-pocovnicu Jul 17, 2025
531f1a3
changed return from string to boolean
alexandru-pocovnicu Jul 17, 2025
4db0d4f
check if the function can also return false
alexandru-pocovnicu Jul 17, 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
11 changes: 10 additions & 1 deletion 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,19 @@ 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(230)
assertEquals(reflex,"Reflex angle")
13 changes: 12 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,11 @@
// 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 (isNaN(numerator) || isNaN(denominator)) return NaN;
if (Math.abs(numerator) < Math.abs(denominator)) return true;
if(Math.abs(numerator)>Math.abs(denominator)) return false;
if(Math.abs(numerator)===Math.abs(denominator)) return false;

}

// here's our helper again
Expand Down Expand Up @@ -40,14 +44,21 @@ 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 notANumber=isProperFraction(NaN,3)
console.assert(isNaN(notANumber), `Expected NaN, got ${notANumber}`);

const notANumber2 = isProperFraction(3, NaN);
console.assert(isNaN(notANumber2), `Expected NaN, got ${notANumber2}`);
11 changes: 11 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>=2 && rank<10)return Number(rank);
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 @@ -33,19 +37,26 @@ 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 faceCards = getCardValue("10♥", "J♥", "Q♥", "K♥");
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 aceofHeart = getCardValue("A♥");
assertEquals(aceofHeart, 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("B")
assertEquals(invalidCard,"Invalid card rank")
16 changes: 14 additions & 2 deletions Sprint-3/2-mandatory-rewrite/1-get-angle-type.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,19 @@
function getAngleType(angle) {
if (angle < 0) return "Negative angle";
if (angle === 0) return "Not an angle";
if (angle > 0 && angle < 90) return "Acute angle";
if (angle === 90) return "Right angle";
// replace with your completed function from key-implement

if (angle > 90 && angle < 180) return "Obtuse angle";
if (angle === 180) return "Straight angle";
if (angle > 180 && angle <= 360) return "Reflex angle";
if (angle >360) return "Revolutional angle";






// replace with your completed function from key-implement.
}


Expand Down
50 changes: 36 additions & 14 deletions Sprint-3/2-mandatory-rewrite/1-get-angle-type.test.js
Original file line number Diff line number Diff line change
@@ -1,24 +1,46 @@
const getAngleType = require("./1-get-angle-type");

test("should identify right angle (90°)", () => {
test("should return not an angle (angle=0)", () => {
expect(getAngleType(0)).toEqual("Not an angle");
});

test("should identify right angle (angle=90°)", () => {
expect(getAngleType(90)).toEqual("Right angle");
});

// REPLACE the comments with the tests
// make your test descriptions as clear and readable as possible
// 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 (0 < angle < 90)",()=>{
expect(getAngleType(45)).toEqual("Acute angle");
expect(getAngleType(89.9)).toEqual("Acute angle");
expect(getAngleType(20.6)).toEqual("Acute angle");
});


test("should identify obtuse angle(90° < angle < 180°)",()=>{
expect(getAngleType(120)).toEqual("Obtuse angle");
expect(getAngleType(90.1)).toEqual("Obtuse angle")
expect(getAngleType(179.9)).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(angle=180°)",()=>{
expect(getAngleType(180)).toEqual("Straight angle")
});


test("should identify reflex angle(180<angle<=360)",()=>{
expect(getAngleType(230)).toEqual("Reflex angle")
expect(getAngleType(180.1)).toEqual("Reflex angle");
expect(getAngleType(360)).toEqual("Reflex angle");
});

test("should identify revolutional angle(angle>360)", () => {
expect(getAngleType(390)).toEqual("Revolutional 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 a negative angle(angle<0)", () => {
expect(getAngleType(-390)).toEqual("Negative angle");
});
11 changes: 9 additions & 2 deletions Sprint-3/2-mandatory-rewrite/2-is-proper-fraction.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
function isProperFraction(numerator, denominator) {
if (numerator < denominator) return true;
// add your completed function from key-implement here
if (isNaN(numerator) || isNaN(denominator)) return false;
if (Math.abs(numerator) < Math.abs(denominator)) {
return true}else{
return false;
Comment on lines +3 to +5
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 improve the indentation of this code?

This is the suggested style by CYF: https://curriculum.codeyourfuture.io/guides/reviewing/style-guide/

};



// add your completed function from key-implement here.
}

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

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

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

// Case 4: Identify Equal Numerator and Denominator:
// Case 4: Identify Equal Numerator and Denominator:.
test("should return false for equal numerator and denominator",()=>{
expect(isProperFraction(3,3)).toEqual(false);
})
test("should return NaN for non-numbers",()=>{
expect(isProperFraction(3,NaN)).toEqual(NaN);
})
19 changes: 16 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,18 @@
function getCardValue(card) {
// replace with your code from key-implement
return 11;
// replace with your code from key-implement...
let rank=card.slice(0,-1);
if (rank === "A") return 11;
const allrank=["2","3","4","5","6","7","8","9","10"]
if(allrank.includes(rank))return Number(rank);
if(rank==="10"|| rank==="J" || rank==="Q" || rank==="K") return 10;
else return "Invalid card rank";

}
module.exports = getCardValue;
module.exports = getCardValue;


// console.log(getCardValue("0x02♠"));
// console.log(getCardValue("2.1♠"));
// console.log(getCardValue("00_02♠"));
// console.log(getCardValue("3e0♠"));
// console.log(getCardValue("000002♠"));
34 changes: 32 additions & 2 deletions Sprint-3/2-mandatory-rewrite/3-get-card-value.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,37 @@ test("should return 11 for Ace of Spades", () => {
expect(aceofSpades).toEqual(11);
});

// Case 2: Handle Number Cards (2-10):
// Case 3: Handle Face Cards (J, Q, K):
// Case 2: Handle Number Cards (2-10):..
test("should return Number Cards (2-10)", () => {
for (let i=2; i<=10;i++){
const card = i + "♠"
expect(getCardValue(card)).toEqual(i);
}
});
test("should return 2 for 2 of Spades", () => {
const twoofSpades = getCardValue("2♠");
expect(twoofSpades).toEqual(2);
})
// Case 3: Handle Face Cards (J, Q, K):.
test("should return 10 for Face Cards (J, Q, K)", () => {
const jofSpades = getCardValue("J♠");
expect(jofSpades).toEqual(10);
expect(getCardValue("K♠")).toEqual(10);
expect(getCardValue("Q♠")).toEqual(10)
});
// Case 4: Handle Ace (A):
test("should return 11 for Ace of Heart",()=>{
const aceofHeart = getCardValue("A♥");
expect(aceofHeart).toEqual(11);
})
// Case 5: Handle Invalid Cards:
test("should return invalid cards for anything else",()=>{
expect(getCardValue("l")).toBe("Invalid card rank")
})

test("should return invalid cards for anything else", () => {
expect(getCardValue("2.1♠")).toBe("Invalid card rank");
});
test("should return invalid cards for anything else", () => {
expect(getCardValue("00_02♠")).toBe("Invalid card rank");
});
Comment on lines +35 to +41
Copy link
Contributor

Choose a reason for hiding this comment

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

Could combine these into one tests, as both of them are testing for invalid card ranks.

4 changes: 2 additions & 2 deletions Sprint-3/3-mandatory-practice/implement/count.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
function countChar(stringOfCharacters, findCharacter) {
return 5
return stringOfCharacters.split("").filter((char)=>char===findCharacter).length
}

//console.log(countChar("heello","l"))
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 return 0 for no occurrences",()=>{
const str = "papadie";
const char = "o";
const count = countChar(str, char);
expect(count).toEqual(0);
})
25 changes: 23 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,26 @@
function getOrdinalNumber(num) {
return "1st";

if (isNaN(num) || (!Number.isInteger(num))) {
return "NaN";
}

const strNum=String(num);
const lastDigit=Number(strNum.slice(-1));
const lastTwoDigits=Number(strNum.slice(-2));

if (lastTwoDigits >= 11 && lastTwoDigits <=13) return num + "th";

if(lastDigit===1)return num + "st";

if ( lastDigit===2) return num + "nd";

if (lastDigit === 3) return num + "rd";

return num+"th"

}

module.exports = getOrdinalNumber;

module.exports = getOrdinalNumber;


Loading