Test evaluation no longer has everything in scope

src/Haskell/Template/Task.hs

@@ -64,7 +64,7 @@
 import Language.Haskell.Interpreter
   (GhcError (..), InterpreterError (..), MonadInterpreter, OptionVal (..),
    Extension(UnknownExtension), as, installedModulesInScope, interpret, languageExtensions, liftIO,
    loadModules, reset, runInterpreter, set, setImports, setTopLevelModules, searchPath)
 import Language.Haskell.Interpreter.Unsafe
   (unsafeRunInterpreterWithArgs)
 import Numeric.Natural                  (Natural)
@@ -609,7 +609,7 @@
   checkResult reject ghcErrors how howMany $ const $ return ()
   where
     warnings = msum (selectWarnings config)
     makeOpts xs = ("-w":) $ ("-Werror=" ++) <$> xs
     ghcOpts  = makeOpts warnings
     howMany = runIdentity $ configGhcLimit config
     extensions = extensionsOf config
@@ -624,7 +624,7 @@
   -> String
   -> m ()
 matchTemplate reject config context exts template submission =
   runMatchTestOn reject exts template submission $ \case
     Fail loc -> mapM_ (rejectMatch rejectWithHint config context template submission) loc
       where
         rejectWithHint = rejectWithMessage reject rejectHint
@@ -743,9 +743,10 @@
   reset -- Make sure nothing is available
   set [installedModulesInScope := False]
   set [searchPath := [dirname]]
+  -- All modules can be imported in source files
   loadModules ("TestHarness" : modules)
-  setTopLevelModules modules
-  setImports ["Prelude", "Test.HUnit", "TestHarness"]
+  -- All export items from these modules are in scope for the interpreter evaluation
+  setImports $ ["Prelude", "Test.HUnit", "TestHarness"] ++ ["Test" | "Test" `elem` modules]
   where
     readExt input = fromMaybe (UnknownExtension input) $ readMaybe input
 
@@ -818,7 +819,7 @@
          (return . (,rawModules))
          eConfig
   where
     configJson:rawModules = splitModules False configAndModules
     eConfig :: Either ParseException SolutionConfigOpt
     eConfig = decodeEither' $ BS.pack configJson