From ee36db63df8fa5e706e5422258d9904ecbdf7405 Mon Sep 17 00:00:00 2001
From: Duncan Coutts <duncan@haskell.org>
Date: Sat, 16 Oct 2010 16:56:15 +0000
Subject: [PATCH] Update the unit tests of the testsuite feature
---
tests/PackageTests/TestStanza/Check.hs | 7 ++++---
tests/suite.hs | 1 +
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/tests/PackageTests/TestStanza/Check.hs b/tests/PackageTests/TestStanza/Check.hs
index f168f792ff..35853a5ef6 100644
--- a/tests/PackageTests/TestStanza/Check.hs
+++ b/tests/PackageTests/TestStanza/Check.hs
@@ -13,6 +13,7 @@ import Distribution.Package
( PackageIdentifier(..), PackageName(..), Dependency(..) )
import Distribution.PackageDescription
( PackageDescription(..), BuildInfo(..), TestSuite(..), Library(..)
+ , TestSuiteInterface(..)
, TestType(..), emptyPackageDescription, emptyBuildInfo, emptyLibrary
, emptyTestSuite, BuildType(..) )
import Distribution.Verbosity (silent)
@@ -47,7 +48,7 @@ suite cabalVersion = TestCase $ do
, stability = "stable"
, description = "Check that Cabal recognizes the Test stanza defined below."
, category = "PackageTests"
- , descCabalVersion = anyVersion
+ , specVersionRaw = Right anyVersion
, buildType = Just Simple
, buildDepends =
[ Dependency (PackageName "base") anyV ]
@@ -61,7 +62,7 @@ suite cabalVersion = TestCase $ do
}
, testSuites = [ emptyTestSuite
{ testName = "dummy"
- , testType = ExeTest (Version [1,0] []) "dummy.hs"
+ , testInterface = TestSuiteExeV10 (Version [1,0] []) "dummy.hs"
, testBuildInfo = emptyBuildInfo
{ targetBuildDepends =
[ Dependency (PackageName "base") anyVersion ]
@@ -75,4 +76,4 @@ suite cabalVersion = TestCase $ do
(unlines $ map (show . disp) xs)
in assertEqual depMessage True False
Right (f, _) -> assertEqual "parsed package description does not match anticipated"
- f anticipatedFinalPD
\ No newline at end of file
+ f anticipatedFinalPD
diff --git a/tests/suite.hs b/tests/suite.hs
index c9307e245d..afbf3b484f 100644
--- a/tests/suite.hs
+++ b/tests/suite.hs
@@ -26,6 +26,7 @@ import PackageTests.TestStanza.Check
import Distribution.Text (display)
import Distribution.Simple.Utils (cabalVersion)
import Data.Version
+import System.Directory
hunit :: TestName -> HUnit.Test -> Test
hunit name test = testGroup name $ hUnitTestToTests test
--
GitLab