Normalize URIs on entry to ValidatingInstrumentation.

pkg/front_end/lib/src/fasta/testing/validating_instrumentation.dart

 // Copyright (c) 2017, 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.md file.
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
 import 'package:front_end/src/base/instrumentation.dart';
 import 'package:front_end/src/fasta/messages.dart';
 import 'package:front_end/src/fasta/scanner.dart';
@@ skipping 60 matching lines @@
               new _Fix(
                   expectation.commentOffset, expectation.commentLength, ''));
         }
       });
     });
   }
 
   /// Updates the source file at [uri] based on the actual property/value
   /// pairs that were observed.
   Future<Null> fixSource(Uri uri, bool offsetsCountCharacters) async {
+    uri = Uri.base.resolveUri(uri);
     var fixes = _fixes[uri];
     if (fixes == null) return;
     File file = new File.fromUri(uri);
     var bytes = (await file.readAsBytes()).toList();
     int convertOffset(int offset) {
       if (offsetsCountCharacters) {
         return UTF8.encode(UTF8.decode(bytes).substring(0, offset)).length;
       } else {
         return offset;
       }
     }
 
     // Apply the fixes in reverse order so that offsets don't need to be
     // adjusted after each fix.
     fixes.sort((a, b) => b.offset.compareTo(a.offset));
     for (var fix in fixes) {
       bytes.replaceRange(convertOffset(fix.offset),
           convertOffset(fix.offset + fix.length), UTF8.encode(fix.replacement));
     }
     await file.writeAsBytes(bytes);
   }
 
   /// Loads expectations from the source file located at [uri].
   ///
   /// Should be called before [finish].
   Future<Null> loadExpectations(Uri uri) async {
+    uri = Uri.base.resolveUri(uri);
     var bytes = await readBytesFromFile(uri);
     var expectations = _unsatisfiedExpectations.putIfAbsent(uri, () => {});
     var testedFeaturesState = _testedFeaturesState.putIfAbsent(uri, () => {});
     ScannerResult result = scan(bytes, includeComments: true);
     for (Token token = result.tokens; !token.isEof; token = token.next) {
       for (analyzer.Token commentToken = token.precedingComments;
           commentToken != null;
           commentToken = commentToken.next) {
         String lexeme = commentToken.lexeme;
         if (lexeme.startsWith('/*@') && lexeme.endsWith('*/')) {
@@ skipping 29 matching lines @@
                 property, value, commentToken.offset, commentToken.length));
           }
         }
       }
     }
   }
 
   @override
   void record(
       Uri uri, int offset, String property, InstrumentationValue value) {
+    uri = Uri.base.resolveUri(uri);
     var expectationsForUri = _unsatisfiedExpectations[uri];
     if (expectationsForUri == null) return;
     var expectationsAtOffset = expectationsForUri[offset];
     if (expectationsAtOffset != null) {
       for (int i = 0; i < expectationsAtOffset.length; i++) {
         var expectation = expectationsAtOffset[i];
         if (expectation.property == property) {
           if (!value.matches(expectation.value)) {
             _problemWithStack(
                 uri,
@@ skipping 69 matching lines @@
       this.property, this.value, this.commentOffset, this.commentLength);
 }
 
 class _Fix {
   final int offset;
   final int length;
   final String replacement;
 
   _Fix(this.offset, this.length, this.replacement);
 }