update analyzer and dart_style

test/testing.dart

 // Copyright (c) 2015, 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 dev_compiler.src.testing;
 
 import 'dart:mirrors';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/file_system/memory_file_system.dart';
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/engine.dart'
     show AnalysisContext, AnalysisEngine, AnalysisOptionsImpl;
 import 'package:analyzer/src/generated/error.dart';
+import 'package:analyzer/src/generated/source.dart';
 import 'package:cli_util/cli_util.dart' show getSdkDir;
 import 'package:logging/logging.dart';
 import 'package:path/path.dart' as path;
 import 'package:source_span/source_span.dart';
 import 'package:test/test.dart';
 
 import 'package:dev_compiler/strong_mode.dart';
 import 'package:dev_compiler/src/analysis_context.dart';
 
 import 'package:dev_compiler/src/server/dependency_graph.dart'
@@ skipping 94 matching lines @@
     provider.newFile(key, value);
   });
   return provider;
 }
 
 class TestUriResolver extends ResourceUriResolver {
   final MemoryResourceProvider provider;
   TestUriResolver(provider)
       : provider = provider,
         super(provider);
-  resolveAbsolute(Uri uri) {
+
+  @override
+  Source resolveAbsolute(Uri uri, [Uri actualUri]) {
     if (uri.scheme == 'package') {
       return (provider.getResource('/packages/' + uri.path) as File)
           .createSource(uri);
     }
-    return super.resolveAbsolute(uri);
+    return super.resolveAbsolute(uri, actualUri);
   }
 }
 
 class _ExpectedErrorVisitor extends UnifyingAstVisitor {
   final Set<AnalysisError> _actualErrors;
   CompilationUnit _unit;
   String _unitSourceCode;
 
   _ExpectedErrorVisitor(List<AnalysisError> actualErrors)
       : _actualErrors = new Set.from(actualErrors);
@@ skipping 111 matching lines @@
     expect(tokens[1], "should", reason: 'invalid error descriptor');
     expect(tokens[2], "be", reason: 'invalid error descriptor');
     if (tokens[0] == "pass") return null;
     // TODO(leafp) For now, we just use whatever the current expectation is,
     // eventually we could do more automated reporting here.
     return _parse(tokens[0]);
   }
 
   String toString() => '$level $typeName';
 }