| Index: pkg/analysis_server/test/integration/integration_tests.dart
|
| diff --git a/pkg/analysis_server/test/integration/integration_tests.dart b/pkg/analysis_server/test/integration/integration_tests.dart
|
| index af863fd5152ed510c067c62195160584ed13235a..a692128a7db5689d6019665fa9ef73d7bcb992fd 100644
|
| --- a/pkg/analysis_server/test/integration/integration_tests.dart
|
| +++ b/pkg/analysis_server/test/integration/integration_tests.dart
|
| @@ -146,8 +146,7 @@ abstract class AbstractAnalysisServerIntegrationTest {
|
| // Matchers common to all domains
|
| // ------------------------------
|
|
|
| -const Matcher isResponse = const MatchesJsonObject('response',
|
| - const {
|
| +const Matcher isResponse = const MatchesJsonObject('response', const {
|
| 'id': isString
|
| }, optionalFields: const {
|
| 'result': anything,
|
| @@ -188,6 +187,12 @@ const Matcher isServerStatusParams = const MatchesJsonObject(
|
| 'analysis': isAnalysisStatus
|
| });
|
|
|
| +// analysis.getErrors
|
| +final Matcher isAnalysisGetErrorsResult = new MatchesJsonObject(
|
| + 'analysis.getErrors result', {
|
| + 'errors': isListOf(isAnalysisError)
|
| +});
|
| +
|
| // analysis.getHover
|
| final Matcher isAnalysisGetHoverResult = new MatchesJsonObject(
|
| 'analysis.getHover result', {
|
| @@ -504,18 +509,19 @@ class Server {
|
| // executable, and the package root into a shell script.
|
| String dartBinary = Platform.executable;
|
| String scriptDir = dirname(Platform.script.path);
|
| - String serverPath = normalize(join(scriptDir, '..',
|
| - '..', 'bin', 'server.dart'));
|
| + String serverPath = normalize(join(scriptDir, '..', '..', 'bin',
|
| + 'server.dart'));
|
| String repoPath = normalize(join(scriptDir, '..', '..', '..', '..'));
|
| String buildDirName;
|
| if (Platform.isWindows) {
|
| buildDirName = 'build';
|
| - } else if (Platform.isMacOS){
|
| + } else if (Platform.isMacOS) {
|
| buildDirName = 'xcodebuild';
|
| } else {
|
| buildDirName = 'out';
|
| }
|
| - String dartConfiguration = 'ReleaseIA32'; // TODO(paulberry): this is a guess
|
| + // TODO(paulberry): this is a guess
|
| + String dartConfiguration = 'ReleaseIA32';
|
| String buildPath = join(repoPath, buildDirName, dartConfiguration);
|
| String packageRoot = join(buildPath, 'packages');
|
| List<String> arguments = [];
|
|
|