commit 477cbe72079554a41d7d8f67d3f25ecb3a9673dd
author Sigurd Meldgaard <sigurdm@google.com> Thu Jun 18 10:24:51 2020 +0200
committer GitHub <noreply@github.com> Thu Jun 18 10:24:51 2020 +0200
tree 8d7ebfac80960b0736ef237df1340f8225af1ac2
parent a8e2442b864edabe953e7c580e0b9736e57f9ef8

Improved expectations in flutter_plugin_format validator test (#2532)

test/validator/flutter_plugin_format_test.dart

diff --git a/test/validator/flutter_plugin_format_test.dart b/test/validator/flutter_plugin_format_test.dart
index 067ce97..4d623cc 100644
--- a/test/validator/flutter_plugin_format_test.dart
+++ b/test/validator/flutter_plugin_format_test.dart
@@ -17,9 +17,10 @@
 
 void main() {
   group('should consider a package valid if it', () {
-    setUp(d.validPackage.create);
-
-    test('looks normal', () => expectValidation(flutterPluginFormat));
+    test('is not a plugin', () async {
+      await d.validPackage.create();
+      return expectValidation(flutterPluginFormat);
+    });
 
     test('is a Flutter 1.9.0 package', () async {
       var pkg = packageMap('test_pkg', '1.0.0', {
@@ -28,7 +29,7 @@
         'sdk': '>=2.0.0 <3.0.0',
         'flutter': '>=1.9.0 <2.0.0',
       });
-      await d.dir(appPath, [d.pubspec(pkg)]).create();
+      await d.dir(appPath, [d.pubspec(pkg), d.dir('ios')]).create();
       await expectValidation(flutterPluginFormat);
     });
 
@@ -39,7 +40,7 @@
         'sdk': '>=2.0.0 <3.0.0',
         'flutter': '>=1.10.0 <2.0.0',
       });
-      await d.dir(appPath, [d.pubspec(pkg)]).create();
+      await d.dir(appPath, [d.pubspec(pkg), d.dir('ios')]).create();
       await expectValidation(flutterPluginFormat);
     });
 
@@ -50,7 +51,7 @@
         'sdk': '>=2.0.0 <3.0.0',
         'flutter': '>=1.10.0-0 <2.0.0',
       });
-      await d.dir(appPath, [d.pubspec(pkg)]).create();
+      await d.dir(appPath, [d.pubspec(pkg), d.dir('ios')]).create();
       await expectValidation(flutterPluginFormat);
     });
 
@@ -71,14 +72,12 @@
           },
         },
       };
-      await d.dir(appPath, [d.pubspec(pkg)]).create();
+      await d.dir(appPath, [d.pubspec(pkg), d.dir('ios')]).create();
       await expectValidation(flutterPluginFormat);
     });
   });
 
   group('should consider a package invalid if it', () {
-    setUp(d.validPackage.create);
-
     test('is a flutter plugin with old and new format', () async {
       var pkg = packageMap('test_pkg', '1.0.0', {
         'flutter': {'sdk': 'flutter'},
@@ -99,8 +98,14 @@
           },
         },
       };
-      await d.dir(appPath, [d.pubspec(pkg)]).create();
-      await expectValidation(flutterPluginFormat, errors: isNotEmpty);
+      await d.dir(appPath, [d.pubspec(pkg), d.dir('ios')]).create();
+      await expectValidation(
+        flutterPluginFormat,
+        errors: contains(
+          contains(
+              'Please consider increasing the Flutter SDK requirement to ^1.10.0'),
+        ),
+      );
     });
 
     test('is a flutter 1.9.0 plugin with old format', () async {
@@ -117,8 +122,11 @@
           'pluginClass': 'MyPlugin',
         },
       };
-      await d.dir(appPath, [d.pubspec(pkg)]).create();
-      await expectValidation(flutterPluginFormat, errors: isNotEmpty);
+      await d.dir(appPath, [d.pubspec(pkg), d.dir('ios')]).create();
+      await expectValidation(flutterPluginFormat,
+          errors: contains(
+            contains('Instead use the flutter.plugin.platforms key'),
+          ));
     });
 
     test('is a flutter 1.9.0 plugin with new format', () async {
@@ -138,8 +146,14 @@
           },
         },
       };
-      await d.dir(appPath, [d.pubspec(pkg)]).create();
-      await expectValidation(flutterPluginFormat, errors: isNotEmpty);
+      await d.dir(appPath, [d.pubspec(pkg), d.dir('ios')]).create();
+      await expectValidation(
+        flutterPluginFormat,
+        errors: contains(
+          contains(
+              'Please consider increasing the Flutter SDK requirement to ^1.10.0'),
+        ),
+      );
     });
 
     test(
@@ -160,8 +174,14 @@
           },
         },
       };
-      await d.dir(appPath, [d.pubspec(pkg)]).create();
-      await expectValidation(flutterPluginFormat, errors: isNotEmpty);
+      await d.dir(appPath, [d.pubspec(pkg), d.dir('ios')]).create();
+      await expectValidation(
+        flutterPluginFormat,
+        errors: contains(
+          contains(
+              'Please consider increasing the Flutter SDK requirement to ^1.10.0'),
+        ),
+      );
     });
 
     test('is a non-flutter package with using the new format', () async {
@@ -178,8 +198,14 @@
           },
         },
       };
-      await d.dir(appPath, [d.pubspec(pkg)]).create();
-      await expectValidation(flutterPluginFormat, errors: isNotEmpty);
+      await d.dir(appPath, [d.pubspec(pkg), d.dir('ios')]).create();
+      await expectValidation(
+        flutterPluginFormat,
+        errors: contains(
+          contains(
+              'Please consider increasing the Flutter SDK requirement to ^1.10.0'),
+        ),
+      );
     });
 
     test('is a flutter 1.8.0 plugin with new format', () async {
@@ -199,8 +225,12 @@
           },
         },
       };
-      await d.dir(appPath, [d.pubspec(pkg)]).create();
-      await expectValidation(flutterPluginFormat, errors: isNotEmpty);
+      await d.dir(appPath, [d.pubspec(pkg), d.dir('ios')]).create();
+      await expectValidation(flutterPluginFormat,
+          errors: contains(
+            contains(
+                'Please consider increasing the Flutter SDK requirement to ^1.10.0'),
+          ));
     });
 
     test('is a flutter 1.9.999 plugin with new format', () async {
@@ -220,8 +250,12 @@
           },
         },
       };
-      await d.dir(appPath, [d.pubspec(pkg)]).create();
-      await expectValidation(flutterPluginFormat, errors: isNotEmpty);
+      await d.dir(appPath, [d.pubspec(pkg), d.dir('ios')]).create();
+      await expectValidation(flutterPluginFormat,
+          errors: contains(
+            contains(
+                'Please consider increasing the Flutter SDK requirement to ^1.10.0'),
+          ));
     });
   });
 }