-
-
Notifications
You must be signed in to change notification settings - Fork 196
Glasgow | ITP May -25 | Pandi Simatupang | Module-Structuring-and-Testing-Data | coursework/sprint-3 #651
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
Glasgow | ITP May -25 | Pandi Simatupang | Module-Structuring-and-Testing-Data | coursework/sprint-3 #651
Changes from 13 commits
0d3ab26
8ca1698
9486542
e895328
a0c7003
0769e0b
b3f7e1c
dde0d24
b4f0f0c
2c54885
8587494
8781fe7
d981134
a2f5474
2698473
a4bcc75
b17787c
75516af
4e98474
c4f73a6
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 === 180) return "Straight angle"; | ||
// read to the end, complete line 36, then pass your test here | ||
else if (angle < 90) return "Acute angle"; | ||
else if (angle > 90 && angle < 180) return "Obtuse angle"; | ||
else return "Reflex angle"; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Here you don't need to write an There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ok, I've changed it to switch-case instead of if-else method. |
||
} | ||
|
||
// we're going to use this helper function to make our assertions easier to read | ||
|
@@ -42,15 +46,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 | ||
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 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(190); | ||
assertEquals(reflex, "Reflex angle"); |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 (numerator === 0 || denominator === 0) return false; | ||
else if (numerator === denominator) return false; | ||
else if (Math.abs(numerator) < Math.abs(denominator)) return true; | ||
else if (Math.abs(numerator) > Math.abs(denominator)) return false; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same as above. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Changed to Switch-case.. |
||
} | ||
|
||
// here's our helper again | ||
|
@@ -41,13 +44,24 @@ 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 testFraction1 = isProperFraction(0, 0); | ||
assertEquals(testFraction1, false); | ||
|
||
const testFraction2 = isProperFraction(0, 3); | ||
assertEquals(testFraction2, false); | ||
|
||
const testFraction3 = isProperFraction(3, 0); | ||
assertEquals(testFraction3, false); |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,7 +8,15 @@ | |
// 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); //start from 0 until just before one last character | ||
if (rank === "A") return 11; | ||
else if ((rank === "10") | (rank === "J") | (rank === "Q") | (rank === "K")) | ||
return 10; | ||
else if (rank > 1 && rank < 10) | ||
return Number( | ||
rank | ||
); //need to convert to number, because === compare type and exact number | ||
else return null; | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same as above. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. modified to switch-case.. |
||
|
||
// You need to write assertions for your function to check it works in different cases | ||
|
@@ -22,7 +30,8 @@ function assertEquals(actualOutput, targetOutput) { | |
} | ||
// Acceptance criteria: | ||
|
||
// 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), | ||
// 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♠"); | ||
|
@@ -32,20 +41,27 @@ assertEquals(aceofSpades, 11); | |
// 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♥"); | ||
const fiveofHearts = getCardValue("8♥"); | ||
// ====> write your test here, and then add a line to pass the test in the function above | ||
assertEquals(fiveofHearts, 8); | ||
|
||
// 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 alphabets = getCardValue("J♥"); | ||
assertEquals(alphabets, 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 rankA = getCardValue("A♥"); | ||
assertEquals(rankA, 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("14♥"); | ||
assertEquals(inValidCard, null); |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,15 @@ | ||
function getAngleType(angle) { | ||
if (angle === 90) return "Right angle"; | ||
// replace with your completed function from key-implement | ||
|
||
else if (angle === 180) return "Straight angle"; | ||
// read to the end, complete line 36, then pass your test here | ||
else if (angle < 90) return "Acute angle"; | ||
else if (angle > 90 && angle < 180) return "Obtuse angle"; | ||
else return "Reflex angle"; | ||
} | ||
Comment on lines
+4
to
9
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same as above. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. already done.. |
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
// 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; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,24 +1,23 @@ | ||
const getAngleType = require("./1-get-angle-type"); | ||
|
||
test("should identify right angle (90°)", () => { | ||
test("testing for multiple different angles", () => { | ||
// 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" | ||
expect(getAngleType(90)).toEqual("Right 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" | ||
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" | ||
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" | ||
expect(getAngleType(300)).toEqual("Reflex 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" | ||
|
||
// 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" | ||
|
||
// Case 4: Identify Straight Angles: | ||
// When the angle is exactly 180 degrees, | ||
// Then the function should return "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" |
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. That is really good, it is my preferred style of writing such a function, as subjective is it may be. It is easy to read and understand at a glance at what is happening, and each line represents a condition. So if you are reading the code trying to work out what will happen if a specific value is passed into the function, it is really easy to read each condition and determine the outcome, all in a matter of seconds and without having to run the code. Good job here, I like this! |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,11 @@ | ||
function isProperFraction(numerator, denominator) { | ||
if (numerator < denominator) return true; | ||
// add your completed function from key-implement here | ||
//if (numerator < denominator) return true; | ||
// add your completed function from key-implement here | ||
|
||
if (numerator === 0 || denominator === 0) return false; | ||
else if (numerator === denominator) return false; | ||
else if (Math.abs(numerator) < Math.abs(denominator)) return true; | ||
else if (Math.abs(numerator) > Math.abs(denominator)) return false; | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same as above. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. modify to multiple ifs.. instead of if-else. |
||
|
||
module.exports = isProperFraction; | ||
module.exports = isProperFraction; |
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; | ||
// replace with your code from key-implement | ||
//return 11; | ||
let rank = card.slice(0, -1); //start from 0 until just before one last character | ||
if (rank === "A") return 11; | ||
else if ((rank === "10") | (rank === "J") | (rank === "Q") | (rank === "K")) | ||
return 10; | ||
else if (rank > 1 && rank < 10) return Number(rank); | ||
//need to convert to number, because === compare type and exact number | ||
else return null; | ||
} | ||
module.exports = getCardValue; | ||
module.exports = getCardValue; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,29 @@ | ||
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 5 for Ace of Spades", () => { | ||
const fiveSpades = getCardValue("5♠"); | ||
expect(fiveSpades).toEqual(5); | ||
}); | ||
|
||
// Case 3: Handle Face Cards (J, Q, K): | ||
test("should return 10 for K of Spades", () => { | ||
const KSpades = getCardValue("K♠"); | ||
expect(KSpades).toEqual(10); | ||
}); | ||
|
||
// Case 4: Handle Ace (A): | ||
test("should return 11 for A of Spades", () => { | ||
const ASpades = getCardValue("A♠"); | ||
expect(ASpades).toEqual(11); | ||
}); | ||
// Case 5: Handle Invalid Cards: | ||
test("should return null for 17 of Spades", () => { | ||
const invalidCard = getCardValue("17♠"); | ||
expect(invalidCard).toEqual(null); | ||
}); |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,12 @@ | ||
function countChar(stringOfCharacters, findCharacter) { | ||
return 5 | ||
let numberOfFindChar = 0; | ||
let lengthOfString = stringOfCharacters.length; | ||
for (let i = 0; i < lengthOfString; i++) { | ||
if (findCharacter === stringOfCharacters[i]) numberOfFindChar++; | ||
} | ||
return numberOfFindChar; | ||
} | ||
|
||
module.exports = countChar; | ||
//console.log(countChar("aaaaaaaaaaaaaaaaaaaaabaaaa", "b")); | ||
|
||
module.exports = countChar; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,18 @@ | ||
function getOrdinalNumber(num) { | ||
return "1st"; | ||
//get the absolute value and turn into string | ||
let myNum = Math.abs(num).toString(); | ||
let myNumLastChar = myNum.at(-1); | ||
if (myNum < 10) { | ||
if (myNum === "1") return `${num}st`; | ||
else if (myNum === "2") return `${num}nd`; | ||
else if (myNum === "3") return `${num}rd`; | ||
else return `${num}th`; | ||
} else if (myNum >= 10) { | ||
if (myNumLastChar === "1") return `${num}st`; | ||
else if (myNumLastChar === "2") return `${num}nd`; | ||
else if (myNumLastChar === "3") return `${num}rd`; | ||
else return `${num}th`; | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same as above. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. changed to Switch-case method. |
||
} | ||
|
||
module.exports = getOrdinalNumber; | ||
module.exports = getOrdinalNumber; |
Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
@@ -1,5 +1,10 @@ | ||||||||||||||||||||||||||||||
function repeat() { | ||||||||||||||||||||||||||||||
return "hellohellohello"; | ||||||||||||||||||||||||||||||
function repeat(str, rep) { | ||||||||||||||||||||||||||||||
myStr = ""; | ||||||||||||||||||||||||||||||
for (let i = 0; i < rep; i++) { | ||||||||||||||||||||||||||||||
myStr = myStr + str; | ||||||||||||||||||||||||||||||
} | ||||||||||||||||||||||||||||||
if (rep < 0) return "negative counts are not valid"; | ||||||||||||||||||||||||||||||
return myStr; | ||||||||||||||||||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
You should always be validating your inputs first, that way there are no dubious values being passed down your program which can create a problem. In this case you should check first that the count is a positive integer, before running any other part of your function. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. thanks, I moved the filter if(rep<0) to the first line of the function to skip out fast when it doesn't match. |
||||||||||||||||||||||||||||||
} | ||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||
module.exports = repeat; | ||||||||||||||||||||||||||||||
module.exports = repeat; |
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice, that is a good solution, it is easier to read already. If you check this part of the Switch documentation, do you think this could be useful for your code? Can it be useful perhaps on other files from this PR?