Id testing for directories with .packages etc

jensjoha · commit-bot@chromium.org · commit a69c81ac341b · 2019-08-01T09:25:28.000Z
We should also be able to test for larger examples, so this CL adds support for directories where all files are included. If the directory contains a .packages file that is used so we can test packages too. Change-Id: Iceda03505575bd9e5604a6e374b7f5fa7185a82e Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/111421 Commit-Queue: Jens Johansen <jensj@google.com> Reviewed-by: Johnni Winther <johnniwinther@google.com>
diff --git a/pkg/front_end/analysis_options.yaml b/pkg/front_end/analysis_options.yaml
@@ -10,6 +10,7 @@ analyzer:
     - test/flow_analysis/nullability_and_reachability/data/**
     - test/flow_analysis/type_promotion/data/**
     - testcases/**
+    - test/id_testing/data/**
   errors:
     # Allow having TODOs in the code
     todo: ignore
diff --git a/pkg/front_end/lib/src/testing/compiler_common.dart b/pkg/front_end/lib/src/testing/compiler_common.dart
@@ -16,7 +16,8 @@ import '../api_prototype/front_end.dart'
         kernelForProgramInternal,
         summaryFor;
 
-import '../api_prototype/memory_file_system.dart' show MemoryFileSystem;
+import '../api_prototype/memory_file_system.dart'
+    show MemoryFileSystem, MemoryFileSystemEntity;
 
 import '../compute_platform_binaries_location.dart'
     show computePlatformBinariesLocation;
@@ -85,7 +86,7 @@ Future<List<int>> summarize(List<String> inputs, Map<String, dynamic> sources,
 ///   contain either source files (value is [String]) or .dill files (value
 ///   is [List<int>]).
 ///
-///   * define an empty .packages file
+///   * define an empty .packages file (if one isn't defined in sources)
 ///
 ///   * specify the location of the sdk summaries.
 Future<Null> setup(CompilerOptions options, Map<String, dynamic> sources,
@@ -100,7 +101,9 @@ Future<Null> setup(CompilerOptions options, Map<String, dynamic> sources,
       entity.writeAsBytesSync(data);
     }
   });
-  fs.entityForUri(toTestUri('.packages')).writeAsStringSync('');
+  MemoryFileSystemEntity dotPackagesFile =
+      fs.entityForUri(toTestUri('.packages'));
+  if (!await dotPackagesFile.exists()) dotPackagesFile.writeAsStringSync('');
   fs
       .entityForUri(invalidCoreLibsSpecUri)
       .writeAsStringSync(_invalidLibrariesSpec);
diff --git a/pkg/front_end/lib/src/testing/id_extractor.dart b/pkg/front_end/lib/src/testing/id_extractor.dart
@@ -56,8 +56,9 @@ abstract class DataExtractor<T> extends Visitor with DataRegistry<T> {
 
   DataExtractor(this.actualMap);
 
-  void computeForLibrary(Library library) {
-    LibraryId id = new LibraryId(library.importUri);
+  void computeForLibrary(Library library, {bool useFileUri: false}) {
+    LibraryId id =
+        new LibraryId(useFileUri ? library.fileUri : library.importUri);
     T value = computeLibraryValue(id, library);
     registerValue(library.fileUri, null, id, value, library);
   }
diff --git a/pkg/front_end/lib/src/testing/id_testing.dart b/pkg/front_end/lib/src/testing/id_testing.dart
@@ -184,14 +184,35 @@ void computeExpectedMap(Uri sourceUri, String filename, AnnotatedCode code,
 
 /// Creates a [TestData] object for the annotated test in [testFile].
 ///
+/// If [testFile] is a file, use that directly. If it's a directory include
+/// everything in that directory.
+///
 /// If [testLibDirectory] is not `null`, files in [testLibDirectory] with the
 /// [testFile] name as a prefix are included.
-TestData computeTestData(File testFile, Directory testLibDirectory,
+TestData computeTestData(FileSystemEntity testFile, Directory testLibDirectory,
     {Iterable<String> supportedMarkers,
     Uri createUriForFileName(String fileName, {bool isLib}),
     void onFailure(String message)}) {
   Uri entryPoint = createUriForFileName('main.dart', isLib: false);
-  String annotatedCode = new File.fromUri(testFile.uri).readAsStringSync();
+
+  File mainTestFile;
+  Map<String, File> additionalFiles;
+  if (testFile is File) {
+    mainTestFile = testFile;
+  } else if (testFile is Directory) {
+    additionalFiles = new Map<String, File>();
+    for (FileSystemEntity entry in testFile.listSync(recursive: true)) {
+      if (entry is! File) continue;
+      if (entry.uri.pathSegments.last == "main.dart") {
+        mainTestFile = entry;
+      } else {
+        additionalFiles[entry.uri.path.substring(testFile.uri.path.length)] =
+            entry;
+      }
+    }
+  }
+
+  String annotatedCode = new File.fromUri(mainTestFile.uri).readAsStringSync();
   Map<Uri, AnnotatedCode> code = {
     entryPoint:
         new AnnotatedCode.fromText(annotatedCode, commentStart, commentEnd)
@@ -208,26 +229,36 @@ TestData computeTestData(File testFile, Directory testLibDirectory,
   };
 
   List<String> libFileNames;
+
+  addSupportingFile(String libFileName, File libEntity, bool isLib) {
+    libFileNames ??= [];
+    libFileNames.add(libFileName);
+    Uri libFileUri = createUriForFileName(libFileName, isLib: isLib);
+    String libCode = libEntity.readAsStringSync();
+    AnnotatedCode annotatedLibCode =
+        new AnnotatedCode.fromText(libCode, commentStart, commentEnd);
+    memorySourceFiles[libFileUri.path] = annotatedLibCode.sourceCode;
+    code[libFileUri] = annotatedLibCode;
+    computeExpectedMap(libFileUri, libFileName, annotatedLibCode, expectedMaps,
+        onFailure: onFailure);
+  }
+
   if (testLibDirectory != null) {
     String name = testFile.uri.pathSegments.last;
     String filePrefix = name.substring(0, name.lastIndexOf('.'));
     for (FileSystemEntity libEntity in testLibDirectory.listSync()) {
       String libFileName = libEntity.uri.pathSegments.last;
       if (libFileName.startsWith(filePrefix)) {
-        libFileNames ??= [];
-        libFileNames.add(libFileName);
-        Uri libFileUri = createUriForFileName(libFileName, isLib: true);
-        String libCode = new File.fromUri(libEntity.uri).readAsStringSync();
-        AnnotatedCode annotatedLibCode =
-            new AnnotatedCode.fromText(libCode, commentStart, commentEnd);
-        memorySourceFiles[libFileUri.path] = annotatedLibCode.sourceCode;
-        code[libFileUri] = annotatedLibCode;
-        computeExpectedMap(
-            libFileUri, libFileName, annotatedLibCode, expectedMaps,
-            onFailure: onFailure);
+        addSupportingFile(libFileName, libEntity, true);
       }
     }
   }
+  if (additionalFiles != null) {
+    for (MapEntry<String, File> additionalFileData in additionalFiles.entries) {
+      addSupportingFile(
+          additionalFileData.key, additionalFileData.value, false);
+    }
+  }
 
   return new TestData(testFile.uri, entryPoint, memorySourceFiles, code,
       expectedMaps, libFileNames);
@@ -613,12 +644,13 @@ Future runTests(Directory dataDir,
     }
     print('----------------------------------------------------------------');
 
-    TestData testData = computeTestData(entity, libDirectory,
+    TestData testData = computeTestData(
+        entity, entity is File ? libDirectory : null,
         supportedMarkers: supportedMarkers,
         createUriForFileName: createUriForFileName,
         onFailure: onFailure);
     print('Test file: ${testData.testFileUri}');
-    if (testData.libFileNames != null) {
+    if (!succinct && testData.libFileNames != null) {
       print('Supporting libraries:');
       for (String libFileName in testData.libFileNames) {
         print('    - libs/$libFileName');
diff --git a/pkg/front_end/lib/src/testing/id_testing_helper.dart b/pkg/front_end/lib/src/testing/id_testing_helper.dart
@@ -306,7 +306,10 @@ Future<bool> runTestForConfig<T>(
   }
 
   for (Library library in component.libraries) {
-    if (excludeLibrary(library)) continue;
+    if (excludeLibrary(library) &&
+        !testData.memorySourceFiles.containsKey(library.fileUri.path)) {
+      continue;
+    }
     dataComputer.computeLibraryData(
         compilerResult, library, actualMapFor(library));
     for (Class cls in library.classes) {
@@ -379,7 +382,6 @@ Future<bool> runTestForConfig<T>(
 
   CfeCompiledData compiledData = new CfeCompiledData<T>(
       compilerResult, testData.testFileUri, actualMaps, globalData);
-
   return checkCode(config.name, testData.testFileUri, testData.code,
       memberAnnotations, compiledData, dataComputer.dataValidator,
       fatalErrors: fatalErrors, succinct: succinct, onFailure: onFailure);
diff --git a/pkg/front_end/test/id_testing/data/directory_testing/.packages b/pkg/front_end/test/id_testing/data/directory_testing/.packages
@@ -0,0 +1 @@
+foo:lib/
diff --git a/pkg/front_end/test/id_testing/data/directory_testing/lib/foo.dart b/pkg/front_end/test/id_testing/data/directory_testing/lib/foo.dart
@@ -0,0 +1,10 @@
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+/*library: file=foo.dart*/
+
+/*member: fooMethod:fooMethod*/
+fooMethod() {
+  print("Hello from foo!");
+}
diff --git a/pkg/front_end/test/id_testing/data/directory_testing/library.dart b/pkg/front_end/test/id_testing/data/directory_testing/library.dart
@@ -0,0 +1,16 @@
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+/*library: file=library.dart*/
+
+import 'package:foo/foo.dart';
+
+/*member: libraryInteger:libraryInteger*/
+int libraryInteger = 42;
+
+/*member: methodFromLibrary:methodFromLibrary*/
+methodFromLibrary() {
+  print(libraryInteger);
+  fooMethod();
+}
diff --git a/pkg/front_end/test/id_testing/data/directory_testing/main.dart b/pkg/front_end/test/id_testing/data/directory_testing/main.dart
@@ -0,0 +1,12 @@
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+/*library: file=main.dart*/
+
+import 'library.dart';
+
+/*member: main:main*/
+main() {
+  methodFromLibrary();
+}
diff --git a/pkg/front_end/test/id_testing/data/directory_testing/pubspec.yaml b/pkg/front_end/test/id_testing/data/directory_testing/pubspec.yaml
@@ -0,0 +1,5 @@
+# Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
+# for details. All rights reserved. Use of this source code is governed by a
+# BSD-style license that can be found in the LICENSE file.
+
+# Analyzer workaround, see https://github.com/dart-lang/sdk/issues/37513
diff --git a/pkg/front_end/test/id_testing/id_testing_test.dart b/pkg/front_end/test/id_testing/id_testing_test.dart
@@ -58,7 +58,7 @@ class IdTestingDataComputer extends DataComputer<String> {
       Map<Id, ActualData<String>> actualMap,
       {bool verbose}) {
     new IdTestingDataExtractor(compilerResult, actualMap)
-        .computeForLibrary(library);
+        .computeForLibrary(library, useFileUri: true);
   }
 
   @override
diff --git a/pkg/front_end/testing.json b/pkg/front_end/testing.json
@@ -348,6 +348,7 @@
     "exclude": [
       "^pkg/analysis_server/lib/src/analysis_server\\.dart",
       "test/extensions/data/",
+      "test/id_testing/data/",
       "test/flow_analysis/definite_assignment/data/",
       "test/flow_analysis/nullability_and_reachability/data/",
       "test/flow_analysis/type_promotion/data/"
diff --git a/tests/compiler/dart2js/equivalence/id_equivalence_helper.dart b/tests/compiler/dart2js/equivalence/id_equivalence_helper.dart
@@ -11,8 +11,11 @@ import 'package:compiler/src/common_elements.dart';
 import 'package:compiler/src/commandline_options.dart';
 import 'package:compiler/src/compiler.dart';
 import 'package:compiler/src/elements/entities.dart';
+import 'package:compiler/src/kernel/element_map_impl.dart';
+import 'package:compiler/src/kernel/kernel_strategy.dart';
 import 'package:expect/expect.dart';
 import 'package:front_end/src/testing/id_testing.dart';
+import 'package:kernel/ast.dart' as ir;
 
 import '../helpers/memory_compiler.dart';
 import '../equivalence/id_equivalence.dart';
@@ -144,6 +147,14 @@ Future<CompiledData<T>> computeData<T>(Uri entryPoint,
     Iterable<Id> globalIds: const <Id>[]}) async {
   OutputCollector outputCollector = new OutputCollector();
   DiagnosticCollector diagnosticCollector = new DiagnosticCollector();
+  Uri packageConfig;
+  Uri wantedPackageConfig = createUriForFileName(".packages", isLib: false);
+  for (String key in memorySourceFiles.keys) {
+    if (key == wantedPackageConfig.path) {
+      packageConfig = wantedPackageConfig;
+      break;
+    }
+  }
   CompilationResult result = await runCompiler(
       entryPoint: entryPoint,
       memorySourceFiles: memorySourceFiles,
@@ -153,7 +164,8 @@ Future<CompiledData<T>> computeData<T>(Uri entryPoint,
       beforeRun: (compiler) {
         compiler.stopAfterTypeInference =
             options.contains(stopAfterTypeInference);
-      });
+      },
+      packageConfig: packageConfig);
   if (!result.isSuccess) {
     if (skipFailedCompilations) return null;
     Expect.isTrue(
@@ -249,18 +261,32 @@ Future<CompiledData<T>> computeData<T>(Uri entryPoint,
             library.canonicalUri.scheme == 'package');
   }
 
+  ir.Library getIrLibrary(LibraryEntity library) {
+    KernelFrontendStrategy frontendStrategy = compiler.frontendStrategy;
+    KernelToElementMapImpl elementMap = frontendStrategy.elementMap;
+    LibraryEntity kLibrary =
+        elementMap.elementEnvironment.lookupLibrary(library.canonicalUri);
+    return elementMap.getLibraryNode(kLibrary);
+  }
+
   for (LibraryEntity library in elementEnvironment.libraries) {
-    if (excludeLibrary(library)) continue;
+    if (excludeLibrary(library) &&
+        !memorySourceFiles.containsKey(getIrLibrary(library).fileUri.path)) {
+      continue;
+    }
+
     dataComputer.computeLibraryData(
-        compiler, library, actualMapForUri(library.canonicalUri),
+        compiler, library, actualMapForUri(getIrLibrary(library).fileUri),
         verbose: verbose);
     elementEnvironment.forEachClass(library, (ClassEntity cls) {
       processClass(cls, actualMapFor(cls));
     });
   }
 
   for (MemberEntity member in closedWorld.processedMembers) {
-    if (excludeLibrary(member.library)) continue;
+    if (excludeLibrary(member.library) &&
+        !memorySourceFiles
+            .containsKey(getIrLibrary(member.library).fileUri.path)) continue;
     processMember(member, actualMapFor(member));
   }
 
@@ -447,16 +473,20 @@ Future checkTests<T>(Directory dataDir, DataComputer<T> dataComputer,
       onTest: onTest,
       libDirectory: libDirectory,
       supportedMarkers: supportedMarkers,
-      createUriForFileName: (String fileName, {bool isLib}) {
-    String commonTestPath = 'sdk/tests/compiler';
-    if (isLib) {
-      return Uri.parse('memory:$commonTestPath/libs/$fileName');
-    } else {
-      // Pretend this is a dart2js_native test to allow use of 'native'
-      // keyword and import of private libraries.
-      return Uri.parse('memory:$commonTestPath/dart2js_native/$fileName');
-    }
-  }, onFailure: Expect.fail, runTest: checkTest);
+      createUriForFileName: createUriForFileName,
+      onFailure: Expect.fail,
+      runTest: checkTest);
+}
+
+Uri createUriForFileName(String fileName, {bool isLib}) {
+  String commonTestPath = 'sdk/tests/compiler';
+  if (isLib) {
+    return Uri.parse('memory:$commonTestPath/libs/$fileName');
+  } else {
+    // Pretend this is a dart2js_native test to allow use of 'native'
+    // keyword and import of private libraries.
+    return Uri.parse('memory:$commonTestPath/dart2js_native/$fileName');
+  }
 }
 
 Future<bool> runTestForConfiguration<T>(TestConfig testConfiguration,
diff --git a/tests/compiler/dart2js/equivalence/id_testing_test.dart b/tests/compiler/dart2js/equivalence/id_testing_test.dart
@@ -61,7 +61,7 @@ class IdTestingDataComputer extends DataComputer<String> {
     KernelToElementMapImpl elementMap = frontendStrategy.elementMap;
     ir.Library node = elementMap.getLibraryNode(library);
     new IdTestingDataExtractor(compiler.reporter, actualMap, elementMap)
-        .computeForLibrary(node);
+        .computeForLibrary(node, useFileUri: true);
   }
 
   @override
