Unit test for the FCellColor struct

Author: gansm

final/ftypes.h

@@ -562,7 +562,7 @@ struct FColors
 
 struct FCellColor
 {
-  uInt32  data;  // Color data
+  uInt32  data{0};  // Color data
 
   FCellColor() = default;
 
@@ -631,24 +631,27 @@ struct FCellColor
     return *this;
   }
 
+  friend constexpr auto operator == (const FCellColor& lhs, const FCellColor& rhs) noexcept -> bool
+  {
+    return lhs.data == rhs.data;
+  }
+
+  friend constexpr auto operator != (const FCellColor& lhs, const FCellColor& rhs) noexcept -> bool
+  {
+    return ! ( lhs == rhs );
+  }
+
   friend constexpr void copyBgColor (const FCellColor& from, FCellColor& to) noexcept
   {
-    to.data = (from.data & 0xffff0000U) | (to.data & 0x0000ffffU);
+    to.data = (to.data & 0x0000ffffU) | (from.data & 0xffff0000U);
   }
 
   friend constexpr void copyFgColor (const FCellColor& from, FCellColor& to) noexcept
   {
-    to.data = (from.data & 0x0000ffffU) | (to.data & 0xffff0000U);
+    to.data = (to.data & 0xffff0000U) | (from.data & 0x0000ffffU);
   }
 };
 
-constexpr auto FColors_to_FCellColor (const FColors& fcolors) noexcept -> FCellColor
-{
-  FCellColor fcellcolor{};
-  fcellcolor.setPair(fcolors);
-  return fcellcolor;
-}
-
 
 // FChar
 //----------------------------------------------------------------------

final/output/tty/foptiattr.cpp

@@ -163,7 +163,7 @@ constexpr auto createFCellColor (T setter) noexcept -> FCellColor
 {
   FColors fcolors{};
   setter(fcolors);
-  return FColors_to_FCellColor(fcolors);
+  return FCellColor(fcolors);
 }
 
 constexpr void setDefaultColorPair (FColors& fcolors) noexcept

final/vterm/fvtermattribute.h

@@ -78,7 +78,7 @@ constexpr auto createFCellColor (T setter) noexcept -> FCellColor
 {
   FColors fcolors{};
   setter(fcolors);
-  return FColors_to_FCellColor(fcolors);
+  return FCellColor(fcolors);
 }
 
 constexpr void setDefaultColorPair (FColors& fcolors) noexcept

test/foptiattr-test.cpp

@@ -63,6 +63,7 @@ class FOptiAttrTest : public CPPUNIT_NS::TestFixture
   protected:
     void classNameTest();
     void noArgumentTest();
+    void FCellColorTest();
     void vga2ansiTest();
     void sgrOptimizerTest();
     void fakeReverseTest();
@@ -86,6 +87,7 @@ class FOptiAttrTest : public CPPUNIT_NS::TestFixture
     // Add a methods to the test suite
     CPPUNIT_TEST (classNameTest);
     CPPUNIT_TEST (noArgumentTest);
+    CPPUNIT_TEST (FCellColorTest);
     CPPUNIT_TEST (vga2ansiTest);
     CPPUNIT_TEST (sgrOptimizerTest);
     CPPUNIT_TEST (fakeReverseTest);
@@ -126,6 +128,50 @@ void FOptiAttrTest::noArgumentTest()
   CPPUNIT_ASSERT ( ! oa.isNormal(ch) );
   ch.color.setBgColor(finalcut::FColor::Default);
   CPPUNIT_ASSERT ( oa.isNormal(ch) );
+
+  finalcut::FCellColor cellcolor1 = {finalcut::FColor::Default, finalcut::FColor::Default};
+  CPPUNIT_ASSERT ( ch.color == cellcolor1 );
+  finalcut::FCellColor cellcolor2 = {finalcut::FColor::Red, finalcut::FColor::Blue};
+  CPPUNIT_ASSERT ( ch.color != cellcolor2 );
+  CPPUNIT_ASSERT ( cellcolor1 != cellcolor2 );
+  copyBgColor(cellcolor2, cellcolor1);
+  CPPUNIT_ASSERT ( cellcolor1.getBgColor() != finalcut::FColor::Default );
+  CPPUNIT_ASSERT ( cellcolor1.getBgColor() == finalcut::FColor::Blue );
+  copyFgColor(cellcolor2, cellcolor1);
+  CPPUNIT_ASSERT ( cellcolor1.getFgColor() != finalcut::FColor::Default );
+  CPPUNIT_ASSERT ( cellcolor1.getFgColor() == finalcut::FColor::Red );
+  CPPUNIT_ASSERT ( cellcolor1 == cellcolor2 );
+  cellcolor1 = {finalcut::FColor::Yellow, finalcut::FColor::NavyBlue};
+  CPPUNIT_ASSERT ( cellcolor1.getFgColor() == finalcut::FColor::Yellow );
+  CPPUNIT_ASSERT ( cellcolor1.getBgColor() == finalcut::FColor::NavyBlue );
+}
+
+//----------------------------------------------------------------------
+void FOptiAttrTest::FCellColorTest()
+{
+  finalcut::FChar ch{};
+  ch.color.setFgColor(finalcut::FColor::Default);
+  ch.color.setBgColor(finalcut::FColor::Default);
+  finalcut::FCellColor cellcolor1 = {finalcut::FColor::Default, finalcut::FColor::Default};
+  CPPUNIT_ASSERT ( ch.color == cellcolor1 );
+  finalcut::FCellColor cellcolor2 = {finalcut::FColor::Red, finalcut::FColor::Blue};
+  CPPUNIT_ASSERT ( ch.color != cellcolor2 );
+  CPPUNIT_ASSERT ( cellcolor1 != cellcolor2 );
+  copyBgColor(cellcolor2, cellcolor1);
+  CPPUNIT_ASSERT ( cellcolor1.getBgColor() != finalcut::FColor::Default );
+  CPPUNIT_ASSERT ( cellcolor1.getBgColor() == finalcut::FColor::Blue );
+  copyFgColor(cellcolor2, cellcolor1);
+  CPPUNIT_ASSERT ( cellcolor1.getFgColor() != finalcut::FColor::Default );
+  CPPUNIT_ASSERT ( cellcolor1.getFgColor() == finalcut::FColor::Red );
+  CPPUNIT_ASSERT ( cellcolor1 == cellcolor2 );
+  cellcolor1 = {finalcut::FColor::Yellow, finalcut::FColor::NavyBlue};
+  CPPUNIT_ASSERT ( cellcolor1.getFgColor() == finalcut::FColor::Yellow );
+  CPPUNIT_ASSERT ( cellcolor1.getBgColor() == finalcut::FColor::NavyBlue );
+  CPPUNIT_ASSERT ( cellcolor1 == finalcut::FCellColor( finalcut::FColor::Yellow
+                                                     , finalcut::FColor::NavyBlue ) );
+  finalcut::FColors pair{finalcut::FColor::Yellow, finalcut::FColor::NavyBlue};
+  CPPUNIT_ASSERT ( cellcolor1 == finalcut::FCellColor(pair) );
+  CPPUNIT_ASSERT ( cellcolor1 == finalcut::FCellColor(0x0011000eU) );
 }
 
 //----------------------------------------------------------------------
@@ -398,8 +444,7 @@ void FOptiAttrTest::fakeReverseTest()
   CPPUNIT_ASSERT ( oa.changeAttribute(from, to).empty() );
 
   // Gray text on blue background
-  to.color.setFgColor(finalcut::FColor::LightGray);
-  to.color.setBgColor(finalcut::FColor::Blue);
+  to.color = {finalcut::FColor::LightGray, finalcut::FColor::Blue};
   CPPUNIT_ASSERT ( from != to );
   CPPUNIT_ASSERT_STRING ( oa.changeAttribute(from, to)
                         , CSI "37m" CSI "44m" );