Skip to content

Commit 0764c40

Browse files
committed
darts: update test and version file
closes exercism#1666
1 parent 4c2068b commit 0764c40

2 files changed

Lines changed: 45 additions & 23 deletions

File tree

exercises/darts/.meta/version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.2.0
1+
2.2.0

exercises/darts/src/test/java/DartsTest.java

Lines changed: 44 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,72 +6,94 @@
66
public class DartsTest {
77

88
@Test
9-
public void testDartOutsideTarget() {
9+
public void missedTarget() {
1010
Darts darts = new Darts(-9, 9);
1111
assertEquals(0, darts.score());
1212
}
1313

1414
@Ignore("Remove to run test")
1515
@Test
16-
public void testDartLandsOnBorderOfTarget() {
16+
public void onTheOuterCircle() {
1717
Darts darts = new Darts(0, 10);
1818
assertEquals(1, darts.score());
1919
}
2020

2121
@Ignore("Remove to run test")
2222
@Test
23-
public void testDartLandsInOuterCircle() {
24-
Darts darts = new Darts(4, 4);
25-
assertEquals(1, darts.score());
23+
public void onTheMiddleCircle() {
24+
Darts darts = new Darts(-5, 0);
25+
assertEquals(5, darts.score());
2626
}
2727

2828
@Ignore("Remove to run test")
2929
@Test
30-
public void testDartLandsInBorderBetweenOuterAndMiddleCircles() {
31-
Darts darts = new Darts(5, 0);
32-
assertEquals(5, darts.score());
30+
public void onTheInnerCircle() {
31+
Darts darts = new Darts(0, -1);
32+
assertEquals(10, darts.score());
3333
}
3434

3535
@Ignore("Remove to run test")
3636
@Test
37-
public void testDartLandsOnMiddleOfCircle() {
38-
Darts darts = new Darts(0.8, -0.8);
39-
assertEquals(5, darts.score());
37+
public void exactlyOnCentre() {
38+
Darts darts = new Darts(0, 0);
39+
assertEquals(10, darts.score());
4040
}
4141

4242
@Ignore("Remove to run test")
4343
@Test
44-
public void testDartLandsOnBorderBetweenMiddleAndInnerCircles() {
45-
Darts darts = new Darts(0, -1);
44+
public void nearTheCentre() {
45+
Darts darts = new Darts(-0.1, -0.1);
4646
assertEquals(10, darts.score());
4747
}
4848

4949
@Ignore("Remove to run test")
5050
@Test
51-
public void testDartLandsInTheInnerCircle() {
52-
Darts darts = new Darts(-0.1, -0.1);
51+
public void justWithinTheInnerCircle() {
52+
Darts darts = new Darts(0.7, 0.7);
5353
assertEquals(10, darts.score());
5454
}
5555

5656
@Ignore("Remove to run test")
5757
@Test
58-
public void testCoordinatesSumLargerOneWithRadiusToOriginSmallerOrEqualOneScoredInnerCircle() {
59-
Darts darts = new Darts(0.4, 0.8);
60-
assertEquals(10, darts.score());
58+
public void justOutsideTheInnerCircle() {
59+
Darts darts = new Darts(0.8, -0.8);
60+
assertEquals(5, darts.score());
6161
}
6262

6363
@Ignore("Remove to run test")
6464
@Test
65-
public void testCoordinatesSumLargerFiveWithRadiusToOriginSmallerOrEqualFiveScoredMiddleCircle() {
66-
Darts darts = new Darts(2, 4);
65+
public void justWithinTheMiddleCirlce() {
66+
Darts darts = new Darts(-3.5, 3.5);
6767
assertEquals(5, darts.score());
6868
}
6969

7070
@Ignore("Remove to run test")
7171
@Test
72-
public void testCoordinatesSumLargerTenWithRadiusToOriginSmallerOrEqualTenScoredOuterCircle() {
73-
Darts darts = new Darts(4, 8);
72+
public void justOutsideTheMiddleCircle() {
73+
Darts darts = new Darts(-3.6, -3.6);
74+
assertEquals(1, darts.score());
75+
}
76+
77+
78+
@Ignore("Remove to run test")
79+
@Test
80+
public void justWithinTheOuterCirlce() {
81+
Darts darts = new Darts(-7.0, 7.0);
7482
assertEquals(1, darts.score());
7583
}
7684

85+
@Ignore("Remove to run test")
86+
@Test
87+
public void justOutsideTheOuterCircle() {
88+
Darts darts = new Darts(7.1, -7.1);
89+
assertEquals(0, darts.score());
90+
}
91+
92+
@Ignore("Remove to run test")
93+
@Test
94+
public void asymmetricPositionBetweenTheInnerAndMiddleCircles() {
95+
Darts darts = new Darts(0.5, -4);
96+
assertEquals(5, darts.score());
97+
}
98+
7799
}

0 commit comments

Comments
 (0)