Skip to content

Commit 934531a

Browse files
Treehugger RobotGerrit Code Review
authored andcommitted
Merge "files_test: Fix initialization order warnings" into main
2 parents 4d1c7f9 + da15b67 commit 934531a

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

common/libs/utils/files_test.cpp

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -53,20 +53,20 @@ TEST_P(EmulateAbsolutePathWithPwd, NoHomeYesPwd) {
5353

5454
INSTANTIATE_TEST_SUITE_P(
5555
CommonUtilsTest, EmulateAbsolutePathWithPwd,
56-
testing::Values(InputOutput{.working_dir_ = "/x/y/z",
57-
.path_to_convert_ = "",
56+
testing::Values(InputOutput{.path_to_convert_ = "",
57+
.working_dir_ = "/x/y/z",
5858
.expected_ = ""},
59-
InputOutput{.working_dir_ = "/x/y/z",
60-
.path_to_convert_ = "a",
59+
InputOutput{.path_to_convert_ = "a",
60+
.working_dir_ = "/x/y/z",
6161
.expected_ = "/x/y/z/a"},
62-
InputOutput{.working_dir_ = "/x/y/z",
63-
.path_to_convert_ = ".",
62+
InputOutput{.path_to_convert_ = ".",
63+
.working_dir_ = "/x/y/z",
6464
.expected_ = "/x/y/z"},
65-
InputOutput{.working_dir_ = "/x/y/z",
66-
.path_to_convert_ = "..",
65+
InputOutput{.path_to_convert_ = "..",
66+
.working_dir_ = "/x/y/z",
6767
.expected_ = "/x/y"},
68-
InputOutput{.working_dir_ = "/x/y/z",
69-
.path_to_convert_ = "./k/../../t/./q",
68+
InputOutput{.path_to_convert_ = "./k/../../t/./q",
69+
.working_dir_ = "/x/y/z",
7070
.expected_ = "/x/y/t/q"}));
7171

7272
TEST_P(EmulateAbsolutePathWithHome, YesHomeNoPwd) {
@@ -84,20 +84,20 @@ TEST_P(EmulateAbsolutePathWithHome, YesHomeNoPwd) {
8484

8585
INSTANTIATE_TEST_SUITE_P(
8686
CommonUtilsTest, EmulateAbsolutePathWithHome,
87-
testing::Values(InputOutput{.home_dir_ = "/x/y/z",
88-
.path_to_convert_ = "~",
87+
testing::Values(InputOutput{.path_to_convert_ = "~",
88+
.home_dir_ = "/x/y/z",
8989
.expected_ = "/x/y/z"},
90-
InputOutput{.home_dir_ = "/x/y/z",
91-
.path_to_convert_ = "~/a",
90+
InputOutput{.path_to_convert_ = "~/a",
91+
.home_dir_ = "/x/y/z",
9292
.expected_ = "/x/y/z/a"},
93-
InputOutput{.home_dir_ = "/x/y/z",
94-
.path_to_convert_ = "~/.",
93+
InputOutput{.path_to_convert_ = "~/.",
94+
.home_dir_ = "/x/y/z",
9595
.expected_ = "/x/y/z"},
96-
InputOutput{.home_dir_ = "/x/y/z",
97-
.path_to_convert_ = "~/..",
96+
InputOutput{.path_to_convert_ = "~/..",
97+
.home_dir_ = "/x/y/z",
9898
.expected_ = "/x/y"},
99-
InputOutput{.home_dir_ = "/x/y/z",
100-
.path_to_convert_ = "~/k/../../t/./q",
99+
InputOutput{.path_to_convert_ = "~/k/../../t/./q",
100+
.home_dir_ = "/x/y/z",
101101
.expected_ = "/x/y/t/q"}));
102102

103103
} // namespace cuttlefish

0 commit comments

Comments
 (0)