Restructure prototypes to fit the status quo for directory structuring

This means renaming the `prototypes` directory to `src-prototypes`, and putting
tests into a new `test-prototypes` directory.

Author: jorisdral

lsm-tree.cabal

@@ -863,41 +863,43 @@ test-suite map-range-test
 
 library prototypes
   import:          language, warnings, wno-x-partial
-  hs-source-dirs:  prototypes
+  hs-source-dirs:  src-prototypes
   exposed-modules:
     FormatPage
     ScheduledMerges
-    ScheduledMergesTest
-    ScheduledMergesTestQLS
 
   build-depends:
-    , base                 <5
+    , base              <5
     , binary
     , bytestring
-    , constraints
     , containers
     , contra-tracer
     , QuickCheck
-    , quickcheck-dynamic
-    , quickcheck-lockstep
     , tasty
-    , tasty-hunit
     , tasty-quickcheck
     , transformers
 
-  ghc-options:
-    -Wno-incomplete-uni-patterns -Wno-partial-fields
-    -Wno-missing-export-lists
-
-test-suite lsm-prototypes-tests
+test-suite prototypes-test
   import:         language, warnings, wno-x-partial
   type:           exitcode-stdio-1.0
-  hs-source-dirs: test
-  main-is:        lsm-prototypes-tests.hs
+  hs-source-dirs: test-prototypes
+  main-is:        Main.hs
+  other-modules:
+    Test.ScheduledMerges
+    Test.ScheduledMergesQLS
+
   build-depends:
     , base
+    , constraints
+    , containers
+    , contra-tracer
     , lsm-tree:prototypes
+    , QuickCheck
+    , quickcheck-dynamic
+    , quickcheck-lockstep
     , tasty
+    , tasty-hunit
+    , tasty-quickcheck
 
 library control
   import:          language, warnings

prototypes/FormatPage.hs renamed to src-prototypes/FormatPage.hs

@@ -1,4 +1,7 @@
 {-# LANGUAGE ParallelListComp #-}
+
+{-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-}
+
 -- | This accompanies the format-page.md documentation as a sanity check
 -- and a precise reference. It is intended to demonstrate that the page
 -- format works. It is also used as a reference implementation for tests of

prototypes/ScheduledMerges.hs renamed to src-prototypes/ScheduledMerges.hs

@@ -1,5 +1,8 @@
 {-# LANGUAGE PatternSynonyms #-}
 
+{-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-}
+{-# OPTIONS_GHC -Wno-partial-fields #-}
+
 -- | A prototype of an LSM with explicitly scheduled incremental merges.
 --
 -- The scheduled incremental merges is about ensuring that the merging

test-prototypes/Main.hs

@@ -0,0 +1,14 @@
+module Main (main) where
+
+import           Test.Tasty
+
+import qualified FormatPage
+import qualified Test.ScheduledMerges
+import qualified Test.ScheduledMergesQLS
+
+main :: IO ()
+main = defaultMain $ testGroup "prototypes" [
+      FormatPage.tests
+    , Test.ScheduledMerges.tests
+    , Test.ScheduledMergesQLS.tests
+    ]

prototypes/ScheduledMergesTest.hs renamed to test-prototypes/Test/ScheduledMerges.hs

@@ -1,4 +1,4 @@
-module ScheduledMergesTest (tests) where
+module Test.ScheduledMerges (tests) where
 
 import           Control.Exception
 import           Control.Monad (replicateM_, when)
@@ -21,7 +21,7 @@ import           Test.Tasty.QuickCheck (QuickCheckMaxSize (..),
                      QuickCheckTests (..), testProperty, (=/=), (===))
 
 tests :: TestTree
-tests = testGroup "Unit and property tests"
+tests = testGroup "Test.ScheduledMerges"
     [ testCase "test_regression_empty_run" test_regression_empty_run
     , testCase "test_merge_again_with_incoming" test_merge_again_with_incoming
     , testProperty "prop_union" prop_union

prototypes/ScheduledMergesTestQLS.hs renamed to test-prototypes/Test/ScheduledMergesQLS.hs

@@ -1,8 +1,9 @@
 {-# LANGUAGE TypeFamilies #-}
 
 {-# OPTIONS_GHC -Wno-orphans #-}
+{-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-}
 
-module ScheduledMergesTestQLS (tests) where
+module Test.ScheduledMergesQLS (tests) where
 
 import           Control.Monad.ST
 import           Control.Tracer (Tracer, nullTracer)
@@ -25,8 +26,9 @@ import           Test.Tasty
 import           Test.Tasty.QuickCheck (testProperty)
 
 tests :: TestTree
-tests =
-    testProperty "ScheduledMerges vs model" $ mapSize (*10) prop_LSM  -- still <10s
+tests = testGroup "Test.ScheduledMergesQLS" [
+      testProperty "ScheduledMerges vs model" $ mapSize (*10) prop_LSM  -- still <10s
+    ]
 
 -- TODO: add tagging, e.g. how often ASupplyUnion makes progress or completes a
 -- union merge.