Support Extension instead of KnownExtension in testing solver DSL

See haskell#2732.
jdnavarro · Oct 15, 2015 · b3f1a63 · b3f1a63
1 parent a8f2d3e
commit b3f1a63
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/cabal-install/tests/UnitTests/Distribution/Client/Dependency/Modular/DSL.hs b/cabal-install/tests/UnitTests/Distribution/Client/Dependency/Modular/DSL.hs
@@ -26,7 +26,7 @@ import qualified Distribution.PackageDescription   as C
 import qualified Distribution.Simple.PackageIndex  as C.PackageIndex
 import qualified Distribution.System               as C
 import qualified Distribution.Version              as C
-import Language.Haskell.Extension (KnownExtension, Language)
+import Language.Haskell.Extension (Extension(..), Language)
 
 -- cabal-install
 import Distribution.Client.ComponentDeps (ComponentDeps)
@@ -99,7 +99,7 @@ data ExampleDependency =
   | ExTest ExampleTestName [ExampleDependency]
 
     -- | Dependency on a language extension
-  | ExExt KnownExtension
+  | ExExt Extension
 
     -- | Dependency on a language version
   | ExLang Language
@@ -146,7 +146,7 @@ exAvSrcPkg ex =
            packageInfoId        = exAvPkgId ex
          , packageSource        = LocalTarballPackage "<<path>>"
          , packageDescrOverride = Nothing
-         , packageDescription   = C.GenericPackageDescription{
+         , packageDescription   = C.GenericPackageDescription {
                C.packageDescription = C.emptyPackageDescription {
                    C.package        = exAvPkgId ex
                  , C.library        = error "not yet configured: library"
@@ -202,7 +202,7 @@ exAvSrcPkg ex =
       let (directDeps, flaggedDeps) = splitDeps deps
       in C.CondNode {
              C.condTreeData        = mempty -- irrelevant to the solver
-           , C.condTreeConstraints = map mkDirect  directDeps
+           , C.condTreeConstraints = map mkDirect directDeps
            , C.condTreeComponents  = map mkFlagged flaggedDeps
            }
 

diff --git a/cabal-install/tests/UnitTests/Distribution/Client/Dependency/Modular/Solver.hs b/cabal-install/tests/UnitTests/Distribution/Client/Dependency/Modular/Solver.hs
@@ -14,7 +14,7 @@ import Test.Tasty.HUnit (testCase, assertEqual, assertBool)
 import Test.Tasty.Options
 
 -- Cabal
-import Language.Haskell.Extension (KnownExtension (..), Language )
+import Language.Haskell.Extension -- (Extension(..), UnknownExtension, Language)
 
 -- cabal-install
 import UnitTests.Distribution.Client.Dependency.Modular.DSL
@@ -71,7 +71,7 @@ tests = [
         , runTest $ mkTest db12 "baseShim6" ["E"] (Just [("E", 1), ("syb", 2)])
         ]
     , testGroup "Extensions" [
-          runTest $ mkTest dbExt1 "unsupportedExtension" ["B"] Nothing
+          runTest $ mkTest dbExt1 "unsupportedExtension" ["A"] Nothing
         ]
     ]
   where
@@ -349,8 +349,7 @@ db12 =
 
 dbExt1 :: ExampleDb
 dbExt1 = [
-    Right $ exAv "A" 1 [ExExt CPP]
-  , Right $ exAv "B" 1 [ExAny "A"]
+    Right $ exAv "A" 1 [ExExt $ UnknownExtension "unknown"]
   ]