Skip to content

Commit 4e14189

Browse files
Merge pull request #247 from ricemery/raindrops
Raindrops
2 parents 831194c + 3109c93 commit 4e14189

File tree

4 files changed

+24
-21
lines changed

4 files changed

+24
-21
lines changed

config.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,9 @@
167167
"slug": "raindrops",
168168
"difficulty": 1,
169169
"topics": [
170+
"Strings",
171+
"Logic",
172+
"Transforming"
170173
]
171174
},
172175
{

exercises/raindrops/example.scala

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
class Raindrops {
1+
object Raindrops {
22
private val sounds = List((3, "Pling"), (5, "Plang"), (7, "Plong"))
33

44
def convert(n: Int): String =
@@ -7,7 +7,3 @@ class Raindrops {
77
case s => s
88
}
99
}
10-
11-
object Raindrops {
12-
def apply() = new Raindrops
13-
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
object Raindrops {
2+
def convert(n: Int): String = ???
3+
}
4+

exercises/raindrops/src/test/scala/RaindropsTest.scala

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,82 +2,82 @@ import org.scalatest.{Matchers, FlatSpec}
22

33
class RaindropsTest extends FlatSpec with Matchers {
44
it should "convert 1" in {
5-
Raindrops().convert(1) should equal("1")
5+
Raindrops.convert(1) should equal("1")
66
}
77

88
it should "convert 3" in {
99
pending
10-
Raindrops().convert(3) should equal("Pling")
10+
Raindrops.convert(3) should equal("Pling")
1111
}
1212

1313
it should "convert 5" in {
1414
pending
15-
Raindrops().convert(5) should equal("Plang")
15+
Raindrops.convert(5) should equal("Plang")
1616
}
1717

1818
it should "convert 7" in {
1919
pending
20-
Raindrops().convert(7) should equal("Plong")
20+
Raindrops.convert(7) should equal("Plong")
2121
}
2222

2323
it should "convert 6" in {
2424
pending
25-
Raindrops().convert(6) should equal("Pling")
25+
Raindrops.convert(6) should equal("Pling")
2626
}
2727

2828
it should "convert 9" in {
2929
pending
30-
Raindrops().convert(9) should equal("Pling")
30+
Raindrops.convert(9) should equal("Pling")
3131
}
3232

3333
it should "convert 10" in {
3434
pending
35-
Raindrops().convert(10) should equal("Plang")
35+
Raindrops.convert(10) should equal("Plang")
3636
}
3737

3838
it should "convert 14" in {
3939
pending
40-
Raindrops().convert(14) should equal("Plong")
40+
Raindrops.convert(14) should equal("Plong")
4141
}
4242

4343
it should "convert 15" in {
4444
pending
45-
Raindrops().convert(15) should equal("PlingPlang")
45+
Raindrops.convert(15) should equal("PlingPlang")
4646
}
4747

4848
it should "convert 21" in {
4949
pending
50-
Raindrops().convert(21) should equal("PlingPlong")
50+
Raindrops.convert(21) should equal("PlingPlong")
5151
}
5252

5353
it should "convert 25" in {
5454
pending
55-
Raindrops().convert(25) should equal("Plang")
55+
Raindrops.convert(25) should equal("Plang")
5656
}
5757

5858
it should "convert 35" in {
5959
pending
60-
Raindrops().convert(35) should equal("PlangPlong")
60+
Raindrops.convert(35) should equal("PlangPlong")
6161
}
6262

6363
it should "convert 49" in {
6464
pending
65-
Raindrops().convert(49) should equal("Plong")
65+
Raindrops.convert(49) should equal("Plong")
6666
}
6767

6868
it should "convert 52" in {
6969
pending
70-
Raindrops().convert(52) should equal("52")
70+
Raindrops.convert(52) should equal("52")
7171
}
7272

7373
it should "convert 105" in {
7474
pending
75-
Raindrops().convert(105) should equal("PlingPlangPlong")
75+
Raindrops.convert(105) should equal("PlingPlangPlong")
7676
}
7777

7878
it should "convert 12121" in {
7979
pending
80-
Raindrops().convert(12121) should equal("12121")
80+
Raindrops.convert(12121) should equal("12121")
8181
}
8282
}
8383

0 commit comments

Comments
 (0)