Improve DesktopFile's comparison operators

TheAssassin · TheAssassin · commit ccfd05b5e02b · 2018-11-19T22:12:14.000+01:00
diff --git a/src/core/desktopfile/desktopfile.cpp b/src/core/desktopfile/desktopfile.cpp
@@ -194,10 +194,10 @@ namespace linuxdeploy {
             }
 
             bool operator==(const DesktopFile& first, const DesktopFile& second) {
-                return first.d->data == second.d->data;
+                return first.d->path == second.d->path && first.d->data == second.d->data;
             }
 
-            bool operator!=(const DesktopFile& first, const DesktopFile& second) {
+            bool operator !=(const DesktopFile& first, const DesktopFile& second) {
                 return !operator==(first, second);
             }
         }
diff --git a/tests/core/desktopfile/test_desktopfilereader.cpp b/tests/core/desktopfile/test_desktopfilereader.cpp
@@ -44,9 +44,31 @@ TEST_F(DesktopFileReaderTest, testPathConstructorWithNonExistingPath) {
 }
 
 TEST_F(DesktopFileReaderTest, testEqualityAndInequalityOperators) {
-    DesktopFileReader emptyReader;
-    EXPECT_TRUE(emptyReader == emptyReader);
-    EXPECT_FALSE(emptyReader != emptyReader);
+    {
+        DesktopFileReader emptyReader;
+        EXPECT_TRUE(emptyReader == emptyReader);
+        EXPECT_FALSE(emptyReader != emptyReader);
+    }
+
+    {
+        // make sure that files with different paths are recognized as different
+        DesktopFile nullFile("/dev/null");
+        DesktopFile fileWithoutPath;
+
+        EXPECT_TRUE(nullFile != fileWithoutPath);
+        EXPECT_FALSE(nullFile == fileWithoutPath);
+    }
+
+    {
+        // make sure that files with different contents are recognized as different
+        DesktopFile fileWithContents;
+        fileWithContents.setEntry("Desktop Entry", DesktopFileEntry("test", "test"));
+
+        DesktopFile emptyFile;
+
+        EXPECT_TRUE(emptyFile != fileWithContents);
+        EXPECT_FALSE(emptyFile == fileWithContents);
+    }
 }
 
 TEST_F(DesktopFileReaderTest, testCopyConstructor) {

Original file line number	Diff line number	Diff line change
`@@ -194,10 +194,10 @@ namespace linuxdeploy {`
`194`	`194`	`}`
`195`	`195`
`196`	`196`	`bool operator==(const DesktopFile& first, const DesktopFile& second) {`
`197`		`- return first.d->data == second.d->data;`
	`197`	`+ return first.d->path == second.d->path && first.d->data == second.d->data;`
`198`	`198`	`}`
`199`	`199`
`200`		`- bool operator!=(const DesktopFile& first, const DesktopFile& second) {`
	`200`	`+ bool operator !=(const DesktopFile& first, const DesktopFile& second) {`
`201`	`201`	`return !operator==(first, second);`
`202`	`202`	`}`
`203`	`203`	`}`