Skip to content

Commit 60cb5c4

Browse files
jasawjasaw
committed
unit test: do not pull ANDROID_HOME from env var
1 parent f3b79ba commit 60cb5c4

File tree

3 files changed

+42
-1
lines changed

3 files changed

+42
-1
lines changed

‎lib/src/builder/user_config.dart‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,10 @@ class UserConfig {
4040
String? androidHome,
4141
bool? preferAndroidCmake,
4242
bool? preferAndroidNinja,
43+
bool envVarAndroidHomeAsDefault = true,
4344
}) : preferAndroidCmake = preferAndroidCmake ?? targetOS == OS.android,
4445
preferAndroidNinja = preferAndroidNinja ?? targetOS == OS.android,
45-
androidHome = androidHome ?? Platform.environment['ANDROID_HOME'];
46+
androidHome = androidHome ?? (envVarAndroidHomeAsDefault ? Platform.environment['ANDROID_HOME'] : null);
4647

4748
UserConfig copyWith({
4849
OS? targetOS,

‎test/native_toolchain/cmake_test.dart‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ void main() {
4242
]));
4343
final userConfig = UserConfig(
4444
targetOS: OS.android,
45+
envVarAndroidHomeAsDefault: false,
4546
);
4647

4748
final executableName = OS.current.executableFileName('cmake');
@@ -74,6 +75,7 @@ void main() {
7475
]));
7576
final userConfig = UserConfig(
7677
targetOS: OS.android,
78+
envVarAndroidHomeAsDefault: false,
7779
androidHome: 'my/android/home',
7880
);
7981

@@ -120,6 +122,7 @@ void main() {
120122
.thenAnswer((_) => Future<List<ToolInstance>>(() => []));
121123
final userConfig = UserConfig(
122124
targetOS: OS.android,
125+
envVarAndroidHomeAsDefault: false,
123126
);
124127
final tools = await cmake.defaultResolver!.resolve(logger: logger, userConfig: userConfig);
125128

@@ -151,6 +154,7 @@ void main() {
151154
.thenAnswer((_) => Future<List<ToolInstance>>(() => []));
152155
final userConfig = UserConfig(
153156
targetOS: OS.android,
157+
envVarAndroidHomeAsDefault: false,
154158
);
155159
final tools = await cmake.defaultResolver!.resolve(logger: logger, userConfig: userConfig);
156160

@@ -182,6 +186,7 @@ void main() {
182186
.thenAnswer((_) => Future<List<ToolInstance>>(() => []));
183187
final userConfig = UserConfig(
184188
targetOS: OS.android,
189+
envVarAndroidHomeAsDefault: false,
185190
cmakeVersion: '4.0.1',
186191
);
187192
final tools = await cmake.defaultResolver!.resolve(logger: logger, userConfig: userConfig);
@@ -204,6 +209,7 @@ void main() {
204209
.thenAnswer((_) => Future<List<ToolInstance>>(() => []));
205210
final userConfig = UserConfig(
206211
targetOS: OS.android,
212+
envVarAndroidHomeAsDefault: false,
207213
preferAndroidCmake: false,
208214
);
209215

@@ -223,6 +229,7 @@ void main() {
223229
]));
224230
final userConfig = UserConfig(
225231
targetOS: OS.android,
232+
envVarAndroidHomeAsDefault: false,
226233
);
227234
final tools = await cmake.defaultResolver!.resolve(logger: logger, userConfig: userConfig);
228235

@@ -244,6 +251,7 @@ void main() {
244251
]));
245252
final userConfig = UserConfig(
246253
targetOS: OS.android,
254+
envVarAndroidHomeAsDefault: false,
247255
preferAndroidCmake: true,
248256
);
249257
final tools = await cmake.defaultResolver!.resolve(logger: logger, userConfig: userConfig);
@@ -282,6 +290,7 @@ void main() {
282290
]));
283291
final userConfig = UserConfig(
284292
targetOS: OS.android,
293+
envVarAndroidHomeAsDefault: false,
285294
cmakeVersion: "4.1.2"
286295
);
287296
final tools = await cmake.defaultResolver!.resolve(logger: logger, userConfig: userConfig);
@@ -306,6 +315,7 @@ void main() {
306315
.thenAnswer((_) => Future<List<ToolInstance>>(() => []));
307316
final userConfig = UserConfig(
308317
targetOS: OS.iOS,
318+
envVarAndroidHomeAsDefault: false,
309319
);
310320

311321
expect(() async => cmake.defaultResolver!.resolve(logger: logger, userConfig: userConfig), throwsA(isA<Exception>()));
@@ -324,6 +334,7 @@ void main() {
324334
.thenAnswer((_) => Future<List<ToolInstance>>(() => []));
325335
final userConfig = UserConfig(
326336
targetOS: OS.iOS,
337+
envVarAndroidHomeAsDefault: false,
327338
preferAndroidCmake: false,
328339
);
329340

@@ -343,6 +354,7 @@ void main() {
343354
.thenAnswer((_) => Future<List<ToolInstance>>(() => []));
344355
final userConfig = UserConfig(
345356
targetOS: OS.iOS,
357+
envVarAndroidHomeAsDefault: false,
346358
preferAndroidCmake: true,
347359
);
348360
final tools = await cmake.defaultResolver!.resolve(logger: logger, userConfig: userConfig);
@@ -365,6 +377,7 @@ void main() {
365377
.thenAnswer((_) => Future<List<ToolInstance>>(() => []));
366378
final userConfig = UserConfig(
367379
targetOS: OS.iOS,
380+
envVarAndroidHomeAsDefault: false,
368381
preferAndroidCmake: true,
369382
cmakeVersion: "4.1.2",
370383
);
@@ -388,6 +401,7 @@ void main() {
388401
.thenAnswer((_) => Future<List<ToolInstance>>(() => []));
389402
final userConfig = UserConfig(
390403
targetOS: OS.iOS,
404+
envVarAndroidHomeAsDefault: false,
391405
preferAndroidCmake: true,
392406
cmakeVersion: "4.1.3",
393407
);
@@ -413,6 +427,7 @@ void main() {
413427
]));
414428
final userConfig = UserConfig(
415429
targetOS: OS.iOS,
430+
envVarAndroidHomeAsDefault: false,
416431
cmakeVersion: "4.1.2",
417432
);
418433
final tools = await cmake.defaultResolver!.resolve(logger: logger, userConfig: userConfig);
@@ -441,6 +456,7 @@ void main() {
441456
]));
442457
final userConfig = UserConfig(
443458
targetOS: OS.iOS,
459+
envVarAndroidHomeAsDefault: false,
444460
preferAndroidCmake: true,
445461
cmakeVersion: "4.1.2",
446462
);
@@ -480,6 +496,7 @@ void main() {
480496
]));
481497
final userConfig = UserConfig(
482498
targetOS: OS.iOS,
499+
envVarAndroidHomeAsDefault: false,
483500
preferAndroidCmake: true,
484501
);
485502
final tools = await cmake.defaultResolver!.resolve(logger: logger, userConfig: userConfig);
@@ -518,6 +535,7 @@ void main() {
518535
]));
519536
final userConfig = UserConfig(
520537
targetOS: OS.iOS,
538+
envVarAndroidHomeAsDefault: false,
521539
);
522540
final tools = await cmake.defaultResolver!.resolve(logger: logger, userConfig: userConfig);
523541

@@ -555,6 +573,7 @@ void main() {
555573
]));
556574
final userConfig = UserConfig(
557575
targetOS: OS.iOS,
576+
envVarAndroidHomeAsDefault: false,
558577
preferAndroidCmake: true,
559578
cmakeVersion: "4.1.4"
560579
);
@@ -594,6 +613,7 @@ void main() {
594613
]));
595614
final userConfig = UserConfig(
596615
targetOS: OS.iOS,
616+
envVarAndroidHomeAsDefault: false,
597617
preferAndroidCmake: true,
598618
cmakeVersion: "4.1.4"
599619
);

‎test/native_toolchain/ninja_test.dart‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ void main() {
4242
]));
4343
final userConfig = UserConfig(
4444
targetOS: OS.android,
45+
envVarAndroidHomeAsDefault: false,
4546
);
4647

4748
final executableName = OS.current.executableFileName('ninja');
@@ -74,6 +75,7 @@ void main() {
7475
]));
7576
final userConfig = UserConfig(
7677
targetOS: OS.android,
78+
envVarAndroidHomeAsDefault: false,
7779
androidHome: 'my/android/home',
7880
);
7981

@@ -120,6 +122,7 @@ void main() {
120122
.thenAnswer((_) => Future<List<ToolInstance>>(() => []));
121123
final userConfig = UserConfig(
122124
targetOS: OS.android,
125+
envVarAndroidHomeAsDefault: false,
123126
);
124127
final tools = await ninja.defaultResolver!.resolve(logger: logger, userConfig: userConfig);
125128

@@ -151,6 +154,7 @@ void main() {
151154
.thenAnswer((_) => Future<List<ToolInstance>>(() => []));
152155
final userConfig = UserConfig(
153156
targetOS: OS.android,
157+
envVarAndroidHomeAsDefault: false,
154158
);
155159
final tools = await ninja.defaultResolver!.resolve(logger: logger, userConfig: userConfig);
156160

@@ -182,6 +186,7 @@ void main() {
182186
.thenAnswer((_) => Future<List<ToolInstance>>(() => []));
183187
final userConfig = UserConfig(
184188
targetOS: OS.android,
189+
envVarAndroidHomeAsDefault: false,
185190
ninjaVersion: '1.11.1',
186191
);
187192
final tools = await ninja.defaultResolver!.resolve(logger: logger, userConfig: userConfig);
@@ -204,6 +209,7 @@ void main() {
204209
.thenAnswer((_) => Future<List<ToolInstance>>(() => []));
205210
final userConfig = UserConfig(
206211
targetOS: OS.android,
212+
envVarAndroidHomeAsDefault: false,
207213
preferAndroidNinja: false,
208214
);
209215

@@ -223,6 +229,7 @@ void main() {
223229
]));
224230
final userConfig = UserConfig(
225231
targetOS: OS.android,
232+
envVarAndroidHomeAsDefault: false,
226233
);
227234
final tools = await ninja.defaultResolver!.resolve(logger: logger, userConfig: userConfig);
228235

@@ -244,6 +251,7 @@ void main() {
244251
]));
245252
final userConfig = UserConfig(
246253
targetOS: OS.android,
254+
envVarAndroidHomeAsDefault: false,
247255
preferAndroidNinja: true,
248256
);
249257
final tools = await ninja.defaultResolver!.resolve(logger: logger, userConfig: userConfig);
@@ -282,6 +290,7 @@ void main() {
282290
]));
283291
final userConfig = UserConfig(
284292
targetOS: OS.android,
293+
envVarAndroidHomeAsDefault: false,
285294
ninjaVersion: "1.12.1"
286295
);
287296
final tools = await ninja.defaultResolver!.resolve(logger: logger, userConfig: userConfig);
@@ -306,6 +315,7 @@ void main() {
306315
.thenAnswer((_) => Future<List<ToolInstance>>(() => []));
307316
final userConfig = UserConfig(
308317
targetOS: OS.iOS,
318+
envVarAndroidHomeAsDefault: false,
309319
);
310320

311321
expect(() async => ninja.defaultResolver!.resolve(logger: logger, userConfig: userConfig), throwsA(isA<Exception>()));
@@ -324,6 +334,7 @@ void main() {
324334
.thenAnswer((_) => Future<List<ToolInstance>>(() => []));
325335
final userConfig = UserConfig(
326336
targetOS: OS.iOS,
337+
envVarAndroidHomeAsDefault: false,
327338
preferAndroidNinja: false,
328339
);
329340

@@ -343,6 +354,7 @@ void main() {
343354
.thenAnswer((_) => Future<List<ToolInstance>>(() => []));
344355
final userConfig = UserConfig(
345356
targetOS: OS.iOS,
357+
envVarAndroidHomeAsDefault: false,
346358
preferAndroidNinja: true,
347359
);
348360
final tools = await ninja.defaultResolver!.resolve(logger: logger, userConfig: userConfig);
@@ -365,6 +377,7 @@ void main() {
365377
.thenAnswer((_) => Future<List<ToolInstance>>(() => []));
366378
final userConfig = UserConfig(
367379
targetOS: OS.iOS,
380+
envVarAndroidHomeAsDefault: false,
368381
preferAndroidNinja: true,
369382
ninjaVersion: "1.12.1",
370383
);
@@ -388,6 +401,7 @@ void main() {
388401
.thenAnswer((_) => Future<List<ToolInstance>>(() => []));
389402
final userConfig = UserConfig(
390403
targetOS: OS.iOS,
404+
envVarAndroidHomeAsDefault: false,
391405
preferAndroidNinja: true,
392406
ninjaVersion: "1.12.3",
393407
);
@@ -413,6 +427,7 @@ void main() {
413427
]));
414428
final userConfig = UserConfig(
415429
targetOS: OS.iOS,
430+
envVarAndroidHomeAsDefault: false,
416431
ninjaVersion: "1.12.1",
417432
);
418433
final tools = await ninja.defaultResolver!.resolve(logger: logger, userConfig: userConfig);
@@ -441,6 +456,7 @@ void main() {
441456
]));
442457
final userConfig = UserConfig(
443458
targetOS: OS.iOS,
459+
envVarAndroidHomeAsDefault: false,
444460
preferAndroidNinja: true,
445461
ninjaVersion: "1.12.1",
446462
);
@@ -480,6 +496,7 @@ void main() {
480496
]));
481497
final userConfig = UserConfig(
482498
targetOS: OS.iOS,
499+
envVarAndroidHomeAsDefault: false,
483500
preferAndroidNinja: true,
484501
);
485502
final tools = await ninja.defaultResolver!.resolve(logger: logger, userConfig: userConfig);
@@ -518,6 +535,7 @@ void main() {
518535
]));
519536
final userConfig = UserConfig(
520537
targetOS: OS.iOS,
538+
envVarAndroidHomeAsDefault: false,
521539
);
522540
final tools = await ninja.defaultResolver!.resolve(logger: logger, userConfig: userConfig);
523541

@@ -555,6 +573,7 @@ void main() {
555573
]));
556574
final userConfig = UserConfig(
557575
targetOS: OS.iOS,
576+
envVarAndroidHomeAsDefault: false,
558577
preferAndroidNinja: true,
559578
ninjaVersion: "1.14.4"
560579
);
@@ -594,6 +613,7 @@ void main() {
594613
]));
595614
final userConfig = UserConfig(
596615
targetOS: OS.iOS,
616+
envVarAndroidHomeAsDefault: false,
597617
preferAndroidNinja: true,
598618
ninjaVersion: "1.14.4"
599619
);

0 commit comments

Comments
 (0)