From c7c95380eeb50ab2552be3f524a3553e448e895c Mon Sep 17 00:00:00 2001 From: HM-127BTY Date: Mon, 20 Jul 2026 15:00:16 +0100 Subject: [PATCH 1/3] Work on sprint 3 1-get-angle-type put in code using "if" function. --- .../implement/1-get-angle-type.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Sprint-3/1-implement-and-rewrite-tests/implement/1-get-angle-type.js b/Sprint-3/1-implement-and-rewrite-tests/implement/1-get-angle-type.js index 9e05a871e2..32d64fef01 100644 --- a/Sprint-3/1-implement-and-rewrite-tests/implement/1-get-angle-type.js +++ b/Sprint-3/1-implement-and-rewrite-tests/implement/1-get-angle-type.js @@ -16,6 +16,17 @@ function getAngleType(angle) { // TODO: Implement this function + if (angle < 90) { + return "Acute angle" + } else if (angle ===90) { + return "Right angle" + } else if (angle < 180) { + return "Obtuse angle" + } else if (angle ===180) { + return "Straight angle" + } else if (angle < 360) { + return "Invalid angle" + } } // The line below allows us to load the getAngleType function into tests in other files. From fa101abbe52d9e0c3d0b33b86b0da1326be81e9a Mon Sep 17 00:00:00 2001 From: HM-127BTY Date: Thu, 23 Jul 2026 14:47:32 +0100 Subject: [PATCH 2/3] Sprint 3 - get angle type. Added in code and testing --- .../implement/1-get-angle-type.js | 22 ++++++++++++++-- .../1-get-angle-type.test.js | 26 +++++++++++++++++++ 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/Sprint-3/1-implement-and-rewrite-tests/implement/1-get-angle-type.js b/Sprint-3/1-implement-and-rewrite-tests/implement/1-get-angle-type.js index 32d64fef01..7ab64f55a4 100644 --- a/Sprint-3/1-implement-and-rewrite-tests/implement/1-get-angle-type.js +++ b/Sprint-3/1-implement-and-rewrite-tests/implement/1-get-angle-type.js @@ -16,7 +16,9 @@ function getAngleType(angle) { // TODO: Implement this function - if (angle < 90) { + if (angle < 0) { + return "Invalid angle" + } else if (angle < 90) { return "Acute angle" } else if (angle ===90) { return "Right angle" @@ -25,9 +27,17 @@ function getAngleType(angle) { } else if (angle ===180) { return "Straight angle" } else if (angle < 360) { + return "Reflex angle" + } else if (angle === 360) { + return "Acute angle" + } else if (angle > 360) { return "Invalid angle" } -} + + } + + + // The line below allows us to load the getAngleType function into tests in other files. // This will be useful in the "rewrite tests with jest" step. @@ -46,3 +56,11 @@ function assertEquals(actualOutput, targetOutput) { // Example: Identify Right Angles const right = getAngleType(90); assertEquals(right, "Right angle"); +// const right = getAngleType(89); +// assertEquals(right, "Acute angle"); +// const right = getAngleType(145); +// assertEquals(right, "Obtuse angle"); +// const right = getAngleType(180); +// assertEquals(right, "Straight angle"); +// const right = getAngleType(200); +// assertEquals(right, "Invalid angle"); \ No newline at end of file diff --git a/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/1-get-angle-type.test.js b/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/1-get-angle-type.test.js index d777f348d3..eed1548586 100644 --- a/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/1-get-angle-type.test.js +++ b/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/1-get-angle-type.test.js @@ -14,7 +14,33 @@ test(`should return "Acute angle" when (0 < angle < 90)`, () => { }); // Case 2: Right angle +test ('should return "Right angle" when (angle ===90)', () => { + expect(getAngleType(90)).toEqual("Right angle"); +}); + // Case 3: Obtuse angles +test ('should return "Obtuse angle" when (angle < 180)', () => { + expect(getAngleType(91)).toEqual("Obtuse angle"); + expect(getAngleType(175)).toEqual("Obtuse angle"); + expect(getAngleType(135)).toEqual("Obtuse angle"); +}); + // Case 4: Straight angle +test ('should return "Straight angle" when (angle ===180)', () => { + expect(getAngleType(180)).toEqual("Straight angle"); +}); + // Case 5: Reflex angles +test ('should return "Reflex angle" when (angle < 360)', () => { + expect(getAngleType(190)).toEqual("Reflex angle"); + expect(getAngleType(250)).toEqual("Reflex angle"); + expect(getAngleType(359)).toEqual("Reflex angle"); +}); + // Case 6: Invalid angles +test ('should return "Invalid angle" when (angle > 360)', () => { + expect(getAngleType(361)).toEqual("Invalid angle"); + expect(getAngleType(450)).toEqual("Invalid angle"); + expect(getAngleType(3854)).toEqual("Invalid angle"); + expect(getAngleType(-12)).toEqual("Invalid angle"); +}); From 5b755baa22d00354fd779d277979b828478fbd67 Mon Sep 17 00:00:00 2001 From: HM-127BTY Date: Wed, 29 Jul 2026 15:03:54 +0100 Subject: [PATCH 3/3] Sprint 3 - rewrite tests with jest - 2 is proper fraction Put in code for .js and testing for .jest --- .../implement/2-is-proper-fraction.js | 23 ++++++++++++++++++- .../2-is-proper-fraction.test.js | 17 ++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/Sprint-3/1-implement-and-rewrite-tests/implement/2-is-proper-fraction.js b/Sprint-3/1-implement-and-rewrite-tests/implement/2-is-proper-fraction.js index 970cb9b641..6ce2029a93 100644 --- a/Sprint-3/1-implement-and-rewrite-tests/implement/2-is-proper-fraction.js +++ b/Sprint-3/1-implement-and-rewrite-tests/implement/2-is-proper-fraction.js @@ -11,9 +11,30 @@ // execute the code to ensure all tests pass. function isProperFraction(numerator, denominator) { - // TODO: Implement this function + if (denominator === 0) { + return false + } + + if (numerator === denominator) { + return false + } + + if (numerator > denominator) { + return false + } + + if (numerator < denominator) { + return true + } } +// function isProperFraction(numerator, denominator) { +// if (denominator === 0) { +// return false +// } else if (Math.abs(numerator) < Math.abs(denominator)) { +// return true +// }; +// } // The line below allows us to load the isProperFraction function into tests in other files. // This will be useful in the "rewrite tests with jest" step. module.exports = isProperFraction; diff --git a/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js b/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js index 7f087b2ba1..c887165a70 100644 --- a/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js +++ b/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js @@ -8,3 +8,20 @@ const isProperFraction = require("../implement/2-is-proper-fraction"); test(`should return false when denominator is zero`, () => { expect(isProperFraction(1, 0)).toEqual(false); }); + +// numerator is higher than denominator +test(`should return false when numerator is higher value than denominator`, () => { + expect(isProperFraction(2, 1)).toEqual(false); +}); + +// numerator is lower than denominator +test(`should return true when numerator is lower value than denominator`, () => { + expect(isProperFraction(1, 2)).toEqual(true); + expect(isProperFraction(-1, 2 )).toEqual(true); + expect(isProperFraction(0, 2 )).toEqual(true); +}) + +// numerator is equal to denominator +test(`should return false when numerator is equal to denominator`, () => { + expect(isProperFraction(1, 1)).toEqual(false); +}); \ No newline at end of file