Skip to content
GitLab
Commit 749830ad authored by Duncan Coutts's avatar Duncan Coutts
Browse files

Move PackageDescription unit tests into a dedicated module 

and make the unit test module build again.
The PackageDescription module no longer needs CPP.
parent 0bf56429
Hide whitespace changes
Inline Side-by-side
Distribution/PackageDescription.hs
View file @ 749830ad
{-# LANGUAGE CPP #-}
{-# OPTIONS_GHC -cpp #-}
{-# OPTIONS_NHC98 -cpp #-}
{-# OPTIONS_JHC -fcpp #-}
-----------------------------------------------------------------------------
-- |
-- Module : Distribution.PackageDescription
......@@ -98,12 +94,6 @@ module Distribution.PackageDescription (
haddockName,
setupMessage,
cabalVersion,
#ifdef DEBUG
-- * Debugging
hunitTests,
test
#endif
) where
import Data.Maybe (isJust, maybeToList)
......@@ -124,16 +114,6 @@ import Distribution.PackageDescription.Parse
import Distribution.PackageDescription.QA (cabalVersion, sanityCheckPackage)
import Distribution.Configuration
#ifdef DEBUG
import Data.Maybe (catMaybes)
import Data.List (sortBy)
import Control.Monad (liftM)
import Test.HUnit (Test(..), assertBool, Assertion, runTestTT, Counts, assertEqual)
import Distribution.License
import Distribution.Version hiding (hunitTests)
import Language.Haskell.Extension
#endif
-- -----------------------------------------------------------------------------
-- The PackageDescription type
......@@ -306,355 +286,3 @@ setupMessage verbosity msg pkg_descr =
bug :: String -> a
bug msg = error $ msg ++ ". Consider this a bug."
-- ------------------------------------------------------------
-- * Testing
-- ------------------------------------------------------------
#ifdef DEBUG
compatTestPkgDesc :: String
compatTestPkgDesc = unlines [
"-- Required",
"Name: Cabal",
"Version: 0.1.1.1.1-rain",
"License: LGPL",
"License-File: foo",
"Copyright: Free Text String",
"Cabal-version: >1.1.1",
"-- Optional - may be in source?",
"Author: Happy Haskell Hacker",
"Homepage: http://www.haskell.org/foo",
"Package-url: http://www.haskell.org/foo",
"Synopsis: a nice package!",
"Description: a really nice package!",
"Category: tools",
"buildable: True",
"CC-OPTIONS: -g -o",
"LD-OPTIONS: -BStatic -dn",
"Frameworks: foo",
"Tested-with: GHC",
"Stability: Free Text String",
"Build-Depends: haskell-src, HUnit>=1.0.0-rain",
"Other-Modules: Distribution.Package, Distribution.Version,",
" Distribution.Simple.GHCPackageConfig",
"Other-files: file1, file2",
"Extra-Tmp-Files: file1, file2",
"C-Sources: not/even/rain.c, such/small/hands",
"HS-Source-Dirs: src, src2",
"Exposed-Modules: Distribution.Void, Foo.Bar",
"Extensions: OverlappingInstances, TypeSynonymInstances",
"Extra-Libraries: libfoo, bar, bang",
"Extra-Lib-Dirs: \"/usr/local/libs\"",
"Include-Dirs: your/slightest, look/will",
"Includes: /easily/unclose, /me, \"funky, path\\\\name\"",
"Install-Includes: /easily/unclose, /me, \"funky, path\\\\name\"",
"GHC-Options: -fTH -fglasgow-exts",
"Hugs-Options: +TH",
"Nhc-Options: ",
"Jhc-Options: ",
"",
"-- Next is an executable",
"Executable: somescript",
"Main-is: SomeFile.hs",
"Other-Modules: Foo1, Util, Main",
"HS-Source-Dir: scripts",
"Extensions: OverlappingInstances",
"GHC-Options: ",
"Hugs-Options: ",
"Nhc-Options: ",
"Jhc-Options: "
]
compatTestPkgDescAnswer :: PackageDescription
compatTestPkgDescAnswer =
PackageDescription
{ package = PackageIdentifier
{ pkgName = "Cabal",
pkgVersion = Version {versionBranch = [0,1,1,1,1],
versionTags = ["rain"]}},
license = LGPL,
licenseFile = "foo",
copyright = "Free Text String",
author = "Happy Haskell Hacker",
homepage = "http://www.haskell.org/foo",
pkgUrl = "http://www.haskell.org/foo",
synopsis = "a nice package!",
description = "a really nice package!",
category = "tools",
descCabalVersion = LaterVersion (Version [1,1,1] []),
buildType = Just Custom,
buildDepends = [Dependency "haskell-src" AnyVersion,
Dependency "HUnit"
(UnionVersionRanges
(ThisVersion (Version [1,0,0] ["rain"]))
(LaterVersion (Version [1,0,0] ["rain"])))],
testedWith = [(GHC, AnyVersion)],
maintainer = "",
stability = "Free Text String",
extraTmpFiles = ["file1", "file2"],
extraSrcFiles = ["file1", "file2"],
dataFiles = [],
library = Just $ Library {
exposedModules = ["Distribution.Void", "Foo.Bar"],
libBuildInfo = BuildInfo {
buildable = True,
ccOptions = ["-g", "-o"],
ldOptions = ["-BStatic", "-dn"],
frameworks = ["foo"],
cSources = ["not/even/rain.c", "such/small/hands"],
hsSourceDirs = ["src", "src2"],
otherModules = ["Distribution.Package",
"Distribution.Version",
"Distribution.Simple.GHCPackageConfig"],
extensions = [OverlappingInstances, TypeSynonymInstances],
extraLibs = ["libfoo", "bar", "bang"],
extraLibDirs = ["/usr/local/libs"],
includeDirs = ["your/slightest", "look/will"],
includes = ["/easily/unclose", "/me", "funky, path\\name"],
installIncludes = ["/easily/unclose", "/me", "funky, path\\name"],
ghcProfOptions = [],
options = [(GHC,["-fTH","-fglasgow-exts"])
,(Hugs,["+TH"]),(NHC,[]),(JHC,[])]
}},
executables = [Executable "somescript"
"SomeFile.hs" (emptyBuildInfo {
otherModules=["Foo1","Util","Main"],
hsSourceDirs = ["scripts"],
extensions = [OverlappingInstances],
options = [(GHC,[]),(Hugs,[]),(NHC,[]),(JHC,[])]
})]
}
-- Parse an old style package description. Assumes no flags etc. being used.
compatParseDescription :: String -> ParseResult PackageDescription
compatParseDescription descr = do
gpd <- parsePackageDescription descr
case finalizePackageDescription [] Nothing "" "" ("",Version [] []) gpd of
Left _ -> syntaxError (-1) "finalize failed"
Right (pd,_) -> return pd
hunitTests :: [Test]
hunitTests =
[ TestLabel "license parsers" $ TestCase $
sequence_ [ assertParseOk ("license " ++ show lVal) lVal
(runP 1 "license" parseLicenseQ (show lVal))
| lVal <- [GPL,LGPL,BSD3,BSD4] ]
, TestLabel "Required fields" $ TestCase $
do assertParseOk "some fields"
emptyPackageDescription {
package = (PackageIdentifier "foo"
(Version [0,0] ["asdf"])) }
(compatParseDescription "Name: foo\nVersion: 0.0-asdf")
assertParseOk "more fields foo"
emptyPackageDescription {
package = (PackageIdentifier "foo"
(Version [0,0] ["asdf"])),
license = GPL }
(compatParseDescription "Name: foo\nVersion:0.0-asdf\nLicense: GPL")
assertParseOk "required fields for foo"
emptyPackageDescription {
package = (PackageIdentifier "foo"
(Version [0,0] ["asdf"])),
license = GPL, copyright="2004 isaac jones" }
(compatParseDescription $ "Name: foo\nVersion:0.0-asdf\n"
++ "Copyright: 2004 isaac jones\nLicense: GPL")
, TestCase $ assertParseOk "no library" Nothing
(library `liftM` (compatParseDescription $
"Name: foo\nVersion: 1\nLicense: GPL\n" ++
"Maintainer: someone\n\nExecutable: script\n" ++
"Main-is: SomeFile.hs\n"))
, TestCase $ assertParseOk "translate deprecated fields"
emptyPackageDescription {
extraSrcFiles = ["foo.c", "bar.ml"],
library = Just $ emptyLibrary {
libBuildInfo = emptyBuildInfo { hsSourceDirs = ["foo","bar"] }}}
(compatParseDescription $
"hs-source-dir: foo bar\nother-files: foo.c bar.ml")
, TestLabel "Package description" $ TestCase $
assertParseOk "entire package description"
compatTestPkgDescAnswer
(compatParseDescription compatTestPkgDesc)
, TestLabel "Package description pretty" $ TestCase $
case compatParseDescription compatTestPkgDesc of
ParseFailed _ -> assertBool "can't parse description" False
ParseOk _ d ->
case compatParseDescription $ showPackageDescription d of
ParseFailed _ ->
assertBool "can't parse description after pretty print!" False
ParseOk _ d' ->
assertBool ("parse . show . parse not identity."
++" Incorrect fields:\n"
++ (unlines $ comparePackageDescriptions d d'))
(d == d')
, TestLabel "Sanity checker" $ TestCase $ do
(warns, ers) <- sanityCheckPackage emptyPackageDescription
assertEqual "Wrong number of errors" 2 (length ers)
assertEqual "Wrong number of warnings" 3 (length warns)
]
-- |Compare two package descriptions and see which fields aren't the same.
comparePackageDescriptions :: PackageDescription
-> PackageDescription
-> [String] -- ^Errors
comparePackageDescriptions p1 p2
= catMaybes $ myCmp package "package"
: myCmp license "license"
: myCmp licenseFile "licenseFile"
: myCmp copyright "copyright"
: myCmp maintainer "maintainer"
: myCmp author "author"
: myCmp stability "stability"
: myCmp testedWith "testedWith"
: myCmp homepage "homepage"
: myCmp pkgUrl "pkgUrl"
: myCmp synopsis "synopsis"
: myCmp description "description"
: myCmp category "category"
: myCmp buildDepends "buildDepends"
: myCmp library "library"
: myCmp executables "executables"
: myCmp descCabalVersion "cabal-version"
: myCmp buildType "build-type" : []
where canon_p1 = canonOptions p1
canon_p2 = canonOptions p2
myCmp :: (Eq a, Show a) => (PackageDescription -> a)
-> String -- Error message
-> Maybe String --
myCmp f er = let e1 = f canon_p1
e2 = f canon_p2
in if e1 /= e2
then Just $ er ++ " Expected: " ++ show e1
++ " Got: " ++ show e2
else Nothing
canonOptions :: PackageDescription -> PackageDescription
canonOptions pd =
pd{ library = fmap canonLib (library pd),
executables = map canonExe (executables pd) }
where
canonLib l = l { libBuildInfo = canonBI (libBuildInfo l) }
canonExe e = e { buildInfo = canonBI (buildInfo e) }
canonBI bi = bi { options = canonOptions (options bi) }
canonOptions opts = sortBy (comparing fst) opts
comparing f a b = f a `compare` f b
-- |Assert that the 2nd value parses correctly and matches the first value
assertParseOk :: (Eq val) => String -> val -> ParseResult val -> Assertion
assertParseOk mes expected actual
= assertBool mes
(case actual of
ParseOk _ v -> v == expected
_ -> False)
test :: IO Counts
test = runTestTT (TestList hunitTests)
------------------------------------------------------------------------------
test_stanzas' = parsePackageDescription testFile
-- ParseOk _ x -> putStrLn $ show x
-- _ -> return ()
testFile = unlines $
[ "Name: dwim"
, "Cabal-version: >= 1.7"
, ""
, "Description: This is a test file "
, " with a description longer than two lines. "
, ""
, "flag Debug {"
, " Description: Enable debug information"
, " Default: False"
, "}"
, "flag build_wibble {"
, "}"
, ""
, "library {"
, " build-depends: blub"
, " exposed-modules: DWIM.Main, DWIM"
, " if os(win32) && flag(debug) {"
, " build-depends: hunit"
, " ghc-options: -DDEBUG"
, " exposed-modules: DWIM.Internal"
, " if !flag(debug) {"
, " build-depends: impossible"
, " }"
, " }"
, "}"
, ""
, "executable foo-bar {"
, " Main-is: Foo.hs"
, " Build-depends: blab"
, "}"
, "executable wobble {"
, " Main-is: Wobble.hs"
, " if flag(debug) {"
, " Build-depends: hunit"
, " }"
, "}"
, "executable wibble {"
, " Main-is: Wibble.hs"
, " hs-source-dirs: wib-stuff"
, " if flag(build_wibble) {"
, " Build-depends: wiblib >= 0.42"
, " } else {"
, " buildable: False"
, " }"
, "}"
]
{-
test_compatParsing =
let ParseOk ws (p, pold) = do
fs <- readFields testPkgDesc
ppd <- parsePackageDescription' fs
let Right (pd,_) = finalizePackageDescription [] (Just pkgs) os arch ppd
pdold <- parsePackageDescription testPkgDesc
return (pd, pdold)
in do putStrLn $ unlines $ map show ws
putStrLn "==========="
putStrLn $ showPackageDescription p
putStrLn "==========="
putStrLn $ showPackageDescription testPkgDescAnswer
putStrLn "==========="
putStrLn $ showPackageDescription pold
putStrLn $ show (p == pold)
where
pkgs = [ PackageIdentifier "haskell-src" (Version [1,0] [])
, PackageIdentifier "HUnit" (Version [1,1] ["rain"])
]
os = (MkOSName "win32")
arch = (MkArchName "amd64")
-}
test_finalizePD =
case parsePackageDescription testFile of
ParseFailed err -> print err
ParseOk _ ppd -> do
case finalizePackageDescription [("debug",True)] (Just pkgs) os arch impl ppd of
Right (pd,fs) -> do putStrLn $ showPackageDescription pd
print fs
Left missing -> putStrLn $ "missing: " ++ show missing
putStrLn $ showPackageDescription $
flattenPackageDescription ppd
where
pkgs = [ PackageIdentifier "blub" (Version [1,0] [])
--, PackageIdentifier "hunit" (Version [1,1] [])
, PackageIdentifier "blab" (Version [0,1] [])
]
os = "win32"
arch = "amd64"
impl = ("ghc", Version [6,6] [])
#endif
Makefile
View file @ 749830ad
......@@ -12,7 +12,7 @@ all: build
# build the library itself
SOURCES=Distribution/*.hs Distribution/Simple/*.hs
SOURCES=Distribution/*.hs Distribution/Simple/*.hs Distribution/PackageDescription/*.hs
CONFIG_STAMP=dist/setup-config
BUILD_STAMP=dist/build/libHSCabal-$(VERSION).a
HADDOCK_STAMP=dist/doc/html/Cabal/index.html
......@@ -83,10 +83,10 @@ clean:
# testing...
#moduleTest:
# mkdir -p dist/debug
# $(HC) --make -Wall -DDEBUG -odir dist/debug -hidir dist/debug \
# -idist/debug/:src:tests/HUnit-1.0/src tests/ModuleTest.hs -o moduleTest
moduleTest: tests/ModuleTest.hs tests/PackageDescriptionTests.hs
mkdir -p dist/test
$(HC) --make -Wall -DDEBUG -odir dist/test -hidir dist/test \
-itests tests/ModuleTest.hs -o moduleTest
#tests: moduleTest clean
# cd tests/A && $(MAKE) clean
......
tests/ModuleTest.hs
View file @ 749830ad
-----------------------------------------------------------------------------
-- |
......@@ -42,42 +41,30 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -}
module Main where
#ifdef DEBUG
-- Import everything, since we want to test the compilation of them:
import qualified Distribution.Version as D.V (hunitTests)
-- import qualified Distribution.InstalledPackageInfo(hunitTests)
import qualified Distribution.License as D.L ()
import qualified Distribution.Compiler as D.C (hunitTests)
import qualified Distribution.Make ()
import qualified Distribution.Package as D.P ()
import qualified Distribution.PackageDescription as D.PD (hunitTests)
import qualified Distribution.Setup as D.Setup (hunitTests)
import Distribution.Compiler (CompilerFlavor(..), Compiler(..), compilerVersion)
import qualified PackageDescriptionTests as D.PD (hunitTests)
import qualified Distribution.Simple.Configure as D.S.C (localBuildInfoFile)
import qualified Distribution.Simple.Register as D.S.R (installedPkgConfigFile)
import Distribution.Simple.Compiler (CompilerFlavor(..), compilerVersion)
import Distribution.Simple.Program (defaultProgramConfiguration)
import Distribution.Version (Version(..))
import qualified Distribution.Simple as D.S (simpleHunitTests)
import qualified Distribution.Simple.Install as D.S.I (hunitTests)
import qualified Distribution.Simple.Build as D.S.B (hunitTests)
import qualified Distribution.Simple.SrcDist as D.S.S (hunitTests)
import qualified Distribution.Simple.Utils as D.S.U (hunitTests)
import System.FilePath( (</>) )
import qualified Distribution.Simple.Configure as D.S.C (hunitTests, localBuildInfoFile)
import qualified Distribution.Simple.Register as D.S.R (hunitTests, installedPkgConfigFile)
import qualified Distribution.Simple.GHCPackageConfig
as GHC (localPackageConfig, maybeCreateLocalPackageConfig)
import Distribution.Simple.Configure (configCompiler)
import Distribution.Verbosity ( silent )
-- base
import Data.List (intersperse)
import Control.Monad(when)
import Directory(setCurrentDirectory, doesFileExist,
doesDirectoryExist, getCurrentDirectory,
getPermissions, Permissions(..))
import Distribution.Compat.Directory (removeDirectoryRecursive)
import System.Cmd(system)
import Control.Monad (when)
import System.Directory (setCurrentDirectory, doesFileExist,
doesDirectoryExist, getCurrentDirectory,
getPermissions, Permissions(..),
removeDirectoryRecursive)
import System.Cmd (system)
import System.Exit(ExitCode(..))
import System.Environment (getArgs)
......@@ -228,7 +215,6 @@ tests currDir comp compConf compVersion = [
-- HUnit
,TestLabel ("testing the HUnit package" ++ compIdent) $ TestCase $
do setCurrentDirectory $ (testdir </> "HUnit-1.0")
GHC.maybeCreateLocalPackageConfig
system "make -s clean"
system "make -s"
assertCmd' compCmd "configure -v0" "configure failed"
......@@ -257,10 +243,8 @@ tests currDir comp compConf compVersion = [
doesDirectoryExist "dist/doc" >>= assertEqual "create of dist/doc" True
assertBuild
when (comp == GHC) -- tests building w/ an installed -package
(do pkgConf <- GHC.localPackageConfig
assertCmd' compCmd "install -v0 --user" "hunit install"
assertCmd ("ghc -package-conf " ++ pkgConf
++ " -package HUnitTest HUnitTester.hs -o ./hunitTest")
(do assertCmd' compCmd "install -v0 --user" "hunit install"
assertCmd ("ghc -package HUnitTest HUnitTester.hs -o ./hunitTest")
"compile w/ hunit"
assertCmd "./hunitTest" "hunit test"
assertCmd' compCmd "unregister --user" "unregister failed")
......@@ -463,14 +447,7 @@ tests currDir comp compConf compVersion = [
main :: IO ()
main = do putStrLn "compile successful"
putStrLn "-= Setup Tests =-"
setupCount <- runTestTT' $ TestList $
(TestLabel "Utils Tests" $ TestList D.S.U.hunitTests):
(TestLabel "Setup Tests" $ TestList D.Setup.hunitTests):
(TestLabel "config Tests" $ TestList D.S.C.hunitTests):
(D.S.R.hunitTests ++ D.V.hunitTests ++
D.S.S.hunitTests ++ D.S.B.hunitTests ++
D.S.I.hunitTests ++ D.S.simpleHunitTests ++
D.PD.hunitTests ++ D.C.hunitTests)
setupCount <- runTestTT' $ TestList (D.V.hunitTests ++ D.PD.hunitTests)
dir <- getCurrentDirectory
-- count' <- runTestTT' $ TestList (tests dir Hugs GHC)
args <- getArgs
......@@ -484,7 +461,9 @@ main = do putStrLn "compile successful"
compilers = [GHC] --, Hugs]
globalTests <-
flip mapM compilers $ \compilerFlavour -> do
compiler <- configCompiler (Just compilerFlavour) Nothing Nothing silent
(compiler, _) <- configCompiler (Just compilerFlavour)
Nothing Nothing
defaultProgramConfiguration silent
let version = compilerVersion compiler
runTestTT' $ TestList (testList compilerFlavour version)
putStrLn "-------------"
......@@ -493,8 +472,6 @@ main = do putStrLn "compile successful"
foldl1 combineCounts (setupCount:globalTests)
return ()
#endif
-- Local Variables:
-- compile-command: "ghc -i../:/usr/local/src/HUnit-1.0 -Wall --make ModuleTest.hs -o moduleTest"
-- End:
tests/PackageDescriptionTests.hs 0 → 100644
View file @ 749830ad
-----------------------------------------------------------------------------
-- |
-- Module : PackageDescriptionTests
-- Copyright : Isaac Jones 2003-2005
--
-- Maintainer : Isaac Jones <ijones@syntaxpolice.org>
-- Stability : alpha
-- Portability : portable
--
-- Package description and parsing.
{- All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials provided
with the distribution.
* Neither the name of Isaac Jones nor the names of other
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -}
module PackageDescriptionTests (
-- * Debugging
hunitTests,
) where
import Distribution.ParseUtils
import Distribution.Package (PackageIdentifier(..))
import Distribution.Version (Version(..), VersionRange(..), Dependency(..))
import Distribution.Compiler (CompilerFlavor(..))
import Distribution.PackageDescription
import Distribution.PackageDescription.Types
import Distribution.PackageDescription.Parse
import Distribution.PackageDescription.QA (sanityCheckPackage)
import Data.Maybe (catMaybes)
import Data.List (sortBy)
import Control.Monad (liftM)
import Test.HUnit (Test(..), assertBool, Assertion, assertEqual)
import Distribution.License
import Language.Haskell.Extension
-- ------------------------------------------------------------
-- * Testing
-- ------------------------------------------------------------
compatTestPkgDesc :: String
compatTestPkgDesc = unlines [
"-- Required",
"Name: Cabal",
"Version: 0.1.1.1.1-rain",
"License: LGPL",
"License-File: foo",
"Copyright: Free Text String",
"Cabal-version: >1.1.1",
"-- Optional - may be in source?",
"Author: Happy Haskell Hacker",
"Homepage: http://www.haskell.org/foo",
"Package-url: http://www.haskell.org/foo",