Merge branch 'accessor-tests' into no-flatten-package-description

Author: leana8959

Cabal-tests/tests/ParserTests.hs

@@ -15,7 +15,14 @@ import Data.Algorithm.Diff                         (PolyDiff (..), getGroupedDif
 import Data.Maybe                                  (isNothing)
 import Distribution.Fields                         (pwarning)
 import Distribution.PackageDescription             (GenericPackageDescription)
-import Distribution.Types.GenericPackageDescription(condLibrary)
+import Distribution.PackageDescription
+  ( condLibrary
+  , condSubLibraries
+  , condForeignLibs
+  , condExecutables
+  , condTestSuites
+  , condBenchmarks
+  )
 import Distribution.PackageDescription.Parsec      (parseGenericPackageDescription)
 import Distribution.PackageDescription.PrettyPrint (showGenericPackageDescription)
 import Distribution.Parsec                         (PWarnType (..), PWarning (..), showPErrorWithSource, showPWarningWithSource)
@@ -35,7 +42,6 @@ import qualified Distribution.InstalledPackageInfo as IPI
 
 #ifdef MIN_VERSION_tree_diff
 import Data.TreeDiff                 (ansiWlEditExpr, ediff, toExpr)
-import Data.TreeDiff.Class           (ToExpr)
 import Data.TreeDiff.Golden          (ediffGolden)
 import Data.TreeDiff.Instances.Cabal ()
 #endif
@@ -239,7 +245,16 @@ treeDiffGoldenTest fp = ediffGolden goldenTest "expr" exprFile $ do
     let res = withSource (PCabalFile (fp, contents)) $ parseGenericPackageDescription contents
     let (_, x) = runParseResult res
     case x of
-        Right gpd      -> pure (toExpr gpd)
+        Right gpd      -> pure $ toExpr
+          ( gpd
+          -- Test accessors because they encapsulate the merging behaviour
+          , condLibrary gpd
+          , condSubLibraries gpd
+          , condForeignLibs gpd
+          , condExecutables gpd
+          , condTestSuites gpd
+          , condBenchmarks gpd
+          )
         Left (_, errs) -> fail $ unlines $ "ERROR" : map (showPErrorWithSource . fmap renderCabalFileSource) (NE.toList errs)
   where
     input = "tests" </> "ParserTests" </> "regressions" </> fp