tests: Use UnqualComponentName instead of String

Author: Ericson2314

Cabal/tests/ParserHackageTests.hs

@@ -17,7 +17,7 @@ import           System.Environment                     (getArgs)
 import           System.Exit                            (exitFailure)
 import           System.FilePath                        ((</>))
 
-import           Distribution.Package (Dependency)
+import           Distribution.Package (Dependency, UnqualComponentName)
 import           Distribution.PackageDescription
 
 import qualified Codec.Archive.Tar                      as Tar
@@ -330,7 +330,7 @@ packageDescription_ = lens packageDescription $ \s a -> s { packageDescription =
 condLibrary_ :: Lens' GenericPackageDescription (Maybe (CondTree ConfVar [Dependency] Library))
 condLibrary_ = lens condLibrary $ \s a -> s { condLibrary = a}
 
-condExecutables_ :: Lens' GenericPackageDescription [(String, CondTree ConfVar [Dependency] Executable)]
+condExecutables_ :: Lens' GenericPackageDescription [(UnqualComponentName, CondTree ConfVar [Dependency] Executable)]
 condExecutables_ = lens condExecutables $ \s a -> s { condExecutables = a }
 
 condTreeData_ :: Lens' (CondTree v c a) a

cabal-install/tests/UnitTests/Distribution/Solver/Modular/DSL.hs

@@ -210,7 +210,7 @@ withTest ex test = withTests ex [test]
 
 withTests :: ExampleAvailable -> [ExTest] -> ExampleAvailable
 withTests ex tests =
-  let testCDs = CD.fromList [(CD.ComponentTest name, deps)
+  let testCDs = CD.fromList [(CD.ComponentTest $ C.mkUnqualComponentName name, deps)
                             | ExTest name deps <- tests]
   in ex { exAvDeps = exAvDeps ex <> testCDs }
 
@@ -219,7 +219,7 @@ withExe ex exe = withExes ex [exe]
 
 withExes :: ExampleAvailable -> [ExExe] -> ExampleAvailable
 withExes ex exes =
-  let exeCDs = CD.fromList [(CD.ComponentExe name, deps)
+  let exeCDs = CD.fromList [(CD.ComponentExe $ C.mkUnqualComponentName name, deps)
                            | ExExe name deps <- exes]
   in ex { exAvDeps = exAvDeps ex <> exeCDs }
 

cabal-install/tests/UnitTests/Distribution/Solver/Modular/QuickCheck.hs

@@ -26,6 +26,8 @@ import Distribution.Client.Dependency.Types
          ( Solver(..) )
 import Distribution.Client.Setup (defaultMaxBackjumps)
 
+import           Distribution.Package (UnqualComponentName, mkUnqualComponentName)
+
 import qualified Distribution.Solver.Types.ComponentDeps as CD
 import           Distribution.Solver.Types.ComponentDeps
                    ( Component(..), ComponentDep, ComponentDeps )
@@ -234,7 +236,7 @@ arbitraryComponentDeps db =
     dedupComponentNames =
         nubBy ((\x y -> isJust x && isJust y && x == y) `on` componentName . fst)
 
-    componentName :: Component -> Maybe String
+    componentName :: Component -> Maybe UnqualComponentName
     componentName ComponentLib        = Nothing
     componentName ComponentSetup      = Nothing
     componentName (ComponentSubLib n) = Just n
@@ -285,9 +287,6 @@ arbitraryDeps db = frequency
 arbitraryFlagName :: Gen String
 arbitraryFlagName = (:[]) <$> elements ['A'..'E']
 
-arbitraryComponentName :: Gen String
-arbitraryComponentName = (:[]) <$> elements "ABC"
-
 instance Arbitrary ReorderGoals where
   arbitrary = ReorderGoals <$> arbitrary
 
@@ -303,12 +302,15 @@ instance Arbitrary Solver where
 
   shrink Modular = []
 
+instance Arbitrary UnqualComponentName where
+  arbitrary = mkUnqualComponentName <$> (:[]) <$> elements "ABC"
+
 instance Arbitrary Component where
   arbitrary = oneof [ return ComponentLib
-                    , ComponentSubLib <$> arbitraryComponentName
-                    , ComponentExe <$> arbitraryComponentName
-                    , ComponentTest <$> arbitraryComponentName
-                    , ComponentBench <$> arbitraryComponentName
+                    , ComponentSubLib <$> arbitrary
+                    , ComponentExe <$> arbitrary
+                    , ComponentTest <$> arbitrary
+                    , ComponentBench <$> arbitrary
                     , return ComponentSetup
                     ]
 

cabal-testsuite/PackageTests/BenchmarkStanza/Check.hs

@@ -14,7 +14,7 @@ suite = do
     dist_dir <- distDir
     lbi <- liftIO $ getPersistBuildConfig dist_dir
     let anticipatedBenchmark = emptyBenchmark
-            { benchmarkName = "dummy"
+            { benchmarkName = mkUnqualComponentName "dummy"
             , benchmarkInterface = BenchmarkExeV10 (mkVersion [1,0])
                                                    "dummy.hs"
             , benchmarkBuildInfo = emptyBuildInfo

cabal-testsuite/PackageTests/TestStanza/Check.hs

@@ -14,7 +14,7 @@ suite = do
     dist_dir <- distDir
     lbi <- liftIO $ getPersistBuildConfig dist_dir
     let anticipatedTestSuite = emptyTestSuite
-            { testName = "dummy"
+            { testName = mkUnqualComponentName "dummy"
             , testInterface = TestSuiteExeV10 (mkVersion [1,0]) "dummy.hs"
             , testBuildInfo = emptyBuildInfo
                     { targetBuildDepends =

cabal-testsuite/PackageTests/Tests.hs

@@ -14,6 +14,7 @@ import qualified PackageTests.ForeignLibs.Check
 import Distribution.Types.TargetInfo
 import Distribution.Types.LocalBuildInfo
 
+import Distribution.Package
 import Distribution.Simple.LocalBuildInfo
   ( absoluteComponentInstallDirs
   , InstallDirs (..)
@@ -25,7 +26,6 @@ import Distribution.System (buildOS, OS(Windows))
 import Distribution.Version
 
 import Control.Monad
-
 import System.Directory
 import Test.Tasty (mkTimeout, localOption)
 
@@ -718,7 +718,7 @@ tests config = do
             lbi <- liftIO $ getPersistBuildConfig dist_dir
             let pkg_descr = localPkgDescr lbi
                 compiler_id = compilerId (compiler lbi)
-                cname = CSubLibName "foo-internal"
+                cname = CSubLibName $ mkUnqualComponentName "foo-internal"
                 [target] = componentNameTargets' pkg_descr lbi cname
                 uid = componentUnitId (targetCLBI target)
                 InstallDirs{libdir=dir,dynlibdir=dyndir} =