SRP6: move botan-low-pwdhash-tests into the Tasty test component

Author: jorisdral

botan-low/botan-low.cabal

@@ -147,6 +147,7 @@ test-suite test
 
   other-modules:
     Test.Botan.Low.PwdHash
+    Test.Botan.Low.SRP6
     Test.Prelude
 
 --
@@ -744,27 +745,6 @@ test-suite botan-low-rng-tests
     NoImplicitPrelude
     OverloadedStrings
 
-test-suite botan-low-srp6-tests
-  import:             warnings, language
-  type:               exitcode-stdio-1.0
-  main-is:            Botan/Low/SRP6Spec.hs
-  hs-source-dirs:     test/
-  build-depends:
-    , base
-    , botan-low
-    , bytestring
-    , hspec
-    , QuickCheck
-
-  other-modules:
-    Paths_botan_low
-    Test.Prelude
-
-  autogen-modules:    Paths_botan_low
-  default-extensions:
-    NoImplicitPrelude
-    OverloadedStrings
-
 test-suite botan-low-totp-tests
   import:             warnings, language
   type:               exitcode-stdio-1.0

botan-low/test/Main.hs

@@ -1,6 +1,7 @@
 module Main (main) where
 
 import qualified Test.Botan.Low.PwdHash
+import qualified Test.Botan.Low.SRP6
 import           Test.Tasty
 
 main :: IO ()
@@ -9,6 +10,8 @@ main = tests >>= defaultMain
 tests :: IO TestTree
 tests = do
   pwdHashTests <- Test.Botan.Low.PwdHash.tests
+  srp6Tests <- Test.Botan.Low.SRP6.tests
   pure $ testGroup "botan-low" [
       pwdHashTests
+    , srp6Tests
     ]

botan-low/test/Botan/Low/SRP6Spec.hs renamed to botan-low/test/Test/Botan/Low/SRP6.hs

@@ -1,11 +1,24 @@
-module Main (main) where
+{-# LANGUAGE OverloadedStrings #-}
 
-import           Test.Prelude
+module Test.Botan.Low.SRP6 (
+    tests
+  ) where
 
 import           Botan.Low.Hash
 import           Botan.Low.PubKey
 import           Botan.Low.RNG
 import           Botan.Low.SRP6
+import           Data.ByteString
+import           Test.Prelude
+import           Test.Tasty
+import           Test.Tasty.Hspec
+
+tests :: IO TestTree
+tests = do
+    specs <- testSpec "spec_srp6" spec_srp6
+    pure $ testGroup "Test.Botan.Low.SRP6" [
+        specs
+      ]
 
 username :: ByteString
 username = "username"
@@ -47,8 +60,8 @@ groupIds =
 hashId :: HashName
 hashId = "SHA-256"
 
-main :: IO ()
-main = hspec $ testSuite groupIds chars $ \ groupId -> do
+spec_srp6 :: Spec
+spec_srp6 = testSuite groupIds chars $ \ groupId -> do
     it "can negotiate a shared secret" $ do
         rng <- rngInit "system"
         verifier <- srp6GenerateVerifier username password salt groupId hashId