polish, part 3

microsoft · Aug 18, 2020 · bdd7430 · bdd7430
1 parent ec13c2c
commit bdd7430
Show file tree

Hide file tree

Showing 6 changed files with 113 additions and 115 deletions.
diff --git a/src/cascadia/LocalTests_TerminalApp/ProfileTests.cpp b/src/cascadia/LocalTests_TerminalApp/ProfileTests.cpp
@@ -119,13 +119,13 @@ namespace TerminalAppLocalTests
 
         auto profile0 = implementation::Profile::FromJson(profile0Json);
         VERIFY_IS_NOT_NULL(profile0->Foreground());
-        VERIFY_ARE_EQUAL(ARGB(0, 0, 0, 0), profile0->Foreground().Value());
+        VERIFY_ARE_EQUAL(til::color(0, 0, 0, 0), profile0->Foreground().Value());
 
         VERIFY_IS_NOT_NULL(profile0->Background());
-        VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), profile0->Background().Value());
+        VERIFY_ARE_EQUAL(til::color(1, 1, 1, 0), profile0->Background().Value());
 
         VERIFY_IS_NOT_NULL(profile0->SelectionBackground());
-        VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), profile0->SelectionBackground().Value());
+        VERIFY_ARE_EQUAL(til::color(1, 1, 1, 0), profile0->SelectionBackground().Value());
 
         VERIFY_ARE_EQUAL(L"profile0", profile0->Name());
 
@@ -136,13 +136,13 @@ namespace TerminalAppLocalTests
         profile0->LayerJson(profile1Json);
 
         VERIFY_IS_NOT_NULL(profile0->Foreground());
-        VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 2), profile0->Foreground().Value());
+        VERIFY_ARE_EQUAL(til::color(2, 2, 2, 0), profile0->Foreground().Value());
 
         VERIFY_IS_NOT_NULL(profile0->Background());
-        VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), profile0->Background().Value());
+        VERIFY_ARE_EQUAL(til::color(1, 1, 1, 0), profile0->Background().Value());
 
         VERIFY_IS_NOT_NULL(profile0->Background());
-        VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), profile0->Background().Value());
+        VERIFY_ARE_EQUAL(til::color(1, 1, 1, 0), profile0->Background().Value());
 
         VERIFY_ARE_EQUAL(L"profile1", profile0->Name());
 
@@ -154,13 +154,13 @@ namespace TerminalAppLocalTests
         profile0->LayerJson(profile2Json);
 
         VERIFY_IS_NOT_NULL(profile0->Foreground());
-        VERIFY_ARE_EQUAL(ARGB(0, 3, 3, 3), profile0->Foreground().Value());
+        VERIFY_ARE_EQUAL(til::color(3, 3, 3, 0), profile0->Foreground().Value());
 
         VERIFY_IS_NOT_NULL(profile0->Background());
-        VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), profile0->Background().Value());
+        VERIFY_ARE_EQUAL(til::color(1, 1, 1, 0), profile0->Background().Value());
 
         VERIFY_IS_NOT_NULL(profile0->SelectionBackground());
-        VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 2), profile0->SelectionBackground().Value());
+        VERIFY_ARE_EQUAL(til::color(2, 2, 2, 0), profile0->SelectionBackground().Value());
 
         VERIFY_ARE_EQUAL(L"profile2", profile0->Name());