Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions app/lib/search/updater.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ import 'package:_discoveryapis_commons/_discoveryapis_commons.dart'
import 'package:gcloud/db.dart';
import 'package:gcloud/service_scope.dart' as ss;
import 'package:logging/logging.dart';
import 'package:meta/meta.dart';

import '../dartdoc/backend.dart';
import '../frontend/models.dart' show Package;
import '../shared/exceptions.dart';
import '../shared/scheduler_stats.dart';
import '../shared/task_scheduler.dart';
Expand Down Expand Up @@ -57,6 +59,18 @@ class IndexUpdater implements TaskRunner {
}
}

/// Updates all packages in the index.
/// It is slower than searchBackend.loadMinimumPackageIndex, but provides a
/// complete document for the index.
@visibleForTesting
Future updateAllPackages() async {
await for (final p in _db.query<Package>().run()) {
final doc = await searchBackend.loadDocument(p.name);
await packageIndex.addPackage(doc);
}
await packageIndex.merge();
}

Future _initSnapshot() async {
if (_snapshot != null) return;
try {
Expand Down
97 changes: 38 additions & 59 deletions app/test/frontend/handlers/listing_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,19 @@
// 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.

import 'package:gcloud/db.dart';
import 'package:http/testing.dart';
import 'package:test/test.dart';

import 'package:pub_dartlang_org/frontend/backend.dart';
import 'package:pub_dartlang_org/frontend/models.dart';
import 'package:pub_dartlang_org/frontend/name_tracker.dart';
import 'package:pub_dartlang_org/frontend/search_service.dart';
import 'package:pub_dartlang_org/frontend/static_files.dart';
import 'package:pub_dartlang_org/shared/analyzer_client.dart';
import 'package:pub_dartlang_org/shared/search_service.dart';
import 'package:pub_dartlang_org/shared/search_client.dart';
import 'package:pub_dartlang_org/search/updater.dart';

import '../../shared/handlers_test_utils.dart';
import '../../shared/test_models.dart';
import '../../shared/test_services.dart';
import '../mocks.dart';

import '_utils.dart';

Expand Down Expand Up @@ -89,34 +86,21 @@ void main() {
expect(content, contains('helium is a Dart package'));
});

tScopedTest('/packages?page=2', () async {
registerSearchService(SearchServiceMock(
(SearchQuery query) {
expect(query.offset, 10);
expect(query.limit, pageSize);
expect(query.platform, isNull);
expect(query.isAd, isFalse);
return SearchResultPage(query, 1, [
PackageView.fromModel(
package: foobarPackage,
version: foobarStablePV,
scoreCard: null)
]);
},
));
final backend = BackendMock(
lookupPackageFun: (packageName) {
return packageName == foobarPackage.name ? foobarPackage : null;
},
lookupLatestVersionsFun: (List<Package> packages) {
expect(packages.length, 1);
expect(packages.first, foobarPackage);
return [foobarStablePV];
},
testWithServices('/packages?page=2', () async {
for (int i = 0; i < 15; i++) {
final bundle = generateBundle('pkg$i', ['1.0.0']);
await dbService.commit(inserts: [bundle.package, ...bundle.versions]);
}
await indexUpdater.updateAllPackages();

final names = ['pkg0', 'pkg3', 'pkg10'];
final list = await backend.latestPackageVersions(offset: 10);
expect(list.map((p) => p.package).toList(), containsAll(names));

await expectHtmlResponse(
await issueGet('/packages?page=2'),
present: names.map((name) => '/packages/$name').toList(),
);
registerBackend(backend);
registerAnalyzerClient(AnalyzerClientMock());
await expectHtmlResponse(await issueGet('/packages?page=2'));
});

testWithServices('/flutter/packages', () async {
Expand All @@ -135,34 +119,29 @@ void main() {
);
});

tScopedTest('/flutter/packages&page=2', () async {
registerSearchService(SearchServiceMock(
(SearchQuery query) {
expect(query.offset, 10);
expect(query.limit, pageSize);
expect(query.platform, 'flutter');
expect(query.isAd, isFalse);
return SearchResultPage(query, 1, [
PackageView.fromModel(
package: foobarPackage,
version: foobarStablePV,
scoreCard: null)
]);
},
testWithServices('/flutter/packages&page=2', () async {
for (int i = 0; i < 15; i++) {
final bundle = generateBundle(
'pkg$i',
['1.0.0'],
pubspecExtraContent: '''
flutter:
plugin:
class: SomeClass
''',
);
await dbService.commit(inserts: [bundle.package, ...bundle.versions]);
}
await indexUpdater.updateAllPackages();

final names = ['pkg0', 'pkg3', 'pkg10'];
final list = await backend.latestPackageVersions(offset: 10);
expect(list.map((p) => p.package).toList(), containsAll(names));

print(await expectHtmlResponse(
await issueGet('/packages?page=2'),
present: names.map((name) => '/packages/$name').toList(),
));
final backend = BackendMock(
lookupPackageFun: (packageName) {
return packageName == foobarPackage.name ? foobarPackage : null;
},
lookupLatestVersionsFun: (List<Package> packages) {
expect(packages.length, 1);
expect(packages.first, foobarPackage);
return [foobarStablePV];
},
);
registerBackend(backend);
registerAnalyzerClient(AnalyzerClientMock());
await expectHtmlResponse(await issueGet('/flutter/packages?page=2'));
});
});
}
Loading