From 735f9abfe1f0241987b4b29b282e93efdfd27f22 Mon Sep 17 00:00:00 2001 From: Harry Terkelsen Date: Thu, 24 Feb 2022 10:44:12 -0800 Subject: [PATCH] Revert "Assert golden files use the right extension (#99016)" (#99075) This reverts commit ee86e61f73ea5a6880eef377febc3f2c37f1b2f6. --- .../flutter_goldens/lib/flutter_goldens.dart | 6 -- .../test/flutter_goldens_test.dart | 60 ------------------- 2 files changed, 66 deletions(-) diff --git a/packages/flutter_goldens/lib/flutter_goldens.dart b/packages/flutter_goldens/lib/flutter_goldens.dart index e0b5bdfcc22..66414148751 100644 --- a/packages/flutter_goldens/lib/flutter_goldens.dart +++ b/packages/flutter_goldens/lib/flutter_goldens.dart @@ -167,12 +167,6 @@ abstract class FlutterGoldenFileComparator extends GoldenFileComparator { /// Prepends the golden URL with the library name that encloses the current /// test. Uri _addPrefix(Uri golden) { - // Ensure the Uri ends in .png as the SkiaClient expects - assert( - golden.toString().split('.').last == 'png', - 'Golden files in the Flutter framework must end with the file extension ' - '.png.' - ); final String prefix = basedir.pathSegments[basedir.pathSegments.length - 2]; return Uri.parse('$prefix.$golden'); } diff --git a/packages/flutter_goldens/test/flutter_goldens_test.dart b/packages/flutter_goldens/test/flutter_goldens_test.dart index 494f582cfe0..c5d22cc5f72 100644 --- a/packages/flutter_goldens/test/flutter_goldens_test.dart +++ b/packages/flutter_goldens/test/flutter_goldens_test.dart @@ -481,26 +481,6 @@ void main() { ); }); - test('asserts .png format', () async { - await expectLater( - () async { - return comparator.compare( - Uint8List.fromList(_kTestPngBytes), - Uri.parse('flutter.golden_test.1'), - ); - }, - throwsA( - isA().having((AssertionError error) => error.toString(), - 'description', - contains( - 'Golden files in the Flutter framework must end with the file ' - 'extension .png.' - ), - ), - ), - ); - }); - test('calls init during compare', () { expect(fakeSkiaClient.initCalls, 0); comparator.compare( @@ -599,26 +579,6 @@ void main() { ); }); - test('asserts .png format', () async { - await expectLater( - () async { - return comparator.compare( - Uint8List.fromList(_kTestPngBytes), - Uri.parse('flutter.golden_test.1'), - ); - }, - throwsA( - isA().having((AssertionError error) => error.toString(), - 'description', - contains( - 'Golden files in the Flutter framework must end with the file ' - 'extension .png.' - ), - ), - ), - ); - }); - test('calls init during compare', () { expect(fakeSkiaClient.tryInitCalls, 0); comparator.compare( @@ -785,26 +745,6 @@ void main() { fakeSkiaClient.cleanTestNameValues['library.flutter.golden_test.1.png'] = 'flutter.golden_test.1'; }); - test('asserts .png format', () async { - await expectLater( - () async { - return comparator.compare( - Uint8List.fromList(_kTestPngBytes), - Uri.parse('flutter.golden_test.1'), - ); - }, - throwsA( - isA().having((AssertionError error) => error.toString(), - 'description', - contains( - 'Golden files in the Flutter framework must end with the file ' - 'extension .png.' - ), - ), - ), - ); - }); - test('passes when bytes match', () async { expect( await comparator.compare(