Fix test configs and utils (#2712)

* Do not import test configs in production.

* Consistent test config paths.

* Whitespace.

* Reuse.

* Import test configs in test utils.

* Add imports where needed.

* Add another missing import.

Author: toinehartman

src/org/rascalmpl/compiler/CheckTestSources.rsc

@@ -36,6 +36,7 @@ import util::FileSystem;
 import util::Benchmark;
 import lang::rascalcore::compile::util::Names;
 import lang::rascalcore::check::RascalConfig;
+import lang::rascalcore::check::TestConfigs;
 
 
 void main() = checkTestSources([]);

src/org/rascalmpl/compiler/CompileTestSources.rsc

@@ -40,6 +40,7 @@ import lang::rascalcore::compile::Compile;
 import util::FileSystem;
 import util::Benchmark;
 import lang::rascalcore::compile::util::Names;
+import lang::rascalcore::check::TestConfigs;
 
 loc GIT_REPO = |file:///Users/paulklint/git/|;
 

src/org/rascalmpl/compiler/GenerateTestSources.rsc

@@ -38,6 +38,7 @@ import util::Monitor;
 import util::Benchmark;
 import lang::rascalcore::compile::util::Names;
 import util::SystemAPI;
+import lang::rascalcore::check::TestConfigs;
 
 // if cmdLineArgs contains "all", then all files in the rascal project are used (~400 files)
 // otherwise only standard library and test files (~200 files) 

src/org/rascalmpl/compiler/lang/rascalcore/check/Checker.rsc

@@ -46,7 +46,6 @@ extend lang::rascalcore::check::CheckerCommon;
 
 import lang::rascalcore::compile::CompileTimeError;
 import lang::rascalcore::check::ModuleLocations;
-extend lang::rascalcore::check::TestConfigs;
 
 import analysis::typepal::Exception;
 

src/org/rascalmpl/compiler/lang/rascalcore/check/TestConfigs.rsc

@@ -127,7 +127,7 @@ public PathConfig makePathConfig(list[loc] sources, list[loc] libraries, bool ke
         generatedSources       = COMPILED + "/src/main/java",
         generatedTestSources   = COMPILED + "/src/test/java/",
         generatedResources     = COMPILED + (keep ? "/src/main/java" : "rascal"),
-        generatedTestResources = COMPILED_RASCAL + (keep ? "/src/test/java/" : "rascal"),
+        generatedTestResources = COMPILED + (keep ? "/src/test/java/" : "rascal"),
         libs                   = libraries
     ); 
 }
@@ -190,7 +190,7 @@ public PathConfig getAllSrcWritablePathConfig(bool keep = false) {
                             TMP_TYPEPAL
                         ],
                         [ ], 
-                        keep=true);
+                        keep=keep);
 }
 
 public RascalCompilerConfig getAllSrcWritableCompilerConfig(bool keep=true){

src/org/rascalmpl/compiler/lang/rascalcore/check/tests/StaticTestingUtils.rsc

@@ -47,6 +47,7 @@ import ParseTree;
 import lang::rascalcore::check::RascalConfig;
 
 import lang::rascalcore::check::Checker;
+import lang::rascalcore::check::TestConfigs;
 import lang::rascal::\syntax::Rascal;
 
 import analysis::typepal::LocationChecks;
@@ -117,7 +118,7 @@ set[Message] getAllMessages(ModuleStatus r)
 ModuleStatus checkStatements(str stmts) {
 	clearMemory();
 	mloc = composeModule(stmts);
-  return  	rascalTModelForLocs([mloc], rascalCompilerConfig(pathConfigForTesting())[infoModuleChecked=true][verbose=verbose], dummy_compile1);
+	return rascalTModelForLocs([mloc], rascalCompilerConfig(pathConfigForTesting())[infoModuleChecked=true][verbose=verbose], dummy_compile1);
 }
 
 ModuleStatus checkModule(str moduleText){
@@ -169,12 +170,7 @@ bool checkOK(str stmts) {
      throw errors;
 }
 
-bool checkModuleOK(loc moduleToCheck, PathConfig pathConfig = pathConfigForTesting()) {
-     errors = getErrorMessages(rascalTModelForLocs([moduleToCheck], rascalCompilerConfig(pathConfig)[infoModuleChecked=true][verbose=verbose], dummy_compile1));
-     if(size(errors) == 0)
-        return true;
-     throw abbrev("<errors>");
-}
+bool checkModuleOK(loc moduleToCheck, PathConfig pathConfig = pathConfigForTesting()) = checkModulesOK([moduleToCheck], pathConfig = pathConfig);
 
 bool checkModulesOK(list[loc] modulesToCheck, PathConfig pathConfig = pathConfigForTesting()) {
      errors = getErrorMessages(rascalTModelForLocs(modulesToCheck, rascalCompilerConfig(pathConfig)[infoModuleChecked=true][verbose=verbose], dummy_compile1));