Skip to content

Commit 492dd56

Browse files
Googlercopybara-github
authored andcommitted
Use aliasElement name, it is not "aliased".
PiperOrigin-RevId: 785435014
1 parent ae52240 commit 492dd56

File tree

5 files changed

+173
-205
lines changed

5 files changed

+173
-205
lines changed

CHANGELOG.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
1-
## 5.5.0
1+
## 5.4.7-wip
22

3-
* Switch to `build` 3.0.0.
4-
* Require Dart SDK ^3.7.0.
5-
6-
## 5.5.0-dev
7-
8-
* Switch to `build` 3.0.0-dev.
93
* Require Dart SDK ^3.7.0.
104

115
## 5.4.6

lib/src/builder.dart

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -937,8 +937,8 @@ class _MockTargetGatherer {
937937
final className = interfaceElement.name3;
938938
final substitution = Substitution.fromInterfaceType(mockTarget.classType);
939939
final relevantMembers = _inheritanceManager
940-
.getInterface2(interfaceElement)
941-
.map2
940+
.getInterface(interfaceElement)
941+
.map
942942
.values
943943
.where((m) => !m.isPrivate && !m.isStatic)
944944
.map((member) => ExecutableMember.from(member, substitution));
@@ -1247,16 +1247,15 @@ class _MockClassInfo {
12471247
});
12481248

12491249
Class _buildMockClass() {
1250-
final typeAlias = mockTarget.classType.alias;
1251-
final aliasedElement = typeAlias?.element2;
1252-
final aliasedType =
1253-
typeAlias?.element2.aliasedType as analyzer.InterfaceType?;
1250+
final instantiatedAlias = mockTarget.classType.alias;
1251+
final aliasElement = instantiatedAlias?.element;
1252+
final aliasedType = aliasElement?.aliasedType as analyzer.InterfaceType?;
12541253
final typeToMock = aliasedType ?? mockTarget.classType;
12551254
final classToMock = mockTarget.interfaceElement;
12561255
final classIsImmutable = classToMock.metadata2.annotations.any(
12571256
(it) => it.isImmutable,
12581257
);
1259-
final className = aliasedElement?.name3 ?? classToMock.name3;
1258+
final className = aliasElement?.name3 ?? classToMock.name3;
12601259

12611260
return Class((cBuilder) {
12621261
cBuilder
@@ -1278,9 +1277,9 @@ class _MockClassInfo {
12781277
// the "implements" clause.
12791278

12801279
final typeParameters =
1281-
aliasedElement?.typeParameters2 ?? classToMock.typeParameters2;
1280+
aliasElement?.typeParameters2 ?? classToMock.typeParameters2;
12821281
final typeArguments =
1283-
typeAlias?.typeArguments ?? typeToMock.typeArguments;
1282+
instantiatedAlias?.typeArguments ?? typeToMock.typeArguments;
12841283

12851284
_withTypeParameters(
12861285
mockTarget.hasExplicitTypeArguments ? [] : typeParameters,
@@ -1300,7 +1299,7 @@ class _MockClassInfo {
13001299
TypeReference((b) {
13011300
b
13021301
..symbol = className
1303-
..url = _typeImport(aliasedElement ?? classToMock)
1302+
..url = _typeImport(aliasElement ?? classToMock)
13041303
..types.addAll(
13051304
mockTarget.hasExplicitTypeArguments
13061305
? typeArguments.map(_typeReference)
@@ -1313,15 +1312,12 @@ class _MockClassInfo {
13131312
}
13141313

13151314
final substitution = Substitution.fromPairs2(
1316-
[
1317-
...classToMock.typeParameters2,
1318-
...?aliasedElement?.typeParameters2,
1319-
],
1320-
[...typeToMock.typeArguments, ...?typeAlias?.typeArguments],
1315+
[...classToMock.typeParameters2, ...?aliasElement?.typeParameters2],
1316+
[...typeToMock.typeArguments, ...?instantiatedAlias?.typeArguments],
13211317
);
13221318
final members = inheritanceManager
1323-
.getInterface2(classToMock)
1324-
.map2
1319+
.getInterface(classToMock)
1320+
.map
13251321
.values
13261322
.map((member) => ExecutableMember.from(member, substitution));
13271323

pubspec.yaml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: mockito
2-
version: 5.5.0
2+
version: 5.4.6
33
description: >-
44
A mock framework inspired by Mockito with APIs for Fakes, Mocks,
55
behavior verification, and stubbing.
@@ -13,23 +13,22 @@ environment:
1313
sdk: ^3.7.0
1414

1515
dependencies:
16-
analyzer: '>=7.5.5 <8.0.0'
17-
build: ^3.0.0
16+
analyzer: '>=6.9.0 <8.0.0'
17+
build: ^2.4.1
1818
code_builder: ^4.5.0
1919
collection: ^1.19.0
2020
dart_style: '>=2.3.7 <4.0.0'
2121
matcher: ^0.12.16
2222
meta: ^1.15.0
2323
path: ^1.9.0
24-
source_gen: ^3.0.0
24+
source_gen: ">=1.4.0 <3.0.0"
2525
test_api: ">=0.6.1 <0.8.0"
2626

2727
dev_dependencies:
28-
build_runner: ^2.5.0
29-
build_test: ^3.3.0
30-
build_web_compilers: ^4.2.0
28+
build_runner: ^2.4.11
29+
build_test: ^2.1.7
30+
build_web_compilers: ^4.0.11
3131
http: ^1.0.0
3232
lints: ^5.1.0
33-
logging: ^1.0.0
3433
package_config: ^2.1.1
3534
test: ^1.24.4

0 commit comments

Comments
 (0)