Implemented Icon::GetDefaultUnknownFileTypeIcon() and Icon::operator ==() with tests.

Author: end2endzone

src/core/Icon.cpp

@@ -50,17 +50,28 @@ namespace shellanything
   {
   }
 
-  const Icon& Icon::operator =(const Icon& icon)
+  const Icon& Icon::operator =(const Icon& other)
   {
-    if (this != &icon)
+    if (this != &other)
     {
-      mFileExtension = icon.mFileExtension;
-      mPath = icon.mPath;
-      mIndex = icon.mIndex;
+      mFileExtension = other.mFileExtension;
+      mPath = other.mPath;
+      mIndex = other.mIndex;
     }
     return (*this);
   }
 
+  bool Icon::operator ==(const Icon& other) const
+  {
+    if (this == &other)
+      return true;
+    if ((mFileExtension == other.mFileExtension) &&
+        (mPath == other.mPath) &&
+        (mIndex == other.mIndex))
+        return true;
+    return false;
+  }
+
   bool Icon::IsValid() const
   {
     if (!mFileExtension.empty())
@@ -150,6 +161,14 @@ namespace shellanything
     mIndex = index;
   }
 
+  Icon Icon::GetDefaultUnknownFileTypeIcon()
+  {
+    Icon tmp;
+    tmp.SetFileExtension("this_file_extension_is_not_registered_on_system");
+    tmp.ResolveFileExtensionIcon();
+    return tmp;
+  }
+
   std::string Icon::ToShortString() const
   {
     std::string str;

src/core/Icon.h

@@ -53,7 +53,20 @@ namespace shellanything
     /// <summary>
     /// Copy operator
     /// </summary>
-    const Icon& operator =(const Icon& icon);
+    const Icon& operator =(const Icon& other);
+
+    /// <summary>
+    /// Equal operator
+    /// </summary>
+    bool operator ==(const Icon& other) const;
+
+    /// <summary>
+    /// Not Equal operator
+    /// </summary>
+    inline bool operator !=(const Icon& other) const
+    {
+      return !((*this) == other);
+    }
 
     /// <summary>
     /// Returns true if the icon have a valid path and index.
@@ -96,6 +109,11 @@ namespace shellanything
     /// </summary>
     void SetIndex(const int& index);
 
+    /// <summary>
+    /// Get the system's default visual icon for unknown file type.
+    /// </summary>
+    static Icon GetDefaultUnknownFileTypeIcon();
+
     // IObject methods
     virtual std::string ToShortString() const;
     virtual void ToLongString(std::string& str, int indent) const;

src/tests/TestIcon.cpp

@@ -65,6 +65,39 @@ namespace shellanything
     {
     }
     //--------------------------------------------------------------------------------------------------
+    TEST_F(TestIcon, testOperatorEquals)
+    {
+      Icon iconA;
+      Icon iconB;
+
+      #define ASSERT_ICON_EQUALS(iconA, iconB) ASSERT_TRUE(iconA == iconB); ASSERT_FALSE(iconA != iconB);
+      #define ASSERT_ICON_NOT_EQUALS(iconA, iconB) ASSERT_TRUE(iconA != iconB); ASSERT_FALSE(iconA == iconB);
+
+      // assert equals
+      ASSERT_ICON_EQUALS(iconA, iconB);
+
+      iconA.SetFileExtension("txt");
+      ASSERT_ICON_NOT_EQUALS(iconA, iconB);
+
+      iconA.SetFileExtension("exe");
+      iconB.SetFileExtension("exe");
+      ASSERT_ICON_EQUALS(iconA, iconB);
+
+      iconA.SetPath("foo.dll");
+      ASSERT_ICON_NOT_EQUALS(iconA, iconB);
+
+      iconA.SetPath("bar.dll");
+      iconB.SetPath("bar.dll");
+      ASSERT_ICON_EQUALS(iconA, iconB);
+
+      iconA.SetIndex(11);
+      ASSERT_ICON_NOT_EQUALS(iconA, iconB);
+
+      iconA.SetIndex(99);
+      iconB.SetIndex(99);
+      ASSERT_ICON_EQUALS(iconA, iconB);
+    }
+    //--------------------------------------------------------------------------------------------------
     TEST_F(TestIcon, testValidIcon)
     {
       // default ctor
@@ -104,7 +137,7 @@ namespace shellanything
       }
     }
     //--------------------------------------------------------------------------------------------------
-    TEST_F(TestIcon, testResolveFileExtensionIcon)
+    TEST_F(TestIcon, testResolveFileExtensionIconTxt)
     {
       Icon icon;
       icon.SetFileExtension("txt");
@@ -115,6 +148,20 @@ namespace shellanything
       ASSERT_TRUE(icon.GetFileExtension().empty());
       ASSERT_FALSE(icon.GetPath().empty());
       ASSERT_NE(Icon::INVALID_ICON_INDEX, icon.GetIndex());
+
+      // assert we did not resolve to default unknown icon
+      ASSERT_TRUE(icon != Icon::GetDefaultUnknownFileTypeIcon());
+    }
+    //--------------------------------------------------------------------------------------------------
+    TEST_F(TestIcon, testGetDefaultUnknownFileTypeIcon)
+    {
+      Icon icon = Icon::GetDefaultUnknownFileTypeIcon();
+
+      ASSERT_TRUE(icon.IsValid());
+      ASSERT_TRUE(icon.GetFileExtension().empty());
+
+      ASSERT_FALSE(icon.GetPath().empty());
+      ASSERT_NE(Icon::INVALID_ICON_INDEX, icon.GetIndex());
     }
     //--------------------------------------------------------------------------------------------------
     TEST_F(TestIcon, testResolveMultipleFileExtensionIcon) // issue #98