Run embedded test on both dart and node

ntkme · ntkme · commit 7ffed6e8fa29 · 2024-10-28T11:32:45.000-07:00
diff --git a/test/embedded/dart/file_importer_test.dart b/test/embedded/dart/file_importer_test.dart
@@ -0,0 +1,16 @@
+// Copyright 2024 Google LLC. Use of this source code is governed by an
+// MIT-style license that can be found in the LICENSE file or at
+// https://opensource.org/licenses/MIT.
+
+@TestOn('vm')
+library;
+
+import 'package:test/test.dart';
+
+import '../shared/file_importer.dart';
+import '../dart_test.dart';
+
+void main() {
+  setUpAll(ensureSnapshotUpToDate);
+  sharedTests(runSassEmbedded);
+}
diff --git a/test/embedded/dart/function_test.dart b/test/embedded/dart/function_test.dart
@@ -0,0 +1,16 @@
+// Copyright 2024 Google LLC. Use of this source code is governed by an
+// MIT-style license that can be found in the LICENSE file or at
+// https://opensource.org/licenses/MIT.
+
+@TestOn('vm')
+library;
+
+import 'package:test/test.dart';
+
+import '../shared/function.dart';
+import '../dart_test.dart';
+
+void main() {
+  setUpAll(ensureSnapshotUpToDate);
+  sharedTests(runSassEmbedded);
+}
diff --git a/test/embedded/dart/importer_test.dart b/test/embedded/dart/importer_test.dart
@@ -0,0 +1,16 @@
+// Copyright 2024 Google LLC. Use of this source code is governed by an
+// MIT-style license that can be found in the LICENSE file or at
+// https://opensource.org/licenses/MIT.
+
+@TestOn('vm')
+library;
+
+import 'package:test/test.dart';
+
+import '../shared/importer.dart';
+import '../dart_test.dart';
+
+void main() {
+  setUpAll(ensureSnapshotUpToDate);
+  sharedTests(runSassEmbedded);
+}
diff --git a/test/embedded/dart/length_delimited_test.dart b/test/embedded/dart/length_delimited_test.dart
@@ -0,0 +1,16 @@
+// Copyright 2024 Google LLC. Use of this source code is governed by an
+// MIT-style license that can be found in the LICENSE file or at
+// https://opensource.org/licenses/MIT.
+
+@TestOn('vm')
+library;
+
+import 'package:test/test.dart';
+
+import '../shared/length_delimited.dart';
+import '../dart_test.dart';
+
+void main() {
+  setUpAll(ensureSnapshotUpToDate);
+  sharedTests();
+}
diff --git a/test/embedded/dart/protocol_test.dart b/test/embedded/dart/protocol_test.dart
@@ -0,0 +1,16 @@
+// Copyright 2024 Google LLC. Use of this source code is governed by an
+// MIT-style license that can be found in the LICENSE file or at
+// https://opensource.org/licenses/MIT.
+
+@TestOn('vm')
+library;
+
+import 'package:test/test.dart';
+
+import '../shared/protocol.dart';
+import '../dart_test.dart';
+
+void main() {
+  setUpAll(ensureSnapshotUpToDate);
+  sharedTests(runSassEmbedded);
+}
diff --git a/test/embedded/dart_test.dart b/test/embedded/dart_test.dart
@@ -0,0 +1,22 @@
+// Copyright 2024 Google LLC. Use of this source code is governed by an
+// MIT-style license that can be found in the LICENSE file or at
+// https://opensource.org/licenses/MIT.
+
+@TestOn('vm')
+library;
+
+import 'package:cli_pkg/testing.dart' as pkg;
+import 'package:test/test.dart';
+
+import 'shared/embedded_process.dart';
+
+void main() {}
+
+/// Ensures that the snapshot of the Dart executable used by [runSassEmbedded] is
+/// up-to-date, if one has been generated.
+void ensureSnapshotUpToDate() => pkg.ensureExecutableUpToDate("sass");
+
+Future<EmbeddedProcess> runSassEmbedded(
+        [Iterable<String> args = const Iterable.empty()]) =>
+    EmbeddedProcess.start(pkg.executableRunner("sass"),
+        [...pkg.executableArgs("sass"), "--embedded", ...args]);
diff --git a/test/embedded/node/file_importer_test.dart b/test/embedded/node/file_importer_test.dart
@@ -0,0 +1,17 @@
+// Copyright 2024 Google LLC. Use of this source code is governed by an
+// MIT-style license that can be found in the LICENSE file or at
+// https://opensource.org/licenses/MIT.
+
+@TestOn('vm')
+@Tags(['node'])
+library;
+
+import 'package:test/test.dart';
+
+import '../shared/file_importer.dart';
+import '../node_test.dart';
+
+void main() {
+  setUpAll(ensureSnapshotUpToDate);
+  sharedTests(runSassEmbedded);
+}
diff --git a/test/embedded/node/function_test.dart b/test/embedded/node/function_test.dart
@@ -0,0 +1,17 @@
+// Copyright 2024 Google LLC. Use of this source code is governed by an
+// MIT-style license that can be found in the LICENSE file or at
+// https://opensource.org/licenses/MIT.
+
+@TestOn('vm')
+@Tags(['node'])
+library;
+
+import 'package:test/test.dart';
+
+import '../shared/function.dart';
+import '../node_test.dart';
+
+void main() {
+  setUpAll(ensureSnapshotUpToDate);
+  sharedTests(runSassEmbedded);
+}
diff --git a/test/embedded/node/importer_test.dart b/test/embedded/node/importer_test.dart
@@ -0,0 +1,17 @@
+// Copyright 2024 Google LLC. Use of this source code is governed by an
+// MIT-style license that can be found in the LICENSE file or at
+// https://opensource.org/licenses/MIT.
+
+@TestOn('vm')
+@Tags(['node'])
+library;
+
+import 'package:test/test.dart';
+
+import '../shared/importer.dart';
+import '../node_test.dart';
+
+void main() {
+  setUpAll(ensureSnapshotUpToDate);
+  sharedTests(runSassEmbedded);
+}
diff --git a/test/embedded/node/length_delimited_test.dart b/test/embedded/node/length_delimited_test.dart
@@ -0,0 +1,17 @@
+// Copyright 2024 Google LLC. Use of this source code is governed by an
+// MIT-style license that can be found in the LICENSE file or at
+// https://opensource.org/licenses/MIT.
+
+@TestOn('vm')
+@Tags(['node'])
+library;
+
+import 'package:test/test.dart';
+
+import '../shared/length_delimited.dart';
+import '../node_test.dart';
+
+void main() {
+  setUpAll(ensureSnapshotUpToDate);
+  sharedTests();
+}
diff --git a/test/embedded/node/protocol_test.dart b/test/embedded/node/protocol_test.dart
@@ -0,0 +1,17 @@
+// Copyright 2024 Google LLC. Use of this source code is governed by an
+// MIT-style license that can be found in the LICENSE file or at
+// https://opensource.org/licenses/MIT.
+
+@TestOn('vm')
+@Tags(['node'])
+library;
+
+import 'package:test/test.dart';
+
+import '../shared/protocol.dart';
+import '../node_test.dart';
+
+void main() {
+  setUpAll(ensureSnapshotUpToDate);
+  sharedTests(runSassEmbedded);
+}
diff --git a/test/embedded/node_test.dart b/test/embedded/node_test.dart
@@ -0,0 +1,24 @@
+// Copyright 2024 Google LLC. Use of this source code is governed by an
+// MIT-style license that can be found in the LICENSE file or at
+// https://opensource.org/licenses/MIT.
+
+@TestOn('vm')
+@Tags(['node'])
+library;
+
+import 'package:cli_pkg/testing.dart' as pkg;
+import 'package:test/test.dart';
+
+import '../ensure_npm_package.dart';
+import 'shared/embedded_process.dart';
+
+void main() {}
+
+/// Ensures that the snapshot of the npm package used by [runSassEmbedded] is
+/// up-to-date, if one has been generated.
+void ensureSnapshotUpToDate() => ensureNpmPackage;
+
+Future<EmbeddedProcess> runSassEmbedded(
+        [Iterable<String> args = const Iterable.empty()]) =>
+    EmbeddedProcess.start(pkg.executableRunner("sass", node: true),
+        [...pkg.executableArgs("sass", node: true), "--embedded", ...args]);
diff --git a/test/embedded/shared/embedded_process.dart b/test/embedded/shared/embedded_process.dart
@@ -2,15 +2,11 @@
 // MIT-style license that can be found in the LICENSE file or at
 // https://opensource.org/licenses/MIT.
 
-@TestOn('vm')
-library;
-
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
 import 'package:async/async.dart';
-import 'package:cli_pkg/testing.dart' as pkg;
 import 'package:test/test.dart';
 
 import 'package:sass/src/embedded/embedded_sass.pb.dart';
@@ -85,14 +81,13 @@ class EmbeddedProcess {
   /// If [forwardOutput] is `true`, the process's [outbound] messages and
   /// [stderr] will be printed to the console as they appear. This is only
   /// intended to be set temporarily to help when debugging test failures.
-  static Future<EmbeddedProcess> start(
+  static Future<EmbeddedProcess> start(String command, List<String> args,
       {String? workingDirectory,
       Map<String, String>? environment,
       bool includeParentEnvironment = true,
       bool runInShell = false,
       bool forwardOutput = false}) async {
-    var process = await Process.start(pkg.executableRunner("sass"),
-        [...pkg.executableArgs("sass"), "--embedded"],
+    var process = await Process.start(command, args,
         workingDirectory: workingDirectory,
         environment: environment,
         includeParentEnvironment: includeParentEnvironment,
diff --git a/test/embedded/shared/file_importer.dart b/test/embedded/shared/file_importer.dart
@@ -2,9 +2,6 @@
 // MIT-style license that can be found in the LICENSE file or at
 // https://opensource.org/licenses/MIT.
 
-@TestOn('vm')
-library;
-
 import 'package:path/path.dart' as p;
 import 'package:test/test.dart';
 import 'package:test_descriptor/test_descriptor.dart' as d;
@@ -15,10 +12,10 @@ import 'package:sass/src/embedded/utils.dart';
 import 'embedded_process.dart';
 import 'utils.dart';
 
-void main() {
+void sharedTests(Future<EmbeddedProcess> runSassEmbedded()) {
   late EmbeddedProcess process;
   setUp(() async {
-    process = await EmbeddedProcess.start();
+    process = await runSassEmbedded();
   });
 
   group("emits a protocol error", () {
diff --git a/test/embedded/shared/function.dart b/test/embedded/shared/function.dart
@@ -2,9 +2,6 @@
 // MIT-style license that can be found in the LICENSE file or at
 // https://opensource.org/licenses/MIT.
 
-@TestOn('vm')
-library;
-
 import 'package:test/test.dart';
 
 import 'package:sass/src/embedded/embedded_sass.pb.dart';
@@ -19,9 +16,9 @@ final _null = Value()..singleton = SingletonValue.NULL;
 
 late EmbeddedProcess _process;
 
-void main() {
+void sharedTests(Future<EmbeddedProcess> runSassEmbedded()) async {
   setUp(() async {
-    _process = await EmbeddedProcess.start();
+    _process = await runSassEmbedded();
   });
 
   group("emits a compile failure for a custom function with a signature", () {
diff --git a/test/embedded/shared/importer.dart b/test/embedded/shared/importer.dart
@@ -2,9 +2,6 @@
 // MIT-style license that can be found in the LICENSE file or at
 // https://opensource.org/licenses/MIT.
 
-@TestOn('vm')
-library;
-
 import 'package:source_maps/source_maps.dart' as source_maps;
 import 'package:test/test.dart';
 import 'package:test_descriptor/test_descriptor.dart' as d;
@@ -15,10 +12,10 @@ import 'package:sass/src/embedded/utils.dart';
 import 'embedded_process.dart';
 import 'utils.dart';
 
-void main() {
+void sharedTests(Future<EmbeddedProcess> runSassEmbedded()) {
   late EmbeddedProcess process;
   setUp(() async {
-    process = await EmbeddedProcess.start();
+    process = await runSassEmbedded();
   });
 
   group("emits a protocol error", () {
diff --git a/test/embedded/shared/length_delimited.dart b/test/embedded/shared/length_delimited.dart
@@ -2,9 +2,6 @@
 // MIT-style license that can be found in the LICENSE file or at
 // https://opensource.org/licenses/MIT.
 
-@TestOn('vm')
-library;
-
 import 'dart:async';
 import 'dart:typed_data';
 
@@ -13,7 +10,7 @@ import 'package:sass/src/embedded/util/length_delimited_transformer.dart';
 import 'package:async/async.dart';
 import 'package:test/test.dart';
 
-void main() {
+void sharedTests() {
   group("encoder", () {
     late Sink<List<int>> sink;
     late Stream<List<int>> stream;
diff --git a/test/embedded/shared/protocol.dart b/test/embedded/shared/protocol.dart
@@ -2,9 +2,6 @@
 // MIT-style license that can be found in the LICENSE file or at
 // https://opensource.org/licenses/MIT.
 
-@TestOn('vm')
-library;
-
 import 'package:path/path.dart' as p;
 import 'package:pub_semver/pub_semver.dart';
 import 'package:source_maps/source_maps.dart' as source_maps;
@@ -17,10 +14,10 @@ import 'package:sass/src/embedded/utils.dart';
 import 'embedded_process.dart';
 import 'utils.dart';
 
-void main() {
+void sharedTests(Future<EmbeddedProcess> runSassEmbedded()) {
   late EmbeddedProcess process;
   setUp(() async {
-    process = await EmbeddedProcess.start();
+    process = await runSassEmbedded();
   });
 
   group("exits upon protocol error", () {
@@ -454,8 +451,15 @@ void main() {
             (InboundMessage_CompileRequest()..path = d.path("test.scss")));
 
       var failure = await getCompileFailure(process);
-      expect(failure.message, startsWith("Cannot open file: "));
-      expect(failure.message.replaceFirst("Cannot open file: ", "").trim(),
+      expect(
+          failure.message,
+          anyOf(startsWith("Cannot open file: "),
+              startsWith("no such file or directory: ")));
+      expect(
+          failure.message
+              .replaceFirst("Cannot open file: ", "")
+              .replaceFirst("no such file or directory: ", "")
+              .trim(),
           equalsPath(d.path('test.scss')));
       expect(failure.span.text, equals(''));
       expect(failure.span.context, equals(''));
diff --git a/test/embedded/shared/utils.dart b/test/embedded/shared/utils.dart
