From bdc024a303457acff274cc44d523f3d355fbfb49 Mon Sep 17 00:00:00 2001 From: Konstantin Shcheglov Date: Wed, 21 Sep 2016 08:54:46 -0700 Subject: [PATCH] Move PackageIndexAssembler into analysis_server. R=brianwilkerson@google.com BUG= Review URL: https://codereview.chromium.org/2357283002 . --- pkg/analysis_server/lib/src/services/index/index.dart | 2 +- .../lib/src/services/index}/index_unit.dart | 0 .../test/services/index}/index_unit_test.dart | 4 ++-- pkg/analysis_server/test/services/index/test_all.dart | 2 ++ pkg/analyzer/test/src/summary/test_all.dart | 2 -- 5 files changed, 5 insertions(+), 5 deletions(-) rename pkg/{analyzer/lib/src/summary => analysis_server/lib/src/services/index}/index_unit.dart (100%) rename pkg/{analyzer/test/src/summary => analysis_server/test/services/index}/index_unit_test.dart (99%) diff --git a/pkg/analysis_server/lib/src/services/index/index.dart b/pkg/analysis_server/lib/src/services/index/index.dart index aa0663732fc..dcf8ea38a60 100644 --- a/pkg/analysis_server/lib/src/services/index/index.dart +++ b/pkg/analysis_server/lib/src/services/index/index.dart @@ -4,13 +4,13 @@ import 'dart:async'; +import 'package:analysis_server/src/services/index/index_unit.dart'; import 'package:analyzer/dart/ast/ast.dart'; import 'package:analyzer/dart/element/element.dart'; import 'package:analyzer/src/generated/engine.dart' show AnalysisContext; import 'package:analyzer/src/generated/source.dart'; import 'package:analyzer/src/summary/format.dart'; import 'package:analyzer/src/summary/idl.dart'; -import 'package:analyzer/src/summary/index_unit.dart'; import 'package:collection/collection.dart'; /** diff --git a/pkg/analyzer/lib/src/summary/index_unit.dart b/pkg/analysis_server/lib/src/services/index/index_unit.dart similarity index 100% rename from pkg/analyzer/lib/src/summary/index_unit.dart rename to pkg/analysis_server/lib/src/services/index/index_unit.dart diff --git a/pkg/analyzer/test/src/summary/index_unit_test.dart b/pkg/analysis_server/test/services/index/index_unit_test.dart similarity index 99% rename from pkg/analyzer/test/src/summary/index_unit_test.dart rename to pkg/analysis_server/test/services/index/index_unit_test.dart index 06f6efb11f8..87388fd272a 100644 --- a/pkg/analyzer/test/src/summary/index_unit_test.dart +++ b/pkg/analysis_server/test/services/index/index_unit_test.dart @@ -4,15 +4,15 @@ import 'dart:convert'; +import 'package:analysis_server/src/services/index/index_unit.dart'; import 'package:analyzer/dart/ast/ast.dart'; import 'package:analyzer/dart/element/element.dart'; import 'package:analyzer/src/summary/format.dart'; import 'package:analyzer/src/summary/idl.dart'; -import 'package:analyzer/src/summary/index_unit.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; import 'package:unittest/unittest.dart'; -import '../abstract_single_unit.dart'; +import '../../abstract_single_unit.dart'; main() { groupSep = ' | '; diff --git a/pkg/analysis_server/test/services/index/test_all.dart b/pkg/analysis_server/test/services/index/test_all.dart index 27a2cd245ee..5c45ec5c601 100644 --- a/pkg/analysis_server/test/services/index/test_all.dart +++ b/pkg/analysis_server/test/services/index/test_all.dart @@ -6,6 +6,7 @@ import 'package:unittest/unittest.dart'; import '../../utils.dart'; import 'index_test.dart' as index_test; +import 'index_unit_test.dart' as index_unit_test; /** * Utility for manually running all tests. @@ -14,5 +15,6 @@ main() { initializeTestEnvironment(); group('index', () { index_test.main(); + index_unit_test.main(); }); } diff --git a/pkg/analyzer/test/src/summary/test_all.dart b/pkg/analyzer/test/src/summary/test_all.dart index f4987f4fc79..ba099c70580 100644 --- a/pkg/analyzer/test/src/summary/test_all.dart +++ b/pkg/analyzer/test/src/summary/test_all.dart @@ -10,7 +10,6 @@ import '../../utils.dart'; import 'api_signature_test.dart' as api_signature_test; import 'flat_buffers_test.dart' as flat_buffers_test; import 'in_summary_source_test.dart' as in_summary_source_test; -import 'index_unit_test.dart' as index_unit_test; import 'linker_test.dart' as linker_test; import 'name_filter_test.dart' as name_filter_test; import 'package_bundle_reader_test.dart' as package_bundle_reader_test; @@ -27,7 +26,6 @@ main() { api_signature_test.main(); flat_buffers_test.main(); in_summary_source_test.main(); - index_unit_test.main(); linker_test.main(); name_filter_test.main(); package_bundle_reader_test.main();