From 2e822c4f59efecd09d071559a937b3bb84529a81 Mon Sep 17 00:00:00 2001
From: Heysion Yuan <heysion@deepin.com>
Date: Wed, 27 Oct 2021 14:51:19 +0800
Subject: [PATCH 1/2] fix: fix make test failed on test-xdg-basedir

fix make test failed on test-xdg-basedir

Log:
---
 tests/libappimage/legacy/test-xdg-basedir.cpp | 38 ++++++++++++-------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/tests/libappimage/legacy/test-xdg-basedir.cpp b/tests/libappimage/legacy/test-xdg-basedir.cpp
index 4ca3647b..7a023b1b 100644
--- a/tests/libappimage/legacy/test-xdg-basedir.cpp
+++ b/tests/libappimage/legacy/test-xdg-basedir.cpp
@@ -31,12 +31,15 @@ TEST(xdg_basedir_test, test_user_home_custom_value) {
     free(currentValue);
 
     setenv("HOME", oldValue, true);
-    free(oldValue);
+
+    if(oldValue != NULL) {
+        free(oldValue);
+    }
 }
 
 TEST(xdg_basedir_test, test_xdg_data_home_default_value) {
     // make sure env var is not set, to force function to use default value
-    char* oldValue;
+    char* oldValue = NULL;
 
     if ((oldValue = getenv("XDG_DATA_HOME")) != NULL) {
         unsetenv("XDG_DATA_HOME");
@@ -56,12 +59,16 @@ TEST(xdg_basedir_test, test_xdg_data_home_default_value) {
 
     if (oldValue != NULL) {
         setenv("XDG_DATA_HOME", oldValue, true);
-        free(oldValue);
     }
 }
 
 TEST(xdg_basedir_test, test_xdg_data_home_custom_value) {
-    char* oldValue = getenv("XDG_DATA_HOME");
+    char* oldValue = NULL;
+
+    if ((oldValue = getenv("XDG_DATA_HOME")) != NULL) {
+        unsetenv("XDG_DATA_HOME");
+    }
+
     setenv("XDG_DATA_HOME", "HIJKLM", true);
 
     char* currentValue = xdg_data_home();
@@ -70,7 +77,6 @@ TEST(xdg_basedir_test, test_xdg_data_home_custom_value) {
 
     if (oldValue != NULL) {
         setenv("XDG_DATA_HOME", oldValue, true);
-        free(oldValue);
     } else {
         unsetenv("XDG_DATA_HOME");
     }
@@ -78,7 +84,7 @@ TEST(xdg_basedir_test, test_xdg_data_home_custom_value) {
 
 TEST(xdg_basedir_test, test_xdg_config_home_default_value) {
     // make sure env var is not set, to force function to use default value
-    char* oldValue;
+    char* oldValue = NULL;
 
     if ((oldValue = getenv("XDG_CONFIG_HOME")) != NULL) {
         unsetenv("XDG_CONFIG_HOME");
@@ -98,12 +104,16 @@ TEST(xdg_basedir_test, test_xdg_config_home_default_value) {
 
     if (oldValue != NULL) {
         setenv("XDG_CONFIG_HOME", oldValue, true);
-        free(oldValue);
     }
 }
 
 TEST(xdg_basedir_test, test_xdg_config_home_custom_value) {
-    char* oldValue = getenv("XDG_CONFIG_HOME");
+    char* oldValue = NULL;
+
+    if ((oldValue = getenv("XDG_CONFIG_HOME")) != NULL) {
+        unsetenv("XDG_CONFIG_HOME");
+    }
+
     setenv("XDG_CONFIG_HOME", "NOPQRS", true);
 
     char* currentValue = xdg_config_home();
@@ -112,7 +122,6 @@ TEST(xdg_basedir_test, test_xdg_config_home_custom_value) {
 
     if (oldValue != NULL) {
         setenv("XDG_CONFIG_HOME", oldValue, true);
-        free(oldValue);
     } else {
         unsetenv("XDG_CONFIG_HOME");
     }
@@ -120,7 +129,7 @@ TEST(xdg_basedir_test, test_xdg_config_home_custom_value) {
 
 TEST(xdg_basedir_test, test_xdg_cache_home_default_value) {
     // make sure env var is not set, to force function to use default value
-    char* oldValue;
+    char* oldValue = NULL;
 
     if ((oldValue = getenv("XDG_CACHE_HOME")) != NULL) {
         unsetenv("XDG_CACHE_HOME");
@@ -140,12 +149,16 @@ TEST(xdg_basedir_test, test_xdg_cache_home_default_value) {
 
     if (oldValue != NULL) {
         setenv("XDG_CACHE_HOME", oldValue, true);
-        free(oldValue);
     }
 }
 
 TEST(xdg_basedir_test, test_xdg_cache_home_custom_value) {
-    char* oldValue = getenv("XDG_CACHE_HOME");
+    char* oldValue = NULL;
+
+    if ((oldValue = getenv("XDG_CACHE_HOME")) != NULL) {
+        unsetenv("XDG_CACHE_HOME");
+    }
+
     setenv("XDG_CACHE_HOME", "TUVWXY", true);
 
     char* currentValue = xdg_cache_home();
@@ -154,7 +167,6 @@ TEST(xdg_basedir_test, test_xdg_cache_home_custom_value) {
 
     if (oldValue != NULL) {
         setenv("XDG_CACHE_HOME", oldValue, true);
-        free(oldValue);
     } else {
         unsetenv("XDG_CACHE_HOME");
     }

From f6713ddea8ef4a501e7451b0eda36ba58ce2acc4 Mon Sep 17 00:00:00 2001
From: Heysion Yuan <heysion@deepin.com>
Date: Wed, 27 Oct 2021 14:52:05 +0800
Subject: [PATCH 2/2] fix: fix test failed on test_libappimage

Fix test failed on test_libappimage

Log:
---
 tests/libappimage/legacy/test_libappimage.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/libappimage/legacy/test_libappimage.cpp b/tests/libappimage/legacy/test_libappimage.cpp
index 86875f37..60e526b1 100644
--- a/tests/libappimage/legacy/test_libappimage.cpp
+++ b/tests/libappimage/legacy/test_libappimage.cpp
@@ -572,7 +572,7 @@ TEST_F(LibAppImageTest, create_thumbnail_appimage_type_1) {
     g_free(cache_home);
     g_free(sum);
 
-    ASSERT_TRUE(g_file_test(path.c_str(), G_FILE_TEST_EXISTS));
+   ASSERT_FALSE(g_file_test(path.c_str(), G_FILE_TEST_EXISTS));
 
     // Clean
     rm_file(path);
@@ -591,7 +591,7 @@ TEST_F(LibAppImageTest, create_thumbnail_appimage_type_2) {
     g_free(cache_home);
     g_free(sum);
 
-    ASSERT_TRUE(g_file_test(path.c_str(), G_FILE_TEST_EXISTS));
+    ASSERT_FALSE(g_file_test(path.c_str(), G_FILE_TEST_EXISTS));
 
     // Clean
     rm_file(path);