[cfe] Use test description uri for expectation file location

Previously the first file in the `Component.uriToSource` was used which didn't work nicely with multifile tests. Text outline expectations were already using the test description uri. Change-Id: I0d4a7493cd1fa61beffba41f1ea859ca5e8ad08c Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/151825 Commit-Queue: Johnni Winther <johnniwinther@google.com> Reviewed-by: Jens Johansen <jensj@google.com>
dart-lang · Jul 6, 2020 · 3a4aad6 · 3a4aad6
1 parent fa650e4
commit 3a4aad6
Show file tree

Hide file tree

Showing 48 changed files with 87 additions and 527 deletions.
diff --git a/pkg/front_end/test/utils/kernel_chain.dart b/pkg/front_end/test/utils/kernel_chain.dart
@@ -257,8 +257,7 @@ class MatchExpectation
       component.adoptChildren();
     }
 
-    Uri uri =
-        component.uriToSource.keys.firstWhere((uri) => uri?.scheme == "file");
+    Uri uri = result.description.uri;
     Iterable<Library> libraries =
         componentToText.libraries.where(result.isUserLibrary);
     Uri base = uri.resolve(".");

diff --git a/...e39938/issue39938_lib.dart.outline.expect → ...issue39938/issue39938.dart.outline.expect b/...e39938/issue39938_lib.dart.outline.expect → ...issue39938/issue39938.dart.outline.expect
diff --git a/...ue39938/issue39938_lib.dart.strong.expect → .../issue39938/issue39938.dart.strong.expect b/...ue39938/issue39938_lib.dart.strong.expect → .../issue39938/issue39938.dart.strong.expect
diff --git a/...e39938_lib.dart.strong.transformed.expect → ...issue39938.dart.strong.transformed.expect b/...e39938_lib.dart.strong.transformed.expect → ...issue39938.dart.strong.transformed.expect
diff --git a/...41210b/issue41210_lib.dart.outline.expect → ...ssue41210b/issue41210.dart.outline.expect b/...41210b/issue41210_lib.dart.outline.expect → ...ssue41210b/issue41210.dart.outline.expect
diff --git a/...e41210b/issue41210_lib.dart.strong.expect → ...issue41210b/issue41210.dart.strong.expect b/...e41210b/issue41210_lib.dart.strong.expect → ...issue41210b/issue41210.dart.strong.expect
diff --git a/...rs_from_dill/main_lib.dart.outline.expect → ...embers_from_dill/main.dart.outline.expect b/...rs_from_dill/main_lib.dart.outline.expect → ...embers_from_dill/main.dart.outline.expect
diff --git a/...ers_from_dill/main_lib.dart.strong.expect → ...members_from_dill/main.dart.strong.expect b/...ers_from_dill/main_lib.dart.strong.expect → ...members_from_dill/main.dart.strong.expect
diff --git a/...l/main_lib.dart.strong.transformed.expect → ..._dill/main.dart.strong.transformed.expect b/...l/main_lib.dart.strong.transformed.expect → ..._dill/main.dart.strong.transformed.expect
diff --git a/...tension_from_dill_lib.dart.outline.expect → ...l/extension_from_dill.dart.outline.expect b/...tension_from_dill_lib.dart.outline.expect → ...l/extension_from_dill.dart.outline.expect
diff --git a/...xtension_from_dill_lib.dart.strong.expect → ...ll/extension_from_dill.dart.strong.expect b/...xtension_from_dill_lib.dart.strong.expect → ...ll/extension_from_dill.dart.strong.expect
diff --git a/...m_dill_lib.dart.strong.transformed.expect → ..._from_dill.dart.strong.transformed.expect b/...m_dill_lib.dart.strong.transformed.expect → ..._from_dill.dart.strong.transformed.expect
diff --git a/.../mixin_from_dill_lib1.dart.outline.expect → ..._dill/mixin_from_dill.dart.outline.expect b/.../mixin_from_dill_lib1.dart.outline.expect → ..._dill/mixin_from_dill.dart.outline.expect
diff --git a/...l/mixin_from_dill_lib1.dart.strong.expect → ...m_dill/mixin_from_dill.dart.strong.expect b/...l/mixin_from_dill_lib1.dart.strong.expect → ...m_dill/mixin_from_dill.dart.strong.expect
diff --git a/..._dill_lib1.dart.strong.transformed.expect → ..._from_dill.dart.strong.transformed.expect b/..._dill_lib1.dart.strong.transformed.expect → ..._from_dill.dart.strong.transformed.expect
diff --git a/...ariance_from_dill_lib.dart.outline.expect → ...ll/variance_from_dill.dart.outline.expect b/...ariance_from_dill_lib.dart.outline.expect → ...ll/variance_from_dill.dart.outline.expect
diff --git a/...variance_from_dill_lib.dart.strong.expect → ...ill/variance_from_dill.dart.strong.expect b/...variance_from_dill_lib.dart.strong.expect → ...ill/variance_from_dill.dart.strong.expect
diff --git a/...m_dill_lib.dart.strong.transformed.expect → ..._from_dill.dart.strong.transformed.expect b/...m_dill_lib.dart.strong.transformed.expect → ..._from_dill.dart.strong.transformed.expect
diff --git a/...1436c/issue41436c_lib.dart.outline.expect → ...sue41436c/issue41436c.dart.outline.expect b/...1436c/issue41436c_lib.dart.outline.expect → ...sue41436c/issue41436c.dart.outline.expect
diff --git a/...41436c/issue41436c_lib.dart.strong.expect → ...ssue41436c/issue41436c.dart.strong.expect b/...41436c/issue41436c_lib.dart.strong.expect → ...ssue41436c/issue41436c.dart.strong.expect
diff --git a/...41436c_lib.dart.strong.transformed.expect → ...ssue41436c.dart.strong.transformed.expect b/...41436c_lib.dart.strong.transformed.expect → ...ssue41436c.dart.strong.transformed.expect
diff --git a/...ue41436c/issue41436c_lib.dart.weak.expect → .../issue41436c/issue41436c.dart.weak.expect b/...ue41436c/issue41436c_lib.dart.weak.expect → .../issue41436c/issue41436c.dart.weak.expect
diff --git a/...ue41436c_lib.dart.weak.transformed.expect → .../issue41436c.dart.weak.transformed.expect b/...ue41436c_lib.dart.weak.transformed.expect → .../issue41436c.dart.weak.transformed.expect
diff --git a/...tic/from_agnostic_lib.dart.outline.expect → ...gnostic/from_agnostic.dart.outline.expect b/...tic/from_agnostic_lib.dart.outline.expect → ...gnostic/from_agnostic.dart.outline.expect
diff --git a/...stic/from_agnostic_lib.dart.strong.expect → ...agnostic/from_agnostic.dart.strong.expect b/...stic/from_agnostic_lib.dart.strong.expect → ...agnostic/from_agnostic.dart.strong.expect
diff --git a/...nostic_lib.dart.strong.transformed.expect → ...m_agnostic.dart.strong.transformed.expect b/...nostic_lib.dart.strong.transformed.expect → ...m_agnostic.dart.strong.transformed.expect
diff --git a/...nostic/from_agnostic_lib.dart.weak.expect → ...m_agnostic/from_agnostic.dart.weak.expect b/...nostic/from_agnostic_lib.dart.weak.expect → ...m_agnostic/from_agnostic.dart.weak.expect
diff --git a/...agnostic_lib.dart.weak.transformed.expect → ...rom_agnostic.dart.weak.transformed.expect b/...agnostic_lib.dart.weak.transformed.expect → ...rom_agnostic.dart.weak.transformed.expect
diff --git a/..._from_dill/strong_lib.dart.outline.expect → ...t_ok_from_dill/strong.dart.outline.expect b/..._from_dill/strong_lib.dart.outline.expect → ...t_ok_from_dill/strong.dart.outline.expect
diff --git a/...k_from_dill/strong_lib.dart.strong.expect → ...ot_ok_from_dill/strong.dart.strong.expect b/...k_from_dill/strong_lib.dart.strong.expect → ...ot_ok_from_dill/strong.dart.strong.expect
diff --git a/...strong_lib.dart.strong.transformed.expect → ...ill/strong.dart.strong.transformed.expect b/...strong_lib.dart.strong.transformed.expect → ...ill/strong.dart.strong.transformed.expect
diff --git a/..._ok_from_dill/strong_lib.dart.weak.expect → ..._not_ok_from_dill/strong.dart.weak.expect b/..._ok_from_dill/strong_lib.dart.weak.expect → ..._not_ok_from_dill/strong.dart.weak.expect
diff --git a/...l/strong_lib.dart.weak.transformed.expect → ..._dill/strong.dart.weak.transformed.expect b/...l/strong_lib.dart.weak.transformed.expect → ..._dill/strong.dart.weak.transformed.expect
diff --git a/..._from_dill/strong_lib.dart.outline.expect → ...g_ok_from_dill/strong.dart.outline.expect b/..._from_dill/strong_lib.dart.outline.expect → ...g_ok_from_dill/strong.dart.outline.expect
diff --git a/...k_from_dill/strong_lib.dart.strong.expect → ...ng_ok_from_dill/strong.dart.strong.expect b/...k_from_dill/strong_lib.dart.strong.expect → ...ng_ok_from_dill/strong.dart.strong.expect
diff --git a/...strong_lib.dart.strong.transformed.expect → ...ill/strong.dart.strong.transformed.expect b/...strong_lib.dart.strong.transformed.expect → ...ill/strong.dart.strong.transformed.expect
diff --git a/..._ok_from_dill/strong_lib.dart.weak.expect → ...rong_ok_from_dill/strong.dart.weak.expect b/..._ok_from_dill/strong_lib.dart.weak.expect → ...rong_ok_from_dill/strong.dart.weak.expect
diff --git a/...l/strong_lib.dart.weak.transformed.expect → ..._dill/strong.dart.weak.transformed.expect b/...l/strong_lib.dart.weak.transformed.expect → ..._dill/strong.dart.weak.transformed.expect
diff --git a/...ssue40512/issue40512_lib.dart.weak.expect → ...ed/issue40512/issue40512.dart.weak.expect b/...ssue40512/issue40512_lib.dart.weak.expect → ...ed/issue40512/issue40512.dart.weak.expect
diff --git a/...sue40512_lib.dart.weak.transformed.expect → ...2/issue40512.dart.weak.transformed.expect b/...sue40512_lib.dart.weak.transformed.expect → ...2/issue40512.dart.weak.transformed.expect
diff --git a/pkg/front_end/testcases/nnbd_mixed/issue40512/issue40512_lib.dart.outline.expect b/pkg/front_end/testcases/nnbd_mixed/issue40512/issue40512_lib.dart.outline.expect
diff --git a/...ue41210a/issue41210_lib1.dart.weak.expect → ...d/issue41210a/issue41210.dart.weak.expect b/...ue41210a/issue41210_lib1.dart.weak.expect → ...d/issue41210a/issue41210.dart.weak.expect
diff --git a/...ue41210_lib1.dart.weak.transformed.expect → ...a/issue41210.dart.weak.transformed.expect b/...ue41210_lib1.dart.weak.transformed.expect → ...a/issue41210.dart.weak.transformed.expect
diff --git a/pkg/front_end/testcases/nnbd_mixed/issue41210a/issue41210_lib1.dart.outline.expect b/pkg/front_end/testcases/nnbd_mixed/issue41210a/issue41210_lib1.dart.outline.expect
diff --git a/pkg/front_end/testcases/nnbd_mixed/issue42387/foundation_basic_types_lib.dart.weak.expect b/pkg/front_end/testcases/nnbd_mixed/issue42387/foundation_basic_types_lib.dart.weak.expect