Raindrops - use object instead of an instance - refs exercism#242. Ad…

…d Raindrops.scala - refs exercism#137. Add topics to config.json - refs exercism#125
ricemery · Dec 15, 2016 · 81bed09 · 81bed09
1 parent 29079be
commit 81bed09
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 21 deletions.
diff --git a/config.json b/config.json
@@ -167,6 +167,9 @@
       "slug": "raindrops",
       "difficulty": 1,
       "topics": [
+         "StrinAgs",
+         "Logic",
+         "Transforming"
       ]
 		},
     {

diff --git a/exercises/raindrops/example.scala b/exercises/raindrops/example.scala
@@ -1,4 +1,4 @@
-class Raindrops {
+object Raindrops {
   private val sounds = List((3, "Pling"), (5, "Plang"), (7, "Plong"))
 
   def convert(n: Int): String =
@@ -7,7 +7,3 @@ class Raindrops {
       case s => s
     }
 }
-
-object Raindrops {
-  def apply() = new Raindrops
-}
diff --git a/exercises/raindrops/src/main/scala/Raindrops.scala b/exercises/raindrops/src/main/scala/Raindrops.scala
@@ -0,0 +1,4 @@
+object Raindrops {
+  def convert(n: Int): String = ???
+}
+
diff --git a/exercises/raindrops/src/test/scala/RaindropsTest.scala b/exercises/raindrops/src/test/scala/RaindropsTest.scala
@@ -2,82 +2,82 @@ import org.scalatest.{Matchers, FlatSpec}
 
 class RaindropsTest extends FlatSpec with Matchers {
   it should "convert 1" in {
-    Raindrops().convert(1) should equal("1")
+    Raindrops.convert(1) should equal("1")
   }
 
   it should "convert 3" in {
     pending
-    Raindrops().convert(3) should equal("Pling")
+    Raindrops.convert(3) should equal("Pling")
   }
 
   it should "convert 5" in {
     pending
-    Raindrops().convert(5) should equal("Plang")
+    Raindrops.convert(5) should equal("Plang")
   }
 
   it should "convert 7" in {
     pending
-    Raindrops().convert(7) should equal("Plong")
+    Raindrops.convert(7) should equal("Plong")
   }
 
   it should "convert 6" in {
     pending
-    Raindrops().convert(6) should equal("Pling")
+    Raindrops.convert(6) should equal("Pling")
   }
 
   it should "convert 9" in {
     pending
-    Raindrops().convert(9) should equal("Pling")
+    Raindrops.convert(9) should equal("Pling")
   }
 
   it should "convert 10" in {
     pending
-    Raindrops().convert(10) should equal("Plang")
+    Raindrops.convert(10) should equal("Plang")
   }
 
   it should "convert 14" in {
     pending
-    Raindrops().convert(14) should equal("Plong")
+    Raindrops.convert(14) should equal("Plong")
   }
 
   it should "convert 15" in {
     pending
-    Raindrops().convert(15) should equal("PlingPlang")
+    Raindrops.convert(15) should equal("PlingPlang")
   }
 
   it should "convert 21" in {
     pending
-    Raindrops().convert(21) should equal("PlingPlong")
+    Raindrops.convert(21) should equal("PlingPlong")
   }
 
   it should "convert 25" in {
     pending
-    Raindrops().convert(25) should equal("Plang")
+    Raindrops.convert(25) should equal("Plang")
   }
 
   it should "convert 35" in {
     pending
-    Raindrops().convert(35) should equal("PlangPlong")
+    Raindrops.convert(35) should equal("PlangPlong")
   }
 
   it should "convert 49" in {
     pending
-    Raindrops().convert(49) should equal("Plong")
+    Raindrops.convert(49) should equal("Plong")
   }
 
   it should "convert 52" in {
     pending
-    Raindrops().convert(52) should equal("52")
+    Raindrops.convert(52) should equal("52")
   }
 
   it should "convert 105" in {
     pending
-    Raindrops().convert(105) should equal("PlingPlangPlong")
+    Raindrops.convert(105) should equal("PlingPlangPlong")
   }
 
   it should "convert 12121" in {
     pending
-    Raindrops().convert(12121) should equal("12121")
+    Raindrops.convert(12121) should equal("12121")
   }
 }