trackler 1.0.0 → 1.0.0.1

data/tracks/haskell/exercises/beer-song/test/Tests.hs

@@ -1,31 +1,340 @@
-{-# OPTIONS_GHC -fno-warn-type-defaults #-}
-
-import Test.Hspec        (Spec, describe, it, shouldBe)
+import Control.Monad     (unless)
+import Test.Hspec        (Spec, describe, expectationFailure, it, shouldBe)
 import Test.Hspec.Runner (configFastFail, defaultConfig, hspecWith)
 
-import Beer (sing, verse)
+import Beer (song)
 
 main :: IO ()
 main = hspecWith defaultConfig {configFastFail = True} specs
 
 specs :: Spec
-specs = describe "beer-song" $ do
-
-          -- As of 2016-07-30, there was no reference file
-          -- for the test cases in `exercism/x-common`.
-
-          describe "verse" $ do
-            it "verse 8" $ verse 8 `shouldBe` verse_8
-            it "verse 2" $ verse 2 `shouldBe` verse_2
-            it "verse 1" $ verse 1 `shouldBe` verse_1
-            it "verse 0" $ verse 0 `shouldBe` verse_0
-          describe "sing" $ do
-            it "song 8 6" $ sing 8 6 `shouldBe` song_8_6
-            it "song 3 0" $ sing 3 0 `shouldBe` song_3_0
+
+specs = describe "beer-song" $
+
+          describe "song" $ do
+
+            -- First we test the input, line by line, to give more
+            -- useful error messages.
+
+            it "matches lines" $ sequence_ lineAssertions
+
+            -- Finally, because testing lines we are unable
+            -- to detect a missing newline at the end of the
+            -- lyrics, we test the full song.
+
+            it "matches full song" $ song `shouldBe` lyrics
   where
-    verse_8 = "8 bottles of beer on the wall, 8 bottles of beer.\nTake one down and pass it around, 7 bottles of beer on the wall.\n"
-    verse_2 = "2 bottles of beer on the wall, 2 bottles of beer.\nTake one down and pass it around, 1 bottle of beer on the wall.\n"
-    verse_1 = "1 bottle of beer on the wall, 1 bottle of beer.\nTake it down and pass it around, no more bottles of beer on the wall.\n"
-    verse_0 = "No more bottles of beer on the wall, no more bottles of beer.\nGo to the store and buy some more, 99 bottles of beer on the wall.\n"
-    song_8_6 = "8 bottles of beer on the wall, 8 bottles of beer.\nTake one down and pass it around, 7 bottles of beer on the wall.\n\n7 bottles of beer on the wall, 7 bottles of beer.\nTake one down and pass it around, 6 bottles of beer on the wall.\n\n6 bottles of beer on the wall, 6 bottles of beer.\nTake one down and pass it around, 5 bottles of beer on the wall.\n\n"
-    song_3_0 = "3 bottles of beer on the wall, 3 bottles of beer.\nTake one down and pass it around, 2 bottles of beer on the wall.\n\n2 bottles of beer on the wall, 2 bottles of beer.\nTake one down and pass it around, 1 bottle of beer on the wall.\n\n1 bottle of beer on the wall, 1 bottle of beer.\nTake it down and pass it around, no more bottles of beer on the wall.\n\nNo more bottles of beer on the wall, no more bottles of beer.\nGo to the store and buy some more, 99 bottles of beer on the wall.\n\n"
+
+    lineAssertions = zipWith checkLine [1 :: Int ..] $ zipMaybe (lines song) (lines lyrics)
+
+    checkLine lineno (got, want) =
+      unless (got == want) $
+        expectationFailure $ "mismatch at line " ++ show lineno ++ "\nexpected: " ++ show want ++ "\n but got: " ++ show got
+
+    zipMaybe    []     []  = []
+    zipMaybe (x:xs)    []  = (Just x , Nothing) : zipMaybe xs []
+    zipMaybe    []  (y:ys) = (Nothing, Just y ) : zipMaybe [] ys
+    zipMaybe (x:xs) (y:ys) = (Just x , Just y ) : zipMaybe xs ys
+
+-- Lyrics extracted from `exercism/x-common` on 2016-10-03.
+
+lyrics :: String
+lyrics = "99 bottles of beer on the wall, 99 bottles of beer.\n\
+         \Take one down and pass it around, 98 bottles of beer on the wall.\n\
+         \\n\
+         \98 bottles of beer on the wall, 98 bottles of beer.\n\
+         \Take one down and pass it around, 97 bottles of beer on the wall.\n\
+         \\n\
+         \97 bottles of beer on the wall, 97 bottles of beer.\n\
+         \Take one down and pass it around, 96 bottles of beer on the wall.\n\
+         \\n\
+         \96 bottles of beer on the wall, 96 bottles of beer.\n\
+         \Take one down and pass it around, 95 bottles of beer on the wall.\n\
+         \\n\
+         \95 bottles of beer on the wall, 95 bottles of beer.\n\
+         \Take one down and pass it around, 94 bottles of beer on the wall.\n\
+         \\n\
+         \94 bottles of beer on the wall, 94 bottles of beer.\n\
+         \Take one down and pass it around, 93 bottles of beer on the wall.\n\
+         \\n\
+         \93 bottles of beer on the wall, 93 bottles of beer.\n\
+         \Take one down and pass it around, 92 bottles of beer on the wall.\n\
+         \\n\
+         \92 bottles of beer on the wall, 92 bottles of beer.\n\
+         \Take one down and pass it around, 91 bottles of beer on the wall.\n\
+         \\n\
+         \91 bottles of beer on the wall, 91 bottles of beer.\n\
+         \Take one down and pass it around, 90 bottles of beer on the wall.\n\
+         \\n\
+         \90 bottles of beer on the wall, 90 bottles of beer.\n\
+         \Take one down and pass it around, 89 bottles of beer on the wall.\n\
+         \\n\
+         \89 bottles of beer on the wall, 89 bottles of beer.\n\
+         \Take one down and pass it around, 88 bottles of beer on the wall.\n\
+         \\n\
+         \88 bottles of beer on the wall, 88 bottles of beer.\n\
+         \Take one down and pass it around, 87 bottles of beer on the wall.\n\
+         \\n\
+         \87 bottles of beer on the wall, 87 bottles of beer.\n\
+         \Take one down and pass it around, 86 bottles of beer on the wall.\n\
+         \\n\
+         \86 bottles of beer on the wall, 86 bottles of beer.\n\
+         \Take one down and pass it around, 85 bottles of beer on the wall.\n\
+         \\n\
+         \85 bottles of beer on the wall, 85 bottles of beer.\n\
+         \Take one down and pass it around, 84 bottles of beer on the wall.\n\
+         \\n\
+         \84 bottles of beer on the wall, 84 bottles of beer.\n\
+         \Take one down and pass it around, 83 bottles of beer on the wall.\n\
+         \\n\
+         \83 bottles of beer on the wall, 83 bottles of beer.\n\
+         \Take one down and pass it around, 82 bottles of beer on the wall.\n\
+         \\n\
+         \82 bottles of beer on the wall, 82 bottles of beer.\n\
+         \Take one down and pass it around, 81 bottles of beer on the wall.\n\
+         \\n\
+         \81 bottles of beer on the wall, 81 bottles of beer.\n\
+         \Take one down and pass it around, 80 bottles of beer on the wall.\n\
+         \\n\
+         \80 bottles of beer on the wall, 80 bottles of beer.\n\
+         \Take one down and pass it around, 79 bottles of beer on the wall.\n\
+         \\n\
+         \79 bottles of beer on the wall, 79 bottles of beer.\n\
+         \Take one down and pass it around, 78 bottles of beer on the wall.\n\
+         \\n\
+         \78 bottles of beer on the wall, 78 bottles of beer.\n\
+         \Take one down and pass it around, 77 bottles of beer on the wall.\n\
+         \\n\
+         \77 bottles of beer on the wall, 77 bottles of beer.\n\
+         \Take one down and pass it around, 76 bottles of beer on the wall.\n\
+         \\n\
+         \76 bottles of beer on the wall, 76 bottles of beer.\n\
+         \Take one down and pass it around, 75 bottles of beer on the wall.\n\
+         \\n\
+         \75 bottles of beer on the wall, 75 bottles of beer.\n\
+         \Take one down and pass it around, 74 bottles of beer on the wall.\n\
+         \\n\
+         \74 bottles of beer on the wall, 74 bottles of beer.\n\
+         \Take one down and pass it around, 73 bottles of beer on the wall.\n\
+         \\n\
+         \73 bottles of beer on the wall, 73 bottles of beer.\n\
+         \Take one down and pass it around, 72 bottles of beer on the wall.\n\
+         \\n\
+         \72 bottles of beer on the wall, 72 bottles of beer.\n\
+         \Take one down and pass it around, 71 bottles of beer on the wall.\n\
+         \\n\
+         \71 bottles of beer on the wall, 71 bottles of beer.\n\
+         \Take one down and pass it around, 70 bottles of beer on the wall.\n\
+         \\n\
+         \70 bottles of beer on the wall, 70 bottles of beer.\n\
+         \Take one down and pass it around, 69 bottles of beer on the wall.\n\
+         \\n\
+         \69 bottles of beer on the wall, 69 bottles of beer.\n\
+         \Take one down and pass it around, 68 bottles of beer on the wall.\n\
+         \\n\
+         \68 bottles of beer on the wall, 68 bottles of beer.\n\
+         \Take one down and pass it around, 67 bottles of beer on the wall.\n\
+         \\n\
+         \67 bottles of beer on the wall, 67 bottles of beer.\n\
+         \Take one down and pass it around, 66 bottles of beer on the wall.\n\
+         \\n\
+         \66 bottles of beer on the wall, 66 bottles of beer.\n\
+         \Take one down and pass it around, 65 bottles of beer on the wall.\n\
+         \\n\
+         \65 bottles of beer on the wall, 65 bottles of beer.\n\
+         \Take one down and pass it around, 64 bottles of beer on the wall.\n\
+         \\n\
+         \64 bottles of beer on the wall, 64 bottles of beer.\n\
+         \Take one down and pass it around, 63 bottles of beer on the wall.\n\
+         \\n\
+         \63 bottles of beer on the wall, 63 bottles of beer.\n\
+         \Take one down and pass it around, 62 bottles of beer on the wall.\n\
+         \\n\
+         \62 bottles of beer on the wall, 62 bottles of beer.\n\
+         \Take one down and pass it around, 61 bottles of beer on the wall.\n\
+         \\n\
+         \61 bottles of beer on the wall, 61 bottles of beer.\n\
+         \Take one down and pass it around, 60 bottles of beer on the wall.\n\
+         \\n\
+         \60 bottles of beer on the wall, 60 bottles of beer.\n\
+         \Take one down and pass it around, 59 bottles of beer on the wall.\n\
+         \\n\
+         \59 bottles of beer on the wall, 59 bottles of beer.\n\
+         \Take one down and pass it around, 58 bottles of beer on the wall.\n\
+         \\n\
+         \58 bottles of beer on the wall, 58 bottles of beer.\n\
+         \Take one down and pass it around, 57 bottles of beer on the wall.\n\
+         \\n\
+         \57 bottles of beer on the wall, 57 bottles of beer.\n\
+         \Take one down and pass it around, 56 bottles of beer on the wall.\n\
+         \\n\
+         \56 bottles of beer on the wall, 56 bottles of beer.\n\
+         \Take one down and pass it around, 55 bottles of beer on the wall.\n\
+         \\n\
+         \55 bottles of beer on the wall, 55 bottles of beer.\n\
+         \Take one down and pass it around, 54 bottles of beer on the wall.\n\
+         \\n\
+         \54 bottles of beer on the wall, 54 bottles of beer.\n\
+         \Take one down and pass it around, 53 bottles of beer on the wall.\n\
+         \\n\
+         \53 bottles of beer on the wall, 53 bottles of beer.\n\
+         \Take one down and pass it around, 52 bottles of beer on the wall.\n\
+         \\n\
+         \52 bottles of beer on the wall, 52 bottles of beer.\n\
+         \Take one down and pass it around, 51 bottles of beer on the wall.\n\
+         \\n\
+         \51 bottles of beer on the wall, 51 bottles of beer.\n\
+         \Take one down and pass it around, 50 bottles of beer on the wall.\n\
+         \\n\
+         \50 bottles of beer on the wall, 50 bottles of beer.\n\
+         \Take one down and pass it around, 49 bottles of beer on the wall.\n\
+         \\n\
+         \49 bottles of beer on the wall, 49 bottles of beer.\n\
+         \Take one down and pass it around, 48 bottles of beer on the wall.\n\
+         \\n\
+         \48 bottles of beer on the wall, 48 bottles of beer.\n\
+         \Take one down and pass it around, 47 bottles of beer on the wall.\n\
+         \\n\
+         \47 bottles of beer on the wall, 47 bottles of beer.\n\
+         \Take one down and pass it around, 46 bottles of beer on the wall.\n\
+         \\n\
+         \46 bottles of beer on the wall, 46 bottles of beer.\n\
+         \Take one down and pass it around, 45 bottles of beer on the wall.\n\
+         \\n\
+         \45 bottles of beer on the wall, 45 bottles of beer.\n\
+         \Take one down and pass it around, 44 bottles of beer on the wall.\n\
+         \\n\
+         \44 bottles of beer on the wall, 44 bottles of beer.\n\
+         \Take one down and pass it around, 43 bottles of beer on the wall.\n\
+         \\n\
+         \43 bottles of beer on the wall, 43 bottles of beer.\n\
+         \Take one down and pass it around, 42 bottles of beer on the wall.\n\
+         \\n\
+         \42 bottles of beer on the wall, 42 bottles of beer.\n\
+         \Take one down and pass it around, 41 bottles of beer on the wall.\n\
+         \\n\
+         \41 bottles of beer on the wall, 41 bottles of beer.\n\
+         \Take one down and pass it around, 40 bottles of beer on the wall.\n\
+         \\n\
+         \40 bottles of beer on the wall, 40 bottles of beer.\n\
+         \Take one down and pass it around, 39 bottles of beer on the wall.\n\
+         \\n\
+         \39 bottles of beer on the wall, 39 bottles of beer.\n\
+         \Take one down and pass it around, 38 bottles of beer on the wall.\n\
+         \\n\
+         \38 bottles of beer on the wall, 38 bottles of beer.\n\
+         \Take one down and pass it around, 37 bottles of beer on the wall.\n\
+         \\n\
+         \37 bottles of beer on the wall, 37 bottles of beer.\n\
+         \Take one down and pass it around, 36 bottles of beer on the wall.\n\
+         \\n\
+         \36 bottles of beer on the wall, 36 bottles of beer.\n\
+         \Take one down and pass it around, 35 bottles of beer on the wall.\n\
+         \\n\
+         \35 bottles of beer on the wall, 35 bottles of beer.\n\
+         \Take one down and pass it around, 34 bottles of beer on the wall.\n\
+         \\n\
+         \34 bottles of beer on the wall, 34 bottles of beer.\n\
+         \Take one down and pass it around, 33 bottles of beer on the wall.\n\
+         \\n\
+         \33 bottles of beer on the wall, 33 bottles of beer.\n\
+         \Take one down and pass it around, 32 bottles of beer on the wall.\n\
+         \\n\
+         \32 bottles of beer on the wall, 32 bottles of beer.\n\
+         \Take one down and pass it around, 31 bottles of beer on the wall.\n\
+         \\n\
+         \31 bottles of beer on the wall, 31 bottles of beer.\n\
+         \Take one down and pass it around, 30 bottles of beer on the wall.\n\
+         \\n\
+         \30 bottles of beer on the wall, 30 bottles of beer.\n\
+         \Take one down and pass it around, 29 bottles of beer on the wall.\n\
+         \\n\
+         \29 bottles of beer on the wall, 29 bottles of beer.\n\
+         \Take one down and pass it around, 28 bottles of beer on the wall.\n\
+         \\n\
+         \28 bottles of beer on the wall, 28 bottles of beer.\n\
+         \Take one down and pass it around, 27 bottles of beer on the wall.\n\
+         \\n\
+         \27 bottles of beer on the wall, 27 bottles of beer.\n\
+         \Take one down and pass it around, 26 bottles of beer on the wall.\n\
+         \\n\
+         \26 bottles of beer on the wall, 26 bottles of beer.\n\
+         \Take one down and pass it around, 25 bottles of beer on the wall.\n\
+         \\n\
+         \25 bottles of beer on the wall, 25 bottles of beer.\n\
+         \Take one down and pass it around, 24 bottles of beer on the wall.\n\
+         \\n\
+         \24 bottles of beer on the wall, 24 bottles of beer.\n\
+         \Take one down and pass it around, 23 bottles of beer on the wall.\n\
+         \\n\
+         \23 bottles of beer on the wall, 23 bottles of beer.\n\
+         \Take one down and pass it around, 22 bottles of beer on the wall.\n\
+         \\n\
+         \22 bottles of beer on the wall, 22 bottles of beer.\n\
+         \Take one down and pass it around, 21 bottles of beer on the wall.\n\
+         \\n\
+         \21 bottles of beer on the wall, 21 bottles of beer.\n\
+         \Take one down and pass it around, 20 bottles of beer on the wall.\n\
+         \\n\
+         \20 bottles of beer on the wall, 20 bottles of beer.\n\
+         \Take one down and pass it around, 19 bottles of beer on the wall.\n\
+         \\n\
+         \19 bottles of beer on the wall, 19 bottles of beer.\n\
+         \Take one down and pass it around, 18 bottles of beer on the wall.\n\
+         \\n\
+         \18 bottles of beer on the wall, 18 bottles of beer.\n\
+         \Take one down and pass it around, 17 bottles of beer on the wall.\n\
+         \\n\
+         \17 bottles of beer on the wall, 17 bottles of beer.\n\
+         \Take one down and pass it around, 16 bottles of beer on the wall.\n\
+         \\n\
+         \16 bottles of beer on the wall, 16 bottles of beer.\n\
+         \Take one down and pass it around, 15 bottles of beer on the wall.\n\
+         \\n\
+         \15 bottles of beer on the wall, 15 bottles of beer.\n\
+         \Take one down and pass it around, 14 bottles of beer on the wall.\n\
+         \\n\
+         \14 bottles of beer on the wall, 14 bottles of beer.\n\
+         \Take one down and pass it around, 13 bottles of beer on the wall.\n\
+         \\n\
+         \13 bottles of beer on the wall, 13 bottles of beer.\n\
+         \Take one down and pass it around, 12 bottles of beer on the wall.\n\
+         \\n\
+         \12 bottles of beer on the wall, 12 bottles of beer.\n\
+         \Take one down and pass it around, 11 bottles of beer on the wall.\n\
+         \\n\
+         \11 bottles of beer on the wall, 11 bottles of beer.\n\
+         \Take one down and pass it around, 10 bottles of beer on the wall.\n\
+         \\n\
+         \10 bottles of beer on the wall, 10 bottles of beer.\n\
+         \Take one down and pass it around, 9 bottles of beer on the wall.\n\
+         \\n\
+         \9 bottles of beer on the wall, 9 bottles of beer.\n\
+         \Take one down and pass it around, 8 bottles of beer on the wall.\n\
+         \\n\
+         \8 bottles of beer on the wall, 8 bottles of beer.\n\
+         \Take one down and pass it around, 7 bottles of beer on the wall.\n\
+         \\n\
+         \7 bottles of beer on the wall, 7 bottles of beer.\n\
+         \Take one down and pass it around, 6 bottles of beer on the wall.\n\
+         \\n\
+         \6 bottles of beer on the wall, 6 bottles of beer.\n\
+         \Take one down and pass it around, 5 bottles of beer on the wall.\n\
+         \\n\
+         \5 bottles of beer on the wall, 5 bottles of beer.\n\
+         \Take one down and pass it around, 4 bottles of beer on the wall.\n\
+         \\n\
+         \4 bottles of beer on the wall, 4 bottles of beer.\n\
+         \Take one down and pass it around, 3 bottles of beer on the wall.\n\
+         \\n\
+         \3 bottles of beer on the wall, 3 bottles of beer.\n\
+         \Take one down and pass it around, 2 bottles of beer on the wall.\n\
+         \\n\
+         \2 bottles of beer on the wall, 2 bottles of beer.\n\
+         \Take one down and pass it around, 1 bottle of beer on the wall.\n\
+         \\n\
+         \1 bottle of beer on the wall, 1 bottle of beer.\n\
+         \Take it down and pass it around, no more bottles of beer on the wall.\n\
+         \\n\
+         \No more bottles of beer on the wall, no more bottles of beer.\n\
+         \Go to the store and buy some more, 99 bottles of beer on the wall.\n"

data/tracks/haskell/exercises/crypto-square/src/CryptoSquare.hs

@@ -1,18 +1,4 @@
-module CryptoSquare
-    ( ciphertext
-    , normalizeCiphertext
-    , normalizePlaintext
-    , plaintextSegments
-    ) where
+module CryptoSquare (encode) where
 
-ciphertext :: String -> String
-ciphertext = undefined
-
-normalizeCiphertext :: String -> String
-normalizeCiphertext = undefined
-
-normalizePlaintext :: String -> String
-normalizePlaintext = undefined
-
-plaintextSegments :: String -> [String]
-plaintextSegments = undefined
+encode :: String -> String
+encode = undefined

data/tracks/haskell/exercises/crypto-square/src/Example.hs

@@ -1,23 +1,15 @@
-module CryptoSquare ( normalizePlaintext
-                    , plaintextSegments
-                    , ciphertext
-                    , normalizeCiphertext ) where
+module CryptoSquare (encode) where
 
-import Data.Char (isAlphaNum, toLower)
-import Data.List (transpose)
+import Data.Char       (isAlphaNum, toLower)
+import Data.List       (transpose)
 import Data.List.Split (chunksOf)
 
-squareSize :: String -> Int
-squareSize = ceiling . (sqrt :: Double -> Double) . fromIntegral . length
-
-normalizePlaintext :: String -> String
-normalizePlaintext = map toLower . filter isAlphaNum
-
-plaintextSegments :: String -> [String]
-plaintextSegments = (squareSize >>= chunksOf) . normalizePlaintext
-
-ciphertext :: String -> String
-ciphertext = concat . transpose . plaintextSegments
-
-normalizeCiphertext :: String -> String
-normalizeCiphertext = unwords . transpose . plaintextSegments
+encode :: String -> String
+encode = unwords
+       . transpose
+       . (squareSize >>= chunksOf)
+       . map toLower
+       . filter isAlphaNum
+  where
+    squareSize :: String -> Int
+    squareSize = ceiling . (sqrt :: Double -> Double) . fromIntegral . length

data/tracks/haskell/exercises/crypto-square/test/Tests.hs

@@ -1,93 +1,53 @@
-import Test.Hspec        (Spec, describe, it, shouldBe)
+{-# LANGUAGE RecordWildCards #-}
+
+import Data.Char         (isSpace)
+import Data.Foldable     (for_)
+import Data.Function     (on)
+import Test.Hspec        (Spec, describe, it, shouldBe, shouldMatchList)
 import Test.Hspec.Runner (configFastFail, defaultConfig, hspecWith)
 
-import CryptoSquare
-  ( ciphertext
-  , normalizeCiphertext 
-  , normalizePlaintext
-  , plaintextSegments
-  )
+import CryptoSquare (encode)
 
 main :: IO ()
 main = hspecWith defaultConfig {configFastFail = True} specs
 
 specs :: Spec
-specs = describe "crypto-square" $ do
-
-    -- Test cases adapted from `exercism/x-common/crypto-square.json`
-    -- on 2016-08-02. Some deviations exist and are noted in comments.
-
-    describe "normalizePlaintext" $ do
-
-      it "Lowercase" $
-          normalizePlaintext "Hello"
-          `shouldBe`         "hello"
-
-      it "Remove spaces" $
-          normalizePlaintext "Hi there"
-          `shouldBe`         "hithere"
-
-      it "Remove punctuation" $
-          normalizePlaintext "@1, 2%, 3 Go!"
-          `shouldBe`         "123go"
-
-    describe "plaintextSegments" $ do
-
-      it "empty plaintext results in an empty rectangle" $
-          plaintextSegments ""
-          `shouldBe`        []
-
-      it "4 character plaintext results in an 2x2 rectangle" $
-          plaintextSegments "Ab Cd"
-          `shouldBe`        [ "ab"
-                            , "cd" ]
-
-      it "9 character plaintext results in an 3x3 rectangle" $
-          plaintextSegments "This is fun!"
-          `shouldBe`        [ "thi"
-                            , "sis"
-                            , "fun" ]
-
-      it "54 character plaintext results in an 8x7 rectangle" $
-          plaintextSegments "If man was meant to stay on the ground, god would have given us roots."
-          `shouldBe`        [ "ifmanwas"
-                            , "meanttos"
-                            , "tayonthe"
-                            , "groundgo"
-                            , "dwouldha"
-                            , "vegivenu"
-                            , "sroots"  ]
-
-    describe "ciphertext" $ do
-
-    -- The function described by the reference file in `x-common`
-    -- as `encoded` is called `ciphertext` in this track.
-
-      it "empty plaintext results in an empty encode" $
-          ciphertext ""
-          `shouldBe` ""
-
-      it "Non-empty plaintext results in the combined plaintext segments" $
-          ciphertext "If man was meant to stay on the ground, god would have given us roots."
-          `shouldBe` "imtgdvsfearwermayoogoanouuiontnnlvtwttddesaohghnsseoau"
-
-    describe "normalizeCiphertext" $ do
-
-    -- The function described by the reference file in `x-common`
-    -- as `ciphertext` is called `normalizeCiphertext` in this track.
-
-      it "empty plaintext results in an empty ciphertext" $
-          normalizeCiphertext ""
-          `shouldBe`          ""
-
-      it "9 character plaintext results in 3 chunks of 3 characters" $
-          normalizeCiphertext "This is fun!"
-          `shouldBe`          "tsf hiu isn"
-
-    {- In this track the encoded text chunks are not padded with spaces.
-
-      it "54 character plaintext results in 7 chunks, the last two padded with spaces" $
-          normalizeCiphertext "If man was meant to stay on the ground, god would have given us roots."
-          `shouldBe`          "imtgdvs fearwer mayoogo anouuio ntnnlvt wttddes aohghn  sseoau "
-
-    -}
+specs = describe "crypto-square" $
+          describe "encode" $ for_ cases test
+  where
+
+    test Case{..} = describe description $ do
+
+      let shouldMatchWords  = shouldBe        `on` words
+          shouldMatchString = shouldBe        `on` filter (not . isSpace)
+          shouldMatchChars  = shouldMatchList `on` filter (not . isSpace)
+
+      it "normalizes the input"    $ encode input `shouldMatchChars`  expected
+      it "reorders the characters" $ encode input `shouldMatchString` expected
+      it "groups the output"       $ encode input `shouldMatchWords`  expected
+
+-- Test cases created from scratch on 2016-10-05, diverging from `x-common`.
+
+data Case = Case { description :: String
+                 , input       :: String
+                 , expected    :: String
+                 }
+
+cases :: [Case]
+cases = [ Case { description = "perfect square, all lowercase with space"
+               , input       = "a dog"
+               , expected    = "ao dg"
+               }
+        , Case { description = "perfect rectangle, mixed case"
+               , input       = "A camel"
+               , expected    = "am ce al"
+               }
+        , Case { description = "incomplete square with punctuation"
+               , input       = "Wait, fox!"
+               , expected    = "wtx af io"
+               }
+        , Case { description = "incomplete rectangle with symbols"
+               , input       = "cat | cut -d@ -f1 | sort | uniq"
+               , expected    = "ctoi adrq tft c1u usn"
+               }
+        ]