Skip to content

Commit 6058205

Browse files
jorisdraljorisdral
committed
Move D.L.Normal.* test modules to D.L.* 
1 parent a1818a3 commit 6058205

File tree

6 files changed

+30
-26
lines changed

6 files changed

+30
-26
lines changed

‎lsm-tree.cabal‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -383,10 +383,10 @@ test-suite lsm-tree-test
383383
Test.Database.LSMTree.Internal.Vector.Growing
384384
Test.Database.LSMTree.Model.Table
385385
Test.Database.LSMTree.Monoidal
386-
Test.Database.LSMTree.Normal.StateMachine
387-
Test.Database.LSMTree.Normal.StateMachine.DL
388-
Test.Database.LSMTree.Normal.StateMachine.Op
389-
Test.Database.LSMTree.Normal.UnitTests
386+
Test.Database.LSMTree.StateMachine
387+
Test.Database.LSMTree.StateMachine.DL
388+
Test.Database.LSMTree.StateMachine.Op
389+
Test.Database.LSMTree.UnitTests
390390
Test.System.Posix.Fcntl.NoCache
391391
Test.Util.FS
392392
Test.Util.Orphans

‎test/Main.hs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ import qualified Test.Database.LSMTree.Internal.Vector
3434
import qualified Test.Database.LSMTree.Internal.Vector.Growing
3535
import qualified Test.Database.LSMTree.Model.Table
3636
import qualified Test.Database.LSMTree.Monoidal
37-
import qualified Test.Database.LSMTree.Normal.StateMachine
38-
import qualified Test.Database.LSMTree.Normal.StateMachine.DL
39-
import qualified Test.Database.LSMTree.Normal.UnitTests
37+
import qualified Test.Database.LSMTree.StateMachine
38+
import qualified Test.Database.LSMTree.StateMachine.DL
39+
import qualified Test.Database.LSMTree.UnitTests
4040
import qualified Test.System.Posix.Fcntl.NoCache
4141
import Test.Tasty
4242

@@ -72,9 +72,9 @@ main = do
7272
, Test.Database.LSMTree.Internal.Vector.Growing.tests
7373
, Test.Database.LSMTree.Model.Table.tests
7474
, Test.Database.LSMTree.Monoidal.tests
75-
, Test.Database.LSMTree.Normal.UnitTests.tests
76-
, Test.Database.LSMTree.Normal.StateMachine.tests
77-
, Test.Database.LSMTree.Normal.StateMachine.DL.tests
75+
, Test.Database.LSMTree.UnitTests.tests
76+
, Test.Database.LSMTree.StateMachine.tests
77+
, Test.Database.LSMTree.StateMachine.DL.tests
7878
, Test.System.Posix.Fcntl.NoCache.tests
7979
, Test.Data.Arena.tests
8080
]

test/Test/Database/LSMTree/Normal/StateMachine.hs renamed to test/Test/Database/LSMTree/StateMachine.hs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
TODO: it is currently not correctly modelled what happens if blob references
4848
are retrieved from an incorrect table.
4949
-}
50-
module Test.Database.LSMTree.Normal.StateMachine (
50+
module Test.Database.LSMTree.StateMachine (
5151
tests
5252
, labelledExamples
5353
-- * Properties
@@ -109,8 +109,8 @@ import qualified System.FS.Sim.MockFS as MockFS
109109
import System.FS.Sim.MockFS (MockFS)
110110
import System.IO.Temp (createTempDirectory,
111111
getCanonicalTemporaryDirectory)
112-
import Test.Database.LSMTree.Normal.StateMachine.Op
113-
(HasBlobRef (getBlobRef), Op (..))
112+
import Test.Database.LSMTree.StateMachine.Op (HasBlobRef (getBlobRef),
113+
Op (..))
114114
import qualified Test.QuickCheck as QC
115115
import Test.QuickCheck (Arbitrary, Gen, Property)
116116
import qualified Test.QuickCheck.Extras as QD
@@ -133,7 +133,7 @@ import Test.Util.TypeFamilyWrappers (WrapBlob (..), WrapBlobRef (..),
133133
-------------------------------------------------------------------------------}
134134

135135
tests :: TestTree
136-
tests = testGroup "Normal.StateMachine" [
136+
tests = testGroup "Test.Database.LSMTree.StateMachine" [
137137
testProperty "propLockstep_ModelIOImpl"
138138
propLockstep_ModelIOImpl
139139

@@ -499,7 +499,7 @@ instance ( Show (Class.TableConfig h)
499499

500500
-- TODO: show instance does not show key-value-blob types. Example:
501501
--
502-
-- Normal.StateMachine
502+
-- StateMachine
503503
-- prop_lockstepIO_ModelIOImpl: FAIL
504504
-- *** Failed! Exception: 'open: inappropriate type (table type mismatch)' (after 25 tests and 2 shrinks):
505505
-- do action $ New TableConfig

test/Test/Database/LSMTree/Normal/StateMachine/DL.hs renamed to test/Test/Database/LSMTree/StateMachine/DL.hs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{-# OPTIONS_GHC -Wno-unused-do-bind #-}
22
{-# OPTIONS_GHC -Wno-orphans #-}
33

4-
module Test.Database.LSMTree.Normal.StateMachine.DL (
4+
module Test.Database.LSMTree.StateMachine.DL (
55
tests
66
) where
77

@@ -12,8 +12,8 @@ import Database.LSMTree as R
1212
import qualified Database.LSMTree.Model.Session as Model (fromSomeTable, tables)
1313
import qualified Database.LSMTree.Model.Table as Model (values)
1414
import Prelude
15-
import Test.Database.LSMTree.Normal.StateMachine hiding (tests)
16-
import Test.Database.LSMTree.Normal.StateMachine.Op
15+
import Test.Database.LSMTree.StateMachine hiding (tests)
16+
import Test.Database.LSMTree.StateMachine.Op
1717
import Test.QuickCheck as QC
1818
import Test.QuickCheck.DynamicLogic
1919
import qualified Test.QuickCheck.Gen as QC
@@ -24,7 +24,7 @@ import qualified Test.Tasty.QuickCheck as QC
2424
import Test.Util.PrettyProxy
2525

2626
tests :: TestTree
27-
tests = testGroup "Test.Database.LSMTree.Normal.StateMachine.DL" [
27+
tests = testGroup "Test.Database.LSMTree.StateMachine.DL" [
2828

2929
QC.testProperty "prop_example" prop_example
3030
]

test/Test/Database/LSMTree/Normal/StateMachine/Op.hs renamed to test/Test/Database/LSMTree/StateMachine/Op.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
{-# LANGUAGE MultiParamTypeClasses #-}
77

88
-- | SumProd Op extended with BlobRef extraction
9-
module Test.Database.LSMTree.Normal.StateMachine.Op (
9+
module Test.Database.LSMTree.StateMachine.Op (
1010
-- * 'Op'
1111
Op (..)
1212
, intOpId

test/Test/Database/LSMTree/Normal/UnitTests.hs renamed to test/Test/Database/LSMTree/UnitTests.hs

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
{- HLINT ignore "Use void" -}
55

6-
module Test.Database.LSMTree.Normal.UnitTests (tests) where
6+
module Test.Database.LSMTree.UnitTests (tests) where
77

88
import Control.Tracer (nullTracer)
99
import Data.ByteString (ByteString)
@@ -13,7 +13,7 @@ import qualified Data.Vector as V
1313
import Data.Word
1414
import qualified System.FS.API as FS
1515

16-
import Database.LSMTree.Normal as R
16+
import Database.LSMTree as R
1717

1818
import Control.Exception (Exception, try)
1919
import Database.LSMTree.Extras.Generators (KeyForIndexCompact)
@@ -25,7 +25,7 @@ import Test.Util.FS (withTempIOHasBlockIO)
2525

2626
tests :: TestTree
2727
tests =
28-
testGroup "Normal.UnitTests"
28+
testGroup "Test.Database.LSMTree.UnitTests"
2929
[ testCaseSteps "unit_blobs" unit_blobs
3030
, testCase "unit_closed_table" unit_closed_table
3131
, testCase "unit_closed_cursor" unit_closed_cursor
@@ -37,15 +37,15 @@ unit_blobs :: (String -> IO ()) -> Assertion
3737
unit_blobs info =
3838
withTempIOHasBlockIO "test" $ \hfs hbio ->
3939
withSession nullTracer hfs hbio (FS.mkFsPath []) $ \sess -> do
40-
table <- new @_ @ByteString @ByteString @ByteString sess defaultTableConfig
41-
inserts table [("key1", "value1", Just "blob1")]
40+
table <- new @_ @ByteString @(ResolveAsFirst ByteString) @ByteString sess defaultTableConfig
41+
inserts table [("key1", ResolveAsFirst "value1", Just "blob1")]
4242

4343
res <- lookups table ["key1"]
4444
info (show res)
4545

4646
case res of
4747
[FoundWithBlob val bref] -> do
48-
val @?= "value1"
48+
val @?= ResolveAsFirst "value1"
4949
blob <- retrieveBlobs sess [bref]
5050
info (show blob)
5151
blob @?= ["blob1"]
@@ -166,6 +166,8 @@ newtype Value1 = Value1 Word64
166166
deriving stock (Show, Eq, Ord)
167167
deriving newtype (SerialiseValue)
168168

169+
deriving via ResolveAsFirst Word64 instance ResolveValue Value1
170+
169171
newtype Blob1 = Blob1 Word64
170172
deriving stock (Show, Eq, Ord)
171173
deriving newtype (SerialiseValue)
@@ -181,6 +183,8 @@ newtype Value2 = Value2 BS.ByteString
181183
deriving stock (Show, Eq, Ord)
182184
deriving newtype (QC.Arbitrary, SerialiseValue)
183185

186+
deriving via ResolveAsFirst BS.ByteString instance ResolveValue Value2
187+
184188
newtype Blob2 = Blob2 BS.ByteString
185189
deriving stock (Show, Eq, Ord)
186190
deriving newtype (SerialiseValue)

0 commit comments

Comments
 (0)