Added simple test for recursive subpackage creation

Author: mmhat

dhall/src/Dhall/Package.hs

@@ -38,6 +38,8 @@ import           Dhall.Util         (_ERROR, renderExpression)
 import           System.Directory
 import           System.FilePath
 
+-- | Whether to recursively create a package for each subdirectory or not.
+-- See the documentation of 'getPackagePathAndContent'.
 data Recurse
     = Recurse
     | Exact

dhall/tests/Dhall/Test/Package.hs

@@ -19,6 +19,7 @@ import           Dhall.Core
     )
 import qualified Dhall.Map          as Map
 import           Dhall.Package
+import           Dhall.Pretty       (CharacterSet(ASCII))
 import           System.FilePath    ((</>))
 import           Test.Tasty
 import           Test.Tasty.HUnit
@@ -31,6 +32,7 @@ tests = testGroup "Package"
     , packageEmptyDirectory
     , packageSingleDirectory
     , packageNested
+    , packageRecursive
     , packageMissingFile
     , packageFilesDifferentDirs
     , packageIncompatibleFiles
@@ -43,7 +45,7 @@ packagePackageFile = testCase "package file" $ do
     let package :: Expr Void Import
         package = RecordLit Map.empty
 
-    (output, expr) <- getPackagePathAndContent Nothing ("./tests/package/package.dhall" :| [])
+    (output, expr) <- getPackagePathAndContent ASCII Exact Nothing ("./tests/package/package.dhall" :| [])
     assertEqual "path" path output
     assertEqual "content" package expr
 
@@ -55,7 +57,7 @@ packageCustomPackageFile = testCase "custom package file" $ do
         package = RecordLit $
             Map.singleton "package" $ makeRecordField $ Embed packageDhall
 
-    (output, expr) <- getPackagePathAndContent (Just "custom.dhall") ("./tests/package/package.dhall" :| [])
+    (output, expr) <- getPackagePathAndContent ASCII Exact (Just "custom.dhall") ("./tests/package/package.dhall" :| [])
     assertEqual "path" path output
     assertEqual "content" package expr
 
@@ -67,7 +69,7 @@ packageSingleFile = testCase "single file" $ do
         package = RecordLit $
             Map.singleton "test" $ makeRecordField $ Embed testDhall
 
-    (output, expr) <- getPackagePathAndContent Nothing ("./tests/package/dir/test.dhall" :| [])
+    (output, expr) <- getPackagePathAndContent ASCII Exact Nothing ("./tests/package/dir/test.dhall" :| [])
     assertEqual "path" path output
     assertEqual "content" package expr
 
@@ -78,7 +80,7 @@ packageEmptyDirectory = testCase "empty directory" $ do
     let package :: Expr Void Import
         package = RecordLit Map.empty
 
-    (output, expr) <- getPackagePathAndContent Nothing ("./tests/package/empty" :| [])
+    (output, expr) <- getPackagePathAndContent ASCII Exact Nothing ("./tests/package/empty" :| [])
     assertEqual "path" path output
     assertEqual "content" package expr
 
@@ -90,7 +92,7 @@ packageSingleDirectory = testCase "single directory" $ do
         package = RecordLit $ Map.singleton "test" $
             makeRecordField $ Embed testDhall
 
-    (output, expr) <- getPackagePathAndContent Nothing ("./tests/package/dir" :| [])
+    (output, expr) <- getPackagePathAndContent ASCII Exact Nothing ("./tests/package/dir" :| [])
     assertEqual "path" path output
     assertEqual "content" package expr
 
@@ -108,18 +110,34 @@ packageNested = testCase "nested files" $ do
             , ("test", makeRecordField $ Embed testDhall)
             ]
 
-    (output, expr) <- getPackagePathAndContent Nothing
+    (output, expr) <- getPackagePathAndContent ASCII Exact Nothing
         ( "./tests/package/test.dhall" :|
         [ "./tests/package/dir/test.dhall"
         , "./tests/package/other/package.dhall"
         ])
     assertEqual "path" path output
     assertEqual "content" package expr
 
+packageRecursive :: TestTree
+packageRecursive = testCase "recursively create subpackages" $ do
+    let path = "./tests/package/dir" </> "package.dhall"
+
+    let package :: Expr Void Import
+        package = RecordLit $ Map.fromList
+            [ ("subdirectory1", makeRecordField $ Embed subdirectoryPackageDhall1)
+            , ("subdirectory2", makeRecordField $ Embed subdirectoryPackageDhall2)
+            , ("test", makeRecordField $ Embed testDhall)
+            ]
+
+    (output, expr) <- getPackagePathAndContent ASCII Recurse Nothing
+        ( "./tests/package/dir" :| [] )
+    assertEqual "path" path output
+    assertEqual "content" package expr
+
 packageMissingFile :: TestTree
 packageMissingFile = testCase "missing file" $ do
     let action :: IO (FilePath, Expr Void Import)
-        action = getPackagePathAndContent Nothing ("./tests/package/missing.dhall" :| [])
+        action = getPackagePathAndContent ASCII Exact Nothing ("./tests/package/missing.dhall" :| [])
 
     assertThrow action $ \case
         InvalidPath "./tests/package/missing.dhall" -> True
@@ -128,7 +146,7 @@ packageMissingFile = testCase "missing file" $ do
 packageFilesDifferentDirs :: TestTree
 packageFilesDifferentDirs = testCase "files from different directories" $ do
     let action :: IO (FilePath, Expr Void Import)
-        action = getPackagePathAndContent Nothing ("./tests/package/dir/test.dhall" :| ["./tests/package/test/test.dhall"])
+        action = getPackagePathAndContent ASCII Exact Nothing ("./tests/package/dir/test.dhall" :| ["./tests/package/test/test.dhall"])
 
     assertThrow action $ \case
         AmbiguousOutputDirectory "./tests/package/dir" "./tests/package/test" -> True
@@ -137,7 +155,7 @@ packageFilesDifferentDirs = testCase "files from different directories" $ do
 packageIncompatibleFiles :: TestTree
 packageIncompatibleFiles = testCase "files that are incompatible" $ do
     let action :: IO (FilePath, Expr Void Import)
-        action = getPackagePathAndContent Nothing ("./tests/package/test.dhall" :| ["./tests/package/test/test.dhall"])
+        action = getPackagePathAndContent ASCII Exact Nothing ("./tests/package/test.dhall" :| ["./tests/package/test/test.dhall"])
 
     assertThrow action $ \case
         IncompatiblePaths xs -> xs == [ testDhall , testTestDhall ]
@@ -191,6 +209,28 @@ otherPackageDhall = Import
     , importMode = Code
     }
 
+subdirectoryPackageDhall1 :: Import
+subdirectoryPackageDhall1 = Import
+    { importHashed = ImportHashed
+        { hash = Nothing
+        , importType = Local Here $ File
+            { directory = Directory {components = ["subdirectory1"]}
+            , file = "package.dhall"}
+            }
+        , importMode = Code
+        }
+
+subdirectoryPackageDhall2 :: Import
+subdirectoryPackageDhall2 = Import
+    { importHashed = ImportHashed
+        { hash = Nothing
+        , importType = Local Here $ File
+            { directory = Directory {components = ["subdirectory2"]}
+            , file = "package.dhall"}
+            }
+        , importMode = Code
+        }
+
 testTestDhall :: Import
 testTestDhall = Import
     { importHashed = ImportHashed