fix sdk_rewriter_test.dart and ci/analyze.sh

Author: yjbanov

ci/analyze.sh

@@ -77,7 +77,11 @@ echo ""
 echo ""
 
 # Check that dart libraries conform.
-echo "Checking web_ui api conformance..."
+echo "Checking the integrity of the Web SDK"
 (cd "$FLUTTER_DIR/web_sdk"; "$DART" pub get)
-(cd "$FLUTTER_DIR"; "$DART" "web_sdk/test/api_conform_test.dart")
-(cd "$FLUTTER_DIR"; "$DART" --enable-asserts "web_sdk/test/js_access_test.dart")
+WEB_SDK_TEST_FILES="$FLUTTER_DIR/web_sdk/test/*"
+for testFile in $WEB_SDK_TEST_FILES
+do
+  echo "Running $testFile"
+  (cd "$FLUTTER_DIR"; FLUTTER_DIR="$FLUTTER_DIR" "$DART" --enable-asserts $testFile)
+done

web_sdk/sdk_rewriter.dart

@@ -154,7 +154,7 @@ void _validateEngineSource(String engineDartPath, String engineDartCode) {
       continue;
     }
 
-    if (line.startsWith('export ')) {
+    if (line.startsWith('export')) {
       // Exports are OK
       continue;
     }

web_sdk/test/api_conform_test.dart

@@ -35,16 +35,17 @@ CompilationUnit _parseAndCheckDart(String path) {
 }
 
 void main() {
+  final String flutterDir = Platform.environment['FLUTTER_DIR']!;
   // These files just contain imports to the part files;
-  final CompilationUnit uiUnit = _parseAndCheckDart('lib/ui/ui.dart');
-  final CompilationUnit webUnit = _parseAndCheckDart('lib/web_ui/lib/ui.dart');
+  final CompilationUnit uiUnit = _parseAndCheckDart('$flutterDir/lib/ui/ui.dart');
+  final CompilationUnit webUnit = _parseAndCheckDart('$flutterDir/lib/web_ui/lib/ui.dart');
   final Map<String, ClassDeclaration> uiClasses = <String, ClassDeclaration>{};
   final Map<String, ClassDeclaration> webClasses = <String, ClassDeclaration>{};
 
   // Gather all public classes from each library. For now we are skipping
   // other top level members.
-  _collectPublicClasses(uiUnit, uiClasses, 'lib/ui/');
-  _collectPublicClasses(webUnit, webClasses, 'lib/web_ui/lib/');
+  _collectPublicClasses(uiUnit, uiClasses, '$flutterDir/lib/ui/');
+  _collectPublicClasses(webUnit, webClasses, '$flutterDir/lib/web_ui/lib/');
 
   if (uiClasses.isEmpty || webClasses.isEmpty) {
     print('Warning: did not resolve any classes.');

web_sdk/test/sdk_rewriter_test.dart

@@ -7,40 +7,43 @@ import 'package:test/test.dart';
 import '../sdk_rewriter.dart';
 
 void main() {
-  test('handles imports/exports correctly in the engine library file', () {
+  test('handles exports correctly in the engine library file', () {
     const String source = '''
-library engine;
+// Comment 1
 
-import '../ui.dart' as ui;
-import 'package:ui/ui.dart' as ui;
+library engine;
 
-import 'package:some_package/some_package.dart';
+// Comment 2
 
-import 'engine/file1.dart';
 export 'engine/file1.dart';
-
-import'engine/file2.dart';
 export'engine/file2.dart';
-
-import      'engine/file3.dart';
 export      'engine/file3.dart';
 ''';
 
     const String expected = '''
+// Comment 1
+
+@JS()
 library dart._engine;
 
-import 'dart:ui' as ui;
+import 'dart:async';
+import 'dart:collection';
+import 'dart:convert' hide Codec;
+import 'dart:developer' as developer;
+import 'dart:html' as html;
+import 'dart:js' as js;
+import 'dart:js_util' as js_util;
+import 'dart:_js_annotations';
+import 'dart:math' as math;
+import 'dart:svg' as svg;
+import 'dart:typed_data';
 import 'dart:ui' as ui;
 
-import 'package:some_package/some_package.dart';
 
+// Comment 2
 
 part 'engine/file1.dart';
-
-
 part 'engine/file2.dart';
-
-
 part 'engine/file3.dart';
 ''';
 
@@ -53,6 +56,36 @@ part 'engine/file3.dart';
     expect(result, expected);
   });
 
+  test('complains about non-compliant engine.dart file', () {
+    const String source = '''
+library engine;
+
+import 'dart:something';
+export 'engine/file1.dart';
+export 'engine/file3.dart';
+''';
+
+    Object? caught;
+    try {
+      rewriteFile(
+        source,
+        filePath: '/path/to/lib/web_ui/lib/src/engine.dart',
+        isUi: false,
+        isEngine: true,
+      );
+    } catch(error) {
+      caught = error;
+    }
+    expect(caught, isA<Exception>());
+    expect(
+      '$caught',
+      'Exception: on line 3: unexpected code in /path/to/lib/web_ui/lib/src/engine.dart. '
+      'This file may only contain comments and exports. Found:\n'
+      'import \'dart:something\';',
+    );
+  });
+
+
   test('removes imports/exports from engine files', () {
     const String source = '''
 import 'package:some_package/some_package.dart';