Skip to content

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

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
16 changes: 13 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,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";
Comment on lines 10 to +16

Choose a reason for hiding this comment

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

Here you don't need to write an if elseif statement. When you return short like this. you can simply write if statements each line. Another approach is to use switch.

}

// we're going to use this helper function to make our assertions easier to read
Expand Down Expand Up @@ -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");
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 (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;
Comment on lines 10 to +14

Choose a reason for hiding this comment

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

Same as above.

}

// here's our helper again
Expand Down Expand Up @@ -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);
22 changes: 19 additions & 3 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,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;
}
Comment on lines 10 to 20

Choose a reason for hiding this comment

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

Same as above.


// You need to write assertions for your function to check it works in different cases
Expand All @@ -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♠");
Expand All @@ -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);
17 changes: 7 additions & 10 deletions Sprint-3/2-mandatory-rewrite/1-get-angle-type.js
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

Choose a reason for hiding this comment

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

Same as above.









// 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;
39 changes: 19 additions & 20 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,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"
11 changes: 8 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,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;
}
Comment on lines 1 to 9

Choose a reason for hiding this comment

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

Same as above.


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 true for a proper fraction", () => {
expect(isProperFraction(0, 0)).toEqual(false);
});

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

// Case 4: Identify Equal Numerator and Denominator:
test("should return true for a proper fraction", () => {
expect(isProperFraction(5, 5)).toEqual(false);
});
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;
// 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;
24 changes: 21 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,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);
});
11 changes: 9 additions & 2 deletions 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 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;
12 changes: 9 additions & 3 deletions Sprint-3/3-mandatory-practice/implement/count.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ const countChar = require("./count");
// Then it should correctly count overlapping occurrences of char (e.g., 'a' appears five times in 'aaaaa').

test("should count multiple occurrences of a character", () => {
const str = "aaaaa";
const char = "a";
const count = countChar(str, char);
const myStr = "aaaaa";
const myChar = "a";
const count = countChar(myStr, myChar);
expect(count).toEqual(5);
});

Expand All @@ -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 count multiple occurrences of a character", () => {
const myStr = "b";
const myChar = "a";
const count = countChar(myStr, myChar);
expect(count).toEqual(0);
});
17 changes: 15 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,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`;
}
Comment on lines +5 to +15

Choose a reason for hiding this comment

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

Same as above.

}

module.exports = getOrdinalNumber;
module.exports = getOrdinalNumber;
30 changes: 28 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,31 @@ const getOrdinalNumber = require("./get-ordinal-number");
// Then the function should return "1st"

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

test("should return '1000th' for 1000", () => {
const num = 1000;
const ordinal = "1000th";
expect(getOrdinalNumber(num)).toEqual(ordinal);
});

test("should return '102nd' for 102", () => {
const num = 102;
const ordinal = "102nd";
expect(getOrdinalNumber(num)).toEqual(ordinal);
});

test("should return '3003rd' for 3003", () => {
const num = 3003;
const ordinal = "3003rd";
expect(getOrdinalNumber(num)).toEqual(ordinal);
});

test("should return '21st' for 21", () => {
const num = 21;
const ordinal = "21st";
expect(getOrdinalNumber(num)).toEqual(ordinal);
});
11 changes: 8 additions & 3 deletions Sprint-3/3-mandatory-practice/implement/repeat.js
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;
Comment on lines +1 to +7

Choose a reason for hiding this comment

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

Suggested change
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;
function repeat(str, rep) {
if (rep < 0) return "negative counts are not valid";
myStr = "";
for (let i = 0; i < rep; i++) {
myStr = myStr + str;
}
return myStr;

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.

}

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