Skip to content

Commit 90192bb

Browse files
committed
Fix lint
1 parent 1fddfa9 commit 90192bb

1 file changed

Lines changed: 17 additions & 23 deletions

File tree

test/stores_test.cpp

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -74,36 +74,34 @@ TEST(Stores, AddStoreHoldRepair_normal)
7474

7575
TEST(Stores, TownerNameForTalkID_knownTowners)
7676
{
77-
EXPECT_STREQ(TownerNameForTalkID(TalkID::Smith), "griswold");
78-
EXPECT_STREQ(TownerNameForTalkID(TalkID::Witch), "adria");
79-
EXPECT_STREQ(TownerNameForTalkID(TalkID::Boy), "wirt");
80-
EXPECT_STREQ(TownerNameForTalkID(TalkID::Healer), "pepin");
77+
EXPECT_STREQ(TownerNameForTalkID(TalkID::Smith), "griswold");
78+
EXPECT_STREQ(TownerNameForTalkID(TalkID::Witch), "adria");
79+
EXPECT_STREQ(TownerNameForTalkID(TalkID::Boy), "wirt");
80+
EXPECT_STREQ(TownerNameForTalkID(TalkID::Healer), "pepin");
8181
EXPECT_STREQ(TownerNameForTalkID(TalkID::Storyteller), "cain");
82-
EXPECT_STREQ(TownerNameForTalkID(TalkID::Tavern), "ogden");
83-
EXPECT_STREQ(TownerNameForTalkID(TalkID::Drunk), "farnham");
84-
EXPECT_STREQ(TownerNameForTalkID(TalkID::Barmaid), "gillian");
82+
EXPECT_STREQ(TownerNameForTalkID(TalkID::Tavern), "ogden");
83+
EXPECT_STREQ(TownerNameForTalkID(TalkID::Drunk), "farnham");
84+
EXPECT_STREQ(TownerNameForTalkID(TalkID::Barmaid), "gillian");
8585
}
8686

8787
TEST(Stores, TownerNameForTalkID_subPagesReturnNull)
8888
{
8989
// Sub-pages (buy/sell screens) should not fire StoreOpened
90-
EXPECT_EQ(TownerNameForTalkID(TalkID::None), nullptr);
91-
EXPECT_EQ(TownerNameForTalkID(TalkID::SmithBuy), nullptr);
92-
EXPECT_EQ(TownerNameForTalkID(TalkID::SmithSell), nullptr);
93-
EXPECT_EQ(TownerNameForTalkID(TalkID::SmithRepair), nullptr);
94-
EXPECT_EQ(TownerNameForTalkID(TalkID::WitchBuy), nullptr);
95-
EXPECT_EQ(TownerNameForTalkID(TalkID::Gossip), nullptr);
96-
EXPECT_EQ(TownerNameForTalkID(TalkID::StorytellerIdentify), nullptr);
90+
EXPECT_EQ(TownerNameForTalkID(TalkID::None), nullptr);
91+
EXPECT_EQ(TownerNameForTalkID(TalkID::SmithBuy), nullptr);
92+
EXPECT_EQ(TownerNameForTalkID(TalkID::SmithSell), nullptr);
93+
EXPECT_EQ(TownerNameForTalkID(TalkID::SmithRepair), nullptr);
94+
EXPECT_EQ(TownerNameForTalkID(TalkID::WitchBuy), nullptr);
95+
EXPECT_EQ(TownerNameForTalkID(TalkID::Gossip), nullptr);
96+
EXPECT_EQ(TownerNameForTalkID(TalkID::StorytellerIdentify), nullptr);
9797
EXPECT_EQ(TownerNameForTalkID(TalkID::StorytellerIdentifyShow), nullptr);
9898
}
9999

100100
TEST(Stores, RegisterTownerDialogOption_storesOption)
101101
{
102102
ExtraTownerOptions.clear();
103103

104-
RegisterTownerDialogOption("farnham",
105-
[]() { return std::string("Go to Tiny Town"); },
106-
[]() {});
104+
RegisterTownerDialogOption("farnham", []() { return std::string("Go to Tiny Town"); }, []() {});
107105

108106
ASSERT_EQ(ExtraTownerOptions.count("farnham"), 1u);
109107
ASSERT_EQ(ExtraTownerOptions.at("farnham").size(), 1u);
@@ -117,9 +115,7 @@ TEST(Stores, RegisterTownerDialogOption_callsOnSelect)
117115
ExtraTownerOptions.clear();
118116

119117
bool called = false;
120-
RegisterTownerDialogOption("farnham",
121-
[]() { return std::string("Travel"); },
122-
[&called]() { called = true; });
118+
RegisterTownerDialogOption("farnham", []() { return std::string("Travel"); }, [&called]() { called = true; });
123119

124120
ExtraTownerOptions.at("farnham")[0].onSelect();
125121
EXPECT_TRUE(called);
@@ -131,9 +127,7 @@ TEST(Stores, RegisterTownerDialogOption_emptyLabelHidesOption)
131127
{
132128
ExtraTownerOptions.clear();
133129

134-
RegisterTownerDialogOption("farnham",
135-
[]() { return std::string(""); },
136-
[]() {});
130+
RegisterTownerDialogOption("farnham", []() { return std::string(""); }, []() {});
137131

138132
ASSERT_EQ(ExtraTownerOptions.at("farnham").size(), 1u);
139133
EXPECT_TRUE(ExtraTownerOptions.at("farnham")[0].getLabel().empty());

0 commit comments

Comments
 (0)