Making runtime test compile

enso-org · Jan 16, 2025 · bd4f78a · bd4f78a
1 parent dabdbed
commit bd4f78a
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 22 deletions.
diff --git a/engine/polyglot-api/src/main/scala/org/enso/polyglot/TopScope.scala b/engine/polyglot-api/src/main/scala/org/enso/polyglot/TopScope.scala
@@ -34,9 +34,14 @@ class TopScope(private val value: Value) {
     value.invokeMember(UNREGISTER_MODULE, qualifiedName): Unit
   }
 
+  def compile(
+    shouldCompileDependencies: Boolean
+  ): Unit = {
+    compile(shouldCompileDependencies, false)
+  }
   def compile(
     shouldCompileDependencies: Boolean,
-    generateDocs: Boolean = false
+    generateDocs: Boolean
   ): Unit = {
     value.invokeMember(COMPILE, shouldCompileDependencies, generateDocs)
   }

diff --git a/...e/runtime-instrument-common/src/test/scala/org/enso/compiler/test/CompilerTestSetup.scala b/...e/runtime-instrument-common/src/test/scala/org/enso/compiler/test/CompilerTestSetup.scala
@@ -120,13 +120,11 @@ trait CompilerTestSetup {
     freshNameSupply: Option[FreshNameSupply]     = None,
     passConfiguration: Option[PassConfiguration] = None,
     compilerConfig: CompilerConfig               = defaultConfig,
-    isGeneratingDocs: Boolean                    = false
   ): ModuleContext = buildModuleContextModule(
     moduleName,
     freshNameSupply,
     passConfiguration,
     compilerConfig,
-    isGeneratingDocs
   )._1
 
   /** Builds a module context with a mocked module for testing purposes.
@@ -141,15 +139,13 @@ trait CompilerTestSetup {
     freshNameSupply: Option[FreshNameSupply]     = None,
     passConfiguration: Option[PassConfiguration] = None,
     compilerConfig: CompilerConfig               = defaultConfig,
-    isGeneratingDocs: Boolean                    = false
   ): (ModuleContext, runtime.Module) = {
     val mod = runtime.Module.empty(moduleName, null)
     val ctx = ModuleContext(
       module            = mod.asCompilerModule(),
       freshNameSupply   = freshNameSupply,
       passConfiguration = passConfiguration,
-      compilerConfig    = compilerConfig,
-      isGeneratingDocs  = isGeneratingDocs
+      compilerConfig    = compilerConfig
     )
     (ctx, mod)
   }

diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/compiler/test/SerdeCompilerTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/compiler/test/SerdeCompilerTest.java
@@ -69,7 +69,7 @@ private void parseSerializedModule(String projectName, String forbiddenMessage)
                 futures.add(future);
                 return null;
               });
-      futures.add(compiler.compile(false, true, true));
+      futures.add(compiler.compile(false, true, true, false));
       for (var f : futures) {
         var persisted = f.get(10, TimeUnit.SECONDS);
         assertEquals("Fib_Test library has been fully persisted", true, persisted);

diff --git a/...time-integration-tests/src/test/java/org/enso/compiler/test/SerializationManagerTest.java b/...time-integration-tests/src/test/java/org/enso/compiler/test/SerializationManagerTest.java
@@ -89,7 +89,7 @@ public void serializeLibrarySuggestions()
     Object result =
         ensoContext
             .getCompiler()
-            .compile(false, true, false)
+            .compile(false, true, false, false)
             .get(COMPILE_TIMEOUT_SECONDS, TimeUnit.SECONDS);
     Assert.assertEquals(Boolean.TRUE, result);
 

diff --git a/...me-integration-tests/src/test/java/org/enso/compiler/test/mini/passes/MiniPassTester.java b/...me-integration-tests/src/test/java/org/enso/compiler/test/mini/passes/MiniPassTester.java
@@ -49,12 +49,7 @@ protected ModuleContext buildModuleContext(QualifiedName moduleName) {
     var isGeneratingDocs = false;
     var runtimeMod = org.enso.interpreter.runtime.Module.empty(moduleName, null);
     return ModuleContext.apply(
-        runtimeMod.asCompilerModule(),
-        compilerConf,
-        freshNameSupply,
-        passConfig,
-        isGeneratingDocs,
-        pkgRepo);
+        runtimeMod.asCompilerModule(), compilerConf, freshNameSupply, passConfig, pkgRepo);
   }
 
   private static CompilerConfig defaultCompilerConfig() {

diff --git a/engine/runtime-integration-tests/src/test/scala/org/enso/compiler/test/CompilerTest.scala b/engine/runtime-integration-tests/src/test/scala/org/enso/compiler/test/CompilerTest.scala
@@ -248,14 +248,12 @@ trait CompilerRunner {
     moduleName: QualifiedName                    = QualifiedName.simpleName("Test_Module"),
     freshNameSupply: Option[FreshNameSupply]     = None,
     passConfiguration: Option[PassConfiguration] = None,
-    compilerConfig: CompilerConfig               = defaultConfig,
-    isGeneratingDocs: Boolean                    = false
+    compilerConfig: CompilerConfig               = defaultConfig
   ): ModuleContext = buildModuleContextModule(
     moduleName,
     freshNameSupply,
     passConfiguration,
-    compilerConfig,
-    isGeneratingDocs
+    compilerConfig
   )._1
 
   /** Builds a module context with a mocked module for testing purposes.
@@ -269,16 +267,14 @@ trait CompilerRunner {
     moduleName: QualifiedName                    = QualifiedName.simpleName("Test_Module"),
     freshNameSupply: Option[FreshNameSupply]     = None,
     passConfiguration: Option[PassConfiguration] = None,
-    compilerConfig: CompilerConfig               = defaultConfig,
-    isGeneratingDocs: Boolean                    = false
+    compilerConfig: CompilerConfig               = defaultConfig
   ): (ModuleContext, runtime.Module) = {
     val mod = runtime.Module.empty(moduleName, null)
     val ctx = ModuleContext(
       module            = mod.asCompilerModule(),
       freshNameSupply   = freshNameSupply,
       passConfiguration = passConfiguration,
-      compilerConfig    = compilerConfig,
-      isGeneratingDocs  = isGeneratingDocs
+      compilerConfig    = compilerConfig
     )
     (ctx, mod)
   }