Skip to content

Glasgow | 25-ITP-SEP | Alaa Tagi | Sprint 3 | Coursework/sprint 3 implement and rewrite #756

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.

Sign up for GitHub

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

Closed
Alaa-Tagi wants to merge 18 commits into from
Closed

Glasgow | 25-ITP-SEP | Alaa Tagi | Sprint 3 | Coursework/sprint 3 implement and rewrite #756

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
b5de08b
build up getAngleType case by case
Alaa-Tagi Oct 9, 2025
b5fa562
Editing is-proper-fraction code
Alaa-Tagi Oct 9, 2025
3898643
Editing getcardvalue code
Alaa-Tagi Oct 12, 2025
78d374a
rewrite test with jest for getangletype code
Alaa-Tagi Oct 12, 2025
d07dd99
update isproperfraction code
Alaa-Tagi Oct 12, 2025
a223e45
Rewrite test with jest for isproperfraction code
Alaa-Tagi Oct 12, 2025
17435c8
update the code
Alaa-Tagi Oct 23, 2025
63246ca
Editing the code
Alaa-Tagi Oct 23, 2025
b5c55bd
edit the code
Alaa-Tagi Oct 23, 2025
a3c8fc8
editing the code
Alaa-Tagi Oct 23, 2025
991832e
Enhance Jest tests for isProperFraction function
Alaa-Tagi Oct 24, 2025
f52bd8d
Fix the code
Alaa-Tagi Oct 24, 2025
5274005
Editing the jest code
Alaa-Tagi Oct 24, 2025
7bc1534
Editing code
Alaa-Tagi Oct 25, 2025
5e63f68
update the jest code
Alaa-Tagi Oct 26, 2025
27f970f
manually deletinh all the unwanted content and the markers
Alaa-Tagi Oct 26, 2025
5837808
deleting the markers
Alaa-Tagi Oct 26, 2025
28455ef
deleting the doubled cases inside the code
Alaa-Tagi Oct 26, 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
20 changes: 4 additions & 16 deletions Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,62 +1,53 @@
const isProperFraction = require("../implement/2-is-proper-fraction");

<<<<<<< HEAD
// Case 1: Proper fraction
// When numerator < denominator, it should return true.
test("should return true for a proper fraction", () => {
=======

// Case 1: Proper Fraction
// Given a numerator smaller than denominator (2/3),
// When the function is called,
// Then it should return true because it's a proper fraction.
test("should return true for a proper fraction (2/3)", () => {
>>>>>>> 52740052fb0ad97a2c7253a04978b14a15b9e763
Copy link
Contributor

@cjyuan cjyuan Oct 26, 2025

Choose a reason for hiding this comment

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

In addition to deleting the markers, you would also need to decide what to do with the conflicting content (those code between the marker). Normally, we just need to delete the code from one version and keep the other one.

In this example, code on lines 3-5 is from version A and code on lines 6-11 is from version B.
If you read the comments, you can see two // Case 1: .....

At current state, this test file won't execute.

Copy link
Author

@Alaa-Tagi Alaa-Tagi Oct 26, 2025

Choose a reason for hiding this comment

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

deleted double cases

expect(isProperFraction(2, 3)).toEqual(true);
});

<<<<<<< HEAD
// Case 2: Improper fraction
// When numerator > denominator, it should return false.
test("should return false for an improper fraction", () => {
=======

// Case 2: Improper Fraction
// Given a numerator greater than denominator (5/2),
// When the function is called,
// Then it should return false because it's an improper fraction.
test("should return false for an improper fraction (5/2)", () => {
>>>>>>> 52740052fb0ad97a2c7253a04978b14a15b9e763
expect(isProperFraction(5, 2)).toEqual(false);
});

<<<<<<< HEAD
// Case 3: Negative proper fraction
// When numerator is negative but |numerator| < |denominator|, it should return true.
test("should return true for a negative proper fraction", () => {
=======

// Case 3: Negative Proper Fraction
// Given a negative proper fraction (-1/2),
// When the function is called,
// Then it should return true because the value is between -1 and 1.
test("should return true for a negative proper fraction (-1/2)", () => {
>>>>>>> 52740052fb0ad97a2c7253a04978b14a15b9e763
expect(isProperFraction(-1, 2)).toEqual(true);
});

<<<<<<< HEAD
// Case 4: Equal numerator and denominator
// When numerator === denominator, it should return false.
test("should return false for equal numerator and denominator", () => {
=======

// Case 4: Equal Numerator and Denominator
// Given a numerator equal to denominator (3/3),
// When the function is called,
// Then it should return false because it's equal to 1 (not proper).
test("should return false for equal numerator and denominator (3/3)", () => {
>>>>>>> 52740052fb0ad97a2c7253a04978b14a15b9e763
expect(isProperFraction(3, 3)).toEqual(false);
});

<<<<<<< HEAD
// Case 5: Zero numerator
// 0 divided by any non-zero denominator is a proper fraction.
test("should return true for zero numerator", () => {
Expand Down Expand Up @@ -87,7 +78,6 @@ test("should return true for large proper fractions", () => {
expect(isProperFraction(999, 1000)).toEqual(true);
});

=======
// Case 5: Negative Improper Fraction
// Given a negative improper fraction (-4/3),
// When the function is called,
Expand Down Expand Up @@ -119,5 +109,3 @@ test("should return true for zero numerator (0/5)", () => {
test("should return false for zero denominator (5/0)", () => {
expect(isProperFraction(5, 0)).toEqual(false);
});

>>>>>>> 52740052fb0ad97a2c7253a04978b14a15b9e763