Skip to content

Commit b8958f9

Browse files
jcollins-gjcollins-g
authored
Move tests around for 2.13 stable (#2650)
* Move tests around for 2.13 stable * dartfmt * Fix a template...
1 parent 34d371f commit b8958f9

File tree

6 files changed

+76
-80
lines changed

6 files changed

+76
-80
lines changed

‎lib/templates/md/_type.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
##### {{{linkedName}}}{{{linkedGenericParameters}}}({{{ linkedParamsNoMetadata }}}) {{{ modelType.linkedName }}}
1+
##### {{{linkedName}}}{{{linkedGenericParameters}}} = {{{ modelType.linkedName }}}
22
{{>categorization}}
33

44
{{{ oneLineDoc }}} {{{ extendedDocLink }}} {{!two spaces intentional}}

‎test/end2end/model_special_cases_test.dart‎

Lines changed: 0 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ library dartdoc.model_special_cases_test;
1111
import 'dart:io';
1212

1313
import 'package:async/async.dart';
14-
import 'package:dartdoc/src/element_type.dart';
1514
import 'package:dartdoc/src/model/model.dart';
1615
import 'package:dartdoc/src/package_config_provider.dart';
1716
import 'package:dartdoc/src/package_meta.dart';
@@ -74,8 +73,6 @@ void main() {
7473
// ExperimentalFeature.experimentalReleaseVersion as these are set to null
7574
// even when partial analyzer implementations are available, and are often
7675
// set too high after release.
77-
final _generalizedTypedefsAllowed =
78-
VersionRange(min: Version.parse('2.13.0-0'), includeMin: true);
7976
final _genericMetadataAllowed =
8077
VersionRange(min: Version.parse('2.14.0-0'), includeMin: true);
8178
final _tripleShiftAllowed =
@@ -189,78 +186,6 @@ void main() {
189186
everyElement(contains(ab0)));
190187
});
191188
}, skip: !_genericMetadataAllowed.allows(_platformVersion));
192-
193-
group('generalized typedefs', () {
194-
Library generalizedTypedefs;
195-
Typedef T0, T1, T2, T3, T4, T5, T6, T7;
196-
Class C, C2;
197-
198-
setUpAll(() async {
199-
generalizedTypedefs = (await _testPackageGraphExperiments)
200-
.libraries
201-
.firstWhere((l) => l.name == 'generalized_typedefs');
202-
T0 = generalizedTypedefs.typedefs.firstWhere((a) => a.name == 'T0');
203-
T1 = generalizedTypedefs.typedefs.firstWhere((a) => a.name == 'T1');
204-
T2 = generalizedTypedefs.typedefs.firstWhere((a) => a.name == 'T2');
205-
T3 = generalizedTypedefs.typedefs.firstWhere((a) => a.name == 'T3');
206-
T4 = generalizedTypedefs.typedefs.firstWhere((a) => a.name == 'T4');
207-
T5 = generalizedTypedefs.typedefs.firstWhere((a) => a.name == 'T5');
208-
T6 = generalizedTypedefs.typedefs.firstWhere((a) => a.name == 'T6');
209-
T7 = generalizedTypedefs.typedefs.firstWhere((a) => a.name == 'T7');
210-
C = generalizedTypedefs.classes.firstWhere((c) => c.name == 'C');
211-
C2 = generalizedTypedefs.classes.firstWhere((c) => c.name == 'C2');
212-
});
213-
214-
void expectTypedefs(Typedef t, String modelTypeToString,
215-
Iterable<String> genericParameters) {
216-
expect(t.modelType.toString(), equals(modelTypeToString));
217-
expect(t.genericTypeParameters.map((p) => p.toString()),
218-
orderedEquals(genericParameters));
219-
}
220-
221-
void expectAliasedTypeName(AliasedElementType n, expected) {
222-
expect(n.aliasElement.name, expected);
223-
}
224-
225-
test('typedef references display aliases', () {
226-
var g = C.instanceMethods.firstWhere((m) => m.name == 'g');
227-
228-
var c = C2.allFields.firstWhere((f) => f.name == 'c');
229-
var d = C2.instanceMethods.firstWhere((f) => f.name == 'd');
230-
231-
expectAliasedTypeName(c.modelType, equals('T1'));
232-
expectAliasedTypeName(d.modelType.returnType, equals('T2'));
233-
expectAliasedTypeName(d.parameters.first.modelType, equals('T3'));
234-
expectAliasedTypeName(d.parameters.last.modelType, equals('T4'));
235-
236-
expectAliasedTypeName(g.modelType.returnType, equals('T1'));
237-
expectAliasedTypeName(
238-
g.modelType.parameters.first.modelType, equals('T2'));
239-
expectAliasedTypeName(
240-
g.modelType.parameters.last.modelType, equals('T3'));
241-
});
242-
243-
test('typedef references to special types work', () {
244-
var a = generalizedTypedefs.properties.firstWhere((p) => p.name == 'a');
245-
var b = C2.allFields.firstWhere((f) => f.name == 'b');
246-
var f = C.allFields.firstWhere((f) => f.name == 'f');
247-
expectAliasedTypeName(a.modelType, equals('T0'));
248-
expectAliasedTypeName(b.modelType, equals('T0'));
249-
expectAliasedTypeName(f.modelType, equals('T0'));
250-
}, skip: 'dart-lang/sdk#45291');
251-
252-
test('basic non-function typedefs work', () {
253-
expectTypedefs(T0, 'void', []);
254-
expectTypedefs(T1, 'Function', []);
255-
expectTypedefs(T2, 'List<X>', ['out X']);
256-
expectTypedefs(T3, 'Map<X, Y>', ['out X', 'out Y']);
257-
expectTypedefs(T4, 'void Function()', []);
258-
expectTypedefs(T5, 'X Function(X, {X name})', ['inout X']);
259-
expectTypedefs(T6, 'X Function(Y, [Map<Y, Y>])', ['out X', 'in Y']);
260-
expectTypedefs(T7, 'X Function(Y, [Map<Y, Y>])',
261-
['out X extends String', 'in Y extends List<X>']);
262-
});
263-
}, skip: (!_generalizedTypedefsAllowed.allows(_platformVersion)));
264189
});
265190

266191
group('HTML Injection when allowed', () {

‎test/end2end/model_test.dart‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,77 @@ void main() {
9191
packageGraph.libraries.firstWhere((lib) => lib.name == 'base_class');
9292
});
9393

94+
group('generalized typedefs', () {
95+
Library generalizedTypedefs;
96+
Typedef T0, T1, T2, T3, T4, T5, T6, T7;
97+
Class C, C2;
98+
99+
setUpAll(() {
100+
generalizedTypedefs = packageGraph.libraries
101+
.firstWhere((l) => l.name == 'generalized_typedefs');
102+
T0 = generalizedTypedefs.typedefs.firstWhere((a) => a.name == 'T0');
103+
T1 = generalizedTypedefs.typedefs.firstWhere((a) => a.name == 'T1');
104+
T2 = generalizedTypedefs.typedefs.firstWhere((a) => a.name == 'T2');
105+
T3 = generalizedTypedefs.typedefs.firstWhere((a) => a.name == 'T3');
106+
T4 = generalizedTypedefs.typedefs.firstWhere((a) => a.name == 'T4');
107+
T5 = generalizedTypedefs.typedefs.firstWhere((a) => a.name == 'T5');
108+
T6 = generalizedTypedefs.typedefs.firstWhere((a) => a.name == 'T6');
109+
T7 = generalizedTypedefs.typedefs.firstWhere((a) => a.name == 'T7');
110+
C = generalizedTypedefs.classes.firstWhere((c) => c.name == 'C');
111+
C2 = generalizedTypedefs.classes.firstWhere((c) => c.name == 'C2');
112+
});
113+
114+
void expectTypedefs(Typedef t, String modelTypeToString,
115+
Iterable<String> genericParameters) {
116+
expect(t.modelType.toString(), equals(modelTypeToString));
117+
expect(t.genericTypeParameters.map((p) => p.toString()),
118+
orderedEquals(genericParameters));
119+
}
120+
121+
void expectAliasedTypeName(AliasedElementType n, expected) {
122+
expect(n.aliasElement.name, expected);
123+
}
124+
125+
test('typedef references display aliases', () {
126+
var g = C.instanceMethods.firstWhere((m) => m.name == 'g');
127+
128+
var c = C2.allFields.firstWhere((f) => f.name == 'c');
129+
var d = C2.instanceMethods.firstWhere((f) => f.name == 'd');
130+
131+
expectAliasedTypeName(c.modelType, equals('T1'));
132+
expectAliasedTypeName(d.modelType.returnType, equals('T2'));
133+
expectAliasedTypeName(d.parameters.first.modelType, equals('T3'));
134+
expectAliasedTypeName(d.parameters.last.modelType, equals('T4'));
135+
136+
expectAliasedTypeName(g.modelType.returnType, equals('T1'));
137+
expectAliasedTypeName(
138+
g.modelType.parameters.first.modelType, equals('T2'));
139+
expectAliasedTypeName(
140+
g.modelType.parameters.last.modelType, equals('T3'));
141+
});
142+
143+
test('typedef references to special types work', () {
144+
var a = generalizedTypedefs.properties.firstWhere((p) => p.name == 'a');
145+
var b = C2.allFields.firstWhere((f) => f.name == 'b');
146+
var f = C.allFields.firstWhere((f) => f.name == 'f');
147+
expectAliasedTypeName(a.modelType, equals('T0'));
148+
expectAliasedTypeName(b.modelType, equals('T0'));
149+
expectAliasedTypeName(f.modelType, equals('T0'));
150+
}, skip: 'dart-lang/sdk#45291');
151+
152+
test('basic non-function typedefs work', () {
153+
expectTypedefs(T0, 'void', []);
154+
expectTypedefs(T1, 'Function', []);
155+
expectTypedefs(T2, 'List<X>', ['out X']);
156+
expectTypedefs(T3, 'Map<X, Y>', ['out X', 'out Y']);
157+
expectTypedefs(T4, 'void Function()', []);
158+
expectTypedefs(T5, 'X Function(X, {X name})', ['inout X']);
159+
expectTypedefs(T6, 'X Function(Y, [Map<Y, Y>])', ['out X', 'in Y']);
160+
expectTypedefs(T7, 'X Function(Y, [Map<Y, Y>])',
161+
['out X extends String', 'in Y extends List<X>']);
162+
});
163+
});
164+
94165
group('NNBD cases', () {
95166
Library lateFinalWithoutInitializer,
96167
nullSafetyClassMemberDeclarations,

‎test/src/utils.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import 'package:dartdoc/src/package_meta.dart';
1616
/// The number of public libraries in testing/test_package, minus 2 for
1717
/// the excluded libraries listed in the initializers for _testPackageGraphMemo
1818
/// and minus 1 for the <nodoc> tag in the 'excluded' library.
19-
const int kTestPackagePublicLibraries = 22;
19+
const int kTestPackagePublicLibraries = 23;
2020

2121
final _resourceProvider = pubPackageMetaProvider.resourceProvider;
2222
final _pathContext = _resourceProvider.pathContext;

‎testing/test_package_experiments/lib/generalized_typedefs.dart‎ renamed to ‎testing/test_package/lib/features/generalized_typedefs.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ abstract class C extends T8 {
3838

3939
T2 operator +(T2 other) => other;
4040

41-
static final T4 h = (){};
41+
static final T4 h = () {};
4242
static T5<C>? i;
4343

4444
T7<String, List<String>> get j;
@@ -50,4 +50,4 @@ extension E on T6 {
5050
static T4 f = () {};
5151

5252
T2 myMethod() => [5];
53-
}
53+
}

‎testing/test_package/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ dependencies:
88
test_package_imported:
99
path: "../test_package_imported"
1010
environment:
11-
sdk: '>=2.12.0 <3.0.0'
11+
sdk: '>=2.13.0 <3.0.0'

0 commit comments

Comments
 (0)