Skip to content

Commit 7de6e0a

Browse files
authored
use tut.actions consistently across unit tests (#853)
1 parent d49fb5b commit 7de6e0a

File tree

2 files changed

+16
-31
lines changed

2 files changed

+16
-31
lines changed

test/unit/crate_name/crate_name_test.bzl

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,49 +7,43 @@ load("//test/unit:common.bzl", "assert_argv_contains")
77
def _default_crate_name_library_test_impl(ctx):
88
env = analysistest.begin(ctx)
99
tut = analysistest.target_under_test(env)
10-
actions = analysistest.target_actions(env)
1110

1211
# Note: Hyphens in crate name converted to underscores.
13-
assert_argv_contains(env, actions[0], "--crate-name=default_crate_name_library")
12+
assert_argv_contains(env, tut.actions[0], "--crate-name=default_crate_name_library")
1413
return analysistest.end(env)
1514

1615
def _custom_crate_name_library_test_impl(ctx):
1716
env = analysistest.begin(ctx)
1817
tut = analysistest.target_under_test(env)
19-
actions = analysistest.target_actions(env)
20-
assert_argv_contains(env, actions[0], "--crate-name=custom_name")
18+
assert_argv_contains(env, tut.actions[0], "--crate-name=custom_name")
2119
return analysistest.end(env)
2220

2321
def _default_crate_name_binary_test_impl(ctx):
2422
env = analysistest.begin(ctx)
2523
tut = analysistest.target_under_test(env)
26-
actions = analysistest.target_actions(env)
2724

2825
# Note: Hyphens in crate name converted to underscores.
29-
assert_argv_contains(env, actions[0], "--crate-name=default_crate_name_binary")
26+
assert_argv_contains(env, tut.actions[0], "--crate-name=default_crate_name_binary")
3027
return analysistest.end(env)
3128

3229
def _custom_crate_name_binary_test_impl(ctx):
3330
env = analysistest.begin(ctx)
3431
tut = analysistest.target_under_test(env)
35-
actions = analysistest.target_actions(env)
36-
assert_argv_contains(env, actions[0], "--crate-name=custom_name")
32+
assert_argv_contains(env, tut.actions[0], "--crate-name=custom_name")
3733
return analysistest.end(env)
3834

3935
def _default_crate_name_test_test_impl(ctx):
4036
env = analysistest.begin(ctx)
4137
tut = analysistest.target_under_test(env)
42-
actions = analysistest.target_actions(env)
4338

4439
# Note: Hyphens in crate name converted to underscores.
45-
assert_argv_contains(env, actions[0], "--crate-name=default_crate_name_test")
40+
assert_argv_contains(env, tut.actions[0], "--crate-name=default_crate_name_test")
4641
return analysistest.end(env)
4742

4843
def _custom_crate_name_test_test_impl(ctx):
4944
env = analysistest.begin(ctx)
5045
tut = analysistest.target_under_test(env)
51-
actions = analysistest.target_actions(env)
52-
assert_argv_contains(env, actions[0], "--crate-name=custom_name")
46+
assert_argv_contains(env, tut.actions[0], "--crate-name=custom_name")
5347
return analysistest.end(env)
5448

5549
def _invalid_default_crate_name_test_impl(ctx):

test/unit/native_deps/native_deps_test.bzl

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ def _native_dep_lib_name(ctx):
1414
def _lib_has_no_native_libs_test_impl(ctx):
1515
env = analysistest.begin(ctx)
1616
tut = analysistest.target_under_test(env)
17-
actions = analysistest.target_actions(env)
18-
action = actions[0]
17+
action = tut.actions[0]
1918
assert_argv_contains(env, action, "--crate-type=lib")
2019
assert_argv_contains_prefix_suffix(env, action, "-Lnative=", "/native_deps")
2120
assert_argv_contains_not(env, action, "-lstatic=native_dep")
@@ -25,8 +24,7 @@ def _lib_has_no_native_libs_test_impl(ctx):
2524
def _rlib_has_no_native_libs_test_impl(ctx):
2625
env = analysistest.begin(ctx)
2726
tut = analysistest.target_under_test(env)
28-
actions = analysistest.target_actions(env)
29-
action = actions[0]
27+
action = tut.actions[0]
3028
assert_argv_contains(env, action, "--crate-type=rlib")
3129
assert_argv_contains_not(env, action, "-lstatic=native_dep")
3230
assert_argv_contains_not(env, action, "-ldylib=native_dep")
@@ -35,45 +33,40 @@ def _rlib_has_no_native_libs_test_impl(ctx):
3533
def _dylib_has_native_libs_test_impl(ctx):
3634
env = analysistest.begin(ctx)
3735
tut = analysistest.target_under_test(env)
38-
actions = analysistest.target_actions(env)
39-
action = actions[0]
36+
action = tut.actions[0]
4037
assert_argv_contains(env, action, "--crate-type=dylib")
4138
assert_argv_contains(env, action, "-lstatic=native_dep")
4239
return analysistest.end(env)
4340

4441
def _cdylib_has_native_libs_test_impl(ctx):
4542
env = analysistest.begin(ctx)
4643
tut = analysistest.target_under_test(env)
47-
actions = analysistest.target_actions(env)
48-
action = actions[0]
44+
action = tut.actions[0]
4945
assert_argv_contains(env, action, "--crate-type=cdylib")
5046
assert_argv_contains_prefix_suffix(env, action, "link-arg=", "/native_deps/" + _native_dep_lib_name(ctx))
5147
return analysistest.end(env)
5248

5349
def _staticlib_has_native_libs_test_impl(ctx):
5450
env = analysistest.begin(ctx)
5551
tut = analysistest.target_under_test(env)
56-
actions = analysistest.target_actions(env)
57-
action = actions[0]
52+
action = tut.actions[0]
5853
assert_argv_contains(env, action, "--crate-type=staticlib")
5954
assert_argv_contains_prefix_suffix(env, action, "link-arg=", "/native_deps/" + _native_dep_lib_name(ctx))
6055
return analysistest.end(env)
6156

6257
def _proc_macro_has_native_libs_test_impl(ctx):
6358
env = analysistest.begin(ctx)
6459
tut = analysistest.target_under_test(env)
65-
actions = analysistest.target_actions(env)
66-
asserts.equals(env, 1, len(actions))
67-
action = actions[0]
60+
asserts.equals(env, 1, len(tut.actions))
61+
action = tut.actions[0]
6862
assert_argv_contains(env, action, "--crate-type=proc-macro")
6963
assert_argv_contains_prefix_suffix(env, action, "link-arg=", "/native_deps/" + _native_dep_lib_name(ctx))
7064
return analysistest.end(env)
7165

7266
def _bin_has_native_libs_test_impl(ctx):
7367
env = analysistest.begin(ctx)
7468
tut = analysistest.target_under_test(env)
75-
actions = analysistest.target_actions(env)
76-
action = actions[0]
69+
action = tut.actions[0]
7770
assert_argv_contains_prefix_suffix(env, action, "link-arg=", "/native_deps/" + _native_dep_lib_name(ctx))
7871
return analysistest.end(env)
7972

@@ -89,8 +82,7 @@ def _extract_linker_args(argv):
8982
def _bin_has_native_dep_and_alwayslink_test_impl(ctx):
9083
env = analysistest.begin(ctx)
9184
tut = analysistest.target_under_test(env)
92-
actions = analysistest.target_actions(env)
93-
action = actions[0]
85+
action = tut.actions[0]
9486

9587
if ctx.target_platform_has_constraint(ctx.attr._macos_constraint[platform_common.ConstraintValueInfo]):
9688
want = [
@@ -120,8 +112,7 @@ def _bin_has_native_dep_and_alwayslink_test_impl(ctx):
120112
def _cdylib_has_native_dep_and_alwayslink_test_impl(ctx):
121113
env = analysistest.begin(ctx)
122114
tut = analysistest.target_under_test(env)
123-
actions = analysistest.target_actions(env)
124-
action = actions[0]
115+
action = tut.actions[0]
125116

126117
if ctx.target_platform_has_constraint(ctx.attr._macos_constraint[platform_common.ConstraintValueInfo]):
127118
want = [

0 commit comments

Comments
 (0)