[rfw] Restore RFW to 100% coverage

packages/rfw/CHANGELOG.md

@@ -1,3 +1,8 @@
+## NEXT
+
+* Adds more testing to restore coverage to 100%.
+* Removes some dead code.
+
 ## 1.0.11
 
 * Adds more documentation in the README.md file!

packages/rfw/lib/src/dart/text.dart

@@ -738,13 +738,12 @@ enum _TokenizerMode {
   quoteEscapeUnicode2,
   quoteEscapeUnicode3,
   quoteEscapeUnicode4,
-  endQuote,
   doubleQuoteEscape,
   doubleQuoteEscapeUnicode1,
   doubleQuoteEscapeUnicode2,
   doubleQuoteEscapeUnicode3,
   doubleQuoteEscapeUnicode4,
-  endDoubleQuote,
+  endQuote,
   slash,
   comment,
 }
@@ -1821,36 +1820,6 @@ Iterable<_Token> _tokenize(String file) sync* {
         }
         break;
 
-      case _TokenizerMode.endQuote:
-        switch (current) {
-          case -1:
-            yield _EofToken(line, column);
-            return;
-          case 0x0A: // U+000A LINE FEED (LF)
-          case 0x20: // U+0020 SPACE character
-            mode = _TokenizerMode.main;
-            break;
-          case 0x28: // U+0028 LEFT PARENTHESIS character (()
-          case 0x29: // U+0029 RIGHT PARENTHESIS character ())
-          case 0x2C: // U+002C COMMA character (,)
-          case 0x3A: // U+003A COLON character (:)
-          case 0x3B: // U+003B SEMICOLON character (;)
-          case 0x3D: // U+003D EQUALS SIGN character (=)
-          case 0x5B: // U+005B LEFT SQUARE BRACKET character ([)
-          case 0x5D: // U+005D RIGHT SQUARE BRACKET character (])
-          case 0x7B: // U+007B LEFT CURLY BRACKET character ({)
-          case 0x7D: // U+007D RIGHT CURLY BRACKET character (})
-            yield _SymbolToken(current, line, column);
-            mode = _TokenizerMode.main;
-            break;
-          case 0x2E: // U+002E FULL STOP character (.)
-            mode = _TokenizerMode.dot1;
-            break;
-          default:
-            throw ParserException('Unexpected character ${_describeRune(current)} after end quote', line, column);
-        }
-        break;
-
       case _TokenizerMode.doubleQuote:
         switch (current) {
           case -1:
@@ -2048,7 +2017,7 @@ Iterable<_Token> _tokenize(String file) sync* {
         }
         break;
 
-      case _TokenizerMode.endDoubleQuote:
+      case _TokenizerMode.endQuote:
         switch (current) {
           case -1:
             yield _EofToken(line, column);
@@ -2074,7 +2043,7 @@ Iterable<_Token> _tokenize(String file) sync* {
             mode = _TokenizerMode.dot1;
             break;
           default:
-            throw ParserException('Unexpected character ${_describeRune(current)} after end doublequote', line, column);
+            throw ParserException('Unexpected character ${_describeRune(current)} after end quote', line, column);
         }
         break;
 

packages/rfw/test/argument_decoders_test.dart

@@ -5,16 +5,19 @@
 // This file is hand-formatted.
 
 import 'dart:io' show Platform;
+import 'dart:ui' as ui;
 
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:rfw/formats.dart' show parseLibraryFile;
 import 'package:rfw/rfw.dart';
 
+final bool masterChannel = 
+    !Platform.environment.containsKey('CHANNEL') ||
+        Platform.environment['CHANNEL'] == 'master';
+
 // See Contributing section of README.md file.
-final bool runGoldens = Platform.isLinux &&
-    (!Platform.environment.containsKey('CHANNEL') ||
-        Platform.environment['CHANNEL'] == 'master');
+final bool runGoldens = Platform.isLinux && masterChannel;
 
 void main() {
   testWidgets('String example', (WidgetTester tester) async {
@@ -238,13 +241,17 @@ void main() {
       ..update(const LibraryName(<String>['core']), createCoreWidgets())
       ..update(const LibraryName(<String>['test']), parseLibraryFile('import core; widget root = SizedBox();'));
     final DynamicContent data = DynamicContent();
+    final List<String> eventLog = <String>[];
     await tester.pumpWidget(
       Directionality(
         textDirection: TextDirection.rtl,
         child: RemoteWidget(
           runtime: runtime,
           data: data,
           widget: const FullyQualifiedWidgetName(LibraryName(<String>['test']), 'root'),
+          onEvent: (String eventName, DynamicMap eventArguments) {
+            eventLog.add('$eventName $eventArguments');
+          },
         ),
       ),
     );
@@ -256,6 +263,20 @@ void main() {
         insets: ArgumentDecoders.edgeInsets(source, <Object>['insets']) ?? EdgeInsets.zero,
       );
     };
+    ArgumentDecoders.gradientDecoders['custom'] = (DataSource source, List<Object> key) {
+      return const RadialGradient(
+        center: Alignment(0.7, -0.6),
+        radius: 0.2,
+        colors: <Color>[ Color(0xFFFFFF00), Color(0xFF0099FF) ],
+        stops: <double>[0.4, 1.0],
+      );
+    };
+    ArgumentDecoders.shapeBorderDecoders['custom'] = (DataSource source, List<Object> key) {
+      return StarBorder(
+        side: ArgumentDecoders.borderSide(source, <Object>[...key, 'side']) ?? const BorderSide(width: 2.0, color: Color(0xFFFFFFFF)),
+        points: source.v<double>(<Object>[...key, 'points']) ?? 5.0,
+      );
+    };
 
     runtime.update(const LibraryName(<String>['test']), parseLibraryFile('''
       import core;
@@ -297,6 +318,7 @@ void main() {
               color: 0xFF8811FF,
               blendMode: "xor",
             },
+            onError: event 'image-error-event' { },
           },
           gradient: {
             type: 'linear',
@@ -338,7 +360,7 @@ void main() {
                 { type: 'continuous', borderRadius: [ { x: 60.0 }, { x: 80.0 }, { x: 0.0 }, { x: 20.0, y: 50.0 } ], side: { width: 10.0, color: 0xFFEEFF33 } },
                 { type: 'rounded', borderRadius: [ { x: 20.0 } ], side: { width: 10.0, color: 0xFF00CCFF } },
                 { type: 'stadium', side: { width: 10.0, color: 0xFF00FFFF } },
-                { type: 'custom', side: { width: 100.0, color: 0xFFFF0000 } }, // should not render
+                { type: 'custom', side: { width: 5.0, color: 0xFFFFFF00 }, points: 6 }, // star
               ],
               gradient: {
                 type: 'radial',
@@ -349,10 +371,13 @@ void main() {
       );
     '''));
     await tester.pump();
+    expect(eventLog, hasLength(1));
+    expect(eventLog.first, startsWith('image-error-event {exception: HTTP request failed, statusCode: 400, x-invalid:'));
+    eventLog.clear();
     await expectLater(
       find.byType(RemoteWidget),
       matchesGoldenFile('goldens/argument_decoders_test.containers.png'),
-      skip: 'https://github.com/flutter/flutter/issues/106205'
+      skip: !runGoldens,
     );
     expect(find.byType(DecoratedBox), findsNWidgets(6));
     expect(
@@ -368,6 +393,16 @@ void main() {
       'opacity 1.0, FilterQuality.low)',
     );
 
+    ArgumentDecoders.colorFilterDecoders['custom'] = (DataSource source, List<Object> key) {
+      return const ColorFilter.mode(Color(0x12345678), BlendMode.xor);
+    };
+    ArgumentDecoders.maskFilterDecoders['custom'] = (DataSource source, List<Object> key) {
+      return const MaskFilter.blur(BlurStyle.outer, 0.5);
+    };
+    ArgumentDecoders.shaderDecoders['custom'] = (DataSource source, List<Object> key) {
+      return ui.Gradient.linear(Offset.zero, const Offset(100.0, 100.0), const <Color>[Color(0xFFFFFF00), Color(0xFF00FFFF)]);
+    };
+
     runtime.update(const LibraryName(<String>['test']), parseLibraryFile('''
       import core;
       widget root = Column(
@@ -428,7 +463,7 @@ void main() {
     await expectLater(
       find.byType(RemoteWidget),
       matchesGoldenFile('goldens/argument_decoders_test.text.png'),
-      skip: 'https://github.com/flutter/flutter/issues/106205'
+      skip: !runGoldens,
     );
 
     runtime.update(const LibraryName(<String>['test']), parseLibraryFile('''
@@ -451,7 +486,7 @@ void main() {
     await expectLater(
       find.byType(RemoteWidget),
       matchesGoldenFile('goldens/argument_decoders_test.gridview.fixed.png'),
-      skip: 'https://github.com/flutter/flutter/issues/106205'
+      skip: !runGoldens,
     );
 
     runtime.update(const LibraryName(<String>['test']), parseLibraryFile('''
@@ -474,7 +509,7 @@ void main() {
     await expectLater(
       find.byType(RemoteWidget),
       matchesGoldenFile('goldens/argument_decoders_test.gridview.max.png'),
-      skip: 'https://github.com/flutter/flutter/issues/106205'
+      skip: !runGoldens,
     );
 
     int sawGridDelegateDecoder = 0;
@@ -504,7 +539,9 @@ void main() {
     await expectLater(
       find.byType(RemoteWidget),
       matchesGoldenFile('goldens/argument_decoders_test.gridview.custom.png'),
-      skip: 'https://github.com/flutter/flutter/issues/106205'
+      skip: !runGoldens,
     );
-  }, skip: !runGoldens);
+
+    expect(eventLog, isEmpty);
+  }, skip: !masterChannel); // https://github.com/flutter/flutter/pull/129851
 }

packages/rfw/test/material_widgets_test.dart

@@ -140,13 +140,15 @@ void main() {
     await expectLater(
       find.byType(RemoteWidget),
       matchesGoldenFile('goldens/material_test.scaffold.png'),
+      skip: !runGoldens,
     );
     await tester.tapAt(const Offset(20.0, 20.0));
     await tester.pump();
     await tester.pump(const Duration(seconds: 1));
     await expectLater(
       find.byType(RemoteWidget),
       matchesGoldenFile('goldens/material_test.drawer.png'),
+      skip: !runGoldens,
     );
-  }, skip: !runGoldens);
+  });
 }