Skip to content

Commit 608f1f9

Browse files
Material Engcopybara-github
Material Eng
authored and
copybara-github
committed
Fix hex formatting in scheme tests.
PiperOrigin-RevId: 542547239
1 parent 672004d commit 608f1f9

25 files changed

+464
-400
lines changed

‎cpp/scheme/scheme_expressive_test.cc

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,26 +26,26 @@ namespace {
2626
TEST(SchemeExpressiveTest, KeyColors) {
2727
SchemeExpressive scheme = SchemeExpressive(Hct(0xff0000ff), false, 0.0);
2828
EXPECT_EQ(MaterialDynamicColors::PrimaryPaletteKeyColor().GetArgb(scheme),
29-
0xff35855F);
29+
0xff35855f);
3030
EXPECT_EQ(MaterialDynamicColors::SecondaryPaletteKeyColor().GetArgb(scheme),
31-
0xff8C6D8C);
31+
0xff8c6d8c);
3232
EXPECT_EQ(MaterialDynamicColors::TertiaryPaletteKeyColor().GetArgb(scheme),
33-
0xff806EA1);
33+
0xff806ea1);
3434
EXPECT_EQ(MaterialDynamicColors::NeutralPaletteKeyColor().GetArgb(scheme),
35-
0xff79757F);
35+
0xff79757f);
3636
EXPECT_EQ(
3737
MaterialDynamicColors::NeutralVariantPaletteKeyColor().GetArgb(scheme),
38-
0xff7A7585);
38+
0xff7a7585);
3939
}
4040

4141
TEST(SchemeExpressiveTest, lightTheme_minContrast_primary) {
4242
SchemeExpressive scheme = SchemeExpressive(Hct(0xff0000ff), false, -1.0);
43-
EXPECT_EQ(MaterialDynamicColors::Primary().GetArgb(scheme), 0xff32835D);
43+
EXPECT_EQ(MaterialDynamicColors::Primary().GetArgb(scheme), 0xff32835d);
4444
}
4545

4646
TEST(SchemeExpressiveTest, lightTheme_standardContrast_primary) {
4747
SchemeExpressive scheme = SchemeExpressive(Hct(0xff0000ff), false, 0.0);
48-
EXPECT_EQ(MaterialDynamicColors::Primary().GetArgb(scheme), 0xff146C48);
48+
EXPECT_EQ(MaterialDynamicColors::Primary().GetArgb(scheme), 0xff146c48);
4949
}
5050

5151
TEST(SchemeExpressiveTest, lightTheme_maxContrast_primary) {
@@ -62,13 +62,13 @@ TEST(SchemeExpressiveTest, lightTheme_minContrast_primaryContainer) {
6262
TEST(SchemeExpressiveTest, lightTheme_standardContrast_primaryContainer) {
6363
SchemeExpressive scheme = SchemeExpressive(Hct(0xff0000ff), false, 0.0);
6464
EXPECT_EQ(MaterialDynamicColors::PrimaryContainer().GetArgb(scheme),
65-
0xffA2F4C6);
65+
0xffa2f4c6);
6666
}
6767

6868
TEST(SchemeExpressiveTest, lightTheme_maxContrast_primaryContainer) {
6969
SchemeExpressive scheme = SchemeExpressive(Hct(0xff0000ff), false, 1.0);
7070
EXPECT_EQ(MaterialDynamicColors::PrimaryContainer().GetArgb(scheme),
71-
0xff004D31);
71+
0xff004d31);
7272
}
7373

7474
TEST(SchemeExpressiveTest, lightTheme_minContrast_onPrimaryContainer) {

‎cpp/scheme/scheme_fruit_salad_test.cc

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@ namespace {
2626
TEST(SchemeFruitSaladTest, KeyColors) {
2727
SchemeFruitSalad scheme = SchemeFruitSalad(Hct(0xff0000ff), false, 0.0);
2828
EXPECT_EQ(MaterialDynamicColors::PrimaryPaletteKeyColor().GetArgb(scheme),
29-
0xff0091C0);
29+
0xff0091c0);
3030
EXPECT_EQ(MaterialDynamicColors::SecondaryPaletteKeyColor().GetArgb(scheme),
31-
0xff3A7E9E);
31+
0xff3a7e9e);
3232
EXPECT_EQ(MaterialDynamicColors::TertiaryPaletteKeyColor().GetArgb(scheme),
33-
0xff6E72AC);
33+
0xff6e72ac);
3434
EXPECT_EQ(MaterialDynamicColors::NeutralPaletteKeyColor().GetArgb(scheme),
3535
0xff777682);
3636
EXPECT_EQ(
3737
MaterialDynamicColors::NeutralVariantPaletteKeyColor().GetArgb(scheme),
38-
0xff75758B);
38+
0xff75758b);
3939
}
4040

4141
TEST(SchemeFruitSaladTest, lightTheme_minContrast_primary) {
@@ -62,7 +62,7 @@ TEST(SchemeFruitSaladTest, lightTheme_minContrast_primaryContainer) {
6262
TEST(SchemeFruitSaladTest, lightTheme_standardContrast_primaryContainer) {
6363
SchemeFruitSalad scheme = SchemeFruitSalad(Hct(0xff0000ff), false, 0.0);
6464
EXPECT_EQ(MaterialDynamicColors::PrimaryContainer().GetArgb(scheme),
65-
0xffC2E8FF);
65+
0xffc2e8ff);
6666
}
6767

6868
TEST(SchemeFruitSaladTest, lightTheme_maxContrast_primaryContainer) {
@@ -80,13 +80,13 @@ TEST(SchemeFruitSaladTest, lightTheme_minContrast_tertiaryContainer) {
8080
TEST(SchemeFruitSaladTest, lightTheme_standardContrast_tertiaryContainer) {
8181
SchemeFruitSalad scheme = SchemeFruitSalad(Hct(0xff0000ff), false, 0.0);
8282
EXPECT_EQ(MaterialDynamicColors::TertiaryContainer().GetArgb(scheme),
83-
0xffE0E0FF);
83+
0xffe0e0ff);
8484
}
8585

8686
TEST(SchemeFruitSaladTest, lightTheme_maxContrast_tertiaryContainer) {
8787
SchemeFruitSalad scheme = SchemeFruitSalad(Hct(0xff0000ff), false, 1.0);
8888
EXPECT_EQ(MaterialDynamicColors::TertiaryContainer().GetArgb(scheme),
89-
0xFF3A3E74);
89+
0xff3a3e74);
9090
}
9191

9292
TEST(SchemeFruitSaladTest, lightTheme_minContrast_onPrimaryContainer) {
@@ -98,7 +98,7 @@ TEST(SchemeFruitSaladTest, lightTheme_minContrast_onPrimaryContainer) {
9898
TEST(SchemeFruitSaladTest, lightTheme_standardContrast_onPrimaryContainer) {
9999
SchemeFruitSalad scheme = SchemeFruitSalad(Hct(0xff0000ff), false, 0.0);
100100
EXPECT_EQ(MaterialDynamicColors::OnPrimaryContainer().GetArgb(scheme),
101-
0xff001E2B);
101+
0xff001e2b);
102102
}
103103

104104
TEST(SchemeFruitSaladTest, lightTheme_maxContrast_onPrimaryContainer) {
@@ -140,7 +140,7 @@ TEST(SchemeFruitSaladTest, darkTheme_minContrast_primary) {
140140

141141
TEST(SchemeFruitSaladTest, darkTheme_standardContrast_primary) {
142142
SchemeFruitSalad scheme = SchemeFruitSalad(Hct(0xff0000ff), true, 0.0);
143-
EXPECT_EQ(MaterialDynamicColors::Primary().GetArgb(scheme), 0xFF76D1FF);
143+
EXPECT_EQ(MaterialDynamicColors::Primary().GetArgb(scheme), 0xff76d1ff);
144144
}
145145

146146
TEST(SchemeFruitSaladTest, darkTheme_maxContrast_primary) {
@@ -157,13 +157,13 @@ TEST(SchemeFruitSaladTest, darkTheme_minContrast_primaryContainer) {
157157
TEST(SchemeFruitSaladTest, darkTheme_standardContrast_primaryContainer) {
158158
SchemeFruitSalad scheme = SchemeFruitSalad(Hct(0xff0000ff), true, 0.0);
159159
EXPECT_EQ(MaterialDynamicColors::PrimaryContainer().GetArgb(scheme),
160-
0xFF004D67);
160+
0xff004d67);
161161
}
162162

163163
TEST(SchemeFruitSaladTest, darkTheme_maxContrast_primaryContainer) {
164164
SchemeFruitSalad scheme = SchemeFruitSalad(Hct(0xff0000ff), true, 1.0);
165165
EXPECT_EQ(MaterialDynamicColors::PrimaryContainer().GetArgb(scheme),
166-
0xFF83D5FF);
166+
0xff83d5ff);
167167
}
168168

169169
TEST(SchemeFruitSaladTest, darkTheme_minContrast_onPrimaryContainer) {
@@ -175,7 +175,7 @@ TEST(SchemeFruitSaladTest, darkTheme_minContrast_onPrimaryContainer) {
175175
TEST(SchemeFruitSaladTest, darkTheme_standardContrast_onPrimaryContainer) {
176176
SchemeFruitSalad scheme = SchemeFruitSalad(Hct(0xff0000ff), true, 0.0);
177177
EXPECT_EQ(MaterialDynamicColors::OnPrimaryContainer().GetArgb(scheme),
178-
0xffC2E8FF);
178+
0xffc2e8ff);
179179
}
180180

181181
TEST(SchemeFruitSaladTest, darkTheme_maxContrast_onPrimaryContainer) {

‎cpp/scheme/scheme_neutral_test.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ TEST(SchemeNeutralTest, KeyColors) {
3030
EXPECT_EQ(MaterialDynamicColors::SecondaryPaletteKeyColor().GetArgb(scheme),
3131
0xff777680);
3232
EXPECT_EQ(MaterialDynamicColors::TertiaryPaletteKeyColor().GetArgb(scheme),
33-
0xff75758B);
33+
0xff75758b);
3434
EXPECT_EQ(MaterialDynamicColors::NeutralPaletteKeyColor().GetArgb(scheme),
3535
0xff787678);
3636
EXPECT_EQ(

‎cpp/scheme/scheme_rainbow_test.cc

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ namespace {
2626
TEST(SchemeRainbowTest, KeyColors) {
2727
SchemeRainbow scheme = SchemeRainbow(Hct(0xff0000ff), false, 0.0);
2828
EXPECT_EQ(MaterialDynamicColors::PrimaryPaletteKeyColor().GetArgb(scheme),
29-
0xff696FC4);
29+
0xff696fc4);
3030
EXPECT_EQ(MaterialDynamicColors::SecondaryPaletteKeyColor().GetArgb(scheme),
31-
0xff75758B);
31+
0xff75758b);
3232
EXPECT_EQ(MaterialDynamicColors::TertiaryPaletteKeyColor().GetArgb(scheme),
33-
0xff936B84);
33+
0xff936b84);
3434
EXPECT_EQ(MaterialDynamicColors::NeutralPaletteKeyColor().GetArgb(scheme),
3535
0xff070707);
3636
EXPECT_EQ(
@@ -40,17 +40,17 @@ TEST(SchemeRainbowTest, KeyColors) {
4040

4141
TEST(SchemeRainbowTest, lightTheme_minContrast_primary) {
4242
SchemeRainbow scheme = SchemeRainbow(Hct(0xff0000ff), false, -1.0);
43-
EXPECT_EQ(MaterialDynamicColors::Primary().GetArgb(scheme), 0xff676DC1);
43+
EXPECT_EQ(MaterialDynamicColors::Primary().GetArgb(scheme), 0xff676dc1);
4444
}
4545

4646
TEST(SchemeRainbowTest, lightTheme_standardContrast_primary) {
4747
SchemeRainbow scheme = SchemeRainbow(Hct(0xff0000ff), false, 0.0);
48-
EXPECT_EQ(MaterialDynamicColors::Primary().GetArgb(scheme), 0xff5056A9);
48+
EXPECT_EQ(MaterialDynamicColors::Primary().GetArgb(scheme), 0xff5056a9);
4949
}
5050

5151
TEST(SchemeRainbowTest, lightTheme_maxContrast_primary) {
5252
SchemeRainbow scheme = SchemeRainbow(Hct(0xff0000ff), false, 1.0);
53-
EXPECT_EQ(MaterialDynamicColors::Primary().GetArgb(scheme), 0xff0F136A);
53+
EXPECT_EQ(MaterialDynamicColors::Primary().GetArgb(scheme), 0xff0f136a);
5454
}
5555

5656
TEST(SchemeRainbowTest, lightTheme_minContrast_primaryContainer) {
@@ -62,13 +62,13 @@ TEST(SchemeRainbowTest, lightTheme_minContrast_primaryContainer) {
6262
TEST(SchemeRainbowTest, lightTheme_standardContrast_primaryContainer) {
6363
SchemeRainbow scheme = SchemeRainbow(Hct(0xff0000ff), false, 0.0);
6464
EXPECT_EQ(MaterialDynamicColors::PrimaryContainer().GetArgb(scheme),
65-
0xffE0E0FF);
65+
0xffe0e0ff);
6666
}
6767

6868
TEST(SchemeRainbowTest, lightTheme_maxContrast_primaryContainer) {
6969
SchemeRainbow scheme = SchemeRainbow(Hct(0xff0000ff), false, 1.0);
7070
EXPECT_EQ(MaterialDynamicColors::PrimaryContainer().GetArgb(scheme),
71-
0xff34398B);
71+
0xff34398b);
7272
}
7373

7474
TEST(SchemeRainbowTest, lightTheme_minContrast_tertiaryContainer) {
@@ -86,7 +86,7 @@ TEST(SchemeRainbowTest, lightTheme_standardContrast_tertiaryContainer) {
8686
TEST(SchemeRainbowTest, lightTheme_maxContrast_tertiaryContainer) {
8787
SchemeRainbow scheme = SchemeRainbow(Hct(0xff0000ff), false, 1.0);
8888
EXPECT_EQ(MaterialDynamicColors::TertiaryContainer().GetArgb(scheme),
89-
0xff5A384E);
89+
0xff5a384e);
9090
}
9191

9292
TEST(SchemeRainbowTest, lightTheme_minContrast_onPrimaryContainer) {
@@ -157,7 +157,7 @@ TEST(SchemeRainbowTest, darkTheme_minContrast_primaryContainer) {
157157
TEST(SchemeRainbowTest, darkTheme_standardContrast_primaryContainer) {
158158
SchemeRainbow scheme = SchemeRainbow(Hct(0xff0000ff), true, 0.0);
159159
EXPECT_EQ(MaterialDynamicColors::PrimaryContainer().GetArgb(scheme),
160-
0xff383E8F);
160+
0xff383e8f);
161161
}
162162

163163
TEST(SchemeRainbowTest, darkTheme_maxContrast_primaryContainer) {

‎cpp/scheme/scheme_test.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ TEST(SchemeTest, BlueDarkScheme) {
4343
}
4444

4545
TEST(SchemeTest, ThirdPartyLightScheme) {
46-
Scheme scheme = MaterialLightColorScheme(0xff6750A4);
46+
Scheme scheme = MaterialLightColorScheme(0xff6750a4);
4747
EXPECT_EQ(HexFromArgb(scheme.primary), "ff6750a4");
4848
EXPECT_EQ(HexFromArgb(scheme.secondary), "ff625b71");
4949
EXPECT_EQ(HexFromArgb(scheme.tertiary), "ff7e5260");
@@ -52,7 +52,7 @@ TEST(SchemeTest, ThirdPartyLightScheme) {
5252
}
5353

5454
TEST(SchemeTest, ThirdPartyDarkScheme) {
55-
Scheme scheme = MaterialDarkColorScheme(0xff6750A4);
55+
Scheme scheme = MaterialDarkColorScheme(0xff6750a4);
5656
EXPECT_EQ(HexFromArgb(scheme.primary), "ffcfbcff");
5757
EXPECT_EQ(HexFromArgb(scheme.secondary), "ffcbc2db");
5858
EXPECT_EQ(HexFromArgb(scheme.tertiary), "ffefb8c8");

‎cpp/scheme/scheme_tonal_spot_test.cc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ namespace {
2626
TEST(SchemeTonalSpotTest, KeyColors) {
2727
SchemeTonalSpot scheme = SchemeTonalSpot(Hct(0xff0000ff), false, 0.0);
2828
EXPECT_EQ(MaterialDynamicColors::PrimaryPaletteKeyColor().GetArgb(scheme),
29-
0xff6E72AC);
29+
0xff6e72ac);
3030
EXPECT_EQ(MaterialDynamicColors::SecondaryPaletteKeyColor().GetArgb(scheme),
31-
0xff75758B);
31+
0xff75758b);
3232
EXPECT_EQ(MaterialDynamicColors::TertiaryPaletteKeyColor().GetArgb(scheme),
33-
0xff936B84);
33+
0xff936b84);
3434
EXPECT_EQ(MaterialDynamicColors::NeutralPaletteKeyColor().GetArgb(scheme),
3535
0xff77767d);
3636
EXPECT_EQ(
@@ -80,7 +80,7 @@ TEST(SchemeTonalSpotTest, lightTheme_minContrast_onPrimaryContainer) {
8080
TEST(SchemeTonalSpotTest, lightTheme_standardContrast_onPrimaryContainer) {
8181
SchemeTonalSpot scheme = SchemeTonalSpot(Hct(0xff0000ff), false, 0.0);
8282
EXPECT_EQ(MaterialDynamicColors::OnPrimaryContainer().GetArgb(scheme),
83-
0xff11144B);
83+
0xff11144b);
8484
}
8585

8686
TEST(SchemeTonalSpotTest, lightTheme_maxContrast_onPrimaryContainer) {
@@ -188,7 +188,7 @@ TEST(SchemeTonalSpotTest, darkTheme_minContrast_primaryContainer) {
188188
TEST(SchemeTonalSpotTest, darkTheme_standardContrast_primaryContainer) {
189189
SchemeTonalSpot scheme = SchemeTonalSpot(Hct(0xff0000ff), true, 0.0);
190190
EXPECT_EQ(MaterialDynamicColors::PrimaryContainer().GetArgb(scheme),
191-
0xff3E4278);
191+
0xff3e4278);
192192
}
193193

194194
TEST(SchemeTonalSpotTest, darkTheme_maxContrast_primaryContainer) {

‎cpp/scheme/scheme_vibrant_test.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ TEST(SchemeVibrantTest, KeyColors) {
2828
EXPECT_EQ(MaterialDynamicColors::PrimaryPaletteKeyColor().GetArgb(scheme),
2929
0xff080cff);
3030
EXPECT_EQ(MaterialDynamicColors::SecondaryPaletteKeyColor().GetArgb(scheme),
31-
0xff7B7296);
31+
0xff7b7296);
3232
EXPECT_EQ(MaterialDynamicColors::TertiaryPaletteKeyColor().GetArgb(scheme),
33-
0xff886C9D);
33+
0xff886c9d);
3434
EXPECT_EQ(MaterialDynamicColors::NeutralPaletteKeyColor().GetArgb(scheme),
3535
0xff777682);
3636
EXPECT_EQ(

0 commit comments

Comments
 (0)