Refactor TestContext constructor for clarity (#1844)

Author: elliette

dwds/test/build_daemon_breakpoint_test.dart

@@ -8,18 +8,18 @@ import 'dart:async';
 
 import 'package:dwds/src/connections/debug_connection.dart';
 import 'package:dwds/src/services/chrome_proxy_service.dart';
-import 'package:path/path.dart' as p;
 import 'package:test/test.dart';
 import 'package:vm_service/vm_service.dart';
 import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart';
 
 import 'fixtures/context.dart';
 
-final context = TestContext(
-    directory: p.join('..', 'fixtures', '_testPackageSound'),
-    entry: p.join('..', 'fixtures', '_testPackageSound', 'web', 'main.dart'),
-    path: 'index.html',
-    pathToServe: 'web');
+final context = TestContext.withSoundNullSafety(
+  packageName: '_testPackageSound',
+  webAssetsPath: 'web',
+  dartEntryFileName: 'main.dart',
+  htmlEntryFileName: 'index.html',
+);
 
 ChromeProxyService get service =>
     fetchChromeProxyService(context.debugConnection);

dwds/test/build_daemon_callstack_test.dart

@@ -8,7 +8,6 @@ import 'dart:async';
 
 import 'package:dwds/src/connections/debug_connection.dart';
 import 'package:dwds/src/services/chrome_proxy_service.dart';
-import 'package:path/path.dart' as p;
 import 'package:test/test.dart';
 import 'package:vm_service/vm_service.dart';
 import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart';
@@ -18,20 +17,18 @@ import 'fixtures/logging.dart';
 import 'utils/version_compatibility.dart';
 
 class TestSetup {
-  static final contextUnsound = TestContext(
-    directory: p.join('..', 'fixtures', '_testPackage'),
-    entry: p.join('..', 'fixtures', '_testPackage', 'web', 'main.dart'),
-    path: 'index.html',
-    pathToServe: 'web',
-    nullSafety: NullSafety.weak,
+  static final contextUnsound = TestContext.withWeakNullSafety(
+    packageName: '_testPackage',
+    webAssetsPath: 'web',
+    dartEntryFileName: 'main.dart',
+    htmlEntryFileName: 'index.html',
   );
 
-  static final contextSound = TestContext(
-    directory: p.join('..', 'fixtures', '_testPackageSound'),
-    entry: p.join('..', 'fixtures', '_testPackageSound', 'web', 'main.dart'),
-    path: 'index.html',
-    pathToServe: 'web',
-    nullSafety: NullSafety.sound,
+  static final contextSound = TestContext.withSoundNullSafety(
+    packageName: '_testPackageSound',
+    webAssetsPath: 'web',
+    dartEntryFileName: 'main.dart',
+    htmlEntryFileName: 'index.html',
   );
 
   TestContext context;

dwds/test/chrome_proxy_service_test.dart

@@ -21,7 +21,7 @@ import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart';
 import 'fixtures/context.dart';
 import 'fixtures/logging.dart';
 
-final context = TestContext();
+final context = TestContext.withSoundNullSafety();
 
 ChromeProxyService get service =>
     fetchChromeProxyService(context.debugConnection);

dwds/test/dart_uri_file_uri_test.dart

@@ -13,21 +13,19 @@ import 'fixtures/context.dart';
 import 'fixtures/utilities.dart';
 import 'utils/version_compatibility.dart';
 
-final context = TestContext(
-  directory: p.join('..', 'fixtures', '_testPackage'),
-  entry: p.join('..', 'fixtures', '_testPackage', 'web', 'main.dart'),
-  path: 'index.html',
-  pathToServe: 'web',
-  nullSafety: NullSafety.weak,
+final context = TestContext.withWeakNullSafety(
+  packageName: '_testPackage',
+  webAssetsPath: 'web',
+  dartEntryFileName: 'main.dart',
+  htmlEntryFileName: 'index.html',
 );
 
 /// The directory for the general _test package.
-final testDir = absolutePath(pathFromDwds: p.join('..', 'fixtures', '_test'));
+final testDir = absolutePath(pathFromFixtures: p.join('_test'));
 
 /// The directory for the _testPackage package (contained within dwds), which
 /// imports _test.
-final testPackageDir =
-    absolutePath(pathFromDwds: p.join('..', 'fixtures', '_testPackage'));
+final testPackageDir = absolutePath(pathFromFixtures: p.join('_testPackage'));
 
 // This tests converting file Uris into our internal paths.
 //

dwds/test/debug_extension_test.dart

@@ -29,7 +29,7 @@ import 'fixtures/utilities.dart';
 // Remove the key before pushing code to GitHub.
 // See go/extension-identification.
 
-final context = TestContext();
+final context = TestContext.withSoundNullSafety();
 
 void main() async {
   Future<void> waitForDartDevToolsWithRetry({
@@ -203,7 +203,7 @@ void main() async {
   }
 
   group('With encoding', () {
-    final context = TestContext();
+    final context = TestContext.withSoundNullSafety();
     setUp(() async {
       await context.setUp(
           enableDebugExtension: true,
@@ -224,7 +224,7 @@ void main() async {
   });
 
   group('With "any" hostname', () {
-    final context = TestContext();
+    final context = TestContext.withSoundNullSafety();
     final uriPattern = RegExp(r'dartExtensionUri = "([^"]+)";');
 
     setUp(() async {

dwds/test/debug_service_test.dart

@@ -12,7 +12,7 @@ import 'package:test/test.dart';
 
 import 'fixtures/context.dart';
 
-final context = TestContext();
+final context = TestContext.withSoundNullSafety();
 
 void main() {
   setUpAll(() async {

dwds/test/debugger_test.dart

@@ -22,7 +22,7 @@ import 'fixtures/context.dart';
 import 'fixtures/debugger_data.dart';
 import 'fixtures/fakes.dart';
 
-final context = TestContext();
+final context = TestContext.withSoundNullSafety();
 late AppInspector inspector;
 late Debugger debugger;
 late FakeWebkitDebugger webkitDebugger;

dwds/test/devtools_test.dart

@@ -13,9 +13,7 @@ import 'package:webdriver/io.dart';
 
 import 'fixtures/context.dart';
 
-final context = TestContext(
-  path: 'append_body/index.html',
-);
+final context = TestContext.withSoundNullSafety();
 
 Future<void> _waitForPageReady(TestContext context) async {
   var attempt = 100;

dwds/test/evaluate_circular_common.dart

@@ -8,7 +8,6 @@ import 'dart:async';
 
 import 'package:dwds/src/connections/debug_connection.dart';
 import 'package:dwds/src/services/chrome_proxy_service.dart';
-import 'package:path/path.dart' as p;
 import 'package:test/test.dart';
 import 'package:vm_service/vm_service.dart';
 import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart';
@@ -17,21 +16,21 @@ import 'fixtures/context.dart';
 import 'fixtures/logging.dart';
 
 class TestSetup {
-  static TestContext createContext(
-          String index, String packageRoot, NullSafety nullSafety) =>
-      TestContext(
-        directory: p.join('..', 'fixtures', packageRoot),
-        entry: p.join('..', 'fixtures', packageRoot, 'web', 'main.dart'),
-        path: index,
-        pathToServe: 'web',
-        nullSafety: nullSafety,
-      );
-
   static TestContext contextUnsound(String index) =>
-      createContext(index, '_testCircular2', NullSafety.weak);
+      TestContext.withWeakNullSafety(
+        packageName: '_testCircular2',
+        webAssetsPath: 'web',
+        dartEntryFileName: 'main.dart',
+        htmlEntryFileName: index,
+      );
 
   static TestContext contextSound(String index) =>
-      createContext(index, '_testCircular2Sound', NullSafety.sound);
+      TestContext.withSoundNullSafety(
+        packageName: '_testCircular2Sound',
+        webAssetsPath: 'web',
+        dartEntryFileName: 'main.dart',
+        htmlEntryFileName: index,
+      );
 
   TestContext context;
 

dwds/test/evaluate_common.dart

@@ -8,7 +8,6 @@ import 'dart:async';
 
 import 'package:dwds/src/connections/debug_connection.dart';
 import 'package:dwds/src/services/chrome_proxy_service.dart';
-import 'package:path/path.dart' as p;
 import 'package:test/test.dart';
 import 'package:vm_service/vm_service.dart';
 import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart';
@@ -17,20 +16,21 @@ import 'fixtures/context.dart';
 import 'fixtures/logging.dart';
 
 class TestSetup {
-  static TestContext createContext(
-          String index, String packageRoot, NullSafety nullSafety) =>
-      TestContext(
-          directory: p.join('..', 'fixtures', packageRoot),
-          entry: p.join('..', 'fixtures', packageRoot, 'web', 'main.dart'),
-          path: index,
-          pathToServe: 'web',
-          nullSafety: nullSafety);
-
   static TestContext contextUnsound(String index) =>
-      createContext(index, '_testPackage', NullSafety.weak);
+      TestContext.withWeakNullSafety(
+        packageName: '_testPackage',
+        webAssetsPath: 'web',
+        dartEntryFileName: 'main.dart',
+        htmlEntryFileName: index,
+      );
 
   static TestContext contextSound(String index) =>
-      createContext(index, '_testPackageSound', NullSafety.sound);
+      TestContext.withSoundNullSafety(
+        packageName: '_testPackageSound',
+        webAssetsPath: 'web',
+        dartEntryFileName: 'main.dart',
+        htmlEntryFileName: index,
+      );
 
   TestContext context;