Merge InMemoryAssetReader and InMemoryAssetWriter into InMemoryAssetReaderWriter. (#3865)

Author: davidmorgan

_test_common/lib/common.dart

@@ -8,8 +8,7 @@ import 'dart:convert';
 import 'package:build/build.dart';
 import 'package:crypto/crypto.dart';
 
-export 'package:build_test/build_test.dart'
-    hide InMemoryAssetReader, InMemoryAssetWriter;
+export 'package:build_test/build_test.dart';
 
 export 'assets.dart';
 export 'builders.dart';

_test_common/lib/test_phases.dart

@@ -148,7 +148,7 @@ Future<TestBuildersResult> testBuilders(
   if (checkBuildStatus) {
     checkBuild(result,
         outputs: outputs,
-        writer: readerWriter,
+        readerWriter: readerWriter,
         status: status,
         rootPackage: packageGraph.root.name,
         expectedGeneratedDir: expectedGeneratedDir);
@@ -161,7 +161,7 @@ Future<TestBuildersResult> testBuilders(
 /// validates the success and outputs of the build.
 void checkBuild(BuildResult result,
     {Map<String, Object>? outputs,
-    required InMemoryAssetWriter writer,
+    required InMemoryAssetReaderWriter readerWriter,
     BuildStatus status = BuildStatus.success,
     String rootPackage = 'a',
     String expectedGeneratedDir = 'generated'}) {
@@ -186,7 +186,7 @@ void checkBuild(BuildResult result,
           : id;
 
   if (status == BuildStatus.success) {
-    checkOutputs(unhiddenOutputs, result.outputs, writer,
+    checkOutputs(unhiddenOutputs, result.outputs, readerWriter,
         mapAssetIds: (id) => mapHidden(id, expectedGeneratedDir));
   }
 }

build/test/builder/build_step_impl_test.dart

@@ -74,11 +74,10 @@ void main() {
   });
 
   group('with in memory file system', () {
-    late InMemoryAssetWriter writer;
-    late InMemoryAssetReader reader;
+    late InMemoryAssetReaderWriter readerWriter;
 
     setUp(() {
-      writer = reader = InMemoryAssetReaderWriter();
+      readerWriter = InMemoryAssetReaderWriter();
     });
 
     test('tracks outputs created by a builder', () async {
@@ -87,13 +86,13 @@ void main() {
       var inputs = {
         primary: 'foo',
       };
-      addAssets(inputs, writer);
+      addAssets(inputs, readerWriter);
       var outputId = AssetId.parse('$primary.copy');
       var buildStep = BuildStepImpl(
         primary,
         [outputId],
-        reader,
-        writer,
+        readerWriter,
+        readerWriter,
         AnalyzerResolvers.custom(),
         resourceManager,
         _unsupported,
@@ -103,7 +102,7 @@ void main() {
       await buildStep.complete();
 
       // One output.
-      expect(writer.assets[outputId], decodedMatches('foo'));
+      expect(readerWriter.assets[outputId], decodedMatches('foo'));
     });
 
     group('resolve', () {
@@ -118,10 +117,10 @@ void main() {
               library b;
             ''',
         };
-        addAssets(inputs, writer);
+        addAssets(inputs, readerWriter);
 
         var primary = makeAssetId('a|web/a.dart');
-        var buildStep = BuildStepImpl(primary, [], reader, writer,
+        var buildStep = BuildStepImpl(primary, [], readerWriter, readerWriter,
             AnalyzerResolvers.custom(), resourceManager, _unsupported);
         var resolver = buildStep.resolver;
 

build/test/generate/run_builder_test.dart

@@ -12,8 +12,7 @@ import 'package:package_config/package_config_types.dart';
 import 'package:test/test.dart';
 
 void main() {
-  late InMemoryAssetWriter writer;
-  late InMemoryAssetReader reader;
+  late InMemoryAssetReaderWriter readerWriter;
   final primary = makeAssetId('a|web/primary.txt');
   final inputs = {
     primary: 'foo',
@@ -29,16 +28,16 @@ void main() {
     });
     builder = TestBuilder(
         extraWork: (buildStep, __) => buildStep.fetchResource(resource));
-    writer = reader = InMemoryAssetReaderWriter();
-    addAssets(inputs, writer);
+    readerWriter = InMemoryAssetReaderWriter();
+    addAssets(inputs, readerWriter);
   });
 
   group('Given a ResourceManager', () {
     late TrackingResourceManager resourceManager;
 
     setUp(() async {
       resourceManager = TrackingResourceManager();
-      await runBuilder(builder, inputs.keys, reader, writer, null,
+      await runBuilder(builder, inputs.keys, readerWriter, readerWriter, null,
           resourceManager: resourceManager);
     });
 
@@ -62,7 +61,7 @@ void main() {
 
   group('With a default ResourceManager', () {
     setUp(() async {
-      await runBuilder(builder, inputs.keys, reader, writer, null);
+      await runBuilder(builder, inputs.keys, readerWriter, readerWriter, null);
     });
 
     test('disposes the default resource manager', () async {
@@ -72,7 +71,7 @@ void main() {
 
   group('can resolve package config', () {
     setUp(() {
-      writer.assets[makeAssetId('build|lib/foo.txt')] = [1, 2, 3];
+      readerWriter.assets[makeAssetId('build|lib/foo.txt')] = [1, 2, 3];
 
       builder = TestBuilder(extraWork: (buildStep, __) async {
         final config = await buildStep.packageConfig;
@@ -91,15 +90,15 @@ void main() {
     });
 
     test('from default', () async {
-      await runBuilder(builder, inputs.keys, reader, writer, null);
+      await runBuilder(builder, inputs.keys, readerWriter, readerWriter, null);
     });
 
     test('when provided', () async {
       await runBuilder(
         builder,
         inputs.keys,
-        reader,
-        writer,
+        readerWriter,
+        readerWriter,
         null,
         packageConfig: PackageConfig([
           Package(

build_modules/test/decoding_cache_test.dart

@@ -50,7 +50,7 @@ void main() {
       final id = AssetId('foo', 'lib/foo');
       final reader = InMemoryAssetReaderWriter()
         ..filesystem.writeAsStringSync(id, 'foo');
-      await cache.write(id, InMemoryAssetWriter(), 'bar');
+      await cache.write(id, InMemoryAssetReaderWriter(), 'bar');
       expect(await cache.find(id, reader), 'bar');
       expect(reader.inputTracker.assetsRead, contains(id),
           reason: 'Should call canRead');

build_modules/test/meta_module_test.dart

@@ -15,11 +15,11 @@ import 'package:test/test.dart';
 import 'matchers.dart';
 
 void main() {
-  late InMemoryAssetReader reader;
+  late InMemoryAssetReaderWriter reader;
   final defaultPlatform = DartPlatform.register('test', ['async']);
 
   List<AssetId> makeAssets(Map<String, String> assetDescriptors) {
-    reader = InMemoryAssetReader();
+    reader = InMemoryAssetReaderWriter();
     var assets = <AssetId>{};
     assetDescriptors.forEach((serializedId, content) {
       var id = AssetId.parse(serializedId);
@@ -30,7 +30,7 @@ void main() {
   }
 
   Future<MetaModule> metaModuleFromSources(
-      InMemoryAssetReader reader, List<AssetId> sources,
+      InMemoryAssetReaderWriter reader, List<AssetId> sources,
       {DartPlatform? platform}) async {
     platform ??= defaultPlatform;
     final libraries = (await Future.wait(sources

build_resolvers/test/resolver_test.dart

@@ -138,7 +138,7 @@ void runTests(ResolversFactory resolversFactory) {
     }, (resolver) async {
       await resolver.libraryFor(entryPoint);
     }, assetReaderChecks: (reader) {
-      expect(reader.inputTracker!.assetsRead, {
+      expect(reader.inputTracker.assetsRead, {
         AssetId('a', 'web/main.dart'),
         AssetId('a', 'web/main.dart.transitive_digest'),
         AssetId('a', 'web/a.dart'),
@@ -181,7 +181,7 @@ void runTests(ResolversFactory resolversFactory) {
     await resolveSources(sources, (resolver) async {
       await resolver.libraryFor(entryPoint);
     }, assetReaderChecks: (reader) {
-      expect(reader.inputTracker!.assetsRead, {
+      expect(reader.inputTracker.assetsRead, {
         AssetId('a', 'web/main.dart'),
         AssetId('a', 'web/main.dart.transitive_digest'),
         AssetId('a', 'web/a.dart'),
@@ -194,7 +194,7 @@ void runTests(ResolversFactory resolversFactory) {
     await resolveSources(sources, (resolver) async {
       await resolver.libraryFor(entryPoint);
     }, assetReaderChecks: (reader) {
-      expect(reader.inputTracker!.assetsRead, {
+      expect(reader.inputTracker.assetsRead, {
         AssetId('a', 'web/main.dart'),
         AssetId('a', 'web/main.dart.transitive_digest'),
         AssetId('a', 'web/a.dart'),

build_runner/test/generate/serve_test.dart

@@ -50,13 +50,13 @@ void main() {
       var results = StreamQueue(handler.buildResults);
       var result = await results.next;
       checkBuild(result,
-          outputs: {'a|web/a.txt.copy': 'a'}, writer: readerWriter);
+          outputs: {'a|web/a.txt.copy': 'a'}, readerWriter: readerWriter);
 
       await readerWriter.writeAsString(makeAssetId('a|web/a.txt'), 'b');
 
       result = await results.next;
       checkBuild(result,
-          outputs: {'a|web/a.txt.copy': 'b'}, writer: readerWriter);
+          outputs: {'a|web/a.txt.copy': 'b'}, readerWriter: readerWriter);
     });
 
     test('blocks serving files until the build is done', () async {
@@ -83,7 +83,7 @@ void main() {
       buildBlocker1.complete();
       var result = await results.next;
       checkBuild(result,
-          outputs: {'a|web/a.txt.copy': 'a'}, writer: readerWriter);
+          outputs: {'a|web/a.txt.copy': 'a'}, readerWriter: readerWriter);
 
       /// Next request completes right away.
       var buildBlocker2 = Completer<void>();
@@ -109,7 +109,7 @@ void main() {
       buildBlocker2.complete();
       result = await results.next;
       checkBuild(result,
-          outputs: {'a|web/a.txt.copy': 'b'}, writer: readerWriter);
+          outputs: {'a|web/a.txt.copy': 'b'}, readerWriter: readerWriter);
 
       /// Make sure we actually see the final request finish.
       return done.future;