Skip to content

Commit dd2d123

Browse files
authored
_NoOpCodec review feedback (#149442)
1 parent 86321ed commit dd2d123

File tree

3 files changed

+22
-17
lines changed

3 files changed

+22
-17
lines changed

packages/flutter/test/painting/image_provider_network_image_test.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import 'package:flutter_test/flutter_test.dart';
1313

1414
import '../image_data.dart';
1515
import '../rendering/rendering_tester.dart';
16-
import 'noop_codec.dart';
16+
import 'no_op_codec.dart';
1717

1818
void main() {
1919
TestRenderingFlutterBinding.ensureInitialized();
@@ -242,7 +242,7 @@ void main() {
242242

243243
const NetworkImage provider = NetworkImage(url);
244244

245-
final MultiFrameImageStreamCompleter completer = provider.loadBuffer(provider, noopCodec) as MultiFrameImageStreamCompleter;
245+
final MultiFrameImageStreamCompleter completer = provider.loadBuffer(provider, noOpDecoderBufferCallback) as MultiFrameImageStreamCompleter;
246246

247247
expect(completer.debugLabel, url);
248248
});

packages/flutter/test/painting/image_provider_test.dart

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import 'package:flutter_test/flutter_test.dart';
1515
import '../image_data.dart';
1616
import '../rendering/rendering_tester.dart';
1717
import 'mocks_for_image_cache.dart';
18-
import 'noop_codec.dart';
18+
import 'no_op_codec.dart';
1919

2020
void main() {
2121
TestRenderingFlutterBinding.ensureInitialized();
@@ -89,7 +89,7 @@ void main() {
8989
final FileImage provider = FileImage(file);
9090

9191
expect(provider.loadBuffer(provider, (ImmutableBuffer buffer, {int? cacheWidth, int? cacheHeight, bool? allowUpscaling}) async {
92-
return Future<Codec>.value(NoopCodec());
92+
return Future<Codec>.value(createNoOpCodec());
9393
}), isA<MultiFrameImageStreamCompleter>());
9494

9595
expect(await error.future, isStateError);
@@ -100,7 +100,7 @@ void main() {
100100
final File file = fs.file('/blue.png')..createSync(recursive: true)..writeAsBytesSync(kBlueSquarePng);
101101
final FileImage provider = FileImage(file);
102102

103-
final MultiFrameImageStreamCompleter completer = provider.loadBuffer(provider, noopCodec) as MultiFrameImageStreamCompleter;
103+
final MultiFrameImageStreamCompleter completer = provider.loadBuffer(provider, noOpDecoderBufferCallback) as MultiFrameImageStreamCompleter;
104104

105105
expect(completer.debugLabel, file.path);
106106
});
@@ -109,7 +109,7 @@ void main() {
109109
final Uint8List bytes = Uint8List.fromList(kBlueSquarePng);
110110
final MemoryImage provider = MemoryImage(bytes);
111111

112-
final MultiFrameImageStreamCompleter completer = provider.loadBuffer(provider, noopCodec) as MultiFrameImageStreamCompleter;
112+
final MultiFrameImageStreamCompleter completer = provider.loadBuffer(provider, noOpDecoderBufferCallback) as MultiFrameImageStreamCompleter;
113113

114114
expect(completer.debugLabel, 'MemoryImage(${describeIdentity(bytes)})');
115115
});
@@ -118,7 +118,7 @@ void main() {
118118
const String asset = 'images/blue.png';
119119
final ExactAssetImage provider = ExactAssetImage(asset, bundle: _TestAssetBundle());
120120
final AssetBundleImageKey key = await provider.obtainKey(ImageConfiguration.empty);
121-
final MultiFrameImageStreamCompleter completer = provider.loadBuffer(key, noopCodec) as MultiFrameImageStreamCompleter;
121+
final MultiFrameImageStreamCompleter completer = provider.loadBuffer(key, noOpDecoderBufferCallback) as MultiFrameImageStreamCompleter;
122122

123123
expect(completer.debugLabel, asset);
124124
});
@@ -128,7 +128,7 @@ void main() {
128128
final ResizeImage provider = ResizeImage(MemoryImage(bytes), width: 40, height: 40);
129129
final MultiFrameImageStreamCompleter completer = provider.loadBuffer(
130130
await provider.obtainKey(ImageConfiguration.empty),
131-
noopCodec,
131+
noOpDecoderBufferCallback,
132132
) as MultiFrameImageStreamCompleter;
133133

134134
expect(completer.debugLabel, 'MemoryImage(${describeIdentity(bytes)}) - Resized(40×40)');

packages/flutter/test/painting/noop_codec.dart renamed to packages/flutter/test/painting/no_op_codec.dart

+14-9
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,20 @@
44

55
import 'dart:ui';
66

7-
class NoopCodec implements Codec {
7+
/// Returns a [Codec] that throws on all member invocations.
8+
Codec createNoOpCodec() => _NoOpCodec();
9+
10+
/// Function matching [DecoderBufferCallback] which returns a [Codec]
11+
/// that throws on all member invocations.
12+
Future<Codec> noOpDecoderBufferCallback(
13+
ImmutableBuffer buffer, {
14+
int? cacheWidth,
15+
int? cacheHeight,
16+
bool? allowUpscaling,
17+
}) async =>
18+
_NoOpCodec();
19+
20+
class _NoOpCodec implements Codec {
821
@override
922
void dispose() {}
1023

@@ -17,11 +30,3 @@ class NoopCodec implements Codec {
1730
@override
1831
int get repetitionCount => throw UnimplementedError();
1932
}
20-
21-
Future<Codec> noopCodec(
22-
ImmutableBuffer buffer, {
23-
int? cacheWidth,
24-
int? cacheHeight,
25-
bool? allowUpscaling,
26-
}) async =>
27-
NoopCodec();

0 commit comments

Comments
 (0)