Prepare test_common/ and fixtures/ for migration (#2797)
* prepare test_common for migration
* applied dart format
* created .dartignore
* updated webdev version
* regenerated the mono_repo configuration
* fix format errors in fixtures/
* created analysis_option for fixtures/
* removed debug print
* updated path to fixtures folder
* fixed path resolution to fixtures
* fix path resolution in webdev/test/tls_test.dart
* renamed test_common to dwds_test_common and updated usages
* applied dart for;5Dmat
* addressed comments
diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
index 6438533..bd8fc15 100644
--- a/.github/workflows/dart.yml
+++ b/.github/workflows/dart.yml
@@ -1,4 +1,4 @@
-# Created with package:mono_repo v6.6.2
+# Created with package:mono_repo v6.6.3
name: Dart CI
on:
push:
@@ -37,7 +37,7 @@
name: Checkout repository
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
- name: mono_repo self validate
- run: dart pub global activate mono_repo 6.6.2
+ run: dart pub global activate mono_repo 6.6.3
- name: mono_repo self validate
run: dart pub global run mono_repo generate --validate
job_002:
@@ -79,16 +79,16 @@
if: "always() && steps.dwds_pub_upgrade.conclusion == 'success'"
working-directory: dwds
job_003:
- name: "analyzer_and_format; linux; Dart dev; PKGS: example, fixtures/_webdev_smoke, frontend_server_client, frontend_server_common, test_common; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`"
+ name: "analyzer_and_format; linux; Dart dev; PKGS: dwds_test_common, dwds_test_common/fixtures/_webdev_smoke, example, frontend_server_client, frontend_server_common; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`"
runs-on: ubuntu-latest
steps:
- name: Cache Pub hosted dependencies
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306
with:
path: "~/.pub-cache/hosted"
- key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:example-fixtures/_webdev_smoke-frontend_server_client-frontend_server_common-test_common;commands:format-analyze_0"
+ key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:dwds_test_common-dwds_test_common/fixtures/_webdev_smoke-example-frontend_server_client-frontend_server_common;commands:format-analyze_0"
restore-keys: |
- os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:example-fixtures/_webdev_smoke-frontend_server_client-frontend_server_common-test_common
+ os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:dwds_test_common-dwds_test_common/fixtures/_webdev_smoke-example-frontend_server_client-frontend_server_common
os:ubuntu-latest;pub-cache-hosted;sdk:dev
os:ubuntu-latest;pub-cache-hosted
os:ubuntu-latest
@@ -99,6 +99,32 @@
- id: checkout
name: Checkout repository
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
+ - id: dwds_test_common_pub_upgrade
+ name: dwds_test_common; dart pub upgrade
+ run: dart pub upgrade
+ if: "always() && steps.checkout.conclusion == 'success'"
+ working-directory: dwds_test_common
+ - name: "dwds_test_common; dart format --output=none --set-exit-if-changed ."
+ run: "dart format --output=none --set-exit-if-changed ."
+ if: "always() && steps.dwds_test_common_pub_upgrade.conclusion == 'success'"
+ working-directory: dwds_test_common
+ - name: "dwds_test_common; dart analyze --fatal-infos ."
+ run: dart analyze --fatal-infos .
+ if: "always() && steps.dwds_test_common_pub_upgrade.conclusion == 'success'"
+ working-directory: dwds_test_common
+ - id: dwds_test_common_fixtures__webdev_smoke_pub_upgrade
+ name: dwds_test_common/fixtures/_webdev_smoke; dart pub upgrade
+ run: dart pub upgrade
+ if: "always() && steps.checkout.conclusion == 'success'"
+ working-directory: dwds_test_common/fixtures/_webdev_smoke
+ - name: "dwds_test_common/fixtures/_webdev_smoke; dart format --output=none --set-exit-if-changed ."
+ run: "dart format --output=none --set-exit-if-changed ."
+ if: "always() && steps.dwds_test_common_fixtures__webdev_smoke_pub_upgrade.conclusion == 'success'"
+ working-directory: dwds_test_common/fixtures/_webdev_smoke
+ - name: "dwds_test_common/fixtures/_webdev_smoke; dart analyze --fatal-infos ."
+ run: dart analyze --fatal-infos .
+ if: "always() && steps.dwds_test_common_fixtures__webdev_smoke_pub_upgrade.conclusion == 'success'"
+ working-directory: dwds_test_common/fixtures/_webdev_smoke
- id: example_pub_upgrade
name: example; dart pub upgrade
run: dart pub upgrade
@@ -112,19 +138,6 @@
run: dart analyze --fatal-infos .
if: "always() && steps.example_pub_upgrade.conclusion == 'success'"
working-directory: example
- - id: fixtures__webdev_smoke_pub_upgrade
- name: fixtures/_webdev_smoke; dart pub upgrade
- run: dart pub upgrade
- if: "always() && steps.checkout.conclusion == 'success'"
- working-directory: fixtures/_webdev_smoke
- - name: "fixtures/_webdev_smoke; dart format --output=none --set-exit-if-changed ."
- run: "dart format --output=none --set-exit-if-changed ."
- if: "always() && steps.fixtures__webdev_smoke_pub_upgrade.conclusion == 'success'"
- working-directory: fixtures/_webdev_smoke
- - name: "fixtures/_webdev_smoke; dart analyze --fatal-infos ."
- run: dart analyze --fatal-infos .
- if: "always() && steps.fixtures__webdev_smoke_pub_upgrade.conclusion == 'success'"
- working-directory: fixtures/_webdev_smoke
- id: frontend_server_client_pub_upgrade
name: frontend_server_client; dart pub upgrade
run: dart pub upgrade
@@ -151,19 +164,6 @@
run: dart analyze --fatal-infos .
if: "always() && steps.frontend_server_common_pub_upgrade.conclusion == 'success'"
working-directory: frontend_server_common
- - id: test_common_pub_upgrade
- name: test_common; dart pub upgrade
- run: dart pub upgrade
- if: "always() && steps.checkout.conclusion == 'success'"
- working-directory: test_common
- - name: "test_common; dart format --output=none --set-exit-if-changed ."
- run: "dart format --output=none --set-exit-if-changed ."
- if: "always() && steps.test_common_pub_upgrade.conclusion == 'success'"
- working-directory: test_common
- - name: "test_common; dart analyze --fatal-infos ."
- run: dart analyze --fatal-infos .
- if: "always() && steps.test_common_pub_upgrade.conclusion == 'success'"
- working-directory: test_common
job_004:
name: "analyzer_and_format; linux; Dart dev; PKG: webdev; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`, `dart test test/build/ensure_build_test.dart`"
runs-on: ubuntu-latest
@@ -347,6 +347,45 @@
- job_003
- job_004
job_009:
+ name: "unit_test; linux; Dart dev; PKG: dwds_test_common; `Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &`, `dart test --exclude-tags=release`"
+ runs-on: ubuntu-latest
+ steps:
+ - name: Cache Pub hosted dependencies
+ uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306
+ with:
+ path: "~/.pub-cache/hosted"
+ key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:dwds_test_common;commands:command-test_6"
+ restore-keys: |
+ os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:dwds_test_common
+ os:ubuntu-latest;pub-cache-hosted;sdk:dev
+ os:ubuntu-latest;pub-cache-hosted
+ os:ubuntu-latest
+ - name: Setup Dart SDK
+ uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
+ with:
+ sdk: dev
+ - id: checkout
+ name: Checkout repository
+ uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
+ - id: dwds_test_common_pub_upgrade
+ name: dwds_test_common; dart pub upgrade
+ run: dart pub upgrade
+ if: "always() && steps.checkout.conclusion == 'success'"
+ working-directory: dwds_test_common
+ - name: "dwds_test_common; Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &"
+ run: "Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &"
+ if: "always() && steps.dwds_test_common_pub_upgrade.conclusion == 'success'"
+ working-directory: dwds_test_common
+ - name: "dwds_test_common; dart test --exclude-tags=release"
+ run: "dart test --exclude-tags=release"
+ if: "always() && steps.dwds_test_common_pub_upgrade.conclusion == 'success'"
+ working-directory: dwds_test_common
+ needs:
+ - job_001
+ - job_002
+ - job_003
+ - job_004
+ job_010:
name: "unit_test; linux; Dart dev; PKG: frontend_server_client; `dart test -j 1`"
runs-on: ubuntu-latest
steps:
@@ -381,45 +420,6 @@
- job_002
- job_003
- job_004
- job_010:
- name: "unit_test; linux; Dart dev; PKG: test_common; `Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &`, `dart test --exclude-tags=release`"
- runs-on: ubuntu-latest
- steps:
- - name: Cache Pub hosted dependencies
- uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306
- with:
- path: "~/.pub-cache/hosted"
- key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:test_common;commands:command-test_6"
- restore-keys: |
- os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:test_common
- os:ubuntu-latest;pub-cache-hosted;sdk:dev
- os:ubuntu-latest;pub-cache-hosted
- os:ubuntu-latest
- - name: Setup Dart SDK
- uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
- with:
- sdk: dev
- - id: checkout
- name: Checkout repository
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
- - id: test_common_pub_upgrade
- name: test_common; dart pub upgrade
- run: dart pub upgrade
- if: "always() && steps.checkout.conclusion == 'success'"
- working-directory: test_common
- - name: "test_common; Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &"
- run: "Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &"
- if: "always() && steps.test_common_pub_upgrade.conclusion == 'success'"
- working-directory: test_common
- - name: "test_common; dart test --exclude-tags=release"
- run: "dart test --exclude-tags=release"
- if: "always() && steps.test_common_pub_upgrade.conclusion == 'success'"
- working-directory: test_common
- needs:
- - job_001
- - job_002
- - job_003
- - job_004
job_011:
name: "unit_test; linux; Dart dev; PKG: webdev; `Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &`, `dart test -j 1`"
runs-on: ubuntu-latest
@@ -604,6 +604,45 @@
- job_003
- job_004
job_016:
+ name: "unit_test; linux; Dart main; PKG: dwds_test_common; `Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &`, `dart test --exclude-tags=release`"
+ runs-on: ubuntu-latest
+ steps:
+ - name: Cache Pub hosted dependencies
+ uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306
+ with:
+ path: "~/.pub-cache/hosted"
+ key: "os:ubuntu-latest;pub-cache-hosted;sdk:main;packages:dwds_test_common;commands:command-test_6"
+ restore-keys: |
+ os:ubuntu-latest;pub-cache-hosted;sdk:main;packages:dwds_test_common
+ os:ubuntu-latest;pub-cache-hosted;sdk:main
+ os:ubuntu-latest;pub-cache-hosted
+ os:ubuntu-latest
+ - name: Setup Dart SDK
+ uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
+ with:
+ sdk: main
+ - id: checkout
+ name: Checkout repository
+ uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
+ - id: dwds_test_common_pub_upgrade
+ name: dwds_test_common; dart pub upgrade
+ run: dart pub upgrade
+ if: "always() && steps.checkout.conclusion == 'success'"
+ working-directory: dwds_test_common
+ - name: "dwds_test_common; Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &"
+ run: "Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &"
+ if: "always() && steps.dwds_test_common_pub_upgrade.conclusion == 'success'"
+ working-directory: dwds_test_common
+ - name: "dwds_test_common; dart test --exclude-tags=release"
+ run: "dart test --exclude-tags=release"
+ if: "always() && steps.dwds_test_common_pub_upgrade.conclusion == 'success'"
+ working-directory: dwds_test_common
+ needs:
+ - job_001
+ - job_002
+ - job_003
+ - job_004
+ job_017:
name: "unit_test; linux; Dart main; PKG: frontend_server_client; `dart test -j 1`"
runs-on: ubuntu-latest
steps:
@@ -638,45 +677,6 @@
- job_002
- job_003
- job_004
- job_017:
- name: "unit_test; linux; Dart main; PKG: test_common; `Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &`, `dart test --exclude-tags=release`"
- runs-on: ubuntu-latest
- steps:
- - name: Cache Pub hosted dependencies
- uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306
- with:
- path: "~/.pub-cache/hosted"
- key: "os:ubuntu-latest;pub-cache-hosted;sdk:main;packages:test_common;commands:command-test_6"
- restore-keys: |
- os:ubuntu-latest;pub-cache-hosted;sdk:main;packages:test_common
- os:ubuntu-latest;pub-cache-hosted;sdk:main
- os:ubuntu-latest;pub-cache-hosted
- os:ubuntu-latest
- - name: Setup Dart SDK
- uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
- with:
- sdk: main
- - id: checkout
- name: Checkout repository
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
- - id: test_common_pub_upgrade
- name: test_common; dart pub upgrade
- run: dart pub upgrade
- if: "always() && steps.checkout.conclusion == 'success'"
- working-directory: test_common
- - name: "test_common; Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &"
- run: "Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &"
- if: "always() && steps.test_common_pub_upgrade.conclusion == 'success'"
- working-directory: test_common
- - name: "test_common; dart test --exclude-tags=release"
- run: "dart test --exclude-tags=release"
- if: "always() && steps.test_common_pub_upgrade.conclusion == 'success'"
- working-directory: test_common
- needs:
- - job_001
- - job_002
- - job_003
- - job_004
job_018:
name: "unit_test; linux; Dart main; PKG: webdev; `Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &`, `dart test -j 1`"
runs-on: ubuntu-latest
@@ -817,6 +817,31 @@
- job_003
- job_004
job_023:
+ name: "unit_test; windows; Dart dev; PKG: dwds_test_common; `dart test --exclude-tags=release`"
+ runs-on: windows-latest
+ steps:
+ - name: Setup Dart SDK
+ uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
+ with:
+ sdk: dev
+ - id: checkout
+ name: Checkout repository
+ uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
+ - id: dwds_test_common_pub_upgrade
+ name: dwds_test_common; dart pub upgrade
+ run: dart pub upgrade
+ if: "always() && steps.checkout.conclusion == 'success'"
+ working-directory: dwds_test_common
+ - name: "dwds_test_common; dart test --exclude-tags=release"
+ run: "dart test --exclude-tags=release"
+ if: "always() && steps.dwds_test_common_pub_upgrade.conclusion == 'success'"
+ working-directory: dwds_test_common
+ needs:
+ - job_001
+ - job_002
+ - job_003
+ - job_004
+ job_024:
name: "unit_test; windows; Dart dev; PKG: frontend_server_client; `dart test -j 1`"
runs-on: windows-latest
steps:
@@ -841,7 +866,7 @@
- job_002
- job_003
- job_004
- job_024:
+ job_025:
name: "unit_test; windows; Dart dev; PKG: webdev; `dart test -j 1`"
runs-on: windows-latest
steps:
@@ -866,31 +891,6 @@
- job_002
- job_003
- job_004
- job_025:
- name: "unit_test; windows; Dart dev; PKG: test_common; `dart test --exclude-tags=release`"
- runs-on: windows-latest
- steps:
- - name: Setup Dart SDK
- uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
- with:
- sdk: dev
- - id: checkout
- name: Checkout repository
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
- - id: test_common_pub_upgrade
- name: test_common; dart pub upgrade
- run: dart pub upgrade
- if: "always() && steps.checkout.conclusion == 'success'"
- working-directory: test_common
- - name: "test_common; dart test --exclude-tags=release"
- run: "dart test --exclude-tags=release"
- if: "always() && steps.test_common_pub_upgrade.conclusion == 'success'"
- working-directory: test_common
- needs:
- - job_001
- - job_002
- - job_003
- - job_004
job_026:
name: "unit_test; windows; Dart main; PKG: dwds; `dart test --tags=extension`"
runs-on: windows-latest
@@ -992,6 +992,31 @@
- job_003
- job_004
job_030:
+ name: "unit_test; windows; Dart main; PKG: dwds_test_common; `dart test --exclude-tags=release`"
+ runs-on: windows-latest
+ steps:
+ - name: Setup Dart SDK
+ uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
+ with:
+ sdk: main
+ - id: checkout
+ name: Checkout repository
+ uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
+ - id: dwds_test_common_pub_upgrade
+ name: dwds_test_common; dart pub upgrade
+ run: dart pub upgrade
+ if: "always() && steps.checkout.conclusion == 'success'"
+ working-directory: dwds_test_common
+ - name: "dwds_test_common; dart test --exclude-tags=release"
+ run: "dart test --exclude-tags=release"
+ if: "always() && steps.dwds_test_common_pub_upgrade.conclusion == 'success'"
+ working-directory: dwds_test_common
+ needs:
+ - job_001
+ - job_002
+ - job_003
+ - job_004
+ job_031:
name: "unit_test; windows; Dart main; PKG: frontend_server_client; `dart test -j 1`"
runs-on: windows-latest
steps:
@@ -1016,7 +1041,7 @@
- job_002
- job_003
- job_004
- job_031:
+ job_032:
name: "unit_test; windows; Dart main; PKG: webdev; `dart test -j 1`"
runs-on: windows-latest
steps:
@@ -1041,31 +1066,6 @@
- job_002
- job_003
- job_004
- job_032:
- name: "unit_test; windows; Dart main; PKG: test_common; `dart test --exclude-tags=release`"
- runs-on: windows-latest
- steps:
- - name: Setup Dart SDK
- uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
- with:
- sdk: main
- - id: checkout
- name: Checkout repository
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
- - id: test_common_pub_upgrade
- name: test_common; dart pub upgrade
- run: dart pub upgrade
- if: "always() && steps.checkout.conclusion == 'success'"
- working-directory: test_common
- - name: "test_common; dart test --exclude-tags=release"
- run: "dart test --exclude-tags=release"
- if: "always() && steps.test_common_pub_upgrade.conclusion == 'success'"
- working-directory: test_common
- needs:
- - job_001
- - job_002
- - job_003
- - job_004
job_033:
name: "beta_cron; linux; Dart beta; PKG: dwds; `Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &`, `dart test -j 1`"
runs-on: ubuntu-latest
diff --git a/.github/workflows/release_reminder.yml b/.github/workflows/release_reminder.yml
index a498408..e4b0ead 100644
--- a/.github/workflows/release_reminder.yml
+++ b/.github/workflows/release_reminder.yml
@@ -21,4 +21,4 @@
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
- name: Run proper release test
run: dart test test/proper_release_test.dart
- working-directory: test_common
+ working-directory: dwds_test_common
diff --git a/debug_extension/test/debug_extension_test.dart b/debug_extension/test/debug_extension_test.dart
index 0a98759..499bd48 100644
--- a/debug_extension/test/debug_extension_test.dart
+++ b/debug_extension/test/debug_extension_test.dart
@@ -16,7 +16,7 @@
import 'package:dwds/src/handlers/injector.dart';
import 'package:http/http.dart' as http;
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
// ignore: deprecated_member_use
import 'package:webdriver/io.dart';
diff --git a/debug_extension/test/puppeteer/extension_common.dart b/debug_extension/test/puppeteer/extension_common.dart
index 155f78a..e9b077c 100644
--- a/debug_extension/test/puppeteer/extension_common.dart
+++ b/debug_extension/test/puppeteer/extension_common.dart
@@ -16,8 +16,8 @@
import 'package:shelf/shelf.dart';
import 'package:shelf_static/shelf_static.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
-import 'package:test_common/utilities.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
+import 'package:dwds_test_common/utilities.dart';
import '../fixtures/context.dart';
import '../fixtures/project.dart';
diff --git a/debug_extension/test/puppeteer/test_utils.dart b/debug_extension/test/puppeteer/test_utils.dart
index a1769eb..e001cbc 100644
--- a/debug_extension/test/puppeteer/test_utils.dart
+++ b/debug_extension/test/puppeteer/test_utils.dart
@@ -7,7 +7,7 @@
import 'package:path/path.dart' as p;
import 'package:puppeteer/puppeteer.dart';
import 'package:test/test.dart';
-import 'package:test_common/utilities.dart';
+import 'package:dwds_test_common/utilities.dart';
import '../fixtures/context.dart';
import '../fixtures/utilities.dart';
diff --git a/dwds/lib/src/injected/client.js b/dwds/lib/src/injected/client.js
index fedcf08..b087dec 100644
--- a/dwds/lib/src/injected/client.js
+++ b/dwds/lib/src/injected/client.js
@@ -1,4 +1,4 @@
-// Generated by dart2js (, csp, intern-composite-values), the Dart to JavaScript compiler version: 3.11.0.
+// Generated by dart2js (, csp, intern-composite-values), the Dart to JavaScript compiler version: 3.12.0-229.0.dev.
// The code supports the following hooks:
// dartPrint(message):
// if this function is defined it is called instead of the Dart [print]
@@ -4439,14 +4439,14 @@
_rootPrint($self, $parent, zone, line) {
A.printString(A._asString(line));
},
- _printToZone(line) {
+ _printToZone0(line) {
$.Zone__current.print$1(line);
},
_rootFork($self, $parent, zone, specification, zoneValues) {
var valueMap, t1, handleUncaughtError;
type$.nullable_ZoneSpecification._as(specification);
type$.nullable_Map_of_nullable_Object_and_nullable_Object._as(zoneValues);
- $.printToZone = A.async___printToZone$closure();
+ $._printToZone = A.async___printToZone$closure();
valueMap = zone.get$_map();
t1 = new A._CustomZone(zone.get$_run(), zone.get$_runUnary(), zone.get$_runBinary(), zone.get$_registerCallback(), zone.get$_registerUnaryCallback(), zone.get$_registerBinaryCallback(), zone.get$_errorCallback(), zone.get$_scheduleMicrotask(), zone.get$_createTimer(), zone.get$_createPeriodicTimer(), zone.get$_print(), zone.get$_fork(), zone.get$_handleUncaughtError(), zone, valueMap);
handleUncaughtError = specification.handleUncaughtError;
@@ -5795,7 +5795,7 @@
return A.SystemHash_finish(hash);
},
print(object) {
- var toZone = $.printToZone;
+ var toZone = $._printToZone;
if (toZone == null)
A.printString(object);
else
@@ -7104,7 +7104,7 @@
return _call(f);
};
}(A._callDartFunctionFast0, f);
- result[$.$get$DART_CLOSURE_PROPERTY_NAME()] = f;
+ result[$.$get$DART_CLOSURE_DART_JSINTEROP_PROPERTY_NAME()] = f;
return result;
},
_functionToJS1(f) {
@@ -7116,7 +7116,7 @@
return _call(f, arg1, arguments.length);
};
}(A._callDartFunctionFast1, f);
- result[$.$get$DART_CLOSURE_PROPERTY_NAME()] = f;
+ result[$.$get$DART_CLOSURE_DART_JSINTEROP_PROPERTY_NAME()] = f;
return result;
},
_functionToJS2(f) {
@@ -7128,7 +7128,7 @@
return _call(f, arg1, arg2, arguments.length);
};
}(A._callDartFunctionFast2, f);
- result[$.$get$DART_CLOSURE_PROPERTY_NAME()] = f;
+ result[$.$get$DART_CLOSURE_DART_JSINTEROP_PROPERTY_NAME()] = f;
return result;
},
_callDartFunctionFast0(callback) {
@@ -9405,6 +9405,8 @@
toString$0(receiver) {
var dartClosure = receiver[$.$get$DART_CLOSURE_PROPERTY_NAME()];
if (dartClosure == null)
+ dartClosure = receiver[$.$get$DART_CLOSURE_DART_JSINTEROP_PROPERTY_NAME()];
+ if (dartClosure == null)
return this.super$LegacyJavaScriptObject$toString(receiver);
return "JavaScript function for " + J.toString$0$(dartClosure);
},
@@ -18456,7 +18458,7 @@
return _call(f, arg1, arg2, arg3, arguments.length);
};
}(A._callDartFunctionFast3, t2);
- result[$.$get$DART_CLOSURE_PROPERTY_NAME()] = t2;
+ result[$.$get$DART_CLOSURE_DART_JSINTEROP_PROPERTY_NAME()] = t2;
t1.forEach(result);
t1 = A._readBody(request, response);
t2 = A._asInt(response.status);
@@ -20405,7 +20407,7 @@
$signature: 1
};
A.SseClient_closure0.prototype = {
- call$1(_) {
+ call$1(__wc0_formal) {
var t1 = this.$this._errorTimer;
if (t1 != null)
t1.cancel$0();
@@ -21671,7 +21673,7 @@
A.throwExpression(A.LateError$fieldNI(t4));
if (!t6.containsKey$1(t5)) {
line = "Error during script reloading, refreshing the page. \nUnable to find an existing digest for module: " + t5 + ".";
- toZone = $.printToZone;
+ toZone = $._printToZone;
if (toZone == null)
A.printString(line);
else
@@ -21916,7 +21918,7 @@
return _call(f);
};
}(t7, t8);
- result[$.$get$DART_CLOSURE_PROPERTY_NAME()] = t8;
+ result[$.$get$DART_CLOSURE_DART_JSINTEROP_PROPERTY_NAME()] = t8;
t1.$dartRunMain = result;
// goto join
$async$goto = 13;
@@ -22132,7 +22134,7 @@
_static(A, "async___rootCreateTimer$closure", 5, null, ["call$5"], ["_rootCreateTimer"], 84, 0);
_static(A, "async___rootCreatePeriodicTimer$closure", 5, null, ["call$5"], ["_rootCreatePeriodicTimer"], 85, 0);
_static(A, "async___rootPrint$closure", 4, null, ["call$4"], ["_rootPrint"], 86, 0);
- _static_1(A, "async___printToZone$closure", "_printToZone", 87);
+ _static_1(A, "async___printToZone$closure", "_printToZone0", 87);
_static(A, "async___rootFork$closure", 5, null, ["call$5"], ["_rootFork"], 88, 0);
_instance(A._Completer.prototype, "get$completeError", 0, 1, null, ["call$2", "call$1"], ["completeError$2", "completeError$1"], 58, 0, 0);
_instance_2_u(A._Future.prototype, "get$_completeError", "_completeError$2", 6);
@@ -22689,7 +22691,7 @@
(function staticFields() {
$._JS_INTEROP_INTERCEPTOR_TAG = null;
$._toStringVisiting = A._setArrayType([], type$.JSArray_Object);
- $.printToZone = null;
+ $._printToZone = null;
$.Primitives__identityHashCodeProperty = null;
$.BoundClosure__receiverFieldNameCache = null;
$.BoundClosure__interceptorFieldNameCache = null;
@@ -22717,6 +22719,7 @@
(function lazyInitializers() {
var _lazyFinal = hunkHelpers.lazyFinal;
_lazyFinal($, "DART_CLOSURE_PROPERTY_NAME", "$get$DART_CLOSURE_PROPERTY_NAME", () => A.getIsolateAffinityTag("_$dart_dartClosure"));
+ _lazyFinal($, "DART_CLOSURE_DART_JSINTEROP_PROPERTY_NAME", "$get$DART_CLOSURE_DART_JSINTEROP_PROPERTY_NAME", () => A.getIsolateAffinityTag("_$dart_dartClosure_dartJSInterop"));
_lazyFinal($, "nullFuture", "$get$nullFuture", () => B.C__RootZone.run$1$1(new A.nullFuture_closure(), type$.Future_void));
_lazyFinal($, "_safeToStringHooks", "$get$_safeToStringHooks", () => A._setArrayType([new J.JSArraySafeToStringHook()], A.findType("JSArray<SafeToStringHook>")));
_lazyFinal($, "TypeErrorDecoder_noSuchMethodPattern", "$get$TypeErrorDecoder_noSuchMethodPattern", () => A.TypeErrorDecoder_extractPattern(A.TypeErrorDecoder_provokeCallErrorOn({
diff --git a/dwds/pubspec.yaml b/dwds/pubspec.yaml
index b8c16da..760b104 100644
--- a/dwds/pubspec.yaml
+++ b/dwds/pubspec.yaml
@@ -51,8 +51,8 @@
js: ">=0.6.4 <0.8.0"
puppeteer: ^3.1.1
test: ^1.21.6
- test_common:
- path: ../test_common
+ dwds_test_common:
+ path: ../dwds_test_common
webdriver: ^3.0.0
yaml: ^3.1.3
diff --git a/dwds/test/integration/breakpoint_amd_test.dart b/dwds/test/integration/breakpoint_amd_test.dart
index d6a5ae4..c2b1947 100644
--- a/dwds/test/integration/breakpoint_amd_test.dart
+++ b/dwds/test/integration/breakpoint_amd_test.dart
@@ -7,8 +7,8 @@
library;
import 'package:dwds/expression_compiler.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'breakpoint_common.dart';
import 'fixtures/context.dart';
diff --git a/dwds/test/integration/breakpoint_common.dart b/dwds/test/integration/breakpoint_common.dart
index 230f2f0..88dea2d 100644
--- a/dwds/test/integration/breakpoint_common.dart
+++ b/dwds/test/integration/breakpoint_common.dart
@@ -2,9 +2,9 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
+import 'package:dwds_test_common/logging.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/logging.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'package:vm_service/vm_service.dart';
import 'package:vm_service_interface/vm_service_interface.dart';
diff --git a/dwds/test/integration/breakpoint_ddc_library_bundle_test.dart b/dwds/test/integration/breakpoint_ddc_library_bundle_test.dart
index 15d1f38..71b4606 100644
--- a/dwds/test/integration/breakpoint_ddc_library_bundle_test.dart
+++ b/dwds/test/integration/breakpoint_ddc_library_bundle_test.dart
@@ -7,8 +7,8 @@
library;
import 'package:dwds/expression_compiler.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'breakpoint_common.dart';
import 'fixtures/context.dart';
diff --git a/dwds/test/integration/callstack_amd_test.dart b/dwds/test/integration/callstack_amd_test.dart
index 9deda58..e511a65 100644
--- a/dwds/test/integration/callstack_amd_test.dart
+++ b/dwds/test/integration/callstack_amd_test.dart
@@ -7,8 +7,8 @@
library;
import 'package:dwds/expression_compiler.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'callstack_common.dart';
import 'fixtures/context.dart';
diff --git a/dwds/test/integration/callstack_common.dart b/dwds/test/integration/callstack_common.dart
index 5f7c652..e0782f6 100644
--- a/dwds/test/integration/callstack_common.dart
+++ b/dwds/test/integration/callstack_common.dart
@@ -2,9 +2,9 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
+import 'package:dwds_test_common/logging.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/logging.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'package:vm_service/vm_service.dart';
import 'package:vm_service_interface/vm_service_interface.dart';
diff --git a/dwds/test/integration/callstack_ddc_library_bundle_test.dart b/dwds/test/integration/callstack_ddc_library_bundle_test.dart
index 35e067c..3344150 100644
--- a/dwds/test/integration/callstack_ddc_library_bundle_test.dart
+++ b/dwds/test/integration/callstack_ddc_library_bundle_test.dart
@@ -7,8 +7,8 @@
library;
import 'package:dwds/expression_compiler.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'callstack_common.dart';
import 'fixtures/context.dart';
diff --git a/dwds/test/integration/chrome_proxy_service_amd_test.dart b/dwds/test/integration/chrome_proxy_service_amd_test.dart
index cf7eca6..fef60fc 100644
--- a/dwds/test/integration/chrome_proxy_service_amd_test.dart
+++ b/dwds/test/integration/chrome_proxy_service_amd_test.dart
@@ -8,8 +8,8 @@
library;
import 'package:dwds/expression_compiler.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'common/chrome_proxy_service_common.dart';
import 'fixtures/context.dart';
diff --git a/dwds/test/integration/chrome_proxy_service_ddc_library_bundle_test.dart b/dwds/test/integration/chrome_proxy_service_ddc_library_bundle_test.dart
index 6e598f4..fa577f8 100644
--- a/dwds/test/integration/chrome_proxy_service_ddc_library_bundle_test.dart
+++ b/dwds/test/integration/chrome_proxy_service_ddc_library_bundle_test.dart
@@ -8,8 +8,8 @@
library;
import 'package:dwds/expression_compiler.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'common/chrome_proxy_service_common.dart';
import 'fixtures/context.dart';
diff --git a/dwds/test/integration/circular_evaluate_amd_test.dart b/dwds/test/integration/circular_evaluate_amd_test.dart
index a577469..44d0d55 100644
--- a/dwds/test/integration/circular_evaluate_amd_test.dart
+++ b/dwds/test/integration/circular_evaluate_amd_test.dart
@@ -10,8 +10,8 @@
import 'dart:io';
import 'package:dwds/expression_compiler.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'evaluate_circular_common.dart';
import 'fixtures/context.dart';
diff --git a/dwds/test/integration/circular_evaluate_ddc_library_bundle_test.dart b/dwds/test/integration/circular_evaluate_ddc_library_bundle_test.dart
index 4eff848..a45d9fc 100644
--- a/dwds/test/integration/circular_evaluate_ddc_library_bundle_test.dart
+++ b/dwds/test/integration/circular_evaluate_ddc_library_bundle_test.dart
@@ -10,8 +10,8 @@
import 'dart:io';
import 'package:dwds/expression_compiler.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'evaluate_circular_common.dart';
import 'fixtures/context.dart';
diff --git a/dwds/test/integration/common/chrome_proxy_service_common.dart b/dwds/test/integration/common/chrome_proxy_service_common.dart
index a27fda7..82552ec 100644
--- a/dwds/test/integration/common/chrome_proxy_service_common.dart
+++ b/dwds/test/integration/common/chrome_proxy_service_common.dart
@@ -15,11 +15,11 @@
import 'package:dwds/src/services/chrome/chrome_proxy_service.dart';
import 'package:dwds/src/utilities/dart_uri.dart';
import 'package:dwds/src/utilities/shared.dart';
+import 'package:dwds_test_common/logging.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:http/http.dart' as http;
import 'package:path/path.dart' as path;
import 'package:test/test.dart';
-import 'package:test_common/logging.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'package:vm_service/vm_service.dart';
import 'package:vm_service_interface/vm_service_interface.dart';
diff --git a/dwds/test/integration/common/hot_restart_common.dart b/dwds/test/integration/common/hot_restart_common.dart
index 843fc7a..ca01000 100644
--- a/dwds/test/integration/common/hot_restart_common.dart
+++ b/dwds/test/integration/common/hot_restart_common.dart
@@ -11,9 +11,9 @@
import 'package:dwds/dwds.dart';
import 'package:dwds/expression_compiler.dart';
+import 'package:dwds_test_common/logging.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/logging.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'package:vm_service/vm_service.dart';
import '../fixtures/context.dart';
diff --git a/dwds/test/integration/common/hot_restart_correctness_common.dart b/dwds/test/integration/common/hot_restart_correctness_common.dart
index 15eafaa..d289bed 100644
--- a/dwds/test/integration/common/hot_restart_correctness_common.dart
+++ b/dwds/test/integration/common/hot_restart_correctness_common.dart
@@ -11,9 +11,9 @@
import 'package:dwds/dwds.dart';
import 'package:dwds/expression_compiler.dart';
+import 'package:dwds_test_common/logging.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/logging.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'package:vm_service/vm_service.dart';
import '../fixtures/context.dart';
diff --git a/dwds/test/integration/dart_uri_file_uri_test.dart b/dwds/test/integration/dart_uri_file_uri_test.dart
index ea245d3..c06a40c 100644
--- a/dwds/test/integration/dart_uri_file_uri_test.dart
+++ b/dwds/test/integration/dart_uri_file_uri_test.dart
@@ -7,9 +7,9 @@
library;
import 'package:dwds/src/utilities/dart_uri.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:path/path.dart' as p;
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'fixtures/context.dart';
import 'fixtures/project.dart';
diff --git a/dwds/test/integration/dart_uri_test.dart b/dwds/test/integration/dart_uri_test.dart
index 5bb24d4..7caa083 100644
--- a/dwds/test/integration/dart_uri_test.dart
+++ b/dwds/test/integration/dart_uri_test.dart
@@ -7,9 +7,9 @@
library;
import 'package:dwds/src/utilities/dart_uri.dart';
+import 'package:dwds_test_common/logging.dart';
import 'package:path/path.dart' as p;
import 'package:test/test.dart';
-import 'package:test_common/logging.dart';
import 'fixtures/fakes.dart';
import 'fixtures/utilities.dart';
diff --git a/dwds/test/integration/dds_port_amd_test.dart b/dwds/test/integration/dds_port_amd_test.dart
index 327bc28..6fbbf45 100644
--- a/dwds/test/integration/dds_port_amd_test.dart
+++ b/dwds/test/integration/dds_port_amd_test.dart
@@ -6,8 +6,8 @@
@Timeout(Duration(minutes: 2))
library;
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'dds_port_common.dart';
diff --git a/dwds/test/integration/dds_port_common.dart b/dwds/test/integration/dds_port_common.dart
index 1a40ac6..5de58e8 100644
--- a/dwds/test/integration/dds_port_common.dart
+++ b/dwds/test/integration/dds_port_common.dart
@@ -5,9 +5,9 @@
import 'dart:io';
import 'package:dwds/dwds.dart';
+import 'package:dwds_test_common/logging.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/logging.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'fixtures/context.dart';
import 'fixtures/project.dart';
diff --git a/dwds/test/integration/dds_port_ddc_library_bundle_test.dart b/dwds/test/integration/dds_port_ddc_library_bundle_test.dart
index 44c8fbd..f8125a3 100644
--- a/dwds/test/integration/dds_port_ddc_library_bundle_test.dart
+++ b/dwds/test/integration/dds_port_ddc_library_bundle_test.dart
@@ -7,8 +7,8 @@
library;
import 'package:dwds/expression_compiler.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'dds_port_common.dart';
diff --git a/dwds/test/integration/debug_service_amd_test.dart b/dwds/test/integration/debug_service_amd_test.dart
index 2640483..c9b17f2 100644
--- a/dwds/test/integration/debug_service_amd_test.dart
+++ b/dwds/test/integration/debug_service_amd_test.dart
@@ -6,8 +6,8 @@
@Timeout(Duration(minutes: 2))
library;
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'debug_service_common.dart';
diff --git a/dwds/test/integration/debug_service_common.dart b/dwds/test/integration/debug_service_common.dart
index 5ae7c44..80003a8 100644
--- a/dwds/test/integration/debug_service_common.dart
+++ b/dwds/test/integration/debug_service_common.dart
@@ -5,8 +5,8 @@
import 'dart:io';
import 'package:dwds/dwds.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'package:vm_service/vm_service.dart';
import 'package:vm_service/vm_service_io.dart';
diff --git a/dwds/test/integration/debug_service_ddc_library_bundle_test.dart b/dwds/test/integration/debug_service_ddc_library_bundle_test.dart
index cf6c3f3..06fe831 100644
--- a/dwds/test/integration/debug_service_ddc_library_bundle_test.dart
+++ b/dwds/test/integration/debug_service_ddc_library_bundle_test.dart
@@ -7,8 +7,8 @@
library;
import 'package:dwds/expression_compiler.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'debug_service_common.dart';
diff --git a/dwds/test/integration/devtools_test.dart b/dwds/test/integration/devtools_test.dart
index b5f9d04..699499a 100644
--- a/dwds/test/integration/devtools_test.dart
+++ b/dwds/test/integration/devtools_test.dart
@@ -9,8 +9,8 @@
import 'dart:io';
import 'package:dwds/src/config/tool_configuration.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'package:vm_service/vm_service.dart';
// ignore: deprecated_member_use
import 'package:webdriver/io.dart';
diff --git a/dwds/test/integration/evaluate_amd_test.dart b/dwds/test/integration/evaluate_amd_test.dart
index 821118c..5bedc79 100644
--- a/dwds/test/integration/evaluate_amd_test.dart
+++ b/dwds/test/integration/evaluate_amd_test.dart
@@ -10,8 +10,8 @@
import 'dart:io';
import 'package:dwds/expression_compiler.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'evaluate_common.dart';
import 'fixtures/context.dart';
diff --git a/dwds/test/integration/evaluate_circular_common.dart b/dwds/test/integration/evaluate_circular_common.dart
index 8c1477b..8aa5700 100644
--- a/dwds/test/integration/evaluate_circular_common.dart
+++ b/dwds/test/integration/evaluate_circular_common.dart
@@ -6,9 +6,9 @@
@Timeout(Duration(minutes: 2))
library;
+import 'package:dwds_test_common/logging.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/logging.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'package:vm_service/vm_service.dart';
import 'package:vm_service_interface/vm_service_interface.dart';
diff --git a/dwds/test/integration/evaluate_common.dart b/dwds/test/integration/evaluate_common.dart
index e08f282..71d3fbb 100644
--- a/dwds/test/integration/evaluate_common.dart
+++ b/dwds/test/integration/evaluate_common.dart
@@ -9,10 +9,10 @@
import 'dart:async';
import 'package:dwds/src/services/expression_evaluator.dart';
+import 'package:dwds_test_common/logging.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
+import 'package:dwds_test_common/utilities.dart' show dartSdkIsAtLeast;
import 'package:test/test.dart';
-import 'package:test_common/logging.dart';
-import 'package:test_common/test_sdk_configuration.dart';
-import 'package:test_common/utilities.dart' show dartSdkIsAtLeast;
import 'package:vm_service/vm_service.dart';
import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart';
diff --git a/dwds/test/integration/evaluate_ddc_library_bundle_test.dart b/dwds/test/integration/evaluate_ddc_library_bundle_test.dart
index c0193eb..e8783c8 100644
--- a/dwds/test/integration/evaluate_ddc_library_bundle_test.dart
+++ b/dwds/test/integration/evaluate_ddc_library_bundle_test.dart
@@ -10,8 +10,8 @@
import 'dart:io';
import 'package:dwds/expression_compiler.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'evaluate_common.dart';
import 'fixtures/context.dart';
diff --git a/dwds/test/integration/evaluate_parts_common.dart b/dwds/test/integration/evaluate_parts_common.dart
index 0d9bfef..1df6cb8 100644
--- a/dwds/test/integration/evaluate_parts_common.dart
+++ b/dwds/test/integration/evaluate_parts_common.dart
@@ -4,9 +4,9 @@
library;
+import 'package:dwds_test_common/logging.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/logging.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'package:vm_service/vm_service.dart';
import 'package:vm_service_interface/vm_service_interface.dart';
diff --git a/dwds/test/integration/events_amd_test.dart b/dwds/test/integration/events_amd_test.dart
index b8a749b..921721f 100644
--- a/dwds/test/integration/events_amd_test.dart
+++ b/dwds/test/integration/events_amd_test.dart
@@ -10,9 +10,9 @@
import 'package:dwds/src/events.dart';
import 'package:dwds/src/utilities/server.dart';
+import 'package:dwds_test_common/logging.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/logging.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'events_common.dart';
diff --git a/dwds/test/integration/events_common.dart b/dwds/test/integration/events_common.dart
index 0350ee4..fe3b29c 100644
--- a/dwds/test/integration/events_common.dart
+++ b/dwds/test/integration/events_common.dart
@@ -6,9 +6,9 @@
import 'dart:io';
import 'package:dwds/src/events.dart';
+import 'package:dwds_test_common/logging.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/logging.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'package:vm_service/vm_service.dart';
import 'package:vm_service_interface/vm_service_interface.dart';
import 'package:webdriver/async_core.dart';
diff --git a/dwds/test/integration/events_ddc_library_bundle_test.dart b/dwds/test/integration/events_ddc_library_bundle_test.dart
index fd37660..d3eaeab 100644
--- a/dwds/test/integration/events_ddc_library_bundle_test.dart
+++ b/dwds/test/integration/events_ddc_library_bundle_test.dart
@@ -6,8 +6,8 @@
library;
import 'package:dwds/expression_compiler.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'events_common.dart';
diff --git a/dwds/test/integration/execution_context_test.dart b/dwds/test/integration/execution_context_test.dart
index 36c4a03..936f5be 100644
--- a/dwds/test/integration/execution_context_test.dart
+++ b/dwds/test/integration/execution_context_test.dart
@@ -12,8 +12,8 @@
import 'package:dwds/data/extension_request.dart';
import 'package:dwds/src/debugging/execution_context.dart';
import 'package:dwds/src/servers/extension_debugger.dart';
+import 'package:dwds_test_common/logging.dart';
import 'package:test/test.dart';
-import 'package:test_common/logging.dart';
import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart';
import 'fixtures/fakes.dart';
diff --git a/dwds/test/integration/expression_compiler_service_common.dart b/dwds/test/integration/expression_compiler_service_common.dart
index bb6f267..3d5a716 100644
--- a/dwds/test/integration/expression_compiler_service_common.dart
+++ b/dwds/test/integration/expression_compiler_service_common.dart
@@ -14,10 +14,10 @@
import 'package:dwds/src/services/expression_compiler.dart';
import 'package:dwds/src/services/expression_compiler_service.dart';
import 'package:dwds/src/utilities/server.dart';
+import 'package:dwds_test_common/logging.dart';
import 'package:logging/logging.dart';
import 'package:shelf/shelf.dart';
import 'package:test/test.dart';
-import 'package:test_common/logging.dart';
ExpressionCompilerService get service => _service!;
late ExpressionCompilerService? _service;
diff --git a/dwds/test/integration/fixtures/context.dart b/dwds/test/integration/fixtures/context.dart
index 31c5b37..6adc4b4 100644
--- a/dwds/test/integration/fixtures/context.dart
+++ b/dwds/test/integration/fixtures/context.dart
@@ -23,6 +23,9 @@
import 'package:dwds/src/services/expression_compiler_service.dart';
import 'package:dwds/src/utilities/dart_uri.dart';
import 'package:dwds/src/utilities/server.dart';
+import 'package:dwds_test_common/logging.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
+import 'package:dwds_test_common/utilities.dart';
import 'package:file/local.dart';
import 'package:frontend_server_common/src/devfs.dart';
import 'package:frontend_server_common/src/resident_runner.dart';
@@ -30,13 +33,10 @@
import 'package:http/io_client.dart';
import 'package:logging/logging.dart' as logging;
import 'package:path/path.dart' as p;
-import 'package:shelf/shelf.dart';
import 'package:shelf/shelf.dart' as shelf;
+import 'package:shelf/shelf.dart';
import 'package:shelf_proxy/shelf_proxy.dart';
import 'package:test/test.dart';
-import 'package:test_common/logging.dart';
-import 'package:test_common/test_sdk_configuration.dart';
-import 'package:test_common/utilities.dart';
import 'package:vm_service/vm_service.dart';
import 'package:vm_service/vm_service_io.dart';
import 'package:webdriver/async_io.dart';
diff --git a/dwds/test/integration/fixtures/project.dart b/dwds/test/integration/fixtures/project.dart
index 8611049..553946d 100644
--- a/dwds/test/integration/fixtures/project.dart
+++ b/dwds/test/integration/fixtures/project.dart
@@ -4,9 +4,9 @@
import 'dart:io';
+import 'package:dwds_test_common/utilities.dart';
import 'package:io/io.dart';
import 'package:path/path.dart' as p;
-import 'package:test_common/utilities.dart';
import 'package:yaml/yaml.dart';
enum IndexBaseMode { noBase, base }
diff --git a/dwds/test/integration/handlers/asset_handler_amd_test.dart b/dwds/test/integration/handlers/asset_handler_amd_test.dart
index 3ae5141..b759593 100644
--- a/dwds/test/integration/handlers/asset_handler_amd_test.dart
+++ b/dwds/test/integration/handlers/asset_handler_amd_test.dart
@@ -5,8 +5,8 @@
@Timeout(Duration(minutes: 2))
library;
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'asset_handler_common.dart';
diff --git a/dwds/test/integration/handlers/asset_handler_common.dart b/dwds/test/integration/handlers/asset_handler_common.dart
index 220db99..7f3ba63 100644
--- a/dwds/test/integration/handlers/asset_handler_common.dart
+++ b/dwds/test/integration/handlers/asset_handler_common.dart
@@ -2,10 +2,10 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
+import 'package:dwds_test_common/logging.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:shelf/shelf.dart';
import 'package:test/test.dart';
-import 'package:test_common/logging.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import '../fixtures/context.dart';
import '../fixtures/project.dart';
diff --git a/dwds/test/integration/handlers/asset_handler_ddc_library_bundle_test.dart b/dwds/test/integration/handlers/asset_handler_ddc_library_bundle_test.dart
index 92a6a8b..dbfe983 100644
--- a/dwds/test/integration/handlers/asset_handler_ddc_library_bundle_test.dart
+++ b/dwds/test/integration/handlers/asset_handler_ddc_library_bundle_test.dart
@@ -6,8 +6,8 @@
library;
import 'package:dwds/expression_compiler.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'asset_handler_common.dart';
diff --git a/dwds/test/integration/hot_reload_breakpoints_common.dart b/dwds/test/integration/hot_reload_breakpoints_common.dart
index 9a22a7e..7f417d3 100644
--- a/dwds/test/integration/hot_reload_breakpoints_common.dart
+++ b/dwds/test/integration/hot_reload_breakpoints_common.dart
@@ -4,9 +4,9 @@
import 'dart:async';
+import 'package:dwds_test_common/logging.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/logging.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'package:vm_service/vm_service.dart';
import 'fixtures/context.dart';
diff --git a/dwds/test/integration/hot_reload_breakpoints_ddc_library_bundle_test.dart b/dwds/test/integration/hot_reload_breakpoints_ddc_library_bundle_test.dart
index 93cd95c..d0494e7 100644
--- a/dwds/test/integration/hot_reload_breakpoints_ddc_library_bundle_test.dart
+++ b/dwds/test/integration/hot_reload_breakpoints_ddc_library_bundle_test.dart
@@ -8,8 +8,8 @@
library;
import 'package:dwds/expression_compiler.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'fixtures/context.dart';
import 'hot_reload_breakpoints_common.dart';
diff --git a/dwds/test/integration/hot_reload_common.dart b/dwds/test/integration/hot_reload_common.dart
index 65a1944..696cba6 100644
--- a/dwds/test/integration/hot_reload_common.dart
+++ b/dwds/test/integration/hot_reload_common.dart
@@ -4,9 +4,9 @@
import 'dart:async';
+import 'package:dwds_test_common/logging.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/logging.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'package:vm_service/vm_service.dart';
import 'fixtures/context.dart';
diff --git a/dwds/test/integration/hot_reload_ddc_library_bundle_test.dart b/dwds/test/integration/hot_reload_ddc_library_bundle_test.dart
index a01690e..ba59239 100644
--- a/dwds/test/integration/hot_reload_ddc_library_bundle_test.dart
+++ b/dwds/test/integration/hot_reload_ddc_library_bundle_test.dart
@@ -8,8 +8,8 @@
library;
import 'package:dwds/expression_compiler.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'fixtures/context.dart';
import 'hot_reload_common.dart';
diff --git a/dwds/test/integration/hot_restart_amd_test.dart b/dwds/test/integration/hot_restart_amd_test.dart
index 451d518..8e1bb83 100644
--- a/dwds/test/integration/hot_restart_amd_test.dart
+++ b/dwds/test/integration/hot_restart_amd_test.dart
@@ -8,8 +8,8 @@
library;
import 'package:dwds/expression_compiler.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'common/hot_restart_common.dart';
import 'fixtures/context.dart';
diff --git a/dwds/test/integration/hot_restart_breakpoints_common.dart b/dwds/test/integration/hot_restart_breakpoints_common.dart
index 289af8e..feda92c 100644
--- a/dwds/test/integration/hot_restart_breakpoints_common.dart
+++ b/dwds/test/integration/hot_restart_breakpoints_common.dart
@@ -5,9 +5,9 @@
import 'dart:async';
import 'package:dwds/expression_compiler.dart';
+import 'package:dwds_test_common/logging.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/logging.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'package:vm_service/vm_service.dart';
import 'package:vm_service_interface/vm_service_interface.dart';
import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart';
diff --git a/dwds/test/integration/hot_restart_breakpoints_ddc_library_bundle_test.dart b/dwds/test/integration/hot_restart_breakpoints_ddc_library_bundle_test.dart
index cd7c5ad..364a411 100644
--- a/dwds/test/integration/hot_restart_breakpoints_ddc_library_bundle_test.dart
+++ b/dwds/test/integration/hot_restart_breakpoints_ddc_library_bundle_test.dart
@@ -8,8 +8,8 @@
library;
import 'package:dwds/expression_compiler.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'fixtures/context.dart';
import 'hot_restart_breakpoints_common.dart';
diff --git a/dwds/test/integration/hot_restart_correctness_amd_test.dart b/dwds/test/integration/hot_restart_correctness_amd_test.dart
index 6feea49..e034ff3 100644
--- a/dwds/test/integration/hot_restart_correctness_amd_test.dart
+++ b/dwds/test/integration/hot_restart_correctness_amd_test.dart
@@ -8,8 +8,8 @@
library;
import 'package:dwds/expression_compiler.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'common/hot_restart_correctness_common.dart';
import 'fixtures/context.dart';
diff --git a/dwds/test/integration/hot_restart_correctness_ddc_library_bundle_test.dart b/dwds/test/integration/hot_restart_correctness_ddc_library_bundle_test.dart
index 448ccaa..f5a1f68 100644
--- a/dwds/test/integration/hot_restart_correctness_ddc_library_bundle_test.dart
+++ b/dwds/test/integration/hot_restart_correctness_ddc_library_bundle_test.dart
@@ -8,8 +8,8 @@
library;
import 'package:dwds/expression_compiler.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'common/hot_restart_correctness_common.dart';
import 'fixtures/context.dart';
diff --git a/dwds/test/integration/hot_restart_ddc_library_bundle_test.dart b/dwds/test/integration/hot_restart_ddc_library_bundle_test.dart
index 880d3e6..dacc2f8 100644
--- a/dwds/test/integration/hot_restart_ddc_library_bundle_test.dart
+++ b/dwds/test/integration/hot_restart_ddc_library_bundle_test.dart
@@ -8,8 +8,8 @@
library;
import 'package:dwds/expression_compiler.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'common/hot_restart_common.dart';
import 'fixtures/context.dart';
diff --git a/dwds/test/integration/inspector_test.dart b/dwds/test/integration/inspector_test.dart
index 3909cdc..3cc765d 100644
--- a/dwds/test/integration/inspector_test.dart
+++ b/dwds/test/integration/inspector_test.dart
@@ -10,8 +10,8 @@
import 'package:dwds/src/config/tool_configuration.dart';
import 'package:dwds/src/debugging/chrome_inspector.dart';
import 'package:dwds/src/utilities/conversions.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'package:vm_service/vm_service.dart';
import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart';
diff --git a/dwds/test/integration/instances/class_inspection_amd_test.dart b/dwds/test/integration/instances/class_inspection_amd_test.dart
index c4b898a..dd9102c 100644
--- a/dwds/test/integration/instances/class_inspection_amd_test.dart
+++ b/dwds/test/integration/instances/class_inspection_amd_test.dart
@@ -8,8 +8,8 @@
library;
import 'package:dwds/expression_compiler.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import '../fixtures/context.dart';
import 'common/class_inspection_common.dart';
diff --git a/dwds/test/integration/instances/class_inspection_ddc_library_bundle_test.dart b/dwds/test/integration/instances/class_inspection_ddc_library_bundle_test.dart
index afa45f0..77a97d6 100644
--- a/dwds/test/integration/instances/class_inspection_ddc_library_bundle_test.dart
+++ b/dwds/test/integration/instances/class_inspection_ddc_library_bundle_test.dart
@@ -8,8 +8,8 @@
library;
import 'package:dwds/expression_compiler.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import '../fixtures/context.dart';
import 'common/class_inspection_common.dart';
diff --git a/dwds/test/integration/instances/common/class_inspection_common.dart b/dwds/test/integration/instances/common/class_inspection_common.dart
index ba8f946..1e857dd 100644
--- a/dwds/test/integration/instances/common/class_inspection_common.dart
+++ b/dwds/test/integration/instances/common/class_inspection_common.dart
@@ -7,9 +7,9 @@
@Timeout(Duration(minutes: 2))
library;
+import 'package:dwds_test_common/logging.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/logging.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'package:vm_service/vm_service.dart';
import '../../fixtures/context.dart';
diff --git a/dwds/test/integration/instances/common/dot_shorthands_common.dart b/dwds/test/integration/instances/common/dot_shorthands_common.dart
index 4503adc..e7e037f 100644
--- a/dwds/test/integration/instances/common/dot_shorthands_common.dart
+++ b/dwds/test/integration/instances/common/dot_shorthands_common.dart
@@ -2,10 +2,10 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
+import 'package:dwds_test_common/logging.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:path/path.dart' show basename;
import 'package:test/test.dart';
-import 'package:test_common/logging.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'package:vm_service/vm_service.dart';
import '../../fixtures/context.dart';
diff --git a/dwds/test/integration/instances/common/instance_common.dart b/dwds/test/integration/instances/common/instance_common.dart
index 2b1ae8c..5c284ec 100644
--- a/dwds/test/integration/instances/common/instance_common.dart
+++ b/dwds/test/integration/instances/common/instance_common.dart
@@ -5,9 +5,9 @@
import 'package:dwds/expression_compiler.dart';
import 'package:dwds/src/config/tool_configuration.dart';
import 'package:dwds/src/debugging/chrome_inspector.dart';
+import 'package:dwds_test_common/logging.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/logging.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'package:vm_service/vm_service.dart';
import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart';
diff --git a/dwds/test/integration/instances/common/instance_inspection_common.dart b/dwds/test/integration/instances/common/instance_inspection_common.dart
index 64821ac..b2c933e 100644
--- a/dwds/test/integration/instances/common/instance_inspection_common.dart
+++ b/dwds/test/integration/instances/common/instance_inspection_common.dart
@@ -2,9 +2,9 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
+import 'package:dwds_test_common/logging.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/logging.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'package:vm_service/vm_service.dart';
import '../../fixtures/context.dart';
diff --git a/dwds/test/integration/instances/common/patterns_inspection_common.dart b/dwds/test/integration/instances/common/patterns_inspection_common.dart
index 9680dee..9ac940d 100644
--- a/dwds/test/integration/instances/common/patterns_inspection_common.dart
+++ b/dwds/test/integration/instances/common/patterns_inspection_common.dart
@@ -2,9 +2,9 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
+import 'package:dwds_test_common/logging.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/logging.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'package:vm_service/vm_service.dart';
import '../../fixtures/context.dart';
diff --git a/dwds/test/integration/instances/common/record_inspection_common.dart b/dwds/test/integration/instances/common/record_inspection_common.dart
index 1cce6db..f4ed96d 100644
--- a/dwds/test/integration/instances/common/record_inspection_common.dart
+++ b/dwds/test/integration/instances/common/record_inspection_common.dart
@@ -2,9 +2,9 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
+import 'package:dwds_test_common/logging.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/logging.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'package:vm_service/vm_service.dart';
import '../../fixtures/context.dart';
diff --git a/dwds/test/integration/instances/common/record_type_inspection_common.dart b/dwds/test/integration/instances/common/record_type_inspection_common.dart
index 7bb1763..02f4bfc 100644
--- a/dwds/test/integration/instances/common/record_type_inspection_common.dart
+++ b/dwds/test/integration/instances/common/record_type_inspection_common.dart
@@ -2,9 +2,9 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
+import 'package:dwds_test_common/logging.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/logging.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'package:vm_service/vm_service.dart';
import '../../fixtures/context.dart';
diff --git a/dwds/test/integration/instances/common/type_inspection_common.dart b/dwds/test/integration/instances/common/type_inspection_common.dart
index e71d65c..ff9954d 100644
--- a/dwds/test/integration/instances/common/type_inspection_common.dart
+++ b/dwds/test/integration/instances/common/type_inspection_common.dart
@@ -3,9 +3,9 @@
// BSD-style license that can be found in the LICENSE file.
import 'package:dwds/expression_compiler.dart';
+import 'package:dwds_test_common/logging.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/logging.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'package:vm_service/vm_service.dart';
import '../../fixtures/context.dart';
diff --git a/dwds/test/integration/instances/dot_shorthands_amd_test.dart b/dwds/test/integration/instances/dot_shorthands_amd_test.dart
index f45627e..7ae4963 100644
--- a/dwds/test/integration/instances/dot_shorthands_amd_test.dart
+++ b/dwds/test/integration/instances/dot_shorthands_amd_test.dart
@@ -8,8 +8,8 @@
library;
import 'package:dwds/src/services/expression_compiler.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import '../fixtures/context.dart';
import 'common/dot_shorthands_common.dart';
diff --git a/dwds/test/integration/instances/dot_shorthands_ddc_library_bundle_test.dart b/dwds/test/integration/instances/dot_shorthands_ddc_library_bundle_test.dart
index 9960d71..3559490 100644
--- a/dwds/test/integration/instances/dot_shorthands_ddc_library_bundle_test.dart
+++ b/dwds/test/integration/instances/dot_shorthands_ddc_library_bundle_test.dart
@@ -8,8 +8,8 @@
library;
import 'package:dwds/src/services/expression_compiler.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import '../fixtures/context.dart';
import 'common/dot_shorthands_common.dart';
diff --git a/dwds/test/integration/instances/instance_amd_test.dart b/dwds/test/integration/instances/instance_amd_test.dart
index c67433b..af28c88 100644
--- a/dwds/test/integration/instances/instance_amd_test.dart
+++ b/dwds/test/integration/instances/instance_amd_test.dart
@@ -7,8 +7,8 @@
library;
import 'package:dwds/src/services/expression_compiler.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import '../fixtures/context.dart';
import 'common/instance_common.dart';
diff --git a/dwds/test/integration/instances/instance_ddc_library_bundle_test.dart b/dwds/test/integration/instances/instance_ddc_library_bundle_test.dart
index 6a6c889..002c71c 100644
--- a/dwds/test/integration/instances/instance_ddc_library_bundle_test.dart
+++ b/dwds/test/integration/instances/instance_ddc_library_bundle_test.dart
@@ -7,8 +7,8 @@
library;
import 'package:dwds/src/services/expression_compiler.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import '../fixtures/context.dart';
import 'common/instance_common.dart';
diff --git a/dwds/test/integration/instances/instance_inspection_amd_test.dart b/dwds/test/integration/instances/instance_inspection_amd_test.dart
index ae7f9fc..1d526c5 100644
--- a/dwds/test/integration/instances/instance_inspection_amd_test.dart
+++ b/dwds/test/integration/instances/instance_inspection_amd_test.dart
@@ -8,8 +8,8 @@
library;
import 'package:dwds/src/services/expression_compiler.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import '../fixtures/context.dart';
import 'common/instance_inspection_common.dart';
diff --git a/dwds/test/integration/instances/instance_inspection_ddc_library_bundle_test.dart b/dwds/test/integration/instances/instance_inspection_ddc_library_bundle_test.dart
index d4f6353..93e375d 100644
--- a/dwds/test/integration/instances/instance_inspection_ddc_library_bundle_test.dart
+++ b/dwds/test/integration/instances/instance_inspection_ddc_library_bundle_test.dart
@@ -8,8 +8,8 @@
library;
import 'package:dwds/src/services/expression_compiler.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import '../fixtures/context.dart';
import 'common/instance_inspection_common.dart';
diff --git a/dwds/test/integration/instances/patterns_inspection_amd_test.dart b/dwds/test/integration/instances/patterns_inspection_amd_test.dart
index 408061b..cb52f73 100644
--- a/dwds/test/integration/instances/patterns_inspection_amd_test.dart
+++ b/dwds/test/integration/instances/patterns_inspection_amd_test.dart
@@ -8,8 +8,8 @@
library;
import 'package:dwds/expression_compiler.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import '../fixtures/context.dart';
import 'common/patterns_inspection_common.dart';
diff --git a/dwds/test/integration/instances/patterns_inspection_ddc_library_bundle_test.dart b/dwds/test/integration/instances/patterns_inspection_ddc_library_bundle_test.dart
index ef6802f..e9a5e0f 100644
--- a/dwds/test/integration/instances/patterns_inspection_ddc_library_bundle_test.dart
+++ b/dwds/test/integration/instances/patterns_inspection_ddc_library_bundle_test.dart
@@ -8,8 +8,8 @@
library;
import 'package:dwds/expression_compiler.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import '../fixtures/context.dart';
import 'common/patterns_inspection_common.dart';
diff --git a/dwds/test/integration/instances/record_inspection_amd_test.dart b/dwds/test/integration/instances/record_inspection_amd_test.dart
index 735d517..0cd64a9 100644
--- a/dwds/test/integration/instances/record_inspection_amd_test.dart
+++ b/dwds/test/integration/instances/record_inspection_amd_test.dart
@@ -8,8 +8,8 @@
library;
import 'package:dwds/src/services/expression_compiler.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import '../fixtures/context.dart';
import 'common/record_inspection_common.dart';
diff --git a/dwds/test/integration/instances/record_inspection_ddc_library_bundle_test.dart b/dwds/test/integration/instances/record_inspection_ddc_library_bundle_test.dart
index b97e15a..0201c28 100644
--- a/dwds/test/integration/instances/record_inspection_ddc_library_bundle_test.dart
+++ b/dwds/test/integration/instances/record_inspection_ddc_library_bundle_test.dart
@@ -8,8 +8,8 @@
library;
import 'package:dwds/src/services/expression_compiler.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import '../fixtures/context.dart';
import 'common/record_inspection_common.dart';
diff --git a/dwds/test/integration/instances/record_type_inspection_amd_test.dart b/dwds/test/integration/instances/record_type_inspection_amd_test.dart
index 428bd30..618ef53 100644
--- a/dwds/test/integration/instances/record_type_inspection_amd_test.dart
+++ b/dwds/test/integration/instances/record_type_inspection_amd_test.dart
@@ -8,8 +8,8 @@
library;
import 'package:dwds/src/services/expression_compiler.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import '../fixtures/context.dart';
import 'common/record_type_inspection_common.dart';
diff --git a/dwds/test/integration/instances/record_type_inspection_ddc_library_bundle_test.dart b/dwds/test/integration/instances/record_type_inspection_ddc_library_bundle_test.dart
index 18382d3..3832869 100644
--- a/dwds/test/integration/instances/record_type_inspection_ddc_library_bundle_test.dart
+++ b/dwds/test/integration/instances/record_type_inspection_ddc_library_bundle_test.dart
@@ -8,8 +8,8 @@
library;
import 'package:dwds/expression_compiler.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import '../fixtures/context.dart';
import 'common/record_type_inspection_common.dart';
diff --git a/dwds/test/integration/instances/type_inspection_amd_test.dart b/dwds/test/integration/instances/type_inspection_amd_test.dart
index 5ec5ddc..717952e 100644
--- a/dwds/test/integration/instances/type_inspection_amd_test.dart
+++ b/dwds/test/integration/instances/type_inspection_amd_test.dart
@@ -8,8 +8,8 @@
library;
import 'package:dwds/expression_compiler.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import '../fixtures/context.dart';
import 'common/type_inspection_common.dart';
diff --git a/dwds/test/integration/instances/type_inspection_ddc_library_bundle_test.dart b/dwds/test/integration/instances/type_inspection_ddc_library_bundle_test.dart
index ec2c312..3756541 100644
--- a/dwds/test/integration/instances/type_inspection_ddc_library_bundle_test.dart
+++ b/dwds/test/integration/instances/type_inspection_ddc_library_bundle_test.dart
@@ -8,8 +8,8 @@
library;
import 'package:dwds/expression_compiler.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import '../fixtures/context.dart';
import 'common/type_inspection_common.dart';
diff --git a/dwds/test/integration/listviews_test.dart b/dwds/test/integration/listviews_test.dart
index 5ddf15b..a9a63b1 100644
--- a/dwds/test/integration/listviews_test.dart
+++ b/dwds/test/integration/listviews_test.dart
@@ -5,8 +5,8 @@
@Timeout(Duration(minutes: 2))
library;
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'fixtures/context.dart';
import 'fixtures/project.dart';
diff --git a/dwds/test/integration/load_strategy_test.dart b/dwds/test/integration/load_strategy_test.dart
index 5bf69c0..80e9318 100644
--- a/dwds/test/integration/load_strategy_test.dart
+++ b/dwds/test/integration/load_strategy_test.dart
@@ -8,9 +8,9 @@
import 'package:dwds/dwds.dart';
import 'package:dwds/src/config/tool_configuration.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:path/path.dart' as p;
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'fixtures/context.dart';
import 'fixtures/fakes.dart';
diff --git a/dwds/test/integration/parts_evaluate_amd_test.dart b/dwds/test/integration/parts_evaluate_amd_test.dart
index a8e0af4..132ae9b 100644
--- a/dwds/test/integration/parts_evaluate_amd_test.dart
+++ b/dwds/test/integration/parts_evaluate_amd_test.dart
@@ -10,8 +10,8 @@
import 'dart:io';
import 'package:dwds/expression_compiler.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'evaluate_parts_common.dart';
import 'fixtures/context.dart';
diff --git a/dwds/test/integration/parts_evaluate_ddc_library_bundle_test.dart b/dwds/test/integration/parts_evaluate_ddc_library_bundle_test.dart
index 4a8ea14..d99e21b 100644
--- a/dwds/test/integration/parts_evaluate_ddc_library_bundle_test.dart
+++ b/dwds/test/integration/parts_evaluate_ddc_library_bundle_test.dart
@@ -10,8 +10,8 @@
import 'dart:io';
import 'package:dwds/expression_compiler.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'evaluate_parts_common.dart';
import 'fixtures/context.dart';
diff --git a/dwds/test/integration/readers/frontend_server_asset_reader_test.dart b/dwds/test/integration/readers/frontend_server_asset_reader_test.dart
index 09dca1f..79559cd 100644
--- a/dwds/test/integration/readers/frontend_server_asset_reader_test.dart
+++ b/dwds/test/integration/readers/frontend_server_asset_reader_test.dart
@@ -8,10 +8,10 @@
import 'dart:io';
import 'package:dwds/src/readers/frontend_server_asset_reader.dart';
+import 'package:dwds_test_common/test_sdk_layout.dart';
+import 'package:dwds_test_common/utilities.dart';
import 'package:path/path.dart' as p;
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_layout.dart';
-import 'package:test_common/utilities.dart';
import '../fixtures/project.dart';
diff --git a/dwds/test/integration/readers/proxy_server_asset_reader_test.dart b/dwds/test/integration/readers/proxy_server_asset_reader_test.dart
index 7e8188f..8fbef91 100644
--- a/dwds/test/integration/readers/proxy_server_asset_reader_test.dart
+++ b/dwds/test/integration/readers/proxy_server_asset_reader_test.dart
@@ -6,8 +6,8 @@
library;
import 'package:dwds/src/readers/proxy_server_asset_reader.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import '../fixtures/context.dart';
import '../fixtures/project.dart';
diff --git a/dwds/test/integration/refresh_amd_test.dart b/dwds/test/integration/refresh_amd_test.dart
index 67fd5d2..f4ffaff 100644
--- a/dwds/test/integration/refresh_amd_test.dart
+++ b/dwds/test/integration/refresh_amd_test.dart
@@ -8,8 +8,8 @@
@Timeout(Duration(minutes: 2))
library;
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'refresh_common.dart';
diff --git a/dwds/test/integration/refresh_common.dart b/dwds/test/integration/refresh_common.dart
index 51b9d29..3e9fab0 100644
--- a/dwds/test/integration/refresh_common.dart
+++ b/dwds/test/integration/refresh_common.dart
@@ -4,9 +4,9 @@
import 'dart:async';
+import 'package:dwds_test_common/logging.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/logging.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'package:vm_service/vm_service.dart';
import 'package:vm_service_interface/vm_service_interface.dart';
diff --git a/dwds/test/integration/refresh_ddc_library_bundle_test.dart b/dwds/test/integration/refresh_ddc_library_bundle_test.dart
index 3a24127..6820f64 100644
--- a/dwds/test/integration/refresh_ddc_library_bundle_test.dart
+++ b/dwds/test/integration/refresh_ddc_library_bundle_test.dart
@@ -9,8 +9,8 @@
library;
import 'package:dwds/expression_compiler.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'refresh_common.dart';
diff --git a/dwds/test/integration/run_request_test.dart b/dwds/test/integration/run_request_test.dart
index badb377..1d4097a 100644
--- a/dwds/test/integration/run_request_test.dart
+++ b/dwds/test/integration/run_request_test.dart
@@ -7,9 +7,9 @@
import 'dart:async';
+import 'package:dwds_test_common/logging.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/logging.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'package:vm_service/vm_service.dart';
import 'package:vm_service_interface/vm_service_interface.dart';
diff --git a/dwds/test/integration/screenshot_amd_test.dart b/dwds/test/integration/screenshot_amd_test.dart
index 01e4f3d..7db972b 100644
--- a/dwds/test/integration/screenshot_amd_test.dart
+++ b/dwds/test/integration/screenshot_amd_test.dart
@@ -5,8 +5,8 @@
@Timeout(Duration(minutes: 2))
library;
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'screenshot_common.dart';
diff --git a/dwds/test/integration/screenshot_common.dart b/dwds/test/integration/screenshot_common.dart
index dffae94..4b530a6 100644
--- a/dwds/test/integration/screenshot_common.dart
+++ b/dwds/test/integration/screenshot_common.dart
@@ -2,9 +2,9 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
+import 'package:dwds_test_common/logging.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/logging.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'fixtures/context.dart';
import 'fixtures/project.dart';
diff --git a/dwds/test/integration/screenshot_ddc_library_bundle_test.dart b/dwds/test/integration/screenshot_ddc_library_bundle_test.dart
index 31e1f68..0fc43cb 100644
--- a/dwds/test/integration/screenshot_ddc_library_bundle_test.dart
+++ b/dwds/test/integration/screenshot_ddc_library_bundle_test.dart
@@ -6,8 +6,8 @@
library;
import 'package:dwds/expression_compiler.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'screenshot_common.dart';
diff --git a/dwds/test/integration/sdk_configuration_test.dart b/dwds/test/integration/sdk_configuration_test.dart
index bf2901d..05dd1af 100644
--- a/dwds/test/integration/sdk_configuration_test.dart
+++ b/dwds/test/integration/sdk_configuration_test.dart
@@ -9,10 +9,10 @@
import 'dart:io';
import 'package:dwds/src/utilities/sdk_configuration.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:file/memory.dart';
import 'package:path/path.dart' as p;
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
var _throwsDoesNotExistException = throwsA(
isA<InvalidSdkConfigurationException>().having(
diff --git a/dwds/test/integration/variable_scope_amd_test.dart b/dwds/test/integration/variable_scope_amd_test.dart
index e47257b..f4d562f 100644
--- a/dwds/test/integration/variable_scope_amd_test.dart
+++ b/dwds/test/integration/variable_scope_amd_test.dart
@@ -6,8 +6,8 @@
@Timeout(Duration(minutes: 2))
library;
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'variable_scope_common.dart';
diff --git a/dwds/test/integration/variable_scope_common.dart b/dwds/test/integration/variable_scope_common.dart
index 6354e61..3f3f2c5 100644
--- a/dwds/test/integration/variable_scope_common.dart
+++ b/dwds/test/integration/variable_scope_common.dart
@@ -6,9 +6,9 @@
import 'package:dwds/src/debugging/dart_scope.dart';
import 'package:dwds/src/services/chrome/chrome_proxy_service.dart';
+import 'package:dwds_test_common/logging.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/logging.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'package:vm_service/vm_service.dart';
import 'fixtures/context.dart';
diff --git a/dwds/test/integration/variable_scope_ddc_library_bundle_test.dart b/dwds/test/integration/variable_scope_ddc_library_bundle_test.dart
index dd225f1..e5a4963 100644
--- a/dwds/test/integration/variable_scope_ddc_library_bundle_test.dart
+++ b/dwds/test/integration/variable_scope_ddc_library_bundle_test.dart
@@ -7,8 +7,8 @@
library;
import 'package:dwds/expression_compiler.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
import 'variable_scope_common.dart';
diff --git a/dwds_test_common/.dartignore b/dwds_test_common/.dartignore
new file mode 100644
index 0000000..fdaa1da
--- /dev/null
+++ b/dwds_test_common/.dartignore
@@ -0,0 +1,2 @@
+# Exclude test fixture packages from Dart tooling
+fixtures/
\ No newline at end of file
diff --git a/dwds_test_common/analysis_options.yaml b/dwds_test_common/analysis_options.yaml
new file mode 100644
index 0000000..3faabb5
--- /dev/null
+++ b/dwds_test_common/analysis_options.yaml
@@ -0,0 +1,5 @@
+include: package:dart_flutter_team_lints/analysis_options.yaml
+
+analyzer:
+ exclude:
+ - fixtures/**
diff --git a/test_common/dart_test.yaml b/dwds_test_common/dart_test.yaml
similarity index 100%
rename from test_common/dart_test.yaml
rename to dwds_test_common/dart_test.yaml
diff --git a/fixtures/_experiment/pubspec.yaml b/dwds_test_common/fixtures/_experiment/pubspec.yaml
similarity index 100%
rename from fixtures/_experiment/pubspec.yaml
rename to dwds_test_common/fixtures/_experiment/pubspec.yaml
diff --git a/fixtures/_experiment/web/index.html b/dwds_test_common/fixtures/_experiment/web/index.html
similarity index 100%
rename from fixtures/_experiment/web/index.html
rename to dwds_test_common/fixtures/_experiment/web/index.html
diff --git a/fixtures/_experiment/web/main.dart b/dwds_test_common/fixtures/_experiment/web/main.dart
similarity index 100%
rename from fixtures/_experiment/web/main.dart
rename to dwds_test_common/fixtures/_experiment/web/main.dart
diff --git a/fixtures/_test/example/append_body/index.html b/dwds_test_common/fixtures/_test/example/append_body/index.html
similarity index 100%
rename from fixtures/_test/example/append_body/index.html
rename to dwds_test_common/fixtures/_test/example/append_body/index.html
diff --git a/fixtures/_test/example/append_body/main.dart b/dwds_test_common/fixtures/_test/example/append_body/main.dart
similarity index 100%
rename from fixtures/_test/example/append_body/main.dart
rename to dwds_test_common/fixtures/_test/example/append_body/main.dart
diff --git a/fixtures/_test/example/hello_world/index.html b/dwds_test_common/fixtures/_test/example/hello_world/index.html
similarity index 100%
rename from fixtures/_test/example/hello_world/index.html
rename to dwds_test_common/fixtures/_test/example/hello_world/index.html
diff --git a/fixtures/_test/example/hello_world/main.dart b/dwds_test_common/fixtures/_test/example/hello_world/main.dart
similarity index 100%
rename from fixtures/_test/example/hello_world/main.dart
rename to dwds_test_common/fixtures/_test/example/hello_world/main.dart
diff --git a/fixtures/_test/example/hello_world/part.dart b/dwds_test_common/fixtures/_test/example/hello_world/part.dart
similarity index 100%
rename from fixtures/_test/example/hello_world/part.dart
rename to dwds_test_common/fixtures/_test/example/hello_world/part.dart
diff --git a/fixtures/_test/example/scopes/main.dart b/dwds_test_common/fixtures/_test/example/scopes/main.dart
similarity index 100%
rename from fixtures/_test/example/scopes/main.dart
rename to dwds_test_common/fixtures/_test/example/scopes/main.dart
diff --git a/fixtures/_test/example/scopes/scopes.html b/dwds_test_common/fixtures/_test/example/scopes/scopes.html
similarity index 100%
rename from fixtures/_test/example/scopes/scopes.html
rename to dwds_test_common/fixtures/_test/example/scopes/scopes.html
diff --git a/fixtures/_test/lib/deferred_library.dart b/dwds_test_common/fixtures/_test/lib/deferred_library.dart
similarity index 100%
rename from fixtures/_test/lib/deferred_library.dart
rename to dwds_test_common/fixtures/_test/lib/deferred_library.dart
diff --git a/fixtures/_test/lib/library.dart b/dwds_test_common/fixtures/_test/lib/library.dart
similarity index 100%
rename from fixtures/_test/lib/library.dart
rename to dwds_test_common/fixtures/_test/lib/library.dart
diff --git a/fixtures/_test/pubspec.yaml b/dwds_test_common/fixtures/_test/pubspec.yaml
similarity index 100%
rename from fixtures/_test/pubspec.yaml
rename to dwds_test_common/fixtures/_test/pubspec.yaml
diff --git a/fixtures/_test_circular1/lib/library1.dart b/dwds_test_common/fixtures/_test_circular1/lib/library1.dart
similarity index 100%
rename from fixtures/_test_circular1/lib/library1.dart
rename to dwds_test_common/fixtures/_test_circular1/lib/library1.dart
diff --git a/fixtures/_test_circular1/pubspec.yaml b/dwds_test_common/fixtures/_test_circular1/pubspec.yaml
similarity index 100%
rename from fixtures/_test_circular1/pubspec.yaml
rename to dwds_test_common/fixtures/_test_circular1/pubspec.yaml
diff --git a/fixtures/_test_circular2/lib/library2.dart b/dwds_test_common/fixtures/_test_circular2/lib/library2.dart
similarity index 100%
rename from fixtures/_test_circular2/lib/library2.dart
rename to dwds_test_common/fixtures/_test_circular2/lib/library2.dart
diff --git a/fixtures/_test_circular2/pubspec.yaml b/dwds_test_common/fixtures/_test_circular2/pubspec.yaml
similarity index 100%
rename from fixtures/_test_circular2/pubspec.yaml
rename to dwds_test_common/fixtures/_test_circular2/pubspec.yaml
diff --git a/fixtures/_test_circular2/web/base_index.html b/dwds_test_common/fixtures/_test_circular2/web/base_index.html
similarity index 100%
rename from fixtures/_test_circular2/web/base_index.html
rename to dwds_test_common/fixtures/_test_circular2/web/base_index.html
diff --git a/fixtures/_test_circular2/web/index.html b/dwds_test_common/fixtures/_test_circular2/web/index.html
similarity index 100%
rename from fixtures/_test_circular2/web/index.html
rename to dwds_test_common/fixtures/_test_circular2/web/index.html
diff --git a/fixtures/_test_circular2/web/main.dart b/dwds_test_common/fixtures/_test_circular2/web/main.dart
similarity index 100%
rename from fixtures/_test_circular2/web/main.dart
rename to dwds_test_common/fixtures/_test_circular2/web/main.dart
diff --git a/fixtures/_test_dot_shorthands/pubspec.yaml b/dwds_test_common/fixtures/_test_dot_shorthands/pubspec.yaml
similarity index 93%
rename from fixtures/_test_dot_shorthands/pubspec.yaml
rename to dwds_test_common/fixtures/_test_dot_shorthands/pubspec.yaml
index 7130bf1..f91980f 100644
--- a/fixtures/_test_dot_shorthands/pubspec.yaml
+++ b/dwds_test_common/fixtures/_test_dot_shorthands/pubspec.yaml
@@ -4,7 +4,7 @@
A fake package used for testing dot shorthands.
publish_to: none
environment:
- sdk: ^3.9.0
+ sdk: ^3.10.0
dev_dependencies:
build_runner: ^2.5.0
diff --git a/fixtures/_test_dot_shorthands/web/index.html b/dwds_test_common/fixtures/_test_dot_shorthands/web/index.html
similarity index 100%
rename from fixtures/_test_dot_shorthands/web/index.html
rename to dwds_test_common/fixtures/_test_dot_shorthands/web/index.html
diff --git a/fixtures/_test_dot_shorthands/web/main.dart b/dwds_test_common/fixtures/_test_dot_shorthands/web/main.dart
similarity index 97%
rename from fixtures/_test_dot_shorthands/web/main.dart
rename to dwds_test_common/fixtures/_test_dot_shorthands/web/main.dart
index 41520c7..bc5f6bb 100644
--- a/fixtures/_test_dot_shorthands/web/main.dart
+++ b/dwds_test_common/fixtures/_test_dot_shorthands/web/main.dart
@@ -2,7 +2,7 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// @dart = 3.9
+// @dart = 3.10
class C {
int value;
diff --git a/fixtures/_test_hot_reload/lib/library1.dart b/dwds_test_common/fixtures/_test_hot_reload/lib/library1.dart
similarity index 100%
rename from fixtures/_test_hot_reload/lib/library1.dart
rename to dwds_test_common/fixtures/_test_hot_reload/lib/library1.dart
diff --git a/fixtures/_test_hot_reload/pubspec.yaml b/dwds_test_common/fixtures/_test_hot_reload/pubspec.yaml
similarity index 100%
rename from fixtures/_test_hot_reload/pubspec.yaml
rename to dwds_test_common/fixtures/_test_hot_reload/pubspec.yaml
diff --git a/fixtures/_test_hot_reload/web/index.html b/dwds_test_common/fixtures/_test_hot_reload/web/index.html
similarity index 100%
rename from fixtures/_test_hot_reload/web/index.html
rename to dwds_test_common/fixtures/_test_hot_reload/web/index.html
diff --git a/fixtures/_test_hot_reload/web/main.dart b/dwds_test_common/fixtures/_test_hot_reload/web/main.dart
similarity index 100%
rename from fixtures/_test_hot_reload/web/main.dart
rename to dwds_test_common/fixtures/_test_hot_reload/web/main.dart
diff --git a/fixtures/_test_hot_reload_breakpoints/pubspec.yaml b/dwds_test_common/fixtures/_test_hot_reload_breakpoints/pubspec.yaml
similarity index 100%
rename from fixtures/_test_hot_reload_breakpoints/pubspec.yaml
rename to dwds_test_common/fixtures/_test_hot_reload_breakpoints/pubspec.yaml
diff --git a/fixtures/_test_hot_reload_breakpoints/web/index.html b/dwds_test_common/fixtures/_test_hot_reload_breakpoints/web/index.html
similarity index 100%
rename from fixtures/_test_hot_reload_breakpoints/web/index.html
rename to dwds_test_common/fixtures/_test_hot_reload_breakpoints/web/index.html
diff --git a/fixtures/_test_hot_reload_breakpoints/web/main.dart b/dwds_test_common/fixtures/_test_hot_reload_breakpoints/web/main.dart
similarity index 100%
rename from fixtures/_test_hot_reload_breakpoints/web/main.dart
rename to dwds_test_common/fixtures/_test_hot_reload_breakpoints/web/main.dart
diff --git a/fixtures/_test_hot_restart1/lib/library1.dart b/dwds_test_common/fixtures/_test_hot_restart1/lib/library1.dart
similarity index 100%
rename from fixtures/_test_hot_restart1/lib/library1.dart
rename to dwds_test_common/fixtures/_test_hot_restart1/lib/library1.dart
diff --git a/fixtures/_test_hot_restart1/pubspec.yaml b/dwds_test_common/fixtures/_test_hot_restart1/pubspec.yaml
similarity index 100%
rename from fixtures/_test_hot_restart1/pubspec.yaml
rename to dwds_test_common/fixtures/_test_hot_restart1/pubspec.yaml
diff --git a/fixtures/_test_hot_restart2/lib/library2.dart b/dwds_test_common/fixtures/_test_hot_restart2/lib/library2.dart
similarity index 100%
rename from fixtures/_test_hot_restart2/lib/library2.dart
rename to dwds_test_common/fixtures/_test_hot_restart2/lib/library2.dart
diff --git a/fixtures/_test_hot_restart2/pubspec.yaml b/dwds_test_common/fixtures/_test_hot_restart2/pubspec.yaml
similarity index 100%
rename from fixtures/_test_hot_restart2/pubspec.yaml
rename to dwds_test_common/fixtures/_test_hot_restart2/pubspec.yaml
diff --git a/fixtures/_test_hot_restart2/web/base_index.html b/dwds_test_common/fixtures/_test_hot_restart2/web/base_index.html
similarity index 100%
rename from fixtures/_test_hot_restart2/web/base_index.html
rename to dwds_test_common/fixtures/_test_hot_restart2/web/base_index.html
diff --git a/fixtures/_test_hot_restart2/web/index.html b/dwds_test_common/fixtures/_test_hot_restart2/web/index.html
similarity index 100%
rename from fixtures/_test_hot_restart2/web/index.html
rename to dwds_test_common/fixtures/_test_hot_restart2/web/index.html
diff --git a/fixtures/_test_hot_restart2/web/main.dart b/dwds_test_common/fixtures/_test_hot_restart2/web/main.dart
similarity index 100%
rename from fixtures/_test_hot_restart2/web/main.dart
rename to dwds_test_common/fixtures/_test_hot_restart2/web/main.dart
diff --git a/fixtures/_test_hot_restart_breakpoints/pubspec.yaml b/dwds_test_common/fixtures/_test_hot_restart_breakpoints/pubspec.yaml
similarity index 100%
rename from fixtures/_test_hot_restart_breakpoints/pubspec.yaml
rename to dwds_test_common/fixtures/_test_hot_restart_breakpoints/pubspec.yaml
diff --git a/fixtures/_test_hot_restart_breakpoints/web/index.html b/dwds_test_common/fixtures/_test_hot_restart_breakpoints/web/index.html
similarity index 100%
rename from fixtures/_test_hot_restart_breakpoints/web/index.html
rename to dwds_test_common/fixtures/_test_hot_restart_breakpoints/web/index.html
diff --git a/fixtures/_test_hot_restart_breakpoints/web/main.dart b/dwds_test_common/fixtures/_test_hot_restart_breakpoints/web/main.dart
similarity index 100%
rename from fixtures/_test_hot_restart_breakpoints/web/main.dart
rename to dwds_test_common/fixtures/_test_hot_restart_breakpoints/web/main.dart
diff --git a/fixtures/_test_package/lib/src/test_part.dart b/dwds_test_common/fixtures/_test_package/lib/src/test_part.dart
similarity index 100%
rename from fixtures/_test_package/lib/src/test_part.dart
rename to dwds_test_common/fixtures/_test_package/lib/src/test_part.dart
diff --git a/fixtures/_test_package/lib/src/version.dart b/dwds_test_common/fixtures/_test_package/lib/src/version.dart
similarity index 100%
rename from fixtures/_test_package/lib/src/version.dart
rename to dwds_test_common/fixtures/_test_package/lib/src/version.dart
diff --git a/fixtures/_test_package/lib/test_library.dart b/dwds_test_common/fixtures/_test_package/lib/test_library.dart
similarity index 100%
rename from fixtures/_test_package/lib/test_library.dart
rename to dwds_test_common/fixtures/_test_package/lib/test_library.dart
diff --git a/fixtures/_test_package/pubspec.yaml b/dwds_test_common/fixtures/_test_package/pubspec.yaml
similarity index 100%
rename from fixtures/_test_package/pubspec.yaml
rename to dwds_test_common/fixtures/_test_package/pubspec.yaml
diff --git a/fixtures/_test_package/web/base_index.html b/dwds_test_common/fixtures/_test_package/web/base_index.html
similarity index 100%
rename from fixtures/_test_package/web/base_index.html
rename to dwds_test_common/fixtures/_test_package/web/base_index.html
diff --git a/fixtures/_test_package/web/index.html b/dwds_test_common/fixtures/_test_package/web/index.html
similarity index 100%
rename from fixtures/_test_package/web/index.html
rename to dwds_test_common/fixtures/_test_package/web/index.html
diff --git a/fixtures/_test_package/web/main.dart b/dwds_test_common/fixtures/_test_package/web/main.dart
similarity index 100%
rename from fixtures/_test_package/web/main.dart
rename to dwds_test_common/fixtures/_test_package/web/main.dart
diff --git a/fixtures/_test_parts/lib/library.dart b/dwds_test_common/fixtures/_test_parts/lib/library.dart
similarity index 100%
rename from fixtures/_test_parts/lib/library.dart
rename to dwds_test_common/fixtures/_test_parts/lib/library.dart
diff --git a/fixtures/_test_parts/lib/part1.dart b/dwds_test_common/fixtures/_test_parts/lib/part1.dart
similarity index 100%
rename from fixtures/_test_parts/lib/part1.dart
rename to dwds_test_common/fixtures/_test_parts/lib/part1.dart
diff --git a/fixtures/_test_parts/lib/part2.dart b/dwds_test_common/fixtures/_test_parts/lib/part2.dart
similarity index 100%
rename from fixtures/_test_parts/lib/part2.dart
rename to dwds_test_common/fixtures/_test_parts/lib/part2.dart
diff --git a/fixtures/_test_parts/lib/part3.dart b/dwds_test_common/fixtures/_test_parts/lib/part3.dart
similarity index 100%
rename from fixtures/_test_parts/lib/part3.dart
rename to dwds_test_common/fixtures/_test_parts/lib/part3.dart
diff --git a/fixtures/_test_parts/pubspec.yaml b/dwds_test_common/fixtures/_test_parts/pubspec.yaml
similarity index 100%
rename from fixtures/_test_parts/pubspec.yaml
rename to dwds_test_common/fixtures/_test_parts/pubspec.yaml
diff --git a/fixtures/_test_parts/web/base_index.html b/dwds_test_common/fixtures/_test_parts/web/base_index.html
similarity index 100%
rename from fixtures/_test_parts/web/base_index.html
rename to dwds_test_common/fixtures/_test_parts/web/base_index.html
diff --git a/fixtures/_test_parts/web/index.html b/dwds_test_common/fixtures/_test_parts/web/index.html
similarity index 100%
rename from fixtures/_test_parts/web/index.html
rename to dwds_test_common/fixtures/_test_parts/web/index.html
diff --git a/fixtures/_test_parts/web/main.dart b/dwds_test_common/fixtures/_test_parts/web/main.dart
similarity index 100%
rename from fixtures/_test_parts/web/main.dart
rename to dwds_test_common/fixtures/_test_parts/web/main.dart
diff --git a/fixtures/_webdev_smoke/build.yaml b/dwds_test_common/fixtures/_webdev_smoke/build.yaml
similarity index 100%
rename from fixtures/_webdev_smoke/build.yaml
rename to dwds_test_common/fixtures/_webdev_smoke/build.yaml
diff --git a/fixtures/_webdev_smoke/canary_build.yaml b/dwds_test_common/fixtures/_webdev_smoke/canary_build.yaml
similarity index 100%
rename from fixtures/_webdev_smoke/canary_build.yaml
rename to dwds_test_common/fixtures/_webdev_smoke/canary_build.yaml
diff --git a/fixtures/_webdev_smoke/localhost+2-key.pem b/dwds_test_common/fixtures/_webdev_smoke/localhost+2-key.pem
similarity index 100%
rename from fixtures/_webdev_smoke/localhost+2-key.pem
rename to dwds_test_common/fixtures/_webdev_smoke/localhost+2-key.pem
diff --git a/fixtures/_webdev_smoke/localhost+2.pem b/dwds_test_common/fixtures/_webdev_smoke/localhost+2.pem
similarity index 100%
rename from fixtures/_webdev_smoke/localhost+2.pem
rename to dwds_test_common/fixtures/_webdev_smoke/localhost+2.pem
diff --git a/fixtures/_webdev_smoke/mono_pkg.yaml b/dwds_test_common/fixtures/_webdev_smoke/mono_pkg.yaml
similarity index 100%
rename from fixtures/_webdev_smoke/mono_pkg.yaml
rename to dwds_test_common/fixtures/_webdev_smoke/mono_pkg.yaml
diff --git a/fixtures/_webdev_smoke/pubspec.yaml b/dwds_test_common/fixtures/_webdev_smoke/pubspec.yaml
similarity index 100%
rename from fixtures/_webdev_smoke/pubspec.yaml
rename to dwds_test_common/fixtures/_webdev_smoke/pubspec.yaml
diff --git a/fixtures/_webdev_smoke/web/index.html b/dwds_test_common/fixtures/_webdev_smoke/web/index.html
similarity index 100%
rename from fixtures/_webdev_smoke/web/index.html
rename to dwds_test_common/fixtures/_webdev_smoke/web/index.html
diff --git a/fixtures/_webdev_smoke/web/main.dart b/dwds_test_common/fixtures/_webdev_smoke/web/main.dart
similarity index 100%
rename from fixtures/_webdev_smoke/web/main.dart
rename to dwds_test_common/fixtures/_webdev_smoke/web/main.dart
diff --git a/fixtures/_webdev_smoke/web/scopes.html b/dwds_test_common/fixtures/_webdev_smoke/web/scopes.html
similarity index 100%
rename from fixtures/_webdev_smoke/web/scopes.html
rename to dwds_test_common/fixtures/_webdev_smoke/web/scopes.html
diff --git a/fixtures/_webdev_smoke/web/scopes_main.dart b/dwds_test_common/fixtures/_webdev_smoke/web/scopes_main.dart
similarity index 100%
rename from fixtures/_webdev_smoke/web/scopes_main.dart
rename to dwds_test_common/fixtures/_webdev_smoke/web/scopes_main.dart
diff --git a/dwds_test_common/fixtures/analysis_options.yaml b/dwds_test_common/fixtures/analysis_options.yaml
new file mode 100644
index 0000000..064de52
--- /dev/null
+++ b/dwds_test_common/fixtures/analysis_options.yaml
@@ -0,0 +1,6 @@
+# This file prevents sub-packages from picking up the parent's analysis options,
+# which eliminates package resolution errors during 'dart format'.
+
+analyzer:
+ exclude:
+ - "**"
\ No newline at end of file
diff --git a/test_common/lib/logging.dart b/dwds_test_common/lib/logging.dart
similarity index 100%
rename from test_common/lib/logging.dart
rename to dwds_test_common/lib/logging.dart
diff --git a/test_common/lib/sdk_asset_generator.dart b/dwds_test_common/lib/sdk_asset_generator.dart
similarity index 98%
rename from test_common/lib/sdk_asset_generator.dart
rename to dwds_test_common/lib/sdk_asset_generator.dart
index e576875..ea1f06e 100644
--- a/test_common/lib/sdk_asset_generator.dart
+++ b/dwds_test_common/lib/sdk_asset_generator.dart
@@ -6,7 +6,7 @@
import 'package:file/local.dart';
import 'package:logging/logging.dart';
import 'package:path/path.dart' as p;
-import 'package:test_common/test_sdk_layout.dart';
+import 'test_sdk_layout.dart';
/// Generates sdk.js, sdk.map, files.
diff --git a/test_common/lib/test_sdk_configuration.dart b/dwds_test_common/lib/test_sdk_configuration.dart
similarity index 95%
rename from test_common/lib/test_sdk_configuration.dart
rename to dwds_test_common/lib/test_sdk_configuration.dart
index cfc0315..c6fabc0 100644
--- a/test_common/lib/test_sdk_configuration.dart
+++ b/dwds_test_common/lib/test_sdk_configuration.dart
@@ -8,8 +8,8 @@
import 'package:dwds/sdk_configuration.dart';
import 'package:logging/logging.dart';
-import 'package:test_common/sdk_asset_generator.dart';
-import 'package:test_common/test_sdk_layout.dart';
+import 'sdk_asset_generator.dart';
+import 'test_sdk_layout.dart';
/// Implementation for SDK configuration for tests that can generate
/// missing assets.
diff --git a/test_common/lib/test_sdk_layout.dart b/dwds_test_common/lib/test_sdk_layout.dart
similarity index 100%
rename from test_common/lib/test_sdk_layout.dart
rename to dwds_test_common/lib/test_sdk_layout.dart
diff --git a/dwds_test_common/lib/utilities.dart b/dwds_test_common/lib/utilities.dart
new file mode 100644
index 0000000..b3c10ac
--- /dev/null
+++ b/dwds_test_common/lib/utilities.dart
@@ -0,0 +1,98 @@
+// Copyright (c) 2026, the Dart project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+import 'dart:io';
+
+import 'package:path/path.dart' as p;
+import 'package:pub_semver/pub_semver.dart';
+
+const webdevDirName = 'webdev';
+const dwdsDirName = 'dwds';
+const fixturesDirName = 'fixtures';
+
+/// The path to the project root directory, e.g. `webdev/` or `pkg/` in the
+/// Dart SDK.
+String get projectRootDir {
+ return p.dirname(_dwdsTestCommonPackageRoot);
+}
+
+/// The path to the DWDS directory in the local machine, e.g.
+/// 'webdev/dwds' or 'pkg/dwds'.
+String get dwdsPath {
+ return p.join(projectRootDir, dwdsDirName);
+}
+
+/// The path to the fixtures directory in the local machine, e.g.
+/// 'webdev/dwds_test_common/fixtures' or 'pkg/dwds_test_common/fixtures'.
+String get fixturesPath {
+ return p.join(_dwdsTestCommonPackageRoot, fixturesDirName);
+}
+
+/// The path to the webdev/dwds_test_common or pkg/dwds_test_common package
+/// root in the local machine, e.g. 'webdev/dwds_test_common' or
+/// 'pkg/dwds_test_common'.
+String get _dwdsTestCommonPackageRoot {
+ final scriptPath = Platform.script.toFilePath();
+ final isTest = scriptPath.contains('dart_test.kernel');
+ if (isTest) {
+ // When running tests, p.current might be dwds, so we need to check
+ // if we're in webdev/dwds_test_common or pkg/dwds_test_common or need to
+ // navigate to it.
+ var current = p.current;
+ if (p.basename(current) == 'dwds') {
+ // Check if dwds_test_common exists as a sibling
+ final testCommonPath = p.join(p.dirname(current), 'dwds_test_common');
+ if (Directory(testCommonPath).existsSync()) {
+ return testCommonPath;
+ }
+ }
+ return current; // p.current is the package root for tests
+ }
+ var current = p.dirname(scriptPath);
+ while (current != p.dirname(current)) {
+ if (File(p.join(current, 'pubspec.yaml')).existsSync()) {
+ return current; // This is the package root
+ }
+ current = p.dirname(current);
+ }
+ throw StateError(
+ 'Could not find `dwds_test_common` package root from '
+ '${Platform.script.path}.',
+ );
+}
+
+// Creates a path compatible for web.
+String webCompatiblePath(List<String> pathParts) {
+ final context = p.Context(style: p.Style.posix);
+ return context.joinAll([...pathParts]);
+}
+
+/// Expects one of [pathFromWebdev], [pathFromDwds] or [pathFromFixtures] to
+/// be provided. Returns the absolute path in the local machine to that path,
+/// e.g. absolutePath(pathFromFixtures: '_test/example') ->
+/// '/workstation/webdev/dwds_test_common/fixtures/_test/example'
+String absolutePath({
+ String? pathFromWebdev,
+ String? pathFromDwds,
+ String? pathFromFixtures,
+}) {
+ if (pathFromWebdev != null) {
+ assert(pathFromDwds == null && pathFromFixtures == null);
+ return p.normalize(p.join(projectRootDir, pathFromWebdev));
+ }
+ if (pathFromDwds != null) {
+ assert(pathFromFixtures == null);
+ return p.normalize(p.join(dwdsPath, pathFromDwds));
+ }
+ if (pathFromFixtures != null) {
+ assert(pathFromDwds == null && pathFromWebdev == null);
+ return p.normalize(p.join(fixturesPath, pathFromFixtures));
+ }
+ throw Exception('Expected a path parameter.');
+}
+
+bool dartSdkIsAtLeast(String sdkVersion) {
+ final expectedVersion = Version.parse(sdkVersion);
+ final actualVersion = Version.parse(Platform.version.split(' ')[0]);
+ return actualVersion >= expectedVersion;
+}
diff --git a/test_common/mono_pkg.yaml b/dwds_test_common/mono_pkg.yaml
similarity index 100%
rename from test_common/mono_pkg.yaml
rename to dwds_test_common/mono_pkg.yaml
diff --git a/test_common/pubspec.yaml b/dwds_test_common/pubspec.yaml
similarity index 72%
rename from test_common/pubspec.yaml
rename to dwds_test_common/pubspec.yaml
index 79ec1d1..392a12d 100644
--- a/test_common/pubspec.yaml
+++ b/dwds_test_common/pubspec.yaml
@@ -1,4 +1,4 @@
-name: test_common
+name: dwds_test_common
publish_to: none
description: >-
Common test functionality.
@@ -14,6 +14,5 @@
test: ^1.21.1
dev_dependencies:
- analysis_config:
- path: ../_analysis_config
- pubspec_parse: ^1.2.2
+ dart_flutter_team_lints: ^3.5.2
+ yaml: ^3.1.2
diff --git a/test_common/pubspec_overrides.yaml b/dwds_test_common/pubspec_overrides.yaml
similarity index 100%
rename from test_common/pubspec_overrides.yaml
rename to dwds_test_common/pubspec_overrides.yaml
diff --git a/test_common/test/proper_release_test.dart b/dwds_test_common/test/proper_release_test.dart
similarity index 91%
rename from test_common/test/proper_release_test.dart
rename to dwds_test_common/test/proper_release_test.dart
index 8726e13..724f7c2 100644
--- a/test_common/test/proper_release_test.dart
+++ b/dwds_test_common/test/proper_release_test.dart
@@ -8,11 +8,11 @@
import 'dart:io';
+import 'package:dwds_test_common/utilities.dart';
import 'package:path/path.dart' as p;
import 'package:pub_semver/pub_semver.dart';
-import 'package:pubspec_parse/pubspec_parse.dart';
import 'package:test/test.dart';
-import 'package:test_common/utilities.dart';
+import 'package:yaml/yaml.dart';
void main() {
for (final package in ['dwds', 'webdev']) {
@@ -20,8 +20,8 @@
final pubspecPath = absolutePath(
pathFromWebdev: p.join(package, 'pubspec.yaml'),
);
- final pubspec = Pubspec.parse(File(pubspecPath).readAsStringSync());
- final version = pubspec.version!;
+ final pubspec = loadYaml(File(pubspecPath).readAsStringSync()) as YamlMap;
+ final version = Version.parse(pubspec['version'] as String);
final isWip = version.toString().contains('wip');
if (!isWip) {
final wasReleased = await _versionWasReleased(
diff --git a/test_common/test/sdk_asset_generator_test.dart b/dwds_test_common/test/sdk_asset_generator_test.dart
similarity index 84%
rename from test_common/test/sdk_asset_generator_test.dart
rename to dwds_test_common/test/sdk_asset_generator_test.dart
index 2f586ae..7f7563d 100644
--- a/test_common/test/sdk_asset_generator_test.dart
+++ b/dwds_test_common/test/sdk_asset_generator_test.dart
@@ -9,10 +9,10 @@
import 'dart:io';
import 'package:dwds/expression_compiler.dart';
+import 'package:dwds_test_common/logging.dart';
+import 'package:dwds_test_common/sdk_asset_generator.dart';
+import 'package:dwds_test_common/test_sdk_layout.dart';
import 'package:test/test.dart';
-import 'package:test_common/logging.dart';
-import 'package:test_common/sdk_asset_generator.dart';
-import 'package:test_common/test_sdk_layout.dart';
void main() {
group('SDK asset generator', () {
@@ -57,7 +57,8 @@
});
test(
- 'Can generate missing SDK assets and validate SDK configuration for the AMD module system',
+ 'Can generate missing SDK assets and validate SDK configuration for the '
+ 'AMD module system',
() async {
final sdkLayout = TestSdkLayout.createDefault(sdkDirectory);
final configuration = TestSdkLayout.createConfiguration(sdkLayout);
@@ -70,7 +71,8 @@
);
await assetGenerator.generateSdkAssets();
- // Make sure SDK configuration and asset generator agree on the file paths.
+ // Make sure SDK configuration and asset generator agree on the file
+ // paths.
expect(configuration.sdkDirectory, equals(sdkDirectory));
expect(configuration.compilerWorkerPath, equals(compilerWorkerPath));
@@ -88,7 +90,8 @@
);
test(
- 'Can generate missing SDK assets and validate SDK configuration for the DDC module system',
+ 'Can generate missing SDK assets and validate SDK configuration for the '
+ 'DDC module system',
() async {
final sdkLayout = TestSdkLayout.createDefault(sdkDirectory);
final configuration = TestSdkLayout.createConfiguration(sdkLayout);
@@ -101,7 +104,8 @@
);
await assetGenerator.generateSdkAssets();
- // Make sure SDK configuration and asset generator agree on the file paths.
+ // Make sure SDK configuration and asset generator agree on the file
+ // paths.
expect(configuration.sdkDirectory, equals(sdkDirectory));
expect(configuration.compilerWorkerPath, equals(compilerWorkerPath));
@@ -136,23 +140,21 @@
},
);
- test(
- 'Can generate missing SDK assets with canary features enabled for the DDC module system',
- () async {
- final sdkLayout = TestSdkLayout.createDefault(sdkDirectory);
+ test('Can generate missing SDK assets with canary features enabled for the '
+ 'DDC module system', () async {
+ final sdkLayout = TestSdkLayout.createDefault(sdkDirectory);
- final assetGenerator = SdkAssetGenerator(
- sdkLayout: sdkLayout,
- verbose: true,
- canaryFeatures: true,
- ddcModuleFormat: ModuleFormat.ddc,
- );
- await assetGenerator.generateSdkAssets();
+ final assetGenerator = SdkAssetGenerator(
+ sdkLayout: sdkLayout,
+ verbose: true,
+ canaryFeatures: true,
+ ddcModuleFormat: ModuleFormat.ddc,
+ );
+ await assetGenerator.generateSdkAssets();
- final sdk = File(ddcSdkJsPath).readAsStringSync();
- expect(sdk, contains('canary'));
- },
- );
+ final sdk = File(ddcSdkJsPath).readAsStringSync();
+ expect(sdk, contains('canary'));
+ });
});
}
diff --git a/test_common/test/test_sdk_configuration_test.dart b/dwds_test_common/test/test_sdk_configuration_test.dart
similarity index 97%
rename from test_common/test/test_sdk_configuration_test.dart
rename to dwds_test_common/test/test_sdk_configuration_test.dart
index 9f1a086..da19953 100644
--- a/test_common/test/test_sdk_configuration_test.dart
+++ b/dwds_test_common/test/test_sdk_configuration_test.dart
@@ -9,9 +9,9 @@
import 'dart:io';
import 'package:dwds/expression_compiler.dart';
+import 'package:dwds_test_common/logging.dart';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
import 'package:test/test.dart';
-import 'package:test_common/logging.dart';
-import 'package:test_common/test_sdk_configuration.dart';
void main() {
const debug = false;
diff --git a/frontend_server_common/lib/src/asset_server.dart b/frontend_server_common/lib/src/asset_server.dart
index 72d2b2d..f63b451 100644
--- a/frontend_server_common/lib/src/asset_server.dart
+++ b/frontend_server_common/lib/src/asset_server.dart
@@ -11,11 +11,11 @@
import 'package:dwds/asset_reader.dart';
import 'package:dwds/config.dart';
+import 'package:dwds_test_common/test_sdk_layout.dart';
import 'package:file/file.dart';
import 'package:logging/logging.dart';
import 'package:mime/mime.dart' as mime;
import 'package:shelf/shelf.dart' as shelf;
-import 'package:test_common/test_sdk_layout.dart';
class TestAssetServer implements AssetReader {
late final String _basePath;
diff --git a/frontend_server_common/lib/src/devfs.dart b/frontend_server_common/lib/src/devfs.dart
index 428134b..945acb7 100644
--- a/frontend_server_common/lib/src/devfs.dart
+++ b/frontend_server_common/lib/src/devfs.dart
@@ -13,9 +13,9 @@
// ignore: implementation_imports
import 'package:dwds/src/debugging/metadata/module_metadata.dart';
import 'package:dwds/utilities.dart';
+import 'package:dwds_test_common/test_sdk_layout.dart';
import 'package:file/file.dart';
import 'package:path/path.dart' as p;
-import 'package:test_common/test_sdk_layout.dart';
import 'asset_server.dart';
import 'bootstrap.dart';
diff --git a/frontend_server_common/lib/src/frontend_server_client.dart b/frontend_server_common/lib/src/frontend_server_client.dart
index f97d15d..9c3ee5d 100644
--- a/frontend_server_common/lib/src/frontend_server_client.dart
+++ b/frontend_server_common/lib/src/frontend_server_client.dart
@@ -9,9 +9,9 @@
import 'dart:io';
import 'package:dwds/expression_compiler.dart';
+import 'package:dwds_test_common/test_sdk_layout.dart';
import 'package:logging/logging.dart';
import 'package:package_config/package_config.dart';
-import 'package:test_common/test_sdk_layout.dart';
import 'utilities.dart';
import 'uuid.dart';
diff --git a/frontend_server_common/lib/src/resident_runner.dart b/frontend_server_common/lib/src/resident_runner.dart
index 9ac21e9..905d7c6 100644
--- a/frontend_server_common/lib/src/resident_runner.dart
+++ b/frontend_server_common/lib/src/resident_runner.dart
@@ -10,9 +10,9 @@
import 'package:dwds/asset_reader.dart';
import 'package:dwds/config.dart';
import 'package:dwds/expression_compiler.dart';
+import 'package:dwds_test_common/test_sdk_layout.dart';
import 'package:file/file.dart';
import 'package:logging/logging.dart';
-import 'package:test_common/test_sdk_layout.dart';
import 'devfs.dart';
import 'frontend_server_client.dart';
diff --git a/frontend_server_common/pubspec.yaml b/frontend_server_common/pubspec.yaml
index 7b3c152..9163032 100644
--- a/frontend_server_common/pubspec.yaml
+++ b/frontend_server_common/pubspec.yaml
@@ -15,8 +15,8 @@
package_config: ^2.0.0
path: ^1.8.0
pub_semver: ^2.1.1
- test_common:
- path: ../test_common
+ dwds_test_common:
+ path: ../dwds_test_common
dev_dependencies:
analysis_config:
diff --git a/test_common/analysis_options.yaml b/test_common/analysis_options.yaml
deleted file mode 100644
index 1167fdd..0000000
--- a/test_common/analysis_options.yaml
+++ /dev/null
@@ -1 +0,0 @@
-include: package:analysis_config/analysis_options.yaml
diff --git a/test_common/lib/utilities.dart b/test_common/lib/utilities.dart
deleted file mode 100644
index 18b335d..0000000
--- a/test_common/lib/utilities.dart
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright (c) 2023, the Dart project authors. Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-import 'dart:io';
-
-import 'package:path/path.dart' as p;
-import 'package:pub_semver/pub_semver.dart';
-
-const webdevDirName = 'webdev';
-const dwdsDirName = 'dwds';
-const fixturesDirName = 'fixtures';
-
-/// The path to the webdev directory in the local machine, e.g.
-/// '/workstation/webdev'.
-String get webdevPath {
- final pathParts = p.split(p.current);
- assert(pathParts.contains(webdevDirName));
- return p.joinAll(
- pathParts.sublist(0, pathParts.lastIndexOf(webdevDirName) + 1),
- );
-}
-
-/// The path to the DWDS directory in the local machine, e.g.
-/// '/workstation/webdev/dwds'.
-String get dwdsPath {
- return p.join(webdevPath, dwdsDirName);
-}
-
-/// The path to the fixtures directory in the local machine, e.g.
-/// '/workstation/webdev/fixtures'.
-String get fixturesPath {
- return p.join(webdevPath, fixturesDirName);
-}
-
-// Creates a path compatible for web.
-String webCompatiblePath(List<String> pathParts) {
- // Note: Replacing "\" with "/" is necessary because `joinAll` uses "\" if
- // the platform is Windows. However, only "/" is expected by the browser.
- return p.joinAll([...pathParts]).replaceAll('\\', '/');
-}
-
-/// Expects one of [pathFromWebdev], [pathFromDwds] or [pathFromFixtures] to be
-/// provided. Returns the absolute path in the local machine to that path, e.g.
-/// absolutePath(pathFromFixtures: '_test/example') ->
-/// '/workstation/webdev/fixtures/_test/example'
-String absolutePath({
- String? pathFromWebdev,
- String? pathFromDwds,
- String? pathFromFixtures,
-}) {
- if (pathFromWebdev != null) {
- assert(pathFromDwds == null && pathFromFixtures == null);
- return p.normalize(p.join(webdevPath, pathFromWebdev));
- }
- if (pathFromDwds != null) {
- assert(pathFromFixtures == null);
- return p.normalize(p.join(dwdsPath, pathFromDwds));
- }
- if (pathFromFixtures != null) {
- assert(pathFromDwds == null && pathFromWebdev == null);
- return p.normalize(p.join(fixturesPath, pathFromFixtures));
- }
- throw Exception('Expected a path parameter.');
-}
-
-bool dartSdkIsAtLeast(String sdkVersion) {
- final expectedVersion = Version.parse(sdkVersion);
- final actualVersion = Version.parse(Platform.version.split(' ')[0]);
- return actualVersion >= expectedVersion;
-}
diff --git a/tool/ci.sh b/tool/ci.sh
index 2ec3324..67171c3 100755
--- a/tool/ci.sh
+++ b/tool/ci.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Created with package:mono_repo v6.6.2
+# Created with package:mono_repo v6.6.3
# Support built in commands on windows out of the box.
diff --git a/tool/release.dart b/tool/release.dart
index d117429..6cf78a6 100644
--- a/tool/release.dart
+++ b/tool/release.dart
@@ -126,7 +126,7 @@
'../webdev',
'../frontend_server_common',
'../frontend_server_client',
- '../test_common',
+ '../dwds_test_common',
]) {
_logInfo('Upgrading pub packages for $packagePath');
final pubUpgradeProcess = await Process.run('dart', [
diff --git a/webdev/CHANGELOG.md b/webdev/CHANGELOG.md
index 250c456..3167398 100644
--- a/webdev/CHANGELOG.md
+++ b/webdev/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 3.8.3-wip
+
+
## 3.8.2
- Add `module-format` flag for testing new DDC Library Bundle module format prior to release.
diff --git a/webdev/lib/src/version.dart b/webdev/lib/src/version.dart
index 1ef2b2b..3acb982 100644
--- a/webdev/lib/src/version.dart
+++ b/webdev/lib/src/version.dart
@@ -1,2 +1,2 @@
// Generated code. Do not modify.
-const packageVersion = '3.8.2';
+const packageVersion = '3.8.3-wip';
diff --git a/webdev/pubspec.yaml b/webdev/pubspec.yaml
index bceeda2..7e106ac 100644
--- a/webdev/pubspec.yaml
+++ b/webdev/pubspec.yaml
@@ -1,6 +1,6 @@
name: webdev
# Every time this changes you need to run `dart run build_runner build`.
-version: 3.8.2
+version: 3.8.3-wip
# We should not depend on a dev SDK before publishing.
# publish_to: none
description: >-
@@ -48,8 +48,8 @@
build_verify: ^3.0.0
build_version: ^2.1.1
test: ^1.21.1
- test_common:
- path: ../test_common
+ dwds_test_common:
+ path: ../dwds_test_common
test_descriptor: ^2.0.0
test_process: ^2.0.2
webdriver: ^3.0.0
diff --git a/webdev/test/e2e_test.dart b/webdev/test/e2e_test.dart
index d703544..101b051 100644
--- a/webdev/test/e2e_test.dart
+++ b/webdev/test/e2e_test.dart
@@ -46,7 +46,7 @@
configureLogWriter(debug);
await testRunner.setUpAll();
exampleDirectory = p.absolute(
- p.join(p.current, '..', 'fixtures', '_webdev_smoke'),
+ p.join(p.current, '..', 'dwds_test_common', 'fixtures', '_webdev_smoke'),
);
final process = await TestProcess.start(
diff --git a/webdev/test/test_utils.dart b/webdev/test/test_utils.dart
index e3da628..8d538f6 100644
--- a/webdev/test/test_utils.dart
+++ b/webdev/test/test_utils.dart
@@ -5,10 +5,10 @@
import 'dart:async';
import 'dart:io';
+import 'package:dwds_test_common/test_sdk_configuration.dart';
+import 'package:dwds_test_common/test_sdk_layout.dart';
import 'package:path/path.dart' as p;
import 'package:test/test.dart';
-import 'package:test_common/test_sdk_configuration.dart';
-import 'package:test_common/test_sdk_layout.dart';
import 'package:test_process/test_process.dart';
final _webdevBin = p.absolute(p.join('bin', 'webdev.dart'));
@@ -51,7 +51,7 @@
Future<String> prepareWorkspace() async {
final exampleDirectory = p.absolute(
- p.join(p.current, '..', 'fixtures', '_webdev_smoke'),
+ p.join(p.current, '..', 'dwds_test_common', 'fixtures', '_webdev_smoke'),
);
final process = await TestProcess.start(
diff --git a/webdev/test/tls_test.dart b/webdev/test/tls_test.dart
index d70ea0e..d3f9cc8 100644
--- a/webdev/test/tls_test.dart
+++ b/webdev/test/tls_test.dart
@@ -28,7 +28,13 @@
configureLogWriter(debug);
await testRunner.setUpAll();
exampleDirectory = p.absolute(
- p.join(p.current, '..', 'fixtures', '_webdev_smoke'),
+ p.join(
+ p.current,
+ '..',
+ 'dwds_test_common',
+ 'fixtures',
+ '_webdev_smoke',
+ ),
);
final process = await TestProcess.start(
