Skip to content

Simplify Filesystem, introduce TestReaderWriter #3873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 21, 2025
Merged

Simplify Filesystem, introduce TestReaderWriter #3873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb8fc64
Introduce `TestReaderWriter` with test-specific API.
davidmorgan Feb 21, 2025
1995f2b
Address review comments.
davidmorgan Feb 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions _test_common/lib/in_memory_reader_writer.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import 'dart:convert';
import 'package:build/build.dart';
import 'package:build_runner_core/build_runner_core.dart';
import 'package:build_test/build_test.dart';
// ignore: implementation_imports
import 'package:build_test/src/in_memory_reader_writer.dart';
import 'package:path/path.dart' as p;
import 'package:watcher/watcher.dart';

Expand All @@ -26,7 +28,7 @@ class InMemoryRunnerAssetReaderWriter extends InMemoryAssetReaderWriter

@override
Future writeAsBytes(AssetId id, List<int> bytes) async {
var type = assets.containsKey(id) ? ChangeType.MODIFY : ChangeType.ADD;
var type = testing.exists(id) ? ChangeType.MODIFY : ChangeType.ADD;
await super.writeAsBytes(id, bytes);
FakeWatcher.notifyWatchers(
WatchEvent(type, p.absolute(id.package, p.fromUri(id.path))),
Expand All @@ -39,7 +41,7 @@ class InMemoryRunnerAssetReaderWriter extends InMemoryAssetReaderWriter
String contents, {
Encoding encoding = utf8,
}) async {
var type = assets.containsKey(id) ? ChangeType.MODIFY : ChangeType.ADD;
var type = testing.exists(id) ? ChangeType.MODIFY : ChangeType.ADD;
await super.writeAsString(id, contents, encoding: encoding);
FakeWatcher.notifyWatchers(
WatchEvent(type, p.absolute(id.package, p.fromUri(id.path))),
Expand All @@ -49,7 +51,7 @@ class InMemoryRunnerAssetReaderWriter extends InMemoryAssetReaderWriter
@override
Future delete(AssetId id) async {
onDelete?.call(id);
assets.remove(id);
testing.delete(id);
FakeWatcher.notifyWatchers(
WatchEvent(ChangeType.REMOVE, p.absolute(id.package, p.fromUri(id.path))),
);
Expand Down
6 changes: 3 additions & 3 deletions _test_common/lib/test_phases.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,9 @@ Future<TestBuildersResult> testBuilders(
inputs.forEach((serializedId, contents) {
var id = makeAssetId(serializedId);
if (contents is String) {
readerWriter.filesystem.writeAsStringSync(id, contents);
readerWriter.testing.writeString(id, contents);
} else if (contents is List<int>) {
readerWriter.filesystem.writeAsBytesSync(id, contents);
readerWriter.testing.writeBytes(id, contents);
}
});

Expand Down Expand Up @@ -179,7 +179,7 @@ Future<TestBuildersResult> testBuilders(
void checkBuild(
BuildResult result, {
Map<String, Object>? outputs,
required InMemoryAssetReaderWriter readerWriter,
required TestReaderWriter readerWriter,
BuildStatus status = BuildStatus.success,
String rootPackage = 'a',
String expectedGeneratedDir = 'generated',
Expand Down
3 changes: 3 additions & 0 deletions build/lib/src/builder/build_step_impl.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,9 @@ class BuildStepImpl implements BuildStep, AssetReaderState {
@override
Filesystem get filesystem => _reader.filesystem;

@override
FilesystemCache get cache => _reader.cache;

@override
AssetFinder get assetFinder => _reader.assetFinder;

Expand Down
Loading
Loading