aboutsummaryrefslogtreecommitdiff
path: root/tests/test-formatter.cpp
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2014-01-30 18:33:14 -0600
committerCharles Kerr <charles.kerr@canonical.com>2014-01-30 18:33:14 -0600
commita7a09a5ca5012fb1c48f259d2587542316e7349b (patch)
treee6ac38cfefcbb049e4f77c1d546abc806e0389c9 /tests/test-formatter.cpp
parent8564861a5026561d94310cd60ed77e3986f64246 (diff)
downloadayatana-indicator-datetime-a7a09a5ca5012fb1c48f259d2587542316e7349b.tar.gz
ayatana-indicator-datetime-a7a09a5ca5012fb1c48f259d2587542316e7349b.tar.bz2
ayatana-indicator-datetime-a7a09a5ca5012fb1c48f259d2587542316e7349b.zip
copyediting: as per review, use name_of_thing() instead of get_name_of_thing() or getNameOfThing()
Diffstat (limited to 'tests/test-formatter.cpp')
-rw-r--r--tests/test-formatter.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/test-formatter.cpp b/tests/test-formatter.cpp
index 9950453..01df4f2 100644
--- a/tests/test-formatter.cpp
+++ b/tests/test-formatter.cpp
@@ -97,7 +97,7 @@ TEST_F(FormatterFixture, TestPhoneHeader)
if(Set24hLocale())
{
PhoneFormatter formatter(clock);
- EXPECT_EQ(std::string("%H:%M"), formatter.headerFormat.get());
+ EXPECT_EQ(std::string("%H:%M"), formatter.header_format.get());
EXPECT_EQ(std::string("18:30"), formatter.header.get());
}
@@ -105,7 +105,7 @@ TEST_F(FormatterFixture, TestPhoneHeader)
if(Set12hLocale())
{
PhoneFormatter formatter(clock);
- EXPECT_EQ(std::string("%l:%M %p"), formatter.headerFormat.get());
+ EXPECT_EQ(std::string("%l:%M %p"), formatter.header_format.get());
EXPECT_EQ(std::string(" 6:30 PM"), formatter.header.get());
}
}
@@ -156,7 +156,7 @@ TEST_F(FormatterFixture, TestDesktopHeader)
m_settings->show_date.set(test_case.show_date);
m_settings->show_year.set(test_case.show_year);
- ASSERT_STREQ(test_case.expected_format_string, f.headerFormat.get().c_str());
+ ASSERT_STREQ(test_case.expected_format_string, f.header_format.get().c_str());
}
}
}
@@ -196,7 +196,7 @@ TEST_F(FormatterFixture, TestUpcomingTimes)
std::shared_ptr<Clock> clock (new MockClock(DateTime(test_case.now)));
DesktopFormatter f(clock, m_settings);
- const auto fmt = f.getRelativeFormat(test_case.then);
+ const auto fmt = f.relative_format(test_case.then);
ASSERT_EQ(test_case.expected_format_string, fmt);
g_clear_pointer(&test_case.now, g_date_time_unref);
@@ -239,7 +239,7 @@ TEST_F(FormatterFixture, TestEventTimes)
std::shared_ptr<Clock> clock(new MockClock(DateTime(test_case.now)));
DesktopFormatter f(clock, m_settings);
- const auto fmt = f.getRelativeFormat(test_case.then, test_case.then_end);
+ const auto fmt = f.relative_format(test_case.then, test_case.then_end);
ASSERT_STREQ(test_case.expected_format_string, fmt.c_str());
g_clear_pointer(&test_case.now, g_date_time_unref);