aurora
/
nextcloud-neon
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

chore: WIP

feature/multiple-server-versions
jld3103 1 year ago
parent
347d85c20b
commit
32b127692f
No known key found for this signature in database
GPG Key ID: 9062417B9E8EB7B3
3 changed files with 184 additions and 163 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      packages/nextcloud/lib/src/version_supported.dart
  2. 313
      packages/nextcloud/test/core_test.dart
  3. 16
      packages/nextcloud/test/helper.dart

18
packages/nextcloud/lib/src/version_supported.dart
Unescape View File

@ -3,8 +3,14 @@ import 'package:nextcloud/src/api/news.openapi.dart';
import 'package:nextcloud/src/api/notes.openapi.dart'; import 'package:nextcloud/src/api/notes.openapi.dart';
import 'package:version/version.dart'; import 'package:version/version.dart';
/// Version of core/Server supported /// Versions of core/Server supported
const coreSupportedVersion = 27; const coreSupportedVersions = [
'25.0.10',
'26.0.5',
'27.0.0',
'27.0.1',
'27.0.2',
];
/// API version of the news app supported /// API version of the news app supported
const newsSupportedVersion = 'v1-3'; const newsSupportedVersion = 'v1-3';
@ -17,16 +23,16 @@ extension CoreVersionSupported on CoreClient {
/// Check if the core/Server version is supported by this client /// Check if the core/Server version is supported by this client
/// ///
/// Also returns the supported version number /// Also returns the supported version number
(bool, int) isSupported(final CoreOcsGetCapabilitiesResponseApplicationJson_Ocs_Data capabilities) => ( (bool, List<String>) isSupported(final CoreOcsGetCapabilitiesResponseApplicationJson_Ocs_Data capabilities) => (
capabilities.version.major == coreSupportedVersion, coreSupportedVersions.contains(capabilities.version.string),
coreSupportedVersion, coreSupportedVersions,
); );
} }
// ignore: public_member_api_docs // ignore: public_member_api_docs
extension CoreStatusVersionSupported on CoreStatus { extension CoreStatusVersionSupported on CoreStatus {
/// Check if the core/Server version is supported /// Check if the core/Server version is supported
bool get isSupported => version.startsWith('$coreSupportedVersion.'); bool get isSupported => coreSupportedVersions.contains(versionstring);
} }
// ignore: public_member_api_docs // ignore: public_member_api_docs

313
packages/nextcloud/test/core_test.dart
Unescape View File

@ -4,159 +4,164 @@ import 'package:test/test.dart';
import 'helper.dart'; import 'helper.dart';
void main() { void main() {
group( for (final serverVersion in coreSupportedVersions) {
'core', final serverVersionMajor = int.parse(serverVersion.split('.').first);
() { group(
late DockerImage image; serverVersion,
setUpAll(() async => image = await getDockerImage()); () {
group('core', () {
late DockerContainer container; late DockerImage image;
late TestNextcloudClient client; setUpAll(() async => image = await getDockerImage(serverVersion: serverVersion));
setUp(() async {
container = await getDockerContainer(image); late DockerContainer container;
client = await getTestClient(container); late TestNextcloudClient client;
}); setUp(() async {
tearDown(() => container.destroy()); container = await getDockerContainer(image);
client = await getTestClient(container);
test('Is supported from capabilities', () async { });
final (supported, _) = client.core.isSupported((await client.core.ocs.getCapabilities()).ocs.data); tearDown(() => container.destroy());
expect(supported, isTrue);
}); test('Is supported from capabilities', () async {
final (supported, _) = client.core.isSupported((await client.core.ocs.getCapabilities()).ocs.data);
test('Is supported from status', () async { expect(supported, isTrue);
final status = await client.core.getStatus(); });
expect(status.isSupported, isTrue);
}); test('Is supported from status', () async {
final status = await client.core.getStatus();
test('Get status', () async { expect(status.isSupported, isTrue);
final status = await client.core.getStatus(); });
expect(status.installed, true);
expect(status.maintenance, false); test('Get status', () async {
expect(status.needsDbUpgrade, false); final status = await client.core.getStatus();
expect(status.version, startsWith('$coreSupportedVersion.')); expect(status.installed, true);
expect(status.versionstring, startsWith('$coreSupportedVersion.')); expect(status.maintenance, false);
expect(status.edition, ''); expect(status.needsDbUpgrade, false);
expect(status.productname, 'Nextcloud'); expect(status.version, startsWith('$serverVersion.'));
expect(status.extendedSupport, false); expect(status.versionstring, serverVersion);
}); expect(status.edition, '');
expect(status.productname, 'Nextcloud');
test('Get capabilities', () async { expect(status.extendedSupport, false);
final capabilities = await client.core.ocs.getCapabilities(); });
expect(capabilities.ocs.data.version.major, coreSupportedVersion);
expect(capabilities.ocs.data.version.string, startsWith('$coreSupportedVersion.')); test('Get capabilities', () async {
expect(capabilities.ocs.data.capabilities.commentsCapabilities, isNotNull); final capabilities = await client.core.ocs.getCapabilities();
expect(capabilities.ocs.data.capabilities.davCapabilities, isNotNull); expect(capabilities.ocs.data.version.major, serverVersionMajor);
expect(capabilities.ocs.data.capabilities.filesCapabilities, isNotNull); expect(capabilities.ocs.data.version.string, serverVersion);
expect(capabilities.ocs.data.capabilities.filesSharingCapabilities, isNotNull); expect(capabilities.ocs.data.capabilities.commentsCapabilities, isNotNull);
expect(capabilities.ocs.data.capabilities.filesTrashbinCapabilities, isNotNull); expect(capabilities.ocs.data.capabilities.davCapabilities, isNotNull);
expect(capabilities.ocs.data.capabilities.filesVersionsCapabilities, isNotNull); expect(capabilities.ocs.data.capabilities.filesCapabilities, isNotNull);
expect(capabilities.ocs.data.capabilities.notesCapabilities, isNotNull); expect(capabilities.ocs.data.capabilities.filesSharingCapabilities, isNotNull);
expect(capabilities.ocs.data.capabilities.notificationsCapabilities, isNotNull); expect(capabilities.ocs.data.capabilities.filesTrashbinCapabilities, isNotNull);
expect(capabilities.ocs.data.capabilities.provisioningApiCapabilities, isNotNull); expect(capabilities.ocs.data.capabilities.filesVersionsCapabilities, isNotNull);
expect(capabilities.ocs.data.capabilities.sharebymailCapabilities, isNotNull); expect(capabilities.ocs.data.capabilities.notesCapabilities, isNotNull);
expect(capabilities.ocs.data.capabilities.themingPublicCapabilities, isNotNull); expect(capabilities.ocs.data.capabilities.notificationsCapabilities, isNotNull);
expect(capabilities.ocs.data.capabilities.userStatusCapabilities, isNotNull); expect(capabilities.ocs.data.capabilities.provisioningApiCapabilities, isNotNull);
expect(capabilities.ocs.data.capabilities.weatherStatusCapabilities, isNotNull); expect(capabilities.ocs.data.capabilities.sharebymailCapabilities, isNotNull);
}); expect(capabilities.ocs.data.capabilities.themingPublicCapabilities, isNotNull);
expect(capabilities.ocs.data.capabilities.userStatusCapabilities, isNotNull);
test('Get navigation apps', () async { expect(capabilities.ocs.data.capabilities.weatherStatusCapabilities, isNotNull);
final navigationApps = await client.core.navigation.getAppsNavigation(); });
expect(navigationApps.ocs.data, hasLength(6));
expect(navigationApps.ocs.data[0].id, 'dashboard'); test('Get navigation apps', () async {
expect(navigationApps.ocs.data[1].id, 'files'); final navigationApps = await client.core.navigation.getAppsNavigation();
expect(navigationApps.ocs.data[2].id, 'photos'); expect(navigationApps.ocs.data, hasLength(6));
expect(navigationApps.ocs.data[3].id, 'activity'); expect(navigationApps.ocs.data[0].id, 'dashboard');
expect(navigationApps.ocs.data[4].id, 'notes'); expect(navigationApps.ocs.data[1].id, 'files');
expect(navigationApps.ocs.data[5].id, 'news'); expect(navigationApps.ocs.data[2].id, 'photos');
}); expect(navigationApps.ocs.data[3].id, 'activity');
expect(navigationApps.ocs.data[4].id, 'notes');
test( expect(navigationApps.ocs.data[5].id, 'news');
'Autocomplete', });
() async {
final response = await client.core.autoComplete.$get( test(
search: '', 'Autocomplete',
itemType: 'call', () async {
itemId: 'new', final response = await client.core.autoComplete.$get(
shareTypes: [ search: '',
ShareType.user.index, itemType: 'call',
ShareType.group.index, itemId: 'new',
], shareTypes: [
ShareType.user.index,
ShareType.group.index,
],
);
expect(response.ocs.data, hasLength(3));
expect(response.ocs.data[0].id, 'admin');
expect(response.ocs.data[0].label, 'admin');
expect(response.ocs.data[0].icon, 'icon-user');
expect(response.ocs.data[0].source, 'users');
expect(response.ocs.data[0].status, isEmpty);
expect(response.ocs.data[0].subline, '');
expect(response.ocs.data[0].shareWithDisplayNameUnique, 'admin@example.com');
expect(response.ocs.data[1].id, 'user2');
expect(response.ocs.data[1].label, 'User Two');
expect(response.ocs.data[1].icon, 'icon-user');
expect(response.ocs.data[1].source, 'users');
expect(response.ocs.data[1].status, isEmpty);
expect(response.ocs.data[1].subline, '');
expect(response.ocs.data[1].shareWithDisplayNameUnique, 'user2');
expect(response.ocs.data[2].id, 'admin');
expect(response.ocs.data[2].label, 'admin');
expect(response.ocs.data[2].icon, '');
expect(response.ocs.data[2].source, 'groups');
expect(response.ocs.data[2].status, isEmpty);
expect(response.ocs.data[2].subline, '');
expect(response.ocs.data[2].shareWithDisplayNameUnique, '');
},
skip: serverVersionMajor < 28, // This test only works on 28+ due to a bug fix with the status
); );
expect(response.ocs.data, hasLength(3));
test('Get preview', () async {
expect(response.ocs.data[0].id, 'admin'); final response = await client.core.preview.getPreview(file: 'Nextcloud.png');
expect(response.ocs.data[0].label, 'admin'); expect(response, isNotEmpty);
expect(response.ocs.data[0].icon, 'icon-user'); });
expect(response.ocs.data[0].source, 'users');
expect(response.ocs.data[0].status, isEmpty); test('Get avatar', () async {
expect(response.ocs.data[0].subline, ''); final response = await client.core.avatar.getAvatar(userId: 'admin', size: 32);
expect(response.ocs.data[0].shareWithDisplayNameUnique, 'admin@example.com'); expect(response.data, isNotEmpty);
});
expect(response.ocs.data[1].id, 'user2');
expect(response.ocs.data[1].label, 'User Two'); test('Get dark avatar', () async {
expect(response.ocs.data[1].icon, 'icon-user'); final response = await client.core.avatar.getAvatarDark(userId: 'admin', size: 32);
expect(response.ocs.data[1].source, 'users'); expect(response.data, isNotEmpty);
expect(response.ocs.data[1].status, isEmpty); });
expect(response.ocs.data[1].subline, '');
expect(response.ocs.data[1].shareWithDisplayNameUnique, 'user2'); test('Delete app password', () async {
await client.core.appPassword.deleteAppPassword();
expect(response.ocs.data[2].id, 'admin'); expect(
expect(response.ocs.data[2].label, 'admin'); () => client.core.appPassword.deleteAppPassword(),
expect(response.ocs.data[2].icon, ''); throwsA(predicate((final e) => (e! as DynamiteApiException).statusCode == 401)),
expect(response.ocs.data[2].source, 'groups'); );
expect(response.ocs.data[2].status, isEmpty); });
expect(response.ocs.data[2].subline, '');
expect(response.ocs.data[2].shareWithDisplayNameUnique, ''); test('Unified search providers', () async {
}, final response = await client.core.unifiedSearch.getProviders();
skip: true, // TODO: This test only works on 28+ due to a bug fix with the status expect(response.ocs.data, hasLength(13));
); });
test('Get preview', () async { test('Unified search', () async {
final response = await client.core.preview.getPreview(file: 'Nextcloud.png'); final response = await client.core.unifiedSearch.search(
expect(response, isNotEmpty); providerId: 'settings',
}); term: 'Personal info',
);
test('Get avatar', () async { expect(response.ocs.data.name, 'Settings');
final response = await client.core.avatar.getAvatar(userId: 'admin', size: 32); expect(response.ocs.data.isPaginated, isFalse);
expect(response.data, isNotEmpty); expect(response.ocs.data.entries, hasLength(1));
}); expect(response.ocs.data.entries.single.thumbnailUrl, isEmpty);
expect(response.ocs.data.entries.single.title, 'Personal info');
test('Get dark avatar', () async { expect(response.ocs.data.entries.single.subline, isEmpty);
final response = await client.core.avatar.getAvatarDark(userId: 'admin', size: 32); expect(response.ocs.data.entries.single.resourceUrl, isNotEmpty);
expect(response.data, isNotEmpty); expect(response.ocs.data.entries.single.icon, 'icon-settings-dark');
}); expect(response.ocs.data.entries.single.rounded, isFalse);
expect(response.ocs.data.entries.single.attributes, isEmpty);
test('Delete app password', () async { });
await client.core.appPassword.deleteAppPassword(); });
expect( },
() => client.core.appPassword.deleteAppPassword(), retry: retryCount,
throwsA(predicate((final e) => (e! as DynamiteApiException).statusCode == 401)), timeout: timeout,
); );
}); }
test('Unified search providers', () async {
final response = await client.core.unifiedSearch.getProviders();
expect(response.ocs.data, hasLength(13));
});
test('Unified search', () async {
final response = await client.core.unifiedSearch.search(
providerId: 'settings',
term: 'Personal info',
);
expect(response.ocs.data.name, 'Settings');
expect(response.ocs.data.isPaginated, isFalse);
expect(response.ocs.data.entries, hasLength(1));
expect(response.ocs.data.entries.single.thumbnailUrl, isEmpty);
expect(response.ocs.data.entries.single.title, 'Personal info');
expect(response.ocs.data.entries.single.subline, isEmpty);
expect(response.ocs.data.entries.single.resourceUrl, isNotEmpty);
expect(response.ocs.data.entries.single.icon, 'icon-settings-dark');
expect(response.ocs.data.entries.single.rounded, isFalse);
expect(response.ocs.data.entries.single.attributes, isEmpty);
});
},
retry: retryCount,
timeout: timeout,
);
} }

16
packages/nextcloud/test/helper.dart
Unescape View File

@ -192,8 +192,15 @@ Future<DockerContainer> getDockerContainer(final DockerImage image, {final bool
typedef DockerImage = String; typedef DockerImage = String;
Future<DockerImage> getDockerImage() async { Future<DockerImage> getDockerImage({
const dockerImageName = 'nextcloud-neon-dev'; final String? serverVersion,
}) async {
final buildArgs = <String, String>{
if (serverVersion != null) 'SERVER_VERSION': serverVersion,
};
final dockerImageName =
'nextcloud-neon-test${buildArgs.isNotEmpty ? '-' : ''}${buildArgs.entries.map((final buildArg) => '${buildArg.key.toLowerCase().replaceAll('_', '-')}-${buildArg.value}').join('-')}';
final inputStream = StreamController<List<int>>(); final inputStream = StreamController<List<int>>();
final process = runExecutableArguments( final process = runExecutableArguments(
@ -202,6 +209,9 @@ Future<DockerImage> getDockerImage() async {
'build', 'build',
'-t', '-t',
dockerImageName, dockerImageName,
...buildArgs.entries
.map((final buildArg) => ['--build-arg', '${buildArg.key}=${buildArg.value}'])
.expand((final buildArg) => buildArg),
'-f', '-f',
'-', '-',
'../../tool', '../../tool',
@ -213,7 +223,7 @@ Future<DockerImage> getDockerImage() async {
final result = await process; final result = await process;
if (result.exitCode != 0) { if (result.exitCode != 0) {
throw Exception('Failed to build docker image'); throw Exception('Failed to build docker image:\n${result.stdout as String}\n${result.stderr as String}');
} }
return dockerImageName; return dockerImageName;

Write Preview
Loading…
Cancel
Save