Update crypto-square exercise to match latest canonical json.

Refs exercism#488

Author: ricemery

exercises/crypto-square/src/test/scala/CryptoSquareTest.scala

@@ -1,64 +1,43 @@
 import org.scalatest.{Matchers, FunSuite}
 
-/** @version 2.0.0 */
+/** @version 3.2.0 */
 class CryptoSquareTest extends FunSuite with Matchers {
 
-  test("Lowercase") {
-    CryptoSquare.normalizedPlaintext("Hello") should be ("hello")
-  }
-
-  test("Remove spaces") {
-    pending
-    CryptoSquare.normalizedPlaintext("Hi there") should be ("hithere")
-  }
-
-  test("Remove punctuation") {
-    pending
-    CryptoSquare.normalizedPlaintext("@1, 2%, 3 Go!") should be ("123go")
-  }
-
-  test("empty plaintext results in an empty rectangle") {
-    pending
-    CryptoSquare.plaintextSegments("") should be (List())
-  }
-
-  test("4 character plaintext results in an 2x2 rectangle") {
-    pending
-    CryptoSquare.plaintextSegments("Ab Cd") should be (List("ab", "cd"))
-  }
-
-  test("9 character plaintext results in an 3x3 rectangle") {
-    pending
-    CryptoSquare.plaintextSegments("This is fun!") should be (List("thi", "sis", "fun"))
+  test("empty plaintext results in an empty ciphertext") {
+    CryptoSquare.ciphertext("") should be("")
   }
 
-  test("54 character plaintext results in an 8x7 rectangle") {
+  test("Lowercase") {
     pending
-    CryptoSquare.plaintextSegments("If man was meant to stay on the ground, god would have given us roots.") should be (List("ifmanwas", "meanttos", "tayonthe", "groundgo", "dwouldha", "vegivenu", "sroots"))
+    CryptoSquare.ciphertext("A") should be("a")
   }
 
-  test("empty plaintext results in an empty encode") {
+  test("Remove spaces") {
     pending
-    CryptoSquare.encoded("") should be ("")
+    CryptoSquare.ciphertext("  b ") should be("b")
   }
 
-  test("Non-empty plaintext results in the combined plaintext segments") {
+  test("Remove punctuation") {
     pending
-    CryptoSquare.encoded("If man was meant to stay on the ground, god would have given us roots.") should be ("imtgdvsfearwermayoogoanouuiontnnlvtwttddesaohghnsseoau")
+    CryptoSquare.ciphertext("@1,%!") should be("1")
   }
 
-  test("empty plaintext results in an empty ciphertext") {
+  test("9 character plaintext results in 3 chunks of 3 characters") {
     pending
-    CryptoSquare.ciphertext("") should be ("")
+    CryptoSquare.ciphertext("This is fun!") should be("tsf hiu isn")
   }
 
-  test("9 character plaintext results in 3 chunks of 3 characters") {
+  test(
+    "8 character plaintext results in 3 chunks, the last one with a trailing space") {
     pending
-    CryptoSquare.ciphertext("This is fun!") should be ("tsf hiu isn")
+    CryptoSquare.ciphertext("Chill out.") should be("clu hlt io ")
   }
 
-  test("54 character plaintext results in 7 chunks, the last two padded with spaces") {
+  test(
+    "54 character plaintext results in 7 chunks, the last two with trailing spaces") {
     pending
-    CryptoSquare.ciphertext("If man was meant to stay on the ground, god would have given us roots.") should be ("imtgdvs fearwer mayoogo anouuio ntnnlvt wttddes aohghn  sseoau ")
+    CryptoSquare.ciphertext(
+      "If man was meant to stay on the ground, god would have given us roots.") should be(
+      "imtgdvs fearwer mayoogo anouuio ntnnlvt wttddes aohghn  sseoau ")
   }
-}
+}

testgen/src/main/scala/CryptoSquareTestGenerator.scala

@@ -8,7 +8,7 @@ object CryptoSquareTestGenerator {
     val file = new File("src/main/resources/crypto-square.json")
 
     val code = TestSuiteBuilder.build(file,
-        fromLabeledTestAlt("normalizedPlaintext" -> Seq("plaintext"), "plaintextSegments" -> Seq("plaintext"),
+        fromLabeledTestAltFromInput("normalizedPlaintext" -> Seq("plaintext"), "plaintextSegments" -> Seq("plaintext"),
           "encoded" -> Seq("plaintext"), "ciphertext" -> Seq("plaintext")))
     println(s"-------------")
     println(code)