Queens - use object instead of an instance - refs exercism#242. Add Q…

…ueens.scala - refs exercism#137. Add topics to config.json - refs exercism#125

config.json

@@ -221,6 +221,10 @@
       "slug": "queen-attack",
       "difficulty": 1,
       "topics": [
+         "Strings",
+         "Optional values",
+         "Logic",
+         "Games"
       ]
 		},
     {

exercises/queen-attack/example.scala

@@ -1,4 +1,4 @@
-case class Queens() {
+object Queens {
 
   def boardString(white: Option[Position], black: Option[Position]): String = {
 
@@ -34,3 +34,4 @@ case class Queens() {
 }
 
 case class Position(x: Int, y: Int)
+

exercises/queen-attack/src/main/scala/Queens.scala

@@ -0,0 +1,8 @@
+object Queens {
+
+  def boardString(white: Option[Position], black: Option[Position]): String = ???
+
+  def canAttack(white: Position, black: Position): Boolean = ???
+}
+
+case class Position(x: Int, y: Int)

exercises/queen-attack/src/test/scala/QueensTest.scala

@@ -2,7 +2,7 @@ import org.scalatest.{Matchers, FunSuite}
 
 class QueensTest extends FunSuite with Matchers {
   test ("empty boardString") {
-    Queens().boardString(None, None) should equal(
+    Queens.boardString(None, None) should equal(
       "_ _ _ _ _ _ _ _\n" +
       "_ _ _ _ _ _ _ _\n" +
       "_ _ _ _ _ _ _ _\n" +
@@ -15,7 +15,7 @@ class QueensTest extends FunSuite with Matchers {
 
   test("boardString") {
     pending
-    Queens().boardString(Some(Position(2, 4)), Some(Position(6, 6))) should equal(
+    Queens.boardString(Some(Position(2, 4)), Some(Position(6, 6))) should equal(
       "_ _ _ _ _ _ _ _\n" +
       "_ _ _ _ _ _ _ _\n" +
       "_ _ _ _ W _ _ _\n" +
@@ -28,24 +28,24 @@ class QueensTest extends FunSuite with Matchers {
 
   test("canAttack - false") {
     pending
-    Queens().canAttack(Position(2, 3), Position(4, 7)) should be (false)
+    Queens.canAttack(Position(2, 3), Position(4, 7)) should be (false)
   }
 
   test("canAttack - vert attack") {
     pending
-    Queens().canAttack(Position(2, 4), Position(2, 7)) should be (true)
+    Queens.canAttack(Position(2, 4), Position(2, 7)) should be (true)
   }
 
   test("canAttack - horiz attack") {
     pending
-    Queens().canAttack(Position(5, 4), Position(2, 4)) should be (true)
+    Queens.canAttack(Position(5, 4), Position(2, 4)) should be (true)
   }
 
   test("canAttack - diag attack") {
     pending
-    Queens().canAttack(Position(1, 1), Position(6, 6)) should be (true)
-    Queens().canAttack(Position(0, 6), Position(1, 7)) should be (true)
-    Queens().canAttack(Position(4, 1), Position(6, 3)) should be (true)
-    Queens().canAttack(Position(2, 2), Position(1, 3)) should be (true)
+    Queens.canAttack(Position(1, 1), Position(6, 6)) should be (true)
+    Queens.canAttack(Position(0, 6), Position(1, 7)) should be (true)
+    Queens.canAttack(Position(4, 1), Position(6, 3)) should be (true)
+    Queens.canAttack(Position(2, 2), Position(1, 3)) should be (true)
   }
 }