Skip to content

Commit 2b44a7f

Browse files
tmanceytmancey
committed
[ads] Refactor epoch operator from [?]:* to [T?]:* 
1 parent c8ca787 commit 2b44a7f

File tree

5 files changed

+31
-29
lines changed

5 files changed

+31
-29
lines changed

‎components/brave_ads/core/internal/serving/targeting/condition_matcher/condition_matcher_util_unittest.cc

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ TEST_F(BraveAdsConditionMatcherUtilTest,
4646

4747
TEST_F(BraveAdsConditionMatcherUtilTest, MatchEpochEqualOperatorCondition) {
4848
// Arrange
49-
const ConditionMatcherMap condition_matchers = {{prefs::kServeAdAt, "[=]:7"}};
49+
const ConditionMatcherMap condition_matchers = {
50+
{prefs::kServeAdAt, "[T=]:7"}};
5051

5152
AdvanceClockBy(base::Days(7));
5253

@@ -57,7 +58,8 @@ TEST_F(BraveAdsConditionMatcherUtilTest, MatchEpochEqualOperatorCondition) {
5758
TEST_F(BraveAdsConditionMatcherUtilTest,
5859
DoNotMatchEpochEqualOperatorCondition) {
5960
// Arrange
60-
const ConditionMatcherMap condition_matchers = {{prefs::kServeAdAt, "[=]:7"}};
61+
const ConditionMatcherMap condition_matchers = {
62+
{prefs::kServeAdAt, "[T=]:7"}};
6163

6264
AdvanceClockBy(base::Days(7) - base::Milliseconds(1));
6365

@@ -149,7 +151,7 @@ TEST_F(BraveAdsConditionMatcherUtilTest,
149151
// Arrange
150152
const ConditionMatcherMap condition_matchers = {
151153
{prefs::kOptedInToNotificationAds, "0"}, // Value is "1" in the pref.
152-
{prefs::kServeAdAt, "[>]:7"}}; // 5 days ago in the pref.
154+
{prefs::kServeAdAt, "[T>]:7"}}; // 5 days ago in the pref.
153155

154156
AdvanceClockBy(base::Days(5));
155157

‎components/brave_ads/core/internal/serving/targeting/condition_matcher/matchers/epoch_operator_condition_matcher_util.cc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ namespace brave_ads {
1717

1818
namespace {
1919

20-
constexpr char kEqualOperatorConditionMatcherPrefix[] = "[=]:";
21-
constexpr char kGreaterThanOperatorConditionMatcherPrefix[] = "[>]:";
22-
constexpr char kGreaterThanOrEqualOperatorConditionMatcherPrefix[] = "[≥]:";
23-
constexpr char kLessThanOperatorConditionMatcherPrefix[] = "[<]:";
24-
constexpr char kLessThanOrEqualOperatorConditionMatcherPrefix[] = "[≤]:";
20+
constexpr char kEqualOperatorConditionMatcherPrefix[] = "[T=]:";
21+
constexpr char kGreaterThanOperatorConditionMatcherPrefix[] = "[T>]:";
22+
constexpr char kGreaterThanOrEqualOperatorConditionMatcherPrefix[] = "[T≥]:";
23+
constexpr char kLessThanOperatorConditionMatcherPrefix[] = "[T<]:";
24+
constexpr char kLessThanOrEqualOperatorConditionMatcherPrefix[] = "[T≤]:";
2525

2626
} // namespace
2727

‎components/brave_ads/core/internal/serving/targeting/condition_matcher/matchers/epoch_operator_condition_matcher_util_unittest.cc

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ TEST_F(BraveAdsEpochOperatorConditionMatcherUtilTest,
2424
DoNotMatchMalformedOperator) {
2525
// Act & Assert
2626
EXPECT_FALSE(MatchEpochOperator(
27-
"13372214400000000" /*1st October 2024 00:00:00 UTC*/, "[=]: 7 "));
27+
"13372214400000000" /*1st October 2024 00:00:00 UTC*/, "[T=]: 7 "));
2828
}
2929

3030
TEST_F(BraveAdsEpochOperatorConditionMatcherUtilTest, MatchEqualOperator) {
@@ -34,7 +34,7 @@ TEST_F(BraveAdsEpochOperatorConditionMatcherUtilTest, MatchEqualOperator) {
3434
// Act & Assert
3535
EXPECT_TRUE(
3636
MatchEpochOperator("13372214400000000" /*1st October 2024 00:00:00 UTC*/,
37-
"[=]:2")); // Event occurred 2 days ago.
37+
"[T=]:2")); // Event occurred 2 days ago.
3838
}
3939

4040
TEST_F(BraveAdsEpochOperatorConditionMatcherUtilTest, DoNotMatchEqualOperator) {
@@ -44,7 +44,7 @@ TEST_F(BraveAdsEpochOperatorConditionMatcherUtilTest, DoNotMatchEqualOperator) {
4444
// Act & Assert
4545
EXPECT_FALSE(
4646
MatchEpochOperator("13372214400000000" /*1st October 2024 00:00:00 UTC*/,
47-
"[=]:3")); // Event occurred 2 days ago.
47+
"[T=]:3")); // Event occurred 2 days ago.
4848
}
4949

5050
TEST_F(BraveAdsEpochOperatorConditionMatcherUtilTest,
@@ -55,7 +55,7 @@ TEST_F(BraveAdsEpochOperatorConditionMatcherUtilTest,
5555
// Act & Assert
5656
EXPECT_TRUE(
5757
MatchEpochOperator("13372214400000000" /*1st October 2024 00:00:00 UTC*/,
58-
"[>]:1")); // Event occurred 2 days ago.
58+
"[T>]:1")); // Event occurred 2 days ago.
5959
}
6060

6161
TEST_F(BraveAdsEpochOperatorConditionMatcherUtilTest,
@@ -66,7 +66,7 @@ TEST_F(BraveAdsEpochOperatorConditionMatcherUtilTest,
6666
// Act & Assert
6767
EXPECT_FALSE(
6868
MatchEpochOperator("13372214400000000" /*1st October 2024 00:00:00 UTC*/,
69-
"[>]:2")); // Event occurred 2 days ago.
69+
"[T>]:2")); // Event occurred 2 days ago.
7070
}
7171

7272
TEST_F(BraveAdsEpochOperatorConditionMatcherUtilTest,
@@ -77,10 +77,10 @@ TEST_F(BraveAdsEpochOperatorConditionMatcherUtilTest,
7777
// Act & Assert
7878
EXPECT_TRUE(
7979
MatchEpochOperator("13372214400000000" /*1st October 2024 00:00:00 UTC*/,
80-
"[≥]:1")); // Event occurred 2 days ago.
80+
"[T≥]:1")); // Event occurred 2 days ago.
8181
EXPECT_TRUE(
8282
MatchEpochOperator("13372214400000000" /*1st October 2024 00:00:00 UTC*/,
83-
"[≥]:2")); // Event occurred 2 days ago.
83+
"[T≥]:2")); // Event occurred 2 days ago.
8484
}
8585

8686
TEST_F(BraveAdsEpochOperatorConditionMatcherUtilTest,
@@ -91,7 +91,7 @@ TEST_F(BraveAdsEpochOperatorConditionMatcherUtilTest,
9191
// Act & Assert
9292
EXPECT_FALSE(
9393
MatchEpochOperator("13372214400000000" /*1st October 2024 00:00:00 UTC*/,
94-
"[≥]:3")); // Event occurred 2 days ago.
94+
"[T≥]:3")); // Event occurred 2 days ago.
9595
}
9696

9797
TEST_F(BraveAdsEpochOperatorConditionMatcherUtilTest, MatchLessThanOperator) {
@@ -101,7 +101,7 @@ TEST_F(BraveAdsEpochOperatorConditionMatcherUtilTest, MatchLessThanOperator) {
101101
// Act & Assert
102102
EXPECT_TRUE(
103103
MatchEpochOperator("13372214400000000" /*1st October 2024 00:00:00 UTC*/,
104-
"[<]:3")); // Event occurred 2 days ago.
104+
"[T<]:3")); // Event occurred 2 days ago.
105105
}
106106

107107
TEST_F(BraveAdsEpochOperatorConditionMatcherUtilTest,
@@ -112,7 +112,7 @@ TEST_F(BraveAdsEpochOperatorConditionMatcherUtilTest,
112112
// Act & Assert
113113
EXPECT_FALSE(
114114
MatchEpochOperator("13372214400000000" /*1st October 2024 00:00:00 UTC*/,
115-
"[<]:2")); // Event occurred 2 days ago.
115+
"[T<]:2")); // Event occurred 2 days ago.
116116
}
117117

118118
TEST_F(BraveAdsEpochOperatorConditionMatcherUtilTest,
@@ -123,10 +123,10 @@ TEST_F(BraveAdsEpochOperatorConditionMatcherUtilTest,
123123
// Act & Assert
124124
EXPECT_TRUE(
125125
MatchEpochOperator("13372214400000000" /*1st October 2024 00:00:00 UTC*/,
126-
"[≤]:3")); // Event occurred 2 days ago.
126+
"[T≤]:3")); // Event occurred 2 days ago.
127127
EXPECT_TRUE(
128128
MatchEpochOperator("13372214400000000" /*1st October 2024 00:00:00 UTC*/,
129-
"[≤]:2")); // Event occurred 2 days ago.
129+
"[T≤]:2")); // Event occurred 2 days ago.
130130
}
131131

132132
TEST_F(BraveAdsEpochOperatorConditionMatcherUtilTest,
@@ -137,7 +137,7 @@ TEST_F(BraveAdsEpochOperatorConditionMatcherUtilTest,
137137
// Act & Assert
138138
EXPECT_FALSE(
139139
MatchEpochOperator("13372214400000000" /*1st October 2024 00:00:00 UTC*/,
140-
"[≤]:1")); // Event occurred 2 days ago.
140+
"[T≤]:1")); // Event occurred 2 days ago.
141141
}
142142

143143
TEST_F(BraveAdsEpochOperatorConditionMatcherUtilTest,
@@ -147,7 +147,7 @@ TEST_F(BraveAdsEpochOperatorConditionMatcherUtilTest,
147147

148148
// Act & Assert
149149
EXPECT_FALSE(MatchEpochOperator(
150-
"13372214400000000" /*1st October 2024 00:00:00 UTC*/, "[_]:2"));
150+
"13372214400000000" /*1st October 2024 00:00:00 UTC*/, "[T_]:2"));
151151
}
152152

153153
} // namespace brave_ads

‎components/brave_ads/core/internal/serving/targeting/condition_matcher/matchers/internal/epoch_operator_condition_matcher_util_internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class TimeDelta;
1616

1717
namespace brave_ads {
1818

19-
inline constexpr char kEpochOperatorConditionMatcherPrefixPattern[] = "[?]:*";
19+
inline constexpr char kEpochOperatorConditionMatcherPrefixPattern[] = "[T?]:*";
2020

2121
// Parses a number of days from a condition.
2222
std::optional<int> ParseDays(std::string_view condition);

‎components/brave_ads/core/internal/serving/targeting/condition_matcher/matchers/internal/epoch_operator_condition_matcher_util_internal_unittest.cc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,35 +18,35 @@ class BraveAdsOperatorConditionMatcherUtilInternalTest : public test::TestBase {
1818
TEST_F(BraveAdsOperatorConditionMatcherUtilInternalTest,
1919
DoNotParseNegativeDays) {
2020
// Act & Assert
21-
EXPECT_FALSE(ParseDays("[=]:-1"));
21+
EXPECT_FALSE(ParseDays("[T=]:-1"));
2222
}
2323

2424
TEST_F(BraveAdsOperatorConditionMatcherUtilInternalTest, ParseDayZero) {
2525
// Act & Assert
26-
EXPECT_EQ(0, ParseDays("[=]:0"));
26+
EXPECT_EQ(0, ParseDays("[T=]:0"));
2727
}
2828

2929
TEST_F(BraveAdsOperatorConditionMatcherUtilInternalTest, ParseDays) {
3030
// Act & Assert
31-
EXPECT_EQ(7, ParseDays("[=]:7"));
31+
EXPECT_EQ(7, ParseDays("[T=]:7"));
3232
}
3333

3434
TEST_F(BraveAdsOperatorConditionMatcherUtilInternalTest,
3535
DoNotParseNonIntegerDays) {
3636
// Act & Assert
37-
EXPECT_FALSE(ParseDays("[=]:1.5"));
37+
EXPECT_FALSE(ParseDays("[T=]:1.5"));
3838
}
3939

4040
TEST_F(BraveAdsOperatorConditionMatcherUtilInternalTest,
4141
DoNotParseMalformedDays) {
4242
// Act & Assert
43-
EXPECT_FALSE(ParseDays("[=]: 7 "));
43+
EXPECT_FALSE(ParseDays("[T=]: 7 "));
4444
}
4545

4646
TEST_F(BraveAdsOperatorConditionMatcherUtilInternalTest,
4747
DoNotParseInvalidDays) {
4848
// Act & Assert
49-
EXPECT_FALSE(ParseDays("[=]:seven"));
49+
EXPECT_FALSE(ParseDays("[T=]:seven"));
5050
}
5151

5252
TEST_F(BraveAdsOperatorConditionMatcherUtilInternalTest, IsUnixEpochTimestamp) {

0 commit comments

Comments
 (0)