Skip to content

Commit eac9e9a

Browse files
committed
correction
1 parent 2f4e882 commit eac9e9a

File tree

5 files changed

+46
-15
lines changed

5 files changed

+46
-15
lines changed

Sprint-3/1-implement-and-rewrite-tests/implement/1-get-angle-type.js

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,14 @@
1515
// execute the code to ensure all tests pass.
1616

1717
function getAngleType(angle) {
18-
if (angle === 90) return "Right angle";
19-
if (angle < 90) return "Acute angle";
20-
if (90 <angle && angle<180 ) return "Obtuse angle";
21-
if (angle === 180) return "Straight angle";
22-
if (180<angle && angle<360) return "Reflex angle";
23-
return "Invalid angle"
18+
if (typeof angle !== "number" || angle <= 0 || angle > 360) return "Invalid angle";
19+
20+
if (angle < 90) return "Acute angle";
21+
if (angle === 90) return "Right angle";
22+
if (angle < 180) return "Obtuse angle";
23+
if (angle === 180) return "Straight angle";
24+
if (angle < 360) return "Reflex angle";
25+
if (angle === 360) return "Full rotation angle";
2426
}
2527

2628
// The line below allows us to load the getAngleType function into tests in other files.
@@ -45,6 +47,12 @@ assertEquals(right, "Right angle");
4547
const acute = getAngleType(45);
4648
assertEquals(acute, "Acute angle");
4749

50+
const angle1=getAngleType(89)
51+
assertEquals(angle1, "Acute angle");
52+
53+
const angle2=getAngleType(-45)
54+
assertEquals(angle2, "Invalid angle");
55+
4856
// Case 3: Identify Obtuse Angles:
4957
const obtuse = getAngleType(120);
5058
assertEquals(obtuse, "Obtuse angle");
@@ -61,4 +69,6 @@ assertEquals(reflex, "Reflex angle");
6169
assertEquals(getAngleType(367),"Invalid angle");
6270

6371
//case 7: Identify boundary angle:
64-
assertEquals(getAngleType(1), "Acute angle");
72+
assertEquals(getAngleType(1), "Acute angle");
73+
74+
assertEquals(getAngleType(0), "Invalid angle");

Sprint-3/1-implement-and-rewrite-tests/implement/2-is-proper-fraction.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ assertEquals(isProperFraction(1, 2), true);
3636
assertEquals(isProperFraction(5,5), false);
3737

3838
//Case 3: (-3)/(-5) is a proper fraction
39-
assertEquals(isFinite(-3,-5), true);
39+
assertEquals(isProperFraction(-3,-5), true);
4040

4141
//Case 4: (-4)/6 is a proper fraction
4242
assertEquals(isProperFraction(-4,6),true);

Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,9 @@ assertEquals(getCardValue("5♣"), 5);
6262
assertEquals(getCardValue("A♦"), 11)
6363

6464
//Examples J Q K:,
65-
assertEquals(getCardValue("Q♥"), 10)
66-
assertEquals(getCardValue("K♥"), 10)
65+
assertEquals(getCardValue("Q♣"), 10)
66+
assertEquals(getCardValue("K♠"), 10)
67+
assertEquals(getCardValue("J♣"), 10)
6768

6869
//Examples invalid numbers:
6970
assertThrow(()=>getCardValue("1♥"))

Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/1-get-angle-type.test.js

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ test(`should return "Acute angle" when (0 < angle < 90)`, () => {
1212
expect(getAngleType(45)).toEqual("Acute angle");
1313
expect(getAngleType(89)).toEqual("Acute angle");
1414
});
15-
15+
1616
// Case 2: Right angle
1717
test ('should return "Right angle" when angle ===90',() => {
1818
expect(getAngleType(90)).toEqual("Right angle");
@@ -21,6 +21,7 @@ test ('should return "Right angle" when angle ===90',() => {
2121
test ('should return "Obtuse angle" when (90<angle && angle <180)',() => {
2222
expect(getAngleType(135)).toEqual("Obtuse angle");
2323
})
24+
2425
// Case 4: Straight angle
2526
test ('should return "Straight angle" when angle ===180',() => {
2627
expect(getAngleType(180)).toEqual("Straight angle");
@@ -32,6 +33,17 @@ test ('should return "Obtuse angle" when (180<angle && angle <360)',() => {
3233
})
3334

3435
// Case 6: Invalid angles
36+
37+
test('should return "Full rotation angle" when (angle=360)', ()=> {
38+
expect(getAngleType(360)).toEqual("Full rotation angle");
39+
})
40+
3541
test('should return "Invalid angle"when (angle>=360)', ()=> {
36-
expect(getAngleType(360)).toEqual("Invalid angle");
42+
expect(getAngleType(1012)).toEqual("Invalid angle");
3743
})
44+
45+
46+
test('should return "Invalid angle" when angle <= 0', () => {
47+
expect(getAngleType(-5)).toEqual("Invalid angle");
48+
expect(getAngleType(-10)).toEqual("Invalid angle");
49+
});

Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,25 @@ test(`should return false when denominator is zero`, () => {
1212
//case:absolute numerator is bigger than absolute denominator
1313
test ('should return false when numerator absolute is bigger than denominator absolute',() => {
1414
expect(isProperFraction(5, -4)).toEqual(false);
15-
})
15+
expect(isProperFraction(-5, 4)).toEqual(false);
16+
expect(isProperFraction(-5, -4)).toEqual(false);
17+
expect(isProperFraction(5, 4)).toEqual(false);
18+
});
1619

1720
//case:numerator is the same as denominator
1821
test('should return false if numerator is the same as denominator', () =>{
1922
expect(isProperFraction(-9,-9)).toEqual(false)
23+
expect(isProperFraction(4,4)).toEqual(false)
2024
})
2125

2226
//case: absolute numerator is less than absolute denominator
2327
test ('should return true when numerator absolute is less than denominator absolute',() => {
24-
expect(isProperFraction(3,-8)).toEqual(true);
25-
})
28+
expect(isProperFraction(3, 8)).toEqual(true);
29+
expect(isProperFraction(-3, 8)).toEqual(true);
30+
expect(isProperFraction(3, -8)).toEqual(true);
31+
expect(isProperFraction(-3, -8)).toEqual(true);
32+
});
33+
2634

2735
//case: numerator is zero
2836
test(`should return true when nominator is zero`, () => {

0 commit comments

Comments
 (0)