An elephant-sized code review (edward 2008-07-09 20:14:33)

1 view
Skip to first unread message

edy...@gmail.com

unread,
Jul 9, 2008, 8:15:00 AM7/9/08
to jame...@gmail.com, google-gadgets...@googlegroups.com
Hello james.su,

I'd like you to do a code review. Please review the following patch:

commit a95ac4ec1e0bc058aa6a76950853f68f1a120d1e
Author: Edward Leap Fox <edward@zion.(none)>
Date: Wed Jul 9 20:13:36 2008 +0800

Fixed the build break in unittests.

diff --git a/extensions/linux_system_framework/tests/filesystem_file_test.cc b/extensions/linux_system_framework/tests/filesystem_file_test.cc
index 920a1d5..2eb82d6 100644
--- a/extensions/linux_system_framework/tests/filesystem_file_test.cc
+++ b/extensions/linux_system_framework/tests/filesystem_file_test.cc
@@ -14,7 +14,10 @@
limitations under the License.
*/

-#include <stdio.h>
+#include <cstdio>
+#include <cstdlib>
+#include <unistd.h>
+#include <dirent.h>
#include "ggadget/common.h"
#include "ggadget/logger.h"
#include "unittest/gtest.h"
@@ -29,9 +32,9 @@ static const char *kTestDir = "/tmp/GGL_FileSystem_Test";
class FileTest : public testing::Test {
protected:
virtual void SetUp() {
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("touch /tmp/GGL_FileSystem_Test");
- std::system("echo -n \"test content: 12345\" > /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("touch /tmp/GGL_FileSystem_Test");
+ system("echo -n \"test content: 12345\" > /tmp/GGL_FileSystem_Test");
file_ = filesystem_.GetFile(kTestDir);
}

@@ -40,7 +43,7 @@ class FileTest : public testing::Test {
file_->Destroy();
file_ = NULL;
}
- std::system("rm /tmp/GGL_FileSystem_Test");
+ system("rm /tmp/GGL_FileSystem_Test");
}

FileSystem filesystem_;
@@ -57,15 +60,15 @@ TEST_F(FileTest, File_1) {

// GGL_FileSystem_Test constructor of class File
TEST_F(FileTest, File_2) {
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("touch /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("touch /tmp/GGL_FileSystem_Test");
FileInterface *file = filesystem_.GetFile("\\tmp\\GGL_FileSystem_Test");
EXPECT_TRUE(file != NULL);
EXPECT_EQ(kTestDir, file->GetPath());
EXPECT_EQ("GGL_FileSystem_Test", file->GetName());
EXPECT_TRUE(filesystem_.FileExists(kTestDir));
file->Destroy();
- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// GGL_FileSystem_Test method GetPath
@@ -82,14 +85,14 @@ TEST_F(FileTest, GetName) {

// GGL_FileSystem_Test method SetName
TEST_F(FileTest, SetName_Accuracy) {
- std::system("rm -R /tmp/new_folder");
+ system("rm -R /tmp/new_folder");
EXPECT_TRUE(file_ != NULL);
EXPECT_EQ("GGL_FileSystem_Test", file_->GetName());
EXPECT_TRUE(file_->SetName("new_name"));
EXPECT_FALSE(filesystem_.FileExists(kTestDir));
EXPECT_TRUE(filesystem_.FileExists("/tmp/new_name"));
EXPECT_EQ("new_name", file_->GetName());
- std::system("rm -R /tmp/new_name");
+ system("rm -R /tmp/new_name");
}

// GGL_FileSystem_Test method SetName with same name
@@ -119,67 +122,67 @@ TEST_F(FileTest, SetName_Failure_EmptyString) {
// GGL_FileSystem_Test method GetShortPath
TEST_F(FileTest, GetShortPath_Accuracy_1) {
EXPECT_TRUE(file_ != NULL);
- std::system("touch /tmp/I_love_you_MengMeng");
+ system("touch /tmp/I_love_you_MengMeng");
FileInterface *file =
filesystem_.GetFile("/tmp/I_love_you_MengMeng");
EXPECT_TRUE(file != NULL);
EXPECT_EQ("/tmp/I_love_you_MengMeng", file->GetPath());
EXPECT_EQ("/tmp/I_LOVE~1", file->GetShortPath());
file->Destroy();
- std::system("rm -R /tmp/I_love_you_MengMeng");
+ system("rm -R /tmp/I_love_you_MengMeng");
}

// GGL_FileSystem_Test method GetShortPath
TEST_F(FileTest, GetShortPath_Accuracy_2) {
EXPECT_TRUE(file_ != NULL);
- std::system("touch /tmp/TestCase");
+ system("touch /tmp/TestCase");
FileInterface *file =
filesystem_.GetFile("/tmp/TestCase");
EXPECT_TRUE(file != NULL);
EXPECT_EQ("/tmp/TestCase", file->GetPath());
EXPECT_EQ("/tmp/TESTCASE", file->GetShortPath());
file->Destroy();
- std::system("rm -R /tmp/TestCase");
+ system("rm -R /tmp/TestCase");
}

// GGL_FileSystem_Test method GetShortPath
TEST_F(FileTest, GetShortPath_Accuracy_3) {
EXPECT_TRUE(file_ != NULL);
- std::system("touch /tmp/I_love_you.txt");
+ system("touch /tmp/I_love_you.txt");
FileInterface *file =
filesystem_.GetFile("/tmp/I_love_you.txt");
EXPECT_TRUE(file != NULL);
EXPECT_EQ("/tmp/I_love_you.txt", file->GetPath());
EXPECT_EQ("/tmp/I_LOVE~1.TXT", file->GetShortPath());
file->Destroy();
- std::system("rm -R /tmp/I_love_you.txt");
+ system("rm -R /tmp/I_love_you.txt");
}

// GGL_FileSystem_Test method GetShortPath
TEST_F(FileTest, GetShortPath_Accuracy_4) {
EXPECT_TRUE(file_ != NULL);
- std::system("touch /tmp/I_love_you.txt1234");
+ system("touch /tmp/I_love_you.txt1234");
FileInterface *file =
filesystem_.GetFile("/tmp/I_love_you.txt1234");
EXPECT_TRUE(file != NULL);
EXPECT_EQ("/tmp/I_love_you.txt1234", file->GetPath());
EXPECT_EQ("/tmp/I_LOVE~1.TXT", file->GetShortPath());
file->Destroy();
- std::system("rm -R /tmp/I_love_you.txt1234");
+ system("rm -R /tmp/I_love_you.txt1234");
}



// GGL_FileSystem_Test method GetShortName
TEST_F(FileTest, GetShortName_Accuracy_1) {
- std::system("touch /tmp/I_love_you_MengMeng");
+ system("touch /tmp/I_love_you_MengMeng");
FileInterface *file =
filesystem_.GetFile("/tmp/I_love_you_MengMeng");
EXPECT_TRUE(file != NULL);
EXPECT_EQ("I_love_you_MengMeng", file->GetName());
EXPECT_EQ("I_LOVE~1", file->GetShortName());
file->Destroy();
- std::system("rm -R /tmp/I_love_you_MengMeng");
+ system("rm -R /tmp/I_love_you_MengMeng");
}

// GGL_FileSystem_Test method GetShortName
@@ -192,27 +195,27 @@ TEST_F(FileTest, GetShortName_Accuracy_2) {
// GGL_FileSystem_Test method GetShortName
TEST_F(FileTest, GetShortName_Accuracy_3) {
EXPECT_TRUE(file_ != NULL);
- std::system("touch /tmp/I_love_you.txt");
+ system("touch /tmp/I_love_you.txt");
FileInterface *file =
filesystem_.GetFile("/tmp/I_love_you.txt");
EXPECT_TRUE(file != NULL);
EXPECT_EQ("I_love_you.txt", file->GetName());
EXPECT_EQ("I_LOVE~1.TXT", file->GetShortName());
file->Destroy();
- std::system("rm -R /tmp/I_love_you.txt");
+ system("rm -R /tmp/I_love_you.txt");
}

// GGL_FileSystem_Test method GetShortName
TEST_F(FileTest, GetShortName_Accuracy_4) {
EXPECT_TRUE(file_ != NULL);
- std::system("touch /tmp/I_love_you.txt1234");
+ system("touch /tmp/I_love_you.txt1234");
FileInterface *file =
filesystem_.GetFile("/tmp/I_love_you.txt1234");
EXPECT_TRUE(file != NULL);
EXPECT_EQ("I_love_you.txt1234", file->GetName());
EXPECT_EQ("I_LOVE~1.TXT", file->GetShortName());
file->Destroy();
- std::system("rm -R /tmp/I_love_you.txt1234");
+ system("rm -R /tmp/I_love_you.txt1234");
}


@@ -241,40 +244,40 @@ TEST_F(FileTest, GetAttributes_Accuracy_1) {

// GGL_FileSystem_Test method GetAttributes
TEST_F(FileTest, GetAttributes_Accuracy_2) {
- std::system("rm -R /tmp/.GGL_FileSystem_Test");
- std::system("touch /tmp/.GGL_FileSystem_Test");
+ system("rm -R /tmp/.GGL_FileSystem_Test");
+ system("touch /tmp/.GGL_FileSystem_Test");
FileInterface *file = filesystem_.GetFile("/tmp/.GGL_FileSystem_Test");
EXPECT_EQ(0, file->GetAttributes() & FILE_ATTR_DIRECTORY);
EXPECT_NE(0, file->GetAttributes() & FILE_ATTR_HIDDEN);
EXPECT_EQ(0, file->GetAttributes() & FILE_ATTR_READONLY);
file->Destroy();
- std::system("rm -R /tmp/.GGL_FileSystem_Test");
+ system("rm -R /tmp/.GGL_FileSystem_Test");
}

// GGL_FileSystem_Test method GetAttributes
TEST_F(FileTest, GetAttributes_Accuracy_3) {
- std::system("chmod -w /tmp/GGL_FileSystem_Test");
+ system("chmod -w /tmp/GGL_FileSystem_Test");
EXPECT_TRUE(file_ != NULL);
EXPECT_EQ(0, file_->GetAttributes() & FILE_ATTR_DIRECTORY);
EXPECT_EQ(0, file_->GetAttributes() & FILE_ATTR_HIDDEN);
EXPECT_NE(0, file_->GetAttributes() & FILE_ATTR_READONLY);
- std::system("chmod +w /tmp/GGL_FileSystem_Test");
- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("chmod +w /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// GGL_FileSystem_Test method GetAttributes
TEST_F(FileTest, GetAttributes_Accuracy_4) {
- std::system("rm -R /tmp/.GGL_FileSystem_Test");
- std::system("touch /tmp/.GGL_FileSystem_Test");
+ system("rm -R /tmp/.GGL_FileSystem_Test");
+ system("touch /tmp/.GGL_FileSystem_Test");
FileInterface *file = filesystem_.GetFile("/tmp/.GGL_FileSystem_Test");
- std::system("chmod -w /tmp/.GGL_FileSystem_Test");
+ system("chmod -w /tmp/.GGL_FileSystem_Test");
EXPECT_TRUE(file != NULL);
EXPECT_EQ(0, file->GetAttributes() & FILE_ATTR_DIRECTORY);
EXPECT_NE(0, file->GetAttributes() & FILE_ATTR_HIDDEN);
EXPECT_NE(0, file->GetAttributes() & FILE_ATTR_READONLY);
file->Destroy();
- std::system("chmod +w /tmp/.GGL_FileSystem_Test");
- std::system("rm -R /tmp/.GGL_FileSystem_Test");
+ system("chmod +w /tmp/.GGL_FileSystem_Test");
+ system("rm -R /tmp/.GGL_FileSystem_Test");
}


@@ -288,13 +291,13 @@ TEST_F(FileTest, SetAttributes_Accuracy_1) {
EXPECT_EQ(0, file_->GetAttributes() & FILE_ATTR_DIRECTORY);
EXPECT_EQ(0, file_->GetAttributes() & FILE_ATTR_HIDDEN);
EXPECT_NE(0, file_->GetAttributes() & FILE_ATTR_READONLY);
- std::system("chmod a+w /tmp/GGL_FileSystem_Test");
+ system("chmod a+w /tmp/GGL_FileSystem_Test");
}

// GGL_FileSystem_Test method SetAttributes
TEST_F(FileTest, SetAttributes_Accuracy_2) {
- std::system("chmod a+w /tmp/.GGL_FileSystem_Test");
- std::system("rm -R /tmp/.GGL_FileSystem_Test");
+ system("chmod a+w /tmp/.GGL_FileSystem_Test");
+ system("rm -R /tmp/.GGL_FileSystem_Test");
EXPECT_TRUE(file_ != NULL);
EXPECT_EQ(0, file_->GetAttributes() & FILE_ATTR_DIRECTORY);
EXPECT_EQ(0, file_->GetAttributes() & FILE_ATTR_HIDDEN);
@@ -304,13 +307,13 @@ TEST_F(FileTest, SetAttributes_Accuracy_2) {
EXPECT_NE(0, file_->GetAttributes() & FILE_ATTR_HIDDEN);
EXPECT_EQ(0, file_->GetAttributes() & FILE_ATTR_READONLY);
EXPECT_EQ(".GGL_FileSystem_Test", file_->GetName());
- std::system("rm -R /tmp/.GGL_FileSystem_Test");
+ system("rm -R /tmp/.GGL_FileSystem_Test");
}

// GGL_FileSystem_Test method SetAttributes
TEST_F(FileTest, SetAttributes_Accuracy_3) {
- std::system("chmod a+w /tmp/.GGL_FileSystem_Test");
- std::system("rm -R /tmp/.GGL_FileSystem_Test");
+ system("chmod a+w /tmp/.GGL_FileSystem_Test");
+ system("rm -R /tmp/.GGL_FileSystem_Test");
EXPECT_TRUE(file_ != NULL);
EXPECT_EQ(0, file_->GetAttributes() & FILE_ATTR_DIRECTORY);
EXPECT_EQ(0, file_->GetAttributes() & FILE_ATTR_HIDDEN);
@@ -321,8 +324,8 @@ TEST_F(FileTest, SetAttributes_Accuracy_3) {
EXPECT_NE(0, file_->GetAttributes() & FILE_ATTR_HIDDEN);
EXPECT_NE(0, file_->GetAttributes() & FILE_ATTR_READONLY);
EXPECT_EQ(".GGL_FileSystem_Test", file_->GetName());
- std::system("chmod a+w /tmp/.GGL_FileSystem_Test");
- std::system("rm -R /tmp/.GGL_FileSystem_Test");
+ system("chmod a+w /tmp/.GGL_FileSystem_Test");
+ system("rm -R /tmp/.GGL_FileSystem_Test");
}

// GGL_FileSystem_Test method SetAttributes with invalid input argument
@@ -362,13 +365,13 @@ TEST_F(FileTest, GetType1) {

// GGL_FileSystem_Test method GetType
TEST_F(FileTest, GetType2) {
- std::system("rm -R /tmp/file.cc");
- std::system("touch /tmp/file.cc");
+ system("rm -R /tmp/file.cc");
+ system("touch /tmp/file.cc");
FileInterface *file = filesystem_.GetFile("/tmp/file.cc");
EXPECT_TRUE(file != NULL);
EXPECT_EQ("cc", file->GetType());
file->Destroy();
- std::system("rm -R /tmp/file.cc");
+ system("rm -R /tmp/file.cc");
}


@@ -389,12 +392,12 @@ TEST_F(FileTest, GetSize1) {

// GGL_FileSystem_Test method GetSize
TEST_F(FileTest, GetSize2) {
- std::system("rm -R /tmp/file.cc");
- std::system("touch /tmp/file.cc");
+ system("rm -R /tmp/file.cc");
+ system("touch /tmp/file.cc");
FileInterface *file = filesystem_.GetFile("/tmp/file.cc");
EXPECT_EQ(0, file->GetSize());
file->Destroy();
- std::system("rm -R /tmp/file.cc");
+ system("rm -R /tmp/file.cc");
}


diff --git a/extensions/linux_system_framework/tests/filesystem_folder_test.cc b/extensions/linux_system_framework/tests/filesystem_folder_test.cc
index 497a358..17618fa 100644
--- a/extensions/linux_system_framework/tests/filesystem_folder_test.cc
+++ b/extensions/linux_system_framework/tests/filesystem_folder_test.cc
@@ -14,7 +14,10 @@
limitations under the License.
*/

-#include <stdio.h>
+#include <cstdio>
+#include <cstdlib>
+#include <unistd.h>
+#include <dirent.h>
#include "ggadget/common.h"
#include "ggadget/logger.h"
#include "unittest/gtest.h"
@@ -30,7 +33,7 @@ static const char *kTestDir = "/tmp/GGL_FileSystem_Test";
class FolderTest : public testing::Test {
protected:
virtual void SetUp() {
- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
folder_ = filesystem_.CreateFolder(kTestDir);
}

@@ -39,7 +42,7 @@ class FolderTest : public testing::Test {
folder_->Destroy();
folder_ = NULL;
}
- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

FileSystem filesystem_;
@@ -78,14 +81,14 @@ TEST_F(FolderTest, GetName) {

// GGL_FileSystem_Test method SetName
TEST_F(FolderTest, SetName_Accuracy) {
- std::system("rm -R /tmp/new_folder");
+ system("rm -R /tmp/new_folder");
EXPECT_TRUE(folder_ != NULL);
EXPECT_EQ("GGL_FileSystem_Test", folder_->GetName());
EXPECT_TRUE(folder_->SetName("new_folder"));
EXPECT_FALSE(filesystem_.FolderExists(kTestDir));
EXPECT_TRUE(filesystem_.FolderExists("/tmp/new_folder"));
EXPECT_EQ("new_folder", folder_->GetName());
- std::system("rm -R /tmp/new_folder");
+ system("rm -R /tmp/new_folder");
}

// GGL_FileSystem_Test method SetName with same name
@@ -121,7 +124,7 @@ TEST_F(FolderTest, GetShortPath_Accuracy_1) {
EXPECT_EQ("/tmp/I_love_you_MengMeng", folder->GetPath());
EXPECT_EQ("/tmp/I_LOVE~1", folder->GetShortPath());
folder->Destroy();
- std::system("rm -R /tmp/I_love_you_MengMeng");
+ system("rm -R /tmp/I_love_you_MengMeng");
}

// GGL_FileSystem_Test method GetShortPath
@@ -133,7 +136,7 @@ TEST_F(FolderTest, GetShortPath_Accuracy_2) {
EXPECT_EQ("/tmp/TestCase", folder->GetPath());
EXPECT_EQ("/tmp/TESTCASE", folder->GetShortPath());
folder->Destroy();
- std::system("rm -R /tmp/TestCase");
+ system("rm -R /tmp/TestCase");
}


@@ -145,7 +148,7 @@ TEST_F(FolderTest, GetShortName_Accuracy_1) {
EXPECT_EQ("I_love_you_MengMeng", folder->GetName());
EXPECT_EQ("I_LOVE~1", folder->GetShortName());
folder->Destroy();
- std::system("rm -R /tmp/I_love_you_MengMeng");
+ system("rm -R /tmp/I_love_you_MengMeng");
}

// GGL_FileSystem_Test method GetShortName
@@ -191,38 +194,38 @@ TEST_F(FolderTest, GetAttributes_Accuracy_1) {

// GGL_FileSystem_Test method GetAttributes
TEST_F(FolderTest, GetAttributes_Accuracy_2) {
- std::system("rm -R /tmp/.GGL_FileSystem_Test");
+ system("rm -R /tmp/.GGL_FileSystem_Test");
FolderInterface *folder = filesystem_.CreateFolder("/tmp/.GGL_FileSystem_Test");
EXPECT_NE(0, folder->GetAttributes() & FILE_ATTR_DIRECTORY);
EXPECT_NE(0, folder->GetAttributes() & FILE_ATTR_HIDDEN);
EXPECT_EQ(0, folder->GetAttributes() & FILE_ATTR_READONLY);
folder->Destroy();
- std::system("rm -R /tmp/.GGL_FileSystem_Test");
+ system("rm -R /tmp/.GGL_FileSystem_Test");
}

// GGL_FileSystem_Test method GetAttributes
TEST_F(FolderTest, GetAttributes_Accuracy_3) {
- std::system("chmod -w /tmp/GGL_FileSystem_Test");
+ system("chmod -w /tmp/GGL_FileSystem_Test");
EXPECT_TRUE(folder_ != NULL);
EXPECT_NE(0, folder_->GetAttributes() & FILE_ATTR_DIRECTORY);
EXPECT_EQ(0, folder_->GetAttributes() & FILE_ATTR_HIDDEN);
EXPECT_NE(0, folder_->GetAttributes() & FILE_ATTR_READONLY);
- std::system("chmod +w /tmp/GGL_FileSystem_Test");
- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("chmod +w /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// GGL_FileSystem_Test method GetAttributes
TEST_F(FolderTest, GetAttributes_Accuracy_4) {
- std::system("rm -R /tmp/.GGL_FileSystem_Test");
+ system("rm -R /tmp/.GGL_FileSystem_Test");
FolderInterface *folder = filesystem_.CreateFolder("/tmp/.GGL_FileSystem_Test");
- std::system("chmod -w /tmp/.GGL_FileSystem_Test");
+ system("chmod -w /tmp/.GGL_FileSystem_Test");
EXPECT_TRUE(folder != NULL);
EXPECT_NE(0, folder->GetAttributes() & FILE_ATTR_DIRECTORY);
EXPECT_NE(0, folder->GetAttributes() & FILE_ATTR_HIDDEN);
EXPECT_NE(0, folder->GetAttributes() & FILE_ATTR_READONLY);
folder->Destroy();
- std::system("chmod +w /tmp/.GGL_FileSystem_Test");
- std::system("rm -R /tmp/.GGL_FileSystem_Test");
+ system("chmod +w /tmp/.GGL_FileSystem_Test");
+ system("rm -R /tmp/.GGL_FileSystem_Test");
}


@@ -236,13 +239,13 @@ TEST_F(FolderTest, SetAttributes_Accuracy_1) {
EXPECT_NE(0, folder_->GetAttributes() & FILE_ATTR_DIRECTORY);
EXPECT_EQ(0, folder_->GetAttributes() & FILE_ATTR_HIDDEN);
EXPECT_NE(0, folder_->GetAttributes() & FILE_ATTR_READONLY);
- std::system("chmod a+w /tmp/GGL_FileSystem_Test");
+ system("chmod a+w /tmp/GGL_FileSystem_Test");
}

// GGL_FileSystem_Test method SetAttributes
TEST_F(FolderTest, SetAttributes_Accuracy_2) {
- std::system("chmod a+w /tmp/.GGL_FileSystem_Test");
- std::system("rm -R /tmp/.GGL_FileSystem_Test");
+ system("chmod a+w /tmp/.GGL_FileSystem_Test");
+ system("rm -R /tmp/.GGL_FileSystem_Test");
EXPECT_TRUE(folder_ != NULL);
EXPECT_NE(0, folder_->GetAttributes() & FILE_ATTR_DIRECTORY);
EXPECT_EQ(0, folder_->GetAttributes() & FILE_ATTR_HIDDEN);
@@ -252,13 +255,13 @@ TEST_F(FolderTest, SetAttributes_Accuracy_2) {
EXPECT_NE(0, folder_->GetAttributes() & FILE_ATTR_HIDDEN);
EXPECT_EQ(0, folder_->GetAttributes() & FILE_ATTR_READONLY);
EXPECT_EQ(".GGL_FileSystem_Test", folder_->GetName());
- std::system("rm -R /tmp/.GGL_FileSystem_Test");
+ system("rm -R /tmp/.GGL_FileSystem_Test");
}

// GGL_FileSystem_Test method SetAttributes
TEST_F(FolderTest, SetAttributes_Accuracy_3) {
- std::system("chmod a+w /tmp/.GGL_FileSystem_Test");
- std::system("rm -R /tmp/.GGL_FileSystem_Test");
+ system("chmod a+w /tmp/.GGL_FileSystem_Test");
+ system("rm -R /tmp/.GGL_FileSystem_Test");
EXPECT_TRUE(folder_ != NULL);
EXPECT_NE(0, folder_->GetAttributes() & FILE_ATTR_DIRECTORY);
EXPECT_EQ(0, folder_->GetAttributes() & FILE_ATTR_HIDDEN);
@@ -269,8 +272,8 @@ TEST_F(FolderTest, SetAttributes_Accuracy_3) {
EXPECT_NE(0, folder_->GetAttributes() & FILE_ATTR_HIDDEN);
EXPECT_NE(0, folder_->GetAttributes() & FILE_ATTR_READONLY);
EXPECT_EQ(".GGL_FileSystem_Test", folder_->GetName());
- std::system("chmod a+w /tmp/.GGL_FileSystem_Test");
- std::system("rm -R /tmp/.GGL_FileSystem_Test");
+ system("chmod a+w /tmp/.GGL_FileSystem_Test");
+ system("rm -R /tmp/.GGL_FileSystem_Test");
}

// GGL_FileSystem_Test method SetAttributes with invalid input argument
@@ -336,25 +339,25 @@ TEST_F(FolderTest, IsRootFolder2) {
// GGL_FileSystem_Test method GetSize
TEST_F(FolderTest, GetSize1) {
EXPECT_TRUE(folder_ != NULL);
- std::system("touch /tmp/GGL_FileSystem_Test/file.cc");
- std::system("echo -n \"12345\" > /tmp/GGL_FileSystem_Test/file.cc");
+ system("touch /tmp/GGL_FileSystem_Test/file.cc");
+ system("echo -n \"12345\" > /tmp/GGL_FileSystem_Test/file.cc");
EXPECT_EQ(4096 + 5, folder_->GetSize());
}

// GGL_FileSystem_Test method GetSize
TEST_F(FolderTest, GetSize2) {
EXPECT_TRUE(folder_ != NULL);
- std::system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
+ system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
EXPECT_EQ(4096 * 2, folder_->GetSize());
}

// GGL_FileSystem_Test method GetSize
TEST_F(FolderTest, GetSize3) {
EXPECT_TRUE(folder_ != NULL);
- std::system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
- std::system("touch /tmp/GGL_FileSystem_Test/file.cc");
- std::system("echo -n \"12345\" > /tmp/GGL_FileSystem_Test/file.cc");
- std::system("touch /tmp/GGL_FileSystem_Test/subfolder/subfile");
+ system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
+ system("touch /tmp/GGL_FileSystem_Test/file.cc");
+ system("echo -n \"12345\" > /tmp/GGL_FileSystem_Test/file.cc");
+ system("touch /tmp/GGL_FileSystem_Test/subfolder/subfile");
EXPECT_EQ(4096 * 2 + 5 + 0, folder_->GetSize());
}

@@ -378,9 +381,9 @@ TEST_F(FolderTest, GetSubFolders_Empty) {
// GGL_FileSystem_Test method GetSubFolders
TEST_F(FolderTest, GetSubFolders1) {
EXPECT_TRUE(folder_ != NULL);
- std::system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
- std::system("touch /tmp/GGL_FileSystem_Test/file.cc");
- std::system("echo -n \"12345\" > /tmp/GGL_FileSystem_Test/file.cc");
+ system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
+ system("touch /tmp/GGL_FileSystem_Test/file.cc");
+ system("echo -n \"12345\" > /tmp/GGL_FileSystem_Test/file.cc");
FoldersInterface *subfolders = folder_->GetSubFolders();
EXPECT_TRUE(subfolders != NULL);
EXPECT_EQ(1, subfolders->GetCount());
@@ -397,11 +400,11 @@ TEST_F(FolderTest, GetSubFolders1) {
// TODO: check whether count of subfolders is 2 under windows
TEST_F(FolderTest, GetSubFolders2) {
EXPECT_TRUE(folder_ != NULL);
- std::system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
- std::system("touch /tmp/GGL_FileSystem_Test/file.cc");
- std::system("echo -n \"12345\" > /tmp/GGL_FileSystem_Test/file.cc");
- std::system("mkdir /tmp/GGL_FileSystem_Test/subfolder/subsubfolder");
- std::system("touch /tmp/GGL_FileSystem_Test/subfolder/subsubfolder/subsubfile");
+ system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
+ system("touch /tmp/GGL_FileSystem_Test/file.cc");
+ system("echo -n \"12345\" > /tmp/GGL_FileSystem_Test/file.cc");
+ system("mkdir /tmp/GGL_FileSystem_Test/subfolder/subsubfolder");
+ system("touch /tmp/GGL_FileSystem_Test/subfolder/subsubfolder/subsubfile");
FoldersInterface *subfolders = folder_->GetSubFolders();
EXPECT_TRUE(subfolders != NULL);
EXPECT_EQ(2, subfolders->GetCount());
@@ -433,9 +436,9 @@ TEST_F(FolderTest, GetFiles_Empty) {
// GGL_FileSystem_Test method GetFiles
TEST_F(FolderTest, GetFiles1) {
EXPECT_TRUE(folder_ != NULL);
- std::system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
- std::system("touch /tmp/GGL_FileSystem_Test/file.cc");
- std::system("echo -n \"12345\" > /tmp/GGL_FileSystem_Test/file.cc");
+ system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
+ system("touch /tmp/GGL_FileSystem_Test/file.cc");
+ system("echo -n \"12345\" > /tmp/GGL_FileSystem_Test/file.cc");
FilesInterface *files = folder_->GetFiles();
EXPECT_TRUE(files != NULL);
EXPECT_EQ(1, files->GetCount());
@@ -453,11 +456,11 @@ TEST_F(FolderTest, GetFiles1) {
// TODO: check whether count of files is 2 under windows
TEST_F(FolderTest, GetFiles2) {
EXPECT_TRUE(folder_ != NULL);
- std::system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
- std::system("touch /tmp/GGL_FileSystem_Test/file.cc");
- std::system("echo -n \"12345\" > /tmp/GGL_FileSystem_Test/file.cc");
- std::system("mkdir /tmp/GGL_FileSystem_Test/subfolder/subsubfolder");
- std::system("touch /tmp/GGL_FileSystem_Test/subfolder/subsubfolder/subsubfile");
+ system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
+ system("touch /tmp/GGL_FileSystem_Test/file.cc");
+ system("echo -n \"12345\" > /tmp/GGL_FileSystem_Test/file.cc");
+ system("mkdir /tmp/GGL_FileSystem_Test/subfolder/subsubfolder");
+ system("touch /tmp/GGL_FileSystem_Test/subfolder/subsubfolder/subsubfile");
FilesInterface *files = folder_->GetFiles();
EXPECT_TRUE(files != NULL);
EXPECT_EQ(2, files->GetCount());
@@ -474,9 +477,9 @@ TEST_F(FolderTest, GetFiles2) {
// GGL_FileSystem_Test method CreateTextFile with relative path
TEST_F(FolderTest, CreateTextFile_Accuracy1) {
EXPECT_TRUE(folder_ != NULL);
- std::system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
- std::system("touch /tmp/GGL_FileSystem_Test/file.cc");
- std::system("echo -n \"12345\" > /tmp/GGL_FileSystem_Test/file.cc");
+ system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
+ system("touch /tmp/GGL_FileSystem_Test/file.cc");
+ system("echo -n \"12345\" > /tmp/GGL_FileSystem_Test/file.cc");
TextStreamInterface *text = folder_->CreateTextFile("file.cc", false, false);
EXPECT_TRUE(text != NULL);
EXPECT_EQ("12345", text->ReadAll());
@@ -487,9 +490,9 @@ TEST_F(FolderTest, CreateTextFile_Accuracy1) {
// GGL_FileSystem_Test method CreateTextFile with absolute path
TEST_F(FolderTest, CreateTextFile_Accuracy2) {
EXPECT_TRUE(folder_ != NULL);
- std::system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
- std::system("touch /tmp/GGL_FileSystem_Test/file.cc");
- std::system("echo -n \"12345\" > /tmp/GGL_FileSystem_Test/file.cc");
+ system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
+ system("touch /tmp/GGL_FileSystem_Test/file.cc");
+ system("echo -n \"12345\" > /tmp/GGL_FileSystem_Test/file.cc");
TextStreamInterface *text = folder_->CreateTextFile("/tmp/GGL_FileSystem_Test/file.cc",
false,
false);
@@ -502,8 +505,8 @@ TEST_F(FolderTest, CreateTextFile_Accuracy2) {
// GGL_FileSystem_Test method CreateTextFile with empty file
TEST_F(FolderTest, CreateTextFile_Accuracy3) {
EXPECT_TRUE(folder_ != NULL);
- std::system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
- std::system("touch /tmp/GGL_FileSystem_Test/file.cc");
+ system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
+ system("touch /tmp/GGL_FileSystem_Test/file.cc");
TextStreamInterface *text = folder_->CreateTextFile("file.cc",
false,
false);
@@ -516,9 +519,9 @@ TEST_F(FolderTest, CreateTextFile_Accuracy3) {
// GGL_FileSystem_Test method CreateTextFile with absolute path
TEST_F(FolderTest, CreateTextFile_Accuracy4) {
EXPECT_TRUE(folder_ != NULL);
- std::system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
- std::system("touch /tmp/GGL_FileSystem_Test/file.cc");
- std::system("echo -n \"12345\" > /tmp/GGL_FileSystem_Test/file.cc");
+ system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
+ system("touch /tmp/GGL_FileSystem_Test/file.cc");
+ system("echo -n \"12345\" > /tmp/GGL_FileSystem_Test/file.cc");
TextStreamInterface *text = folder_->CreateTextFile("\\tmp\\GGL_FileSystem_Test\\file.cc",
false,
false);
diff --git a/extensions/linux_system_framework/tests/filesystem_test.cc b/extensions/linux_system_framework/tests/filesystem_test.cc
index 89fec73..4ff6f06 100644
--- a/extensions/linux_system_framework/tests/filesystem_test.cc
+++ b/extensions/linux_system_framework/tests/filesystem_test.cc
@@ -14,7 +14,10 @@
limitations under the License.
*/

-#include <stdio.h>
+#include <cstdio>
+#include <cstdlib>
+#include <unistd.h>
+#include <dirent.h>
#include <ggadget/common.h>
#include <ggadget/logger.h>
#include <unittest/gtest.h>
@@ -429,22 +432,22 @@ TEST(FileSystem, DriveExists) {
// test method FileExists
TEST(FileSystem, FileExists_Accuracy1) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test");
- std::system("touch /tmp/GGL_FileSystem_Test/file.cc");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
+ system("touch /tmp/GGL_FileSystem_Test/file.cc");
EXPECT_TRUE(filesystem.FileExists("/tmp/GGL_FileSystem_Test/file.cc"));
EXPECT_TRUE(filesystem.FileExists("\\tmp\\GGL_FileSystem_Test\\file.cc"));
EXPECT_FALSE(filesystem.FileExists("/tmp/GGL_FileSystem_Test/invalid.cc"));
- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// if the target is not a file, it should return false
TEST(FileSystem, FileExists_Accuracy2) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
EXPECT_FALSE(filesystem.FileExists(kTestDir));
- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// tests with NULL argument
@@ -464,19 +467,19 @@ TEST(FileSystem, FileExists_Failure2) {
// test method FolderExists
TEST(FileSystem, FolderExists_Accuracy1) {
FileSystem filesystem;
- std::system("mkdir /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
EXPECT_TRUE(filesystem.FolderExists(kTestDir));
EXPECT_FALSE(filesystem.FolderExists("/tmp/jfsj213132dlksf"));
- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// if the target is not a folder, it should return false
TEST(FileSystem, FolderExists_Accuracy2) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("touch /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("touch /tmp/GGL_FileSystem_Test");
EXPECT_FALSE(filesystem.FolderExists(kTestDir));
- std::system("rm /tmp/GGL_FileSystem_Test");
+ system("rm /tmp/GGL_FileSystem_Test");
}

// tests with NULL argument
@@ -505,17 +508,17 @@ TEST(FileSystem, GetFile_Accuracy1) {
FileSystem filesystem;
EXPECT_TRUE(filesystem.GetFile("/") == NULL);

- std::system("touch /tmp/GGL_FileSystem_Test");
+ system("touch /tmp/GGL_FileSystem_Test");
EXPECT_TRUE(filesystem.GetFile(kTestDir) != NULL);
EXPECT_TRUE(filesystem.GetFile("\\tmp\\GGL_FileSystem_Test") != NULL);
- std::system("rm /tmp/GGL_FileSystem_Test");
+ system("rm /tmp/GGL_FileSystem_Test");
}

// test method GetFile with non-existing file
TEST(FileSystem, GetFile_Accuracy2) {
FileSystem filesystem;

- std::system("rm /tmp/no_exist_file");
+ system("rm /tmp/no_exist_file");
EXPECT_TRUE(filesystem.GetFile("/tmp/no_exist_file") == NULL);
EXPECT_TRUE(filesystem.GetFile("\\tmp\\no_exist_file") == NULL);
}
@@ -524,23 +527,23 @@ TEST(FileSystem, GetFile_Accuracy2) {
TEST(FileSystem, GetFile_Accuracy3) {
FileSystem filesystem;

- std::system("mkdir /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
EXPECT_TRUE(filesystem.GetFile(kTestDir) == NULL);
EXPECT_TRUE(filesystem.GetFile("\\tmp\\GGL_FileSystem_Test") == NULL);
- std::system("rm -r /tmp/GGL_FileSystem_Test");
+ system("rm -r /tmp/GGL_FileSystem_Test");
}

// test whether the FileInterface contains correct information
TEST(FileSystem, GetFile_Accuracy4) {
FileSystem filesystem;

- std::system("touch /tmp/GGL_FileSystem_Test");
+ system("touch /tmp/GGL_FileSystem_Test");
EXPECT_TRUE(filesystem.GetFile(kTestDir) != NULL);

FileInterface *file = filesystem.GetFile(kTestDir);
EXPECT_TRUE(file->GetPath() == kTestDir);

- std::system("rm /tmp/GGL_FileSystem_Test");
+ system("rm /tmp/GGL_FileSystem_Test");
}

// tests with NULL argument
@@ -562,17 +565,17 @@ TEST(FileSystem, GetFolder_Accuracy1) {
FileSystem filesystem;
EXPECT_TRUE(filesystem.GetFolder("/") != NULL);

- std::system("mkdir /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
EXPECT_TRUE(filesystem.GetFolder(kTestDir) != NULL);
EXPECT_TRUE(filesystem.GetFolder("\\tmp\\GGL_FileSystem_Test") != NULL);
- std::system("rm -r /tmp/GGL_FileSystem_Test");
+ system("rm -r /tmp/GGL_FileSystem_Test");
}

// test method GetFolder with non-existing file
TEST(FileSystem, GetFolder_Accuracy2) {
FileSystem filesystem;

- std::system("rm -r /tmp/no_exist_folder");
+ system("rm -r /tmp/no_exist_folder");
EXPECT_TRUE(filesystem.GetFolder("/tmp/no_exist_folder") == NULL);
EXPECT_TRUE(filesystem.GetFolder("\\tmp\\no_exist_folder") == NULL);
}
@@ -581,23 +584,23 @@ TEST(FileSystem, GetFolder_Accuracy2) {
TEST(FileSystem, GetFolder_Accuracy3) {
FileSystem filesystem;

- std::system("touch /tmp/GGL_FileSystem_Test");
+ system("touch /tmp/GGL_FileSystem_Test");
EXPECT_TRUE(filesystem.GetFolder(kTestDir) == NULL);
EXPECT_TRUE(filesystem.GetFolder("\\tmp\\GGL_FileSystem_Test") == NULL);
- std::system("rm /tmp/GGL_FileSystem_Test");
+ system("rm /tmp/GGL_FileSystem_Test");
}

// test whether the FolderInterface contains correct information
TEST(FileSystem, GetFolder_Accuracy4) {
FileSystem filesystem;

- std::system("mkdir /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
EXPECT_TRUE(filesystem.GetFolder(kTestDir) != NULL);

FolderInterface *folder = filesystem.GetFolder(kTestDir);
EXPECT_TRUE(folder->GetPath() == kTestDir);

- std::system("rm -r /tmp/GGL_FileSystem_Test");
+ system("rm -r /tmp/GGL_FileSystem_Test");
}

// tests with NULL argument
@@ -625,34 +628,34 @@ TEST(FileSystem, GetSpecialFolder) {
// test method DeleteFile with existing file
TEST(FileSystem, DeleteFile_Accuracy_ExistingFile_1) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("touch /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("touch /tmp/GGL_FileSystem_Test");
EXPECT_TRUE(filesystem.FileExists(kTestDir));

EXPECT_TRUE(filesystem.DeleteFile(kTestDir, true));

EXPECT_FALSE(filesystem.FileExists(kTestDir));
- std::system("rm /tmp/GGL_FileSystem_Test");
+ system("rm /tmp/GGL_FileSystem_Test");
}

// test method DeleteFile with existing file
TEST(FileSystem, DeleteFile_Accuracy_ExistingFile_2) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("touch /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("touch /tmp/GGL_FileSystem_Test");
EXPECT_TRUE(filesystem.FileExists(kTestDir));

EXPECT_TRUE(filesystem.DeleteFile("\\tmp\\GGL_FileSystem_Test", true));

EXPECT_FALSE(filesystem.FileExists(kTestDir));
- std::system("rm /tmp/GGL_FileSystem_Test");
+ system("rm /tmp/GGL_FileSystem_Test");
}

// test method DeleteFile with non-existing file
TEST(FileSystem, DeleteFile_Accuracy_NonExistingFile_1) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("rm /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm /tmp/GGL_FileSystem_Test");
EXPECT_FALSE(filesystem.FileExists(kTestDir));
EXPECT_FALSE(filesystem.DeleteFile(kTestDir, true));
}
@@ -660,8 +663,8 @@ TEST(FileSystem, DeleteFile_Accuracy_NonExistingFile_1) {
// test method DeleteFile with non-existing file
TEST(FileSystem, DeleteFile_Accuracy_NonExistingFile_2) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("rm /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm /tmp/GGL_FileSystem_Test");
EXPECT_FALSE(filesystem.FileExists(kTestDir));
EXPECT_FALSE(filesystem.DeleteFile("\\tmp\\GGL_FileSystem_Test", true));
}
@@ -669,19 +672,19 @@ TEST(FileSystem, DeleteFile_Accuracy_NonExistingFile_2) {
// test method DeleteFile with existing folder
TEST(FileSystem, DeleteFile_Accuracy_ExistingFolder_1) {
FileSystem filesystem;
- std::system("mkdir /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
EXPECT_FALSE(filesystem.FileExists(kTestDir));
EXPECT_FALSE(filesystem.DeleteFile(kTestDir, true));
- std::system("rm -r /tmp/GGL_FileSystem_Test");
+ system("rm -r /tmp/GGL_FileSystem_Test");
}

// test method DeleteFile with existing folder
TEST(FileSystem, DeleteFile_Accuracy_ExistingFolder_2) {
FileSystem filesystem;
- std::system("mkdir /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
EXPECT_FALSE(filesystem.FileExists(kTestDir));
EXPECT_FALSE(filesystem.DeleteFile("\\tmp\\GGL_FileSystem_Test", true));
- std::system("rm -r /tmp/GGL_FileSystem_Test");
+ system("rm -r /tmp/GGL_FileSystem_Test");
}

// test with NULL argument
@@ -701,34 +704,34 @@ TEST(FileSystem, DeleteFile_Failure2) {
// test method DeleteFolder with existing folder
TEST(FileSystem, DeleteFolder_Accuracy_ExistingFolder_1) {
FileSystem filesystem;
- std::system("rm /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test");
+ system("rm /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
EXPECT_TRUE(filesystem.FolderExists(kTestDir));

EXPECT_TRUE(filesystem.DeleteFolder(kTestDir, true));

EXPECT_FALSE(filesystem.FolderExists(kTestDir));
- std::system("rm /tmp/GGL_FileSystem_Test");
+ system("rm /tmp/GGL_FileSystem_Test");
}

// test method DeleteFolder with existing folder
TEST(FileSystem, DeleteFolder_Accuracy_ExistingFolder_2) {
FileSystem filesystem;
- std::system("rm /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test");
+ system("rm /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
EXPECT_TRUE(filesystem.FolderExists(kTestDir));

EXPECT_TRUE(filesystem.DeleteFolder("\\tmp\\GGL_FileSystem_Test", true));

EXPECT_FALSE(filesystem.FolderExists(kTestDir));
- std::system("rm /tmp/GGL_FileSystem_Test");
+ system("rm /tmp/GGL_FileSystem_Test");
}

// test method DeleteFolder with non-existing file
TEST(FileSystem, DeleteFolder_Accuracy_NonExistingFile_1) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("rm /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm /tmp/GGL_FileSystem_Test");
EXPECT_FALSE(filesystem.FolderExists(kTestDir));
EXPECT_FALSE(filesystem.DeleteFolder(kTestDir, true));
}
@@ -736,8 +739,8 @@ TEST(FileSystem, DeleteFolder_Accuracy_NonExistingFile_1) {
// test method DeleteFolder with non-existing file
TEST(FileSystem, DeleteFolder_Accuracy_NonExistingFile_2) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("rm /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm /tmp/GGL_FileSystem_Test");
EXPECT_FALSE(filesystem.FolderExists(kTestDir));
EXPECT_FALSE(filesystem.DeleteFolder("\\tmp\\GGL_FileSystem_Test", true));
}
@@ -745,21 +748,21 @@ TEST(FileSystem, DeleteFolder_Accuracy_NonExistingFile_2) {
// test method DeleteFolder with existing file
TEST(FileSystem, DeleteFolder_Accuracy_ExistingFile_1) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("touch /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("touch /tmp/GGL_FileSystem_Test");
EXPECT_TRUE(filesystem.FileExists(kTestDir));
EXPECT_FALSE(filesystem.DeleteFolder(kTestDir, true));
- std::system("rm /tmp/GGL_FileSystem_Test");
+ system("rm /tmp/GGL_FileSystem_Test");
}

// test method DeleteFolder with existing file
TEST(FileSystem, DeleteFolder_Accuracy_ExistingFile_2) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("touch /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("touch /tmp/GGL_FileSystem_Test");
EXPECT_TRUE(filesystem.FileExists(kTestDir));
EXPECT_FALSE(filesystem.DeleteFolder("\\tmp\\GGL_FileSystem_Test", true));
- std::system("rm /tmp/GGL_FileSystem_Test");
+ system("rm /tmp/GGL_FileSystem_Test");
}

// test with NULL argument
@@ -780,11 +783,11 @@ TEST(FileSystem, DeleteFolder_Failure2) {
// test method MoveFile with existing file
TEST(FileSystem, MoveFile_Accuracy_ExistingFile_1) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test");
- std::system("touch /tmp/GGL_FileSystem_Test/file1");
- std::system("echo -n \"sample content\" > /tmp/GGL_FileSystem_Test/file1");
- std::system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
+ system("touch /tmp/GGL_FileSystem_Test/file1");
+ system("echo -n \"sample content\" > /tmp/GGL_FileSystem_Test/file1");
+ system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
EXPECT_TRUE(filesystem.FileExists("/tmp/GGL_FileSystem_Test/file1"));
EXPECT_TRUE(filesystem.FolderExists("/tmp/GGL_FileSystem_Test/subfolder"));

@@ -796,17 +799,17 @@ TEST(FileSystem, MoveFile_Accuracy_ExistingFile_1) {
EXPECT_TRUE(
filesystem.FileExists("/tmp/GGL_FileSystem_Test/subfolder/file1"));

- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test method MoveFile with existing file
TEST(FileSystem, MoveFile_Accuracy_ExistingFile_2) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test");
- std::system("touch /tmp/GGL_FileSystem_Test/file1");
- std::system("echo -n \"sample content\" > /tmp/GGL_FileSystem_Test/file1");
- std::system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
+ system("touch /tmp/GGL_FileSystem_Test/file1");
+ system("echo -n \"sample content\" > /tmp/GGL_FileSystem_Test/file1");
+ system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
EXPECT_TRUE(filesystem.FileExists("/tmp/GGL_FileSystem_Test/file1"));
EXPECT_TRUE(filesystem.FolderExists("/tmp/GGL_FileSystem_Test/subfolder"));

@@ -818,18 +821,18 @@ TEST(FileSystem, MoveFile_Accuracy_ExistingFile_2) {
EXPECT_TRUE(
filesystem.FileExists("/tmp/GGL_FileSystem_Test/subfolder/file1"));

- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}


// test method MoveFile with existing file
TEST(FileSystem, MoveFile_Accuracy_ExistingFile_3) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test");
- std::system("touch /tmp/GGL_FileSystem_Test/file1");
- std::system("echo -n \"sample content\" > /tmp/GGL_FileSystem_Test/file1");
- std::system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
+ system("touch /tmp/GGL_FileSystem_Test/file1");
+ system("echo -n \"sample content\" > /tmp/GGL_FileSystem_Test/file1");
+ system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
EXPECT_TRUE(filesystem.FileExists("/tmp/GGL_FileSystem_Test/file1"));
EXPECT_TRUE(filesystem.FolderExists("/tmp/GGL_FileSystem_Test/subfolder"));

@@ -841,18 +844,18 @@ TEST(FileSystem, MoveFile_Accuracy_ExistingFile_3) {
EXPECT_TRUE(
filesystem.FileExists("/tmp/file1"));

- std::system("rm -R /tmp/file1");
- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/file1");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test method MoveFile with existing file
TEST(FileSystem, MoveFile_Accuracy_ExistingFile_4) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test");
- std::system("touch /tmp/GGL_FileSystem_Test/file1");
- std::system("echo -n \"sample content\" > /tmp/GGL_FileSystem_Test/file1");
- std::system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
+ system("touch /tmp/GGL_FileSystem_Test/file1");
+ system("echo -n \"sample content\" > /tmp/GGL_FileSystem_Test/file1");
+ system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
EXPECT_TRUE(filesystem.FileExists("/tmp/GGL_FileSystem_Test/file1"));
EXPECT_TRUE(filesystem.FolderExists("/tmp/GGL_FileSystem_Test/subfolder"));

@@ -864,16 +867,16 @@ TEST(FileSystem, MoveFile_Accuracy_ExistingFile_4) {
EXPECT_TRUE(
filesystem.FileExists("/tmp/file1"));

- std::system("rm -R /tmp/file1");
- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/file1");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test method MoveFile with non-existing file
TEST(FileSystem, MoveFile_Accuracy_NonExistingFile_1) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
EXPECT_FALSE(filesystem.FileExists("/tmp/GGL_FileSystem_Test/file1"));
EXPECT_TRUE(filesystem.FolderExists("/tmp/GGL_FileSystem_Test/subfolder"));

@@ -882,15 +885,15 @@ TEST(FileSystem, MoveFile_Accuracy_NonExistingFile_1) {

EXPECT_FALSE(result);

- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test method MoveFile with non-existing file
TEST(FileSystem, MoveFile_Accuracy_NonExistingFile_2) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
EXPECT_FALSE(filesystem.FileExists("/tmp/GGL_FileSystem_Test/file1"));
EXPECT_TRUE(filesystem.FolderExists("/tmp/GGL_FileSystem_Test/subfolder"));

@@ -899,15 +902,15 @@ TEST(FileSystem, MoveFile_Accuracy_NonExistingFile_2) {

EXPECT_FALSE(result);

- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test method MoveFile with non-existing folder
TEST(FileSystem, MoveFile_Accuracy_NonExistingFolder_1) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
EXPECT_TRUE(filesystem.FolderExists("/tmp/GGL_FileSystem_Test/subfolder"));

bool result = filesystem.MoveFile("/tmp/GGL_FileSystem_Test/subfolder",
@@ -915,15 +918,15 @@ TEST(FileSystem, MoveFile_Accuracy_NonExistingFolder_1) {

EXPECT_FALSE(result);

- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test method MoveFile with non-existing folder
TEST(FileSystem, MoveFile_Accuracy_NonExistingFolder_2) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
EXPECT_TRUE(filesystem.FolderExists("/tmp/GGL_FileSystem_Test/subfolder"));

bool result = filesystem.MoveFile("\\tmp/GGL_FileSystem_Test\\subfolder",
@@ -931,7 +934,7 @@ TEST(FileSystem, MoveFile_Accuracy_NonExistingFolder_2) {

EXPECT_FALSE(result);

- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test with NULL argument
@@ -952,11 +955,11 @@ TEST(FileSystem, MoveFile_Failure2) {
// test method MoveFolder with existing file
TEST(FileSystem, MoveFolder_Accuracy_ExistingFile_1) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test");
- std::system("touch /tmp/GGL_FileSystem_Test/file1");
- std::system("echo -n \"sample content\" > /tmp/GGL_FileSystem_Test/file1");
- std::system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
+ system("touch /tmp/GGL_FileSystem_Test/file1");
+ system("echo -n \"sample content\" > /tmp/GGL_FileSystem_Test/file1");
+ system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
EXPECT_TRUE(filesystem.FileExists("/tmp/GGL_FileSystem_Test/file1"));
EXPECT_TRUE(filesystem.FolderExists("/tmp/GGL_FileSystem_Test/subfolder"));

@@ -966,17 +969,17 @@ TEST(FileSystem, MoveFolder_Accuracy_ExistingFile_1) {
EXPECT_FALSE(result);
EXPECT_TRUE(filesystem.FileExists("/tmp/GGL_FileSystem_Test/file1"));

- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test method MoveFolder with existing file
TEST(FileSystem, MoveFolder_Accuracy_ExistingFile_2) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test");
- std::system("touch /tmp/GGL_FileSystem_Test/file1");
- std::system("echo -n \"sample content\" > /tmp/GGL_FileSystem_Test/file1");
- std::system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
+ system("touch /tmp/GGL_FileSystem_Test/file1");
+ system("echo -n \"sample content\" > /tmp/GGL_FileSystem_Test/file1");
+ system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
EXPECT_TRUE(filesystem.FileExists("/tmp/GGL_FileSystem_Test/file1"));
EXPECT_TRUE(filesystem.FolderExists("/tmp/GGL_FileSystem_Test/subfolder"));

@@ -986,17 +989,17 @@ TEST(FileSystem, MoveFolder_Accuracy_ExistingFile_2) {
EXPECT_FALSE(result);
EXPECT_TRUE(filesystem.FileExists("/tmp/GGL_FileSystem_Test/file1"));

- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test method MoveFolder with existing file
TEST(FileSystem, MoveFolder_Accuracy_ExistingFile_3) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test");
- std::system("touch /tmp/GGL_FileSystem_Test/file1");
- std::system("echo -n \"sample content\" > /tmp/GGL_FileSystem_Test/file1");
- std::system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
+ system("touch /tmp/GGL_FileSystem_Test/file1");
+ system("echo -n \"sample content\" > /tmp/GGL_FileSystem_Test/file1");
+ system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
EXPECT_TRUE(filesystem.FileExists("/tmp/GGL_FileSystem_Test/file1"));
EXPECT_TRUE(filesystem.FolderExists("/tmp/GGL_FileSystem_Test/subfolder"));

@@ -1006,18 +1009,18 @@ TEST(FileSystem, MoveFolder_Accuracy_ExistingFile_3) {
EXPECT_FALSE(result);
EXPECT_TRUE(filesystem.FileExists("/tmp/GGL_FileSystem_Test/file1"));

- std::system("rm -R /tmp/file1");
- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/file1");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test method MoveFolder with existing folder
TEST(FileSystem, MoveFolder_Accuracy_ExistingFile_4) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test");
- std::system("touch /tmp/GGL_FileSystem_Test/file1");
- std::system("echo -n \"sample content\" > /tmp/GGL_FileSystem_Test/file1");
- std::system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
+ system("touch /tmp/GGL_FileSystem_Test/file1");
+ system("echo -n \"sample content\" > /tmp/GGL_FileSystem_Test/file1");
+ system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
EXPECT_TRUE(filesystem.FileExists("/tmp/GGL_FileSystem_Test/file1"));
EXPECT_TRUE(filesystem.FolderExists("/tmp/GGL_FileSystem_Test/subfolder"));

@@ -1027,17 +1030,17 @@ TEST(FileSystem, MoveFolder_Accuracy_ExistingFile_4) {
EXPECT_FALSE(result);
EXPECT_TRUE(filesystem.FileExists("/tmp/GGL_FileSystem_Test/file1"));

- std::system("rm -R /tmp/file1");
- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/file1");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test method MoveFolder with existing folder
TEST(FileSystem, MoveFolder_Accuracy_ExistingFolder_1) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test/folder1");
- std::system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test/folder1");
+ system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
EXPECT_TRUE(filesystem.FolderExists("/tmp/GGL_FileSystem_Test/folder1"));
EXPECT_TRUE(filesystem.FolderExists("/tmp/GGL_FileSystem_Test/subfolder"));

@@ -1049,16 +1052,16 @@ TEST(FileSystem, MoveFolder_Accuracy_ExistingFolder_1) {
EXPECT_TRUE(filesystem.FolderExists(
"/tmp/GGL_FileSystem_Test/subfolder/folder1"));

- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test method MoveFolder with existing folder
TEST(FileSystem, MoveFolder_Accuracy_ExistingFolder_2) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test/folder1");
- std::system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test/folder1");
+ system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
EXPECT_TRUE(filesystem.FolderExists("/tmp/GGL_FileSystem_Test/folder1"));
EXPECT_TRUE(filesystem.FolderExists("/tmp/GGL_FileSystem_Test/subfolder"));

@@ -1070,14 +1073,14 @@ TEST(FileSystem, MoveFolder_Accuracy_ExistingFolder_2) {
EXPECT_TRUE(filesystem.FolderExists(
"/tmp/GGL_FileSystem_Test/subfolder/folder1"));

- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test method MoveFolder with non-existing folder
TEST(FileSystem, MoveFolder_Accuracy_NonExistingFolder_1) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
EXPECT_FALSE(filesystem.FolderExists("/tmp/GGL_FileSystem_Test/subfolder"));

bool result = filesystem.MoveFolder("/tmp/GGL_FileSystem_Test/subfolder",
@@ -1085,14 +1088,14 @@ TEST(FileSystem, MoveFolder_Accuracy_NonExistingFolder_1) {

EXPECT_FALSE(result);

- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test method MoveFolder with non-existing folder
TEST(FileSystem, MoveFolder_Accuracy_NonExistingFolder_2) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
EXPECT_FALSE(filesystem.FolderExists("/tmp/GGL_FileSystem_Test/subfolder"));

bool result = filesystem.MoveFolder("/tmp\\GGL_FileSystem_Test\\subfolder",
@@ -1100,7 +1103,7 @@ TEST(FileSystem, MoveFolder_Accuracy_NonExistingFolder_2) {

EXPECT_FALSE(result);

- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test with NULL argument
@@ -1121,11 +1124,11 @@ TEST(FileSystem, MoveFolder_Failure2) {
// test method CopyFile with existing file
TEST(FileSystem, CopyFile_Accuracy_ExistingFile_1) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test");
- std::system("touch /tmp/GGL_FileSystem_Test/file1");
- std::system("echo -n \"sample content\" > /tmp/GGL_FileSystem_Test/file1");
- std::system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
+ system("touch /tmp/GGL_FileSystem_Test/file1");
+ system("echo -n \"sample content\" > /tmp/GGL_FileSystem_Test/file1");
+ system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
EXPECT_TRUE(filesystem.FileExists("/tmp/GGL_FileSystem_Test/file1"));
EXPECT_TRUE(filesystem.FolderExists("/tmp/GGL_FileSystem_Test/subfolder"));

@@ -1138,17 +1141,17 @@ TEST(FileSystem, CopyFile_Accuracy_ExistingFile_1) {
EXPECT_TRUE(
filesystem.FileExists("/tmp/GGL_FileSystem_Test/subfolder/file1"));

- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test method CopyFile with existing file
TEST(FileSystem, CopyFile_Accuracy_ExistingFile_2) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test");
- std::system("touch /tmp/GGL_FileSystem_Test/file1");
- std::system("echo -n \"sample content\" > /tmp/GGL_FileSystem_Test/file1");
- std::system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
+ system("touch /tmp/GGL_FileSystem_Test/file1");
+ system("echo -n \"sample content\" > /tmp/GGL_FileSystem_Test/file1");
+ system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
EXPECT_TRUE(filesystem.FileExists("/tmp/GGL_FileSystem_Test/file1"));
EXPECT_TRUE(filesystem.FolderExists("/tmp/GGL_FileSystem_Test/subfolder"));

@@ -1161,18 +1164,18 @@ TEST(FileSystem, CopyFile_Accuracy_ExistingFile_2) {
EXPECT_TRUE(
filesystem.FileExists("/tmp/GGL_FileSystem_Test/subfolder/file1"));

- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}


// test method CopyFile with existing file
TEST(FileSystem, CopyFile_Accuracy_ExistingFile_3) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test");
- std::system("touch /tmp/GGL_FileSystem_Test/file1");
- std::system("echo -n \"sample content\" > /tmp/GGL_FileSystem_Test/file1");
- std::system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
+ system("touch /tmp/GGL_FileSystem_Test/file1");
+ system("echo -n \"sample content\" > /tmp/GGL_FileSystem_Test/file1");
+ system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
EXPECT_TRUE(filesystem.FileExists("/tmp/GGL_FileSystem_Test/file1"));
EXPECT_TRUE(filesystem.FolderExists("/tmp/GGL_FileSystem_Test/subfolder"));

@@ -1185,18 +1188,18 @@ TEST(FileSystem, CopyFile_Accuracy_ExistingFile_3) {
EXPECT_TRUE(
filesystem.FileExists("/tmp/file1"));

- std::system("rm -R /tmp/file1");
- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/file1");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test method CopyFile with existing file
TEST(FileSystem, CopyFile_Accuracy_ExistingFile_4) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test");
- std::system("touch /tmp/GGL_FileSystem_Test/file1");
- std::system("echo -n \"sample content\" > /tmp/GGL_FileSystem_Test/file1");
- std::system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
+ system("touch /tmp/GGL_FileSystem_Test/file1");
+ system("echo -n \"sample content\" > /tmp/GGL_FileSystem_Test/file1");
+ system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
EXPECT_TRUE(filesystem.FileExists("/tmp/GGL_FileSystem_Test/file1"));
EXPECT_TRUE(filesystem.FolderExists("/tmp/GGL_FileSystem_Test/subfolder"));

@@ -1209,19 +1212,19 @@ TEST(FileSystem, CopyFile_Accuracy_ExistingFile_4) {
EXPECT_TRUE(
filesystem.FileExists("/tmp/file1"));

- std::system("rm -R /tmp/file1");
- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/file1");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test method CopyFile with overwritting file
TEST(FileSystem, CopyFile_Accuracy_ExistingFile_5) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test");
- std::system("touch /tmp/GGL_FileSystem_Test/file1");
- std::system("echo -n \"sample content\" > /tmp/GGL_FileSystem_Test/file1");
- std::system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
- std::system("touch /tmp/GGL_FileSystem_Test/subfolder/file1");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
+ system("touch /tmp/GGL_FileSystem_Test/file1");
+ system("echo -n \"sample content\" > /tmp/GGL_FileSystem_Test/file1");
+ system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
+ system("touch /tmp/GGL_FileSystem_Test/subfolder/file1");
EXPECT_TRUE(filesystem.FileExists("/tmp/GGL_FileSystem_Test/file1"));
EXPECT_TRUE(filesystem.FolderExists("/tmp/GGL_FileSystem_Test/subfolder"));

@@ -1231,18 +1234,18 @@ TEST(FileSystem, CopyFile_Accuracy_ExistingFile_5) {

EXPECT_FALSE(result);

- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test method CopyFile with overwritting file
TEST(FileSystem, CopyFile_Accuracy_ExistingFile_6) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test");
- std::system("touch /tmp/GGL_FileSystem_Test/file1");
- std::system("echo -n \"sample content\" > /tmp/GGL_FileSystem_Test/file1");
- std::system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
- std::system("touch /tmp/GGL_FileSystem_Test/subfolder/file1");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
+ system("touch /tmp/GGL_FileSystem_Test/file1");
+ system("echo -n \"sample content\" > /tmp/GGL_FileSystem_Test/file1");
+ system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
+ system("touch /tmp/GGL_FileSystem_Test/subfolder/file1");
EXPECT_TRUE(filesystem.FileExists("/tmp/GGL_FileSystem_Test/file1"));
EXPECT_TRUE(filesystem.FolderExists("/tmp/GGL_FileSystem_Test/subfolder"));

@@ -1265,15 +1268,15 @@ TEST(FileSystem, CopyFile_Accuracy_ExistingFile_6) {
text = NULL;
}

- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test method CopyFile with non-existing file
TEST(FileSystem, CopyFile_Accuracy_NonExistingFile_1) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
EXPECT_FALSE(filesystem.FileExists("/tmp/GGL_FileSystem_Test/file1"));
EXPECT_TRUE(filesystem.FolderExists("/tmp/GGL_FileSystem_Test/subfolder"));

@@ -1283,15 +1286,15 @@ TEST(FileSystem, CopyFile_Accuracy_NonExistingFile_1) {

EXPECT_FALSE(result);

- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test method CopyFile with non-existing file
TEST(FileSystem, CopyFile_Accuracy_NonExistingFile_2) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
EXPECT_FALSE(filesystem.FileExists("/tmp/GGL_FileSystem_Test/file1"));
EXPECT_TRUE(filesystem.FolderExists("/tmp/GGL_FileSystem_Test/subfolder"));

@@ -1301,15 +1304,15 @@ TEST(FileSystem, CopyFile_Accuracy_NonExistingFile_2) {

EXPECT_FALSE(result);

- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test method CopyFile with existing folder
TEST(FileSystem, CopyFile_Accuracy_ExistingFolder_1) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
EXPECT_TRUE(filesystem.FolderExists("/tmp/GGL_FileSystem_Test/subfolder"));

bool result = filesystem.CopyFile("/tmp/GGL_FileSystem_Test/subfolder",
@@ -1318,15 +1321,15 @@ TEST(FileSystem, CopyFile_Accuracy_ExistingFolder_1) {

EXPECT_FALSE(result);

- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test method CopyFile with existing folder
TEST(FileSystem, CopyFile_Accuracy_ExistingFolder_2) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
EXPECT_TRUE(filesystem.FolderExists("/tmp/GGL_FileSystem_Test/subfolder"));

bool result = filesystem.CopyFile("\\tmp/GGL_FileSystem_Test\\subfolder",
@@ -1335,7 +1338,7 @@ TEST(FileSystem, CopyFile_Accuracy_ExistingFolder_2) {

EXPECT_FALSE(result);

- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test with NULL argument
@@ -1360,11 +1363,11 @@ TEST(FileSystem, CopyFile_Failure2) {
// test method CopyFolder with existing file
TEST(FileSystem, CopyFolder_Accuracy_ExistingFile_1) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test");
- std::system("touch /tmp/GGL_FileSystem_Test/file1");
- std::system("echo -n \"sample content\" > /tmp/GGL_FileSystem_Test/file1");
- std::system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
+ system("touch /tmp/GGL_FileSystem_Test/file1");
+ system("echo -n \"sample content\" > /tmp/GGL_FileSystem_Test/file1");
+ system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
EXPECT_TRUE(filesystem.FileExists("/tmp/GGL_FileSystem_Test/file1"));
EXPECT_TRUE(filesystem.FolderExists("/tmp/GGL_FileSystem_Test/subfolder"));

@@ -1375,17 +1378,17 @@ TEST(FileSystem, CopyFolder_Accuracy_ExistingFile_1) {
EXPECT_FALSE(result);
EXPECT_TRUE(filesystem.FileExists("/tmp/GGL_FileSystem_Test/file1"));

- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test method CopyFolder with existing file
TEST(FileSystem, CopyFolder_Accuracy_ExistingFile_2) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test");
- std::system("touch /tmp/GGL_FileSystem_Test/file1");
- std::system("echo -n \"sample content\" > /tmp/GGL_FileSystem_Test/file1");
- std::system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
+ system("touch /tmp/GGL_FileSystem_Test/file1");
+ system("echo -n \"sample content\" > /tmp/GGL_FileSystem_Test/file1");
+ system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
EXPECT_TRUE(filesystem.FileExists("/tmp/GGL_FileSystem_Test/file1"));
EXPECT_TRUE(filesystem.FolderExists("/tmp/GGL_FileSystem_Test/subfolder"));

@@ -1396,17 +1399,17 @@ TEST(FileSystem, CopyFolder_Accuracy_ExistingFile_2) {
EXPECT_FALSE(result);
EXPECT_TRUE(filesystem.FileExists("/tmp/GGL_FileSystem_Test/file1"));

- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test method CopyFolder with existing file
TEST(FileSystem, CopyFolder_Accuracy_ExistingFile_3) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test");
- std::system("touch /tmp/GGL_FileSystem_Test/file1");
- std::system("echo -n \"sample content\" > /tmp/GGL_FileSystem_Test/file1");
- std::system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
+ system("touch /tmp/GGL_FileSystem_Test/file1");
+ system("echo -n \"sample content\" > /tmp/GGL_FileSystem_Test/file1");
+ system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
EXPECT_TRUE(filesystem.FileExists("/tmp/GGL_FileSystem_Test/file1"));
EXPECT_TRUE(filesystem.FolderExists("/tmp/GGL_FileSystem_Test/subfolder"));

@@ -1417,18 +1420,18 @@ TEST(FileSystem, CopyFolder_Accuracy_ExistingFile_3) {
EXPECT_FALSE(result);
EXPECT_TRUE(filesystem.FileExists("/tmp/GGL_FileSystem_Test/file1"));

- std::system("rm -R /tmp/file1");
- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/file1");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test method CopyFolder with existing folder
TEST(FileSystem, CopyFolder_Accuracy_ExistingFile_4) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test");
- std::system("touch /tmp/GGL_FileSystem_Test/file1");
- std::system("echo -n \"sample content\" > /tmp/GGL_FileSystem_Test/file1");
- std::system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
+ system("touch /tmp/GGL_FileSystem_Test/file1");
+ system("echo -n \"sample content\" > /tmp/GGL_FileSystem_Test/file1");
+ system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
EXPECT_TRUE(filesystem.FileExists("/tmp/GGL_FileSystem_Test/file1"));
EXPECT_TRUE(filesystem.FolderExists("/tmp/GGL_FileSystem_Test/subfolder"));

@@ -1439,17 +1442,17 @@ TEST(FileSystem, CopyFolder_Accuracy_ExistingFile_4) {
EXPECT_FALSE(result);
EXPECT_TRUE(filesystem.FileExists("/tmp/GGL_FileSystem_Test/file1"));

- std::system("rm -R /tmp/file1");
- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/file1");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test method CopyFolder with existing folder
TEST(FileSystem, CopyFolder_Accuracy_ExistingFolder_1) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test/folder1");
- std::system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test/folder1");
+ system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
EXPECT_TRUE(filesystem.FolderExists("/tmp/GGL_FileSystem_Test/folder1"));
EXPECT_TRUE(filesystem.FolderExists("/tmp/GGL_FileSystem_Test/subfolder"));

@@ -1462,16 +1465,16 @@ TEST(FileSystem, CopyFolder_Accuracy_ExistingFolder_1) {
EXPECT_TRUE(filesystem.FolderExists(
"/tmp/GGL_FileSystem_Test/subfolder/folder1"));

- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test method CopyFolder with existing folder
TEST(FileSystem, CopyFolder_Accuracy_ExistingFolder_2) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test/folder1");
- std::system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test/folder1");
+ system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
EXPECT_TRUE(filesystem.FolderExists("/tmp/GGL_FileSystem_Test/folder1"));
EXPECT_TRUE(filesystem.FolderExists("/tmp/GGL_FileSystem_Test/subfolder"));

@@ -1484,17 +1487,17 @@ TEST(FileSystem, CopyFolder_Accuracy_ExistingFolder_2) {
EXPECT_TRUE(filesystem.FolderExists(
"/tmp/GGL_FileSystem_Test/subfolder/folder1"));

- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test method CopyFolder with overwritting folder
TEST(FileSystem, CopyFolder_Accuracy_ExistingFolder_3) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test/folder1");
- std::system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
- std::system("mkdir /tmp/GGL_FileSystem_Test/subfolder/folder1");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test/folder1");
+ system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
+ system("mkdir /tmp/GGL_FileSystem_Test/subfolder/folder1");
EXPECT_TRUE(filesystem.FolderExists("/tmp/GGL_FileSystem_Test/subfolder"));

bool result = filesystem.CopyFolder("/tmp/GGL_FileSystem_Test/folder1",
@@ -1503,17 +1506,17 @@ TEST(FileSystem, CopyFolder_Accuracy_ExistingFolder_3) {

EXPECT_FALSE(result);

- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test method CopyFolder with overwritting folder
TEST(FileSystem, CopyFolder_Accuracy_ExistingFolder_4) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test/folder1");
- std::system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
- std::system("mkdir /tmp/GGL_FileSystem_Test/subfolder/folder1");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test/folder1");
+ system("mkdir /tmp/GGL_FileSystem_Test/subfolder");
+ system("mkdir /tmp/GGL_FileSystem_Test/subfolder/folder1");
EXPECT_TRUE(filesystem.FolderExists("/tmp/GGL_FileSystem_Test/subfolder"));

bool result = filesystem.CopyFolder("/tmp/GGL_FileSystem_Test/folder1",
@@ -1522,14 +1525,14 @@ TEST(FileSystem, CopyFolder_Accuracy_ExistingFolder_4) {

EXPECT_TRUE(result);

- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test method CopyFolder with non-existing folder
TEST(FileSystem, CopyFolder_Accuracy_NonExistingFolder_1) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
EXPECT_FALSE(filesystem.FolderExists("/tmp/GGL_FileSystem_Test/subfolder"));

bool result = filesystem.CopyFolder("/tmp/GGL_FileSystem_Test/subfolder",
@@ -1538,14 +1541,14 @@ TEST(FileSystem, CopyFolder_Accuracy_NonExistingFolder_1) {

EXPECT_FALSE(result);

- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test method CopyFolder with non-existing folder
TEST(FileSystem, CopyFolder_Accuracy_NonExistingFolder_2) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
EXPECT_FALSE(filesystem.FolderExists("/tmp/GGL_FileSystem_Test/subfolder"));

bool result = filesystem.CopyFolder("/tmp\\GGL_FileSystem_Test\\subfolder",
@@ -1554,7 +1557,7 @@ TEST(FileSystem, CopyFolder_Accuracy_NonExistingFolder_2) {

EXPECT_FALSE(result);

- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test with NULL argument
@@ -1579,71 +1582,71 @@ TEST(FileSystem, CopyFolder_Failure2) {
// test method CreateFolder with non-existing folder
TEST(FileSystem, CreateFolder_Accuracy_NonExistingFolder_1) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
EXPECT_FALSE(filesystem.FolderExists(kTestDir));
FolderInterface *folder = filesystem.CreateFolder(kTestDir);
EXPECT_TRUE(folder != NULL);
EXPECT_EQ(kTestDir, folder->GetPath());
EXPECT_TRUE(filesystem.FolderExists(kTestDir));
- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test method CreateFolder with non-existing folder
TEST(FileSystem, CreateFolder_Accuracy_NonExistingFolder_2) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
EXPECT_FALSE(filesystem.FolderExists(kTestDir));
FolderInterface
*folder = filesystem.CreateFolder("\\tmp\\GGL_FileSystem_Test");
EXPECT_TRUE(folder != NULL);
EXPECT_EQ(kTestDir, folder->GetPath());
EXPECT_TRUE(filesystem.FolderExists(kTestDir));
- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test method CreateFolder with existing folder
TEST(FileSystem, CreateFolder_ExistingFolder_1) {
FileSystem filesystem;
- std::system("mkdir /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
EXPECT_TRUE(filesystem.FolderExists(kTestDir));
FolderInterface *folder = filesystem.CreateFolder(kTestDir);
EXPECT_TRUE(folder != NULL);
EXPECT_EQ(kTestDir, folder->GetPath());
EXPECT_TRUE(filesystem.FolderExists(kTestDir));
- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test method CreateFolder with existing folder
TEST(FileSystem, CreateFolder_ExistingFolder_2) {
FileSystem filesystem;
- std::system("mkdir /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
EXPECT_TRUE(filesystem.FolderExists(kTestDir));
FolderInterface*folder =filesystem.CreateFolder("\\tmp\\GGL_FileSystem_Test");
EXPECT_TRUE(folder != NULL);
EXPECT_EQ(kTestDir, folder->GetPath());
EXPECT_TRUE(filesystem.FolderExists(kTestDir));
- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test method CreateFolder with existing file
TEST(FileSystem, CreateFolder_Accuracy_ExistingFile_1) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("touch /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("touch /tmp/GGL_FileSystem_Test");
EXPECT_FALSE(filesystem.FolderExists(kTestDir));
EXPECT_TRUE(filesystem.FileExists(kTestDir));
FolderInterface *folder = filesystem.CreateFolder(kTestDir);
EXPECT_TRUE(folder == NULL);
EXPECT_FALSE(filesystem.FolderExists(kTestDir));
EXPECT_TRUE(filesystem.FileExists(kTestDir));
- std::system("rm /tmp/GGL_FileSystem_Test");
+ system("rm /tmp/GGL_FileSystem_Test");
}

// test method CreateFolder with existing file
TEST(FileSystem, CreateFolder_Accuracy_ExistingFile_2) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("touch /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("touch /tmp/GGL_FileSystem_Test");
EXPECT_FALSE(filesystem.FolderExists(kTestDir));
EXPECT_TRUE(filesystem.FileExists(kTestDir));
FolderInterface
@@ -1651,7 +1654,7 @@ TEST(FileSystem, CreateFolder_Accuracy_ExistingFile_2) {
EXPECT_TRUE(folder == NULL);
EXPECT_FALSE(filesystem.FolderExists(kTestDir));
EXPECT_TRUE(filesystem.FileExists(kTestDir));
- std::system("rm /tmp/GGL_FileSystem_Test");
+ system("rm /tmp/GGL_FileSystem_Test");
}

// test with NULL argument
@@ -1669,7 +1672,7 @@ TEST(FileSystem, CreateFolder_Failure2) {
// test method CreateTextFile with non-existing file
TEST(FileSystem, CreateTextFile_Accuracy_NonExistingFile_1) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
EXPECT_FALSE(filesystem.FileExists(kTestDir));
EXPECT_FALSE(filesystem.FolderExists(kTestDir));
TextStreamInterface
@@ -1682,13 +1685,13 @@ TEST(FileSystem, CreateTextFile_Accuracy_NonExistingFile_1) {
text = NULL;
EXPECT_TRUE(filesystem.FileExists(kTestDir));
EXPECT_FALSE(filesystem.FolderExists(kTestDir));
- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test method CreateTextFile with non-existing file
TEST(FileSystem, CreateTextFile_Accuracy_NonExistingFile_2) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
EXPECT_FALSE(filesystem.FileExists(kTestDir));
EXPECT_FALSE(filesystem.FolderExists(kTestDir));
TextStreamInterface
@@ -1701,13 +1704,13 @@ TEST(FileSystem, CreateTextFile_Accuracy_NonExistingFile_2) {
text = NULL;
EXPECT_TRUE(filesystem.FileExists(kTestDir));
EXPECT_FALSE(filesystem.FolderExists(kTestDir));
- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test method CreateTextFile with existing file
TEST(FileSystem, CreateTextFile_Accuracy_ExistingFile_1) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
FILE *fp = fopen(kTestDir, "wb");
if (!fp)
return;
@@ -1720,13 +1723,13 @@ TEST(FileSystem, CreateTextFile_Accuracy_ExistingFile_1) {
EXPECT_TRUE(text != NULL);
EXPECT_EQ("Test for create text file!\n", text->ReadAll());
EXPECT_TRUE(filesystem.FileExists(kTestDir));
- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test method CreateTextFile with existing file
TEST(FileSystem, CreateTextFile_Accuracy_ExistingFile_2) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
FILE *fp = fopen(kTestDir, "wb");
if (!fp)
return;
@@ -1739,14 +1742,14 @@ TEST(FileSystem, CreateTextFile_Accuracy_ExistingFile_2) {
EXPECT_TRUE(text != NULL);
EXPECT_EQ("Test for create text file!", text->ReadAll());
EXPECT_TRUE(filesystem.FileExists(kTestDir));
- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test method CreateTextFile with existing folder
TEST(FileSystem, CreateTextFile_Accuracy_ExistingFolder_1) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
EXPECT_TRUE(filesystem.FolderExists(kTestDir));
EXPECT_FALSE(filesystem.FileExists(kTestDir));
TextStreamInterface
@@ -1755,14 +1758,14 @@ TEST(FileSystem, CreateTextFile_Accuracy_ExistingFolder_1) {
EXPECT_TRUE(text == NULL);
EXPECT_TRUE(filesystem.FolderExists(kTestDir));
EXPECT_FALSE(filesystem.FileExists(kTestDir));
- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test method CreateTextFile with existing folder
TEST(FileSystem, CreateTextFile_Accuracy_ExistingFolder_2) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
EXPECT_TRUE(filesystem.FolderExists(kTestDir));
EXPECT_FALSE(filesystem.FileExists(kTestDir));
TextStreamInterface
@@ -1771,7 +1774,7 @@ TEST(FileSystem, CreateTextFile_Accuracy_ExistingFolder_2) {
EXPECT_TRUE(text == NULL);
EXPECT_TRUE(filesystem.FolderExists(kTestDir));
EXPECT_FALSE(filesystem.FileExists(kTestDir));
- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test with NULL argument
@@ -1789,7 +1792,7 @@ TEST(FileSystem, CreateTextFile_Failure2) {
// test method OpenTextFile with non-existing file
TEST(FileSystem, OpenTextFile_Accuracy_NonExistingFile_1) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
EXPECT_FALSE(filesystem.FileExists(kTestDir));
EXPECT_FALSE(filesystem.FolderExists(kTestDir));
TextStreamInterface
@@ -1802,13 +1805,13 @@ TEST(FileSystem, OpenTextFile_Accuracy_NonExistingFile_1) {
text = NULL;
EXPECT_TRUE(filesystem.FileExists(kTestDir));
EXPECT_FALSE(filesystem.FolderExists(kTestDir));
- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test method OpenTextFile with non-existing file
TEST(FileSystem, OpenTextFile_Accuracy_NonExistingFile_2) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
EXPECT_FALSE(filesystem.FileExists(kTestDir));
EXPECT_FALSE(filesystem.FolderExists(kTestDir));
TextStreamInterface
@@ -1821,13 +1824,13 @@ TEST(FileSystem, OpenTextFile_Accuracy_NonExistingFile_2) {
text = NULL;
EXPECT_TRUE(filesystem.FileExists(kTestDir));
EXPECT_FALSE(filesystem.FolderExists(kTestDir));
- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test method OpenTextFile with non-existing file with create == false
TEST(FileSystem, OpenTextFile_Accuracy_NonExistingFile_3) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
EXPECT_FALSE(filesystem.FileExists(kTestDir));
EXPECT_FALSE(filesystem.FolderExists(kTestDir));
TextStreamInterface
@@ -1836,13 +1839,13 @@ TEST(FileSystem, OpenTextFile_Accuracy_NonExistingFile_3) {
EXPECT_TRUE(text == NULL);
EXPECT_FALSE(filesystem.FileExists(kTestDir));
EXPECT_FALSE(filesystem.FolderExists(kTestDir));
- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test method OpenTextFile with non-existing file with create == false
TEST(FileSystem, OpenTextFile_Accuracy_NonExistingFile_4) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
EXPECT_FALSE(filesystem.FileExists(kTestDir));
EXPECT_FALSE(filesystem.FolderExists(kTestDir));
TextStreamInterface
@@ -1851,13 +1854,13 @@ TEST(FileSystem, OpenTextFile_Accuracy_NonExistingFile_4) {
EXPECT_TRUE(text == NULL);
EXPECT_FALSE(filesystem.FileExists(kTestDir));
EXPECT_FALSE(filesystem.FolderExists(kTestDir));
- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test method OpenTextFile with existing file
TEST(FileSystem, OpenTextFile_Accuracy_ExistingFile_1) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
FILE *fp = fopen(kTestDir, "wb");
if (!fp)
return;
@@ -1870,13 +1873,13 @@ TEST(FileSystem, OpenTextFile_Accuracy_ExistingFile_1) {
EXPECT_TRUE(text != NULL);
EXPECT_EQ("Test for create text file!\n", text->ReadAll());
EXPECT_TRUE(filesystem.FileExists(kTestDir));
- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test method OpenTextFile with existing file
TEST(FileSystem, OpenTextFile_Accuracy_ExistingFile_2) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
FILE *fp = fopen(kTestDir, "wb");
if (!fp)
return;
@@ -1889,14 +1892,14 @@ TEST(FileSystem, OpenTextFile_Accuracy_ExistingFile_2) {
EXPECT_TRUE(text != NULL);
EXPECT_EQ("Test for create text file!", text->ReadAll());
EXPECT_TRUE(filesystem.FileExists(kTestDir));
- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test method OpenTextFile with existing folder
TEST(FileSystem, OpenTextFile_Accuracy_ExistingFolder_1) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
EXPECT_TRUE(filesystem.FolderExists(kTestDir));
EXPECT_FALSE(filesystem.FileExists(kTestDir));
TextStreamInterface
@@ -1905,14 +1908,14 @@ TEST(FileSystem, OpenTextFile_Accuracy_ExistingFolder_1) {
EXPECT_TRUE(text == NULL);
EXPECT_TRUE(filesystem.FolderExists(kTestDir));
EXPECT_FALSE(filesystem.FileExists(kTestDir));
- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test method OpenTextFile with existing folder
TEST(FileSystem, OpenTextFile_Accuracy_ExistingFolder_2) {
FileSystem filesystem;
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("mkdir /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("mkdir /tmp/GGL_FileSystem_Test");
EXPECT_TRUE(filesystem.FolderExists(kTestDir));
EXPECT_FALSE(filesystem.FileExists(kTestDir));
TextStreamInterface
@@ -1921,7 +1924,7 @@ TEST(FileSystem, OpenTextFile_Accuracy_ExistingFolder_2) {
EXPECT_TRUE(text == NULL);
EXPECT_TRUE(filesystem.FolderExists(kTestDir));
EXPECT_FALSE(filesystem.FileExists(kTestDir));
- std::system("rm -R /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
}

// test with NULL argument
diff --git a/extensions/linux_system_framework/tests/filesystem_textstream_test.cc b/extensions/linux_system_framework/tests/filesystem_textstream_test.cc
index 47de502..9884a90 100644
--- a/extensions/linux_system_framework/tests/filesystem_textstream_test.cc
+++ b/extensions/linux_system_framework/tests/filesystem_textstream_test.cc
@@ -14,7 +14,10 @@
limitations under the License.
*/

-#include <stdio.h>
+#include <cstdio>
+#include <cstdlib>
+#include <unistd.h>
+#include <dirent.h>
#include <ggadget/common.h>
#include <ggadget/logger.h>
#include <unittest/gtest.h>
@@ -29,9 +32,9 @@ static const char *kTestDir = "/tmp/GGL_FileSystem_Test";
class TextStreamTest : public testing::Test {
protected:
virtual void SetUp() {
- std::system("rm -R /tmp/GGL_FileSystem_Test");
- std::system("touch /tmp/GGL_FileSystem_Test");
- std::system("echo -n \"line1\nline2\nline3\n\" > /tmp/GGL_FileSystem_Test");
+ system("rm -R /tmp/GGL_FileSystem_Test");
+ system("touch /tmp/GGL_FileSystem_Test");
+ system("echo -n \"line1\nline2\nline3\n\" > /tmp/GGL_FileSystem_Test");
text_ = filesystem_.CreateTextFile(kTestDir, false, false);
}

@@ -41,7 +44,7 @@ class TextStreamTest : public testing::Test {
text_->Destroy();
text_ = NULL;
}
- std::system("rm /tmp/GGL_FileSystem_Test");
+ system("rm /tmp/GGL_FileSystem_Test");
}

FileSystem filesystem_;
@@ -208,13 +211,13 @@ TEST_F(TextStreamTest, ReadAll2) {
EXPECT_EQ("", text->ReadAll());
text->Close();
text->Destroy();
- std::system("rm /tmp/no_existing_file");
+ system("rm /tmp/no_existing_file");
}


// GGL_FileSystem_Test method Write
TEST_F(TextStreamTest, Write1) {
- std::system("rm -R /tmp/file.cc");
+ system("rm -R /tmp/file.cc");
TextStreamInterface *text =
filesystem_.CreateTextFile("/tmp/file.cc", false, false);
EXPECT_TRUE(text != NULL);
@@ -227,7 +230,7 @@ TEST_F(TextStreamTest, Write1) {
EXPECT_EQ("new content", text->ReadAll());
text->Close();
text->Destroy();
- std::system("rm -R /tmp/file.cc");
+ system("rm -R /tmp/file.cc");
}

// GGL_FileSystem_Test method Write
@@ -261,7 +264,7 @@ TEST_F(TextStreamTest, Write_Failure_1) {

// GGL_FileSystem_Test method WriteLine
TEST_F(TextStreamTest, WriteLine1) {
- std::system("rm -R /tmp/file.cc");
+ system("rm -R /tmp/file.cc");
TextStreamInterface *text =
filesystem_.CreateTextFile("/tmp/file.cc", false, false);
EXPECT_TRUE(text != NULL);
@@ -274,7 +277,7 @@ TEST_F(TextStreamTest, WriteLine1) {
EXPECT_EQ("new content\n", text->ReadAll());
text->Close();
text->Destroy();
- std::system("rm -R /tmp/file.cc");
+ system("rm -R /tmp/file.cc");
}

// GGL_FileSystem_Test method WriteLine
@@ -322,7 +325,7 @@ TEST_F(TextStreamTest, WriteLine_Failure_2) {

// GGL_FileSystem_Test method WriteBlankLines
TEST_F(TextStreamTest, WriteBlankLines1) {
- std::system("rm -R /tmp/file.cc");
+ system("rm -R /tmp/file.cc");
TextStreamInterface *text =
filesystem_.CreateTextFile("/tmp/file.cc", false, false);
EXPECT_TRUE(text != NULL);
@@ -335,11 +338,11 @@ TEST_F(TextStreamTest, WriteBlankLines1) {
EXPECT_EQ("\n", text->ReadAll());
text->Close();
text->Destroy();
- std::system("rm -R /tmp/file.cc");
+ system("rm -R /tmp/file.cc");
}

TEST_F(TextStreamTest, WriteBlankLines1_) {
- std::system("rm -R /tmp/file.cc");
+ system("rm -R /tmp/file.cc");
TextStreamInterface *text =
filesystem_.CreateTextFile("/tmp/file.cc", false, false);
EXPECT_TRUE(text != NULL);
@@ -352,7 +355,7 @@ TEST_F(TextStreamTest, WriteBlankLines1_) {
EXPECT_EQ("\n\n\n", text->ReadAll());
text->Close();
text->Destroy();
- std::system("rm -R /tmp/file.cc");
+ system("rm -R /tmp/file.cc");
}

// GGL_FileSystem_Test method WriteBlankLines
diff --git a/ggadget/gtk/tests/cairo_graphics_test.cc b/ggadget/gtk/tests/cairo_graphics_test.cc
index 339666a..7dd18af 100644
--- a/ggadget/gtk/tests/cairo_graphics_test.cc
+++ b/ggadget/gtk/tests/cairo_graphics_test.cc
@@ -15,6 +15,7 @@
*/

#include <cstdio>
+#include <cstdlib>
#include <cairo.h>
#include <glib-object.h>
#include <sys/types.h>
diff --git a/ggadget/gtk/tests/hotkey_test.cc b/ggadget/gtk/tests/hotkey_test.cc
index 74b825f..b13b977 100644
--- a/ggadget/gtk/tests/hotkey_test.cc
+++ b/ggadget/gtk/tests/hotkey_test.cc
@@ -49,10 +49,10 @@ TEST(HotKeyTest, KeyEvent) {
ASSERT_STREQ("Ctrl-Alt-t", key.GetKeyString().c_str());
ASSERT_TRUE(key.IsNormalKey());
key.Reset();
- key.AppendKeyEvent(KeyEvent(GDK_Control_L, 0));
+ key.AppendKeyEvent(KeyEvent(GDK_Control_L, 0), true);
ASSERT_EQ(static_cast<unsigned int>(GDK_Control_L), key.GetKeyValue());
ASSERT_EQ(0u, key.GetKeyMask());
- key.AppendKeyEvent(KeyEvent(GDK_t, KEY_ControlMask));
+ key.AppendKeyEvent(KeyEvent(GDK_t, KEY_ControlMask), true);
ASSERT_EQ(static_cast<unsigned int>(GDK_t), key.GetKeyValue());
ASSERT_EQ(static_cast<unsigned int>(KEY_ControlMask), key.GetKeyMask());
}
diff --git a/ggadget/qt/tests/Makefile.am b/ggadget/qt/tests/Makefile.am
index ac90f8f..1eb3ba3 100644
--- a/ggadget/qt/tests/Makefile.am
+++ b/ggadget/qt/tests/Makefile.am
@@ -20,7 +20,8 @@ INCLUDES = -I$(top_builddir) \
AM_CPPFLAGS = @QT4_CFLAGS@ \
$(PREDEFINED_MACROS)

-AM_CXXFLAGS = $(DEFAULT_COMPILE_FLAGS)
+AM_CXXFLAGS = $(DEFAULT_COMPILE_FLAGS) \
+ -Wno-conversion

LDADD = @QT4_LIBS@ \
$(top_builddir)/unittest/libgtest.la \
diff --git a/ggadget/tests/Makefile.am b/ggadget/tests/Makefile.am
index 8ee5ba3..a60a3e0 100644
--- a/ggadget/tests/Makefile.am
+++ b/ggadget/tests/Makefile.am
@@ -121,6 +121,8 @@ bar_module_la_LIBADD = $(top_builddir)/unittest/libgtest.la \
bar_module_la_LDFLAGS = -avoid-version \
-rpath ${abs_builddir} \
-module
+unicode_utils_test_CXXFLAGS = $(PREDEFINED_MACROS) \
+ -Wno-conversion

file_manager_test_data_dest: file_manager_test_data
(rm -fr $@; cp -R $< $@; find $@ -name '.*' -exec rm -fr {} \;) || true
diff --git a/ggadget/tests/backoff_test.cc b/ggadget/tests/backoff_test.cc
index 7dc71bf..a9877f4 100644
--- a/ggadget/tests/backoff_test.cc
+++ b/ggadget/tests/backoff_test.cc
@@ -17,6 +17,7 @@
#include "ggadget/backoff.h"
#include "ggadget/string_utils.h"
#include "unittest/gtest.h"
+#include <cstdlib>

using namespace ggadget;

diff --git a/ggadget/tests/basic_element_test.cc b/ggadget/tests/basic_element_test.cc
index 28de409..8008544 100644
--- a/ggadget/tests/basic_element_test.cc
+++ b/ggadget/tests/basic_element_test.cc
@@ -108,22 +108,22 @@ TEST_F(BasicElementTest, TestPixelHeight) {
view.SetSize(100, 100);

BasicElement *m = view.GetChildren()->AppendElement("muffin", NULL);
- ASSERT_FLOAT_EQ(0.0, m->GetPixelHeight());
+ ASSERT_FLOAT_EQ(0.0F, static_cast<float>(m->GetPixelHeight()));
m->SetPixelHeight(100.0);
ASSERT_TRUE(host->GetQueuedDraw());
ASSERT_FALSE(host->GetQueuedDraw());
- ASSERT_FLOAT_EQ(100.0, m->GetPixelHeight());
+ ASSERT_FLOAT_EQ(100.0F, static_cast<float>(m->GetPixelHeight()));
// Setting the height as negative value will make no effect.
m->SetPixelHeight(-100.0);
ASSERT_FALSE(host->GetQueuedDraw());
- ASSERT_FLOAT_EQ(100.0, m->GetPixelHeight());
+ ASSERT_FLOAT_EQ(100.0f, static_cast<float>(m->GetPixelHeight()));
ggadget::BasicElement *c = m->GetChildren()->AppendElement("pie", NULL);
c->SetPixelHeight(50.0);
ASSERT_TRUE(host->GetQueuedDraw());
// Modifying the height of the parent will not effect the child.
m->SetPixelHeight(150.0);
ASSERT_TRUE(host->GetQueuedDraw());
- ASSERT_FLOAT_EQ(50.0, c->GetPixelHeight());
+ ASSERT_FLOAT_EQ(50.0f, static_cast<float>(c->GetPixelHeight()));
}

TEST_F(BasicElementTest, TestRelativeHeight) {
@@ -135,27 +135,27 @@ TEST_F(BasicElementTest, TestRelativeHeight) {
m->SetPixelWidth(100);
m->SetRelativeHeight(0.50);
ASSERT_TRUE(host->GetQueuedDraw());
- ASSERT_FLOAT_EQ(0.50, m->GetRelativeHeight());
- ASSERT_FLOAT_EQ(150.0, m->GetPixelHeight());
+ ASSERT_FLOAT_EQ(0.50f, static_cast<float>(m->GetRelativeHeight()));
+ ASSERT_FLOAT_EQ(150.0f, static_cast<float>(m->GetPixelHeight()));
ggadget::BasicElement *c = m->GetChildren()->AppendElement("pie", NULL);
c->SetRelativeHeight(0.50);
ASSERT_TRUE(host->GetQueuedDraw());
- ASSERT_FLOAT_EQ(0.50, c->GetRelativeHeight());
- ASSERT_FLOAT_EQ(75.0, c->GetPixelHeight());
+ ASSERT_FLOAT_EQ(0.50f, static_cast<float>(c->GetRelativeHeight()));
+ ASSERT_FLOAT_EQ(75.0f, static_cast<float>(c->GetPixelHeight()));
// Setting the height as negative value will make no effect.
c->SetRelativeHeight(-0.50);
ASSERT_FALSE(host->GetQueuedDraw());
- ASSERT_FLOAT_EQ(0.50, c->GetRelativeHeight());
- ASSERT_FLOAT_EQ(75.0, c->GetPixelHeight());
+ ASSERT_FLOAT_EQ(0.50f, static_cast<float>(c->GetRelativeHeight()));
+ ASSERT_FLOAT_EQ(75.0f, static_cast<float>(c->GetPixelHeight()));
// Modifying the height of the parent will effect the child.
m->SetRelativeHeight(1.0);
ASSERT_TRUE(host->GetQueuedDraw());
- ASSERT_FLOAT_EQ(0.50, c->GetRelativeHeight());
- ASSERT_FLOAT_EQ(150.0, c->GetPixelHeight());
+ ASSERT_FLOAT_EQ(0.50f, static_cast<float>(c->GetRelativeHeight()));
+ ASSERT_FLOAT_EQ(150.0f, static_cast<float>(c->GetPixelHeight()));
// Modifying the height of the parent will effect the child.
m->SetPixelHeight(100.0);
ASSERT_TRUE(host->GetQueuedDraw());
- ASSERT_FLOAT_EQ(50.0, c->GetPixelHeight());
+ ASSERT_FLOAT_EQ(50.0f, static_cast<float>(c->GetPixelHeight()));
}

TEST_F(BasicElementTest, TestHitTest) {
@@ -209,18 +209,18 @@ TEST_F(BasicElementTest, TestOpacity) {
view.SetSize(100, 100);

Muffin m(NULL, &view, NULL);
- ASSERT_FLOAT_EQ(1.0, m.GetOpacity());
+ ASSERT_FLOAT_EQ(1.0f, static_cast<float>(m.GetOpacity()));
m.SetOpacity(0.5);
ASSERT_TRUE(host->GetQueuedDraw());
- ASSERT_FLOAT_EQ(0.5, m.GetOpacity());
+ ASSERT_FLOAT_EQ(0.5f, static_cast<float>(m.GetOpacity()));
// Setting the value greater than 1 will make no effect.
m.SetOpacity(1.5);
ASSERT_FALSE(host->GetQueuedDraw());
- ASSERT_FLOAT_EQ(0.5, m.GetOpacity());
+ ASSERT_FLOAT_EQ(0.5f, static_cast<float>(m.GetOpacity()));
// Setting the value less than 0 will make no effect.
m.SetOpacity(-0.5);
ASSERT_FALSE(host->GetQueuedDraw());
- ASSERT_FLOAT_EQ(0.5, m.GetOpacity());
+ ASSERT_FLOAT_EQ(0.5f, static_cast<float>(m.GetOpacity()));
}

TEST_F(BasicElementTest, TestPixelPinX) {
@@ -229,20 +229,20 @@ TEST_F(BasicElementTest, TestPixelPinX) {

view.SetSize(400, 300);
BasicElement *m = view.GetChildren()->AppendElement("muffin", NULL);
- ASSERT_FLOAT_EQ(0.0, m->GetPixelPinX());
+ ASSERT_FLOAT_EQ(0.0f, static_cast<float>(m->GetPixelPinX()));
m->SetPixelWidth(100.0);
m->SetPixelHeight(100.0);
m->SetPixelPinX(100.5);
ASSERT_TRUE(host->GetQueuedDraw());
- ASSERT_FLOAT_EQ(100.5, m->GetPixelPinX());
+ ASSERT_FLOAT_EQ(100.5f, static_cast<float>(m->GetPixelPinX()));
// Modifying the width of the parent will not effect the pin x.
m->SetPixelWidth(150.5);
ASSERT_TRUE(host->GetQueuedDraw());
- ASSERT_FLOAT_EQ(100.5, m->GetPixelPinX());
+ ASSERT_FLOAT_EQ(100.5f, static_cast<float>(m->GetPixelPinX()));
ASSERT_FALSE(m->PinXIsRelative());
m->SetPixelPinX(-50.5);
ASSERT_TRUE(host->GetQueuedDraw());
- ASSERT_FLOAT_EQ(-50.5, m->GetPixelPinX());
+ ASSERT_FLOAT_EQ(-50.5f, static_cast<float>(m->GetPixelPinX()));
}

TEST_F(BasicElementTest, TestRelativePinX) {
@@ -256,15 +256,15 @@ TEST_F(BasicElementTest, TestRelativePinX) {
ASSERT_TRUE(host->GetQueuedDraw());
m->SetRelativePinX(0.5);
ASSERT_TRUE(host->GetQueuedDraw());
- ASSERT_FLOAT_EQ(100.0, m->GetPixelPinX());
+ ASSERT_FLOAT_EQ(100.0f, static_cast<float>(m->GetPixelPinX()));
// Modifying the width will effect the pin x.
m->SetPixelWidth(400.0);
ASSERT_TRUE(host->GetQueuedDraw());
- ASSERT_FLOAT_EQ(200.0, m->GetPixelPinX());
+ ASSERT_FLOAT_EQ(200.0f, static_cast<float>(m->GetPixelPinX()));
ASSERT_TRUE(m->PinXIsRelative());
m->SetRelativePinX(-0.25);
ASSERT_TRUE(host->GetQueuedDraw());
- ASSERT_FLOAT_EQ(-100.0, m->GetPixelPinX());
+ ASSERT_FLOAT_EQ(-100.0f, static_cast<float>(m->GetPixelPinX()));
}

TEST_F(BasicElementTest, TestPixelPinY) {
@@ -278,15 +278,15 @@ TEST_F(BasicElementTest, TestPixelPinY) {
ASSERT_TRUE(host->GetQueuedDraw());
m->SetPixelPinY(100.5);
ASSERT_TRUE(host->GetQueuedDraw());
- ASSERT_FLOAT_EQ(100.5, m->GetPixelPinY());
+ ASSERT_FLOAT_EQ(100.5f, static_cast<float>(m->GetPixelPinY()));
// Modifying the width will not effect the pin y.
m->SetPixelHeight(300.5);
ASSERT_TRUE(host->GetQueuedDraw());
- ASSERT_FLOAT_EQ(100.5, m->GetPixelPinY());
+ ASSERT_FLOAT_EQ(100.5f, static_cast<float>(m->GetPixelPinY()));
ASSERT_FALSE(m->PinYIsRelative());
m->SetPixelPinY(-50.5);
ASSERT_TRUE(host->GetQueuedDraw());
- ASSERT_FLOAT_EQ(-50.5, m->GetPixelPinY());
+ ASSERT_FLOAT_EQ(-50.5f, static_cast<float>(m->GetPixelPinY()));
}

TEST_F(BasicElementTest, TestRelativePinY) {
@@ -300,15 +300,15 @@ TEST_F(BasicElementTest, TestRelativePinY) {
ASSERT_TRUE(host->GetQueuedDraw());
m->SetRelativePinY(0.5);
ASSERT_TRUE(host->GetQueuedDraw());
- ASSERT_FLOAT_EQ(75.0, m->GetPixelPinY());
+ ASSERT_FLOAT_EQ(75.0f, static_cast<float>(m->GetPixelPinY()));
// Modifying the width of the parent will not effect the pin y.
m->SetPixelHeight(300.0);
ASSERT_TRUE(host->GetQueuedDraw());
- ASSERT_FLOAT_EQ(150.0, m->GetPixelPinY());
+ ASSERT_FLOAT_EQ(150.0f, static_cast<float>(m->GetPixelPinY()));
ASSERT_TRUE(m->PinYIsRelative());
m->SetRelativePinY(-0.25);
ASSERT_TRUE(host->GetQueuedDraw());
- ASSERT_FLOAT_EQ(-75.0, m->GetPixelPinY());
+ ASSERT_FLOAT_EQ(-75.0f, static_cast<float>(m->GetPixelPinY()));
}

TEST_F(BasicElementTest, TestRotation) {
@@ -318,10 +318,10 @@ TEST_F(BasicElementTest, TestRotation) {
Muffin m(NULL, &view, NULL);
m.SetPixelWidth(100.0);
m.SetPixelHeight(100.0);
- ASSERT_FLOAT_EQ(0.0, m.GetRotation());
+ ASSERT_FLOAT_EQ(0.0f, static_cast<float>(m.GetRotation()));
m.SetRotation(0.5);
ASSERT_TRUE(host->GetQueuedDraw());
- ASSERT_FLOAT_EQ(0.5, m.GetRotation());
+ ASSERT_FLOAT_EQ(0.5f, static_cast<float>(m.GetRotation()));
}

TEST_F(BasicElementTest, TestTooltip) {
@@ -342,21 +342,21 @@ TEST_F(BasicElementTest, TestPixelWidth) {

view.SetSize(400, 300);
Muffin m(NULL, &view, NULL);
- ASSERT_FLOAT_EQ(0.0, m.GetPixelWidth());
+ ASSERT_FLOAT_EQ(0.0f, static_cast<float>(m.GetPixelWidth()));
m.SetPixelWidth(100.0);
m.SetPixelHeight(100.0);
ASSERT_TRUE(host->GetQueuedDraw());
- ASSERT_FLOAT_EQ(100.0, m.GetPixelWidth());
+ ASSERT_FLOAT_EQ(100.0f, static_cast<float>(m.GetPixelWidth()));
// Setting the width as negative value will make no effect.
m.SetPixelWidth(-100.0);
ASSERT_FALSE(host->GetQueuedDraw());
- ASSERT_FLOAT_EQ(100.0, m.GetPixelWidth());
+ ASSERT_FLOAT_EQ(100.0f, static_cast<float>(m.GetPixelWidth()));
ggadget::BasicElement *c = m.GetChildren()->AppendElement("pie", NULL);
c->SetPixelWidth(50.0);
// Modifying the width of the parent will not effect the child.
m.SetPixelWidth(200.0);
ASSERT_TRUE(host->GetQueuedDraw());
- ASSERT_FLOAT_EQ(50.0, c->GetPixelWidth());
+ ASSERT_FLOAT_EQ(50.0f, static_cast<float>(c->GetPixelWidth()));
}

TEST_F(BasicElementTest, TestRelativeWidth) {
@@ -368,27 +368,27 @@ TEST_F(BasicElementTest, TestRelativeWidth) {
m->SetPixelHeight(100);
m->SetRelativeWidth(0.50);
ASSERT_TRUE(host->GetQueuedDraw());
- ASSERT_FLOAT_EQ(0.50, m->GetRelativeWidth());
- ASSERT_FLOAT_EQ(200.0, m->GetPixelWidth());
+ ASSERT_FLOAT_EQ(0.50f, static_cast<float>(m->GetRelativeWidth()));
+ ASSERT_FLOAT_EQ(200.0f, static_cast<float>(m->GetPixelWidth()));
ggadget::BasicElement *c = m->GetChildren()->AppendElement("pie", NULL);
c->SetRelativeWidth(0.50);
ASSERT_TRUE(host->GetQueuedDraw());
- ASSERT_FLOAT_EQ(0.50, c->GetRelativeWidth());
- ASSERT_FLOAT_EQ(100.0, c->GetPixelWidth());
+ ASSERT_FLOAT_EQ(0.50f, static_cast<float>(c->GetRelativeWidth()));
+ ASSERT_FLOAT_EQ(100.0f, static_cast<float>(c->GetPixelWidth()));
// Setting the width as negative value will make no effect.
c->SetRelativeWidth(-0.50);
ASSERT_FALSE(host->GetQueuedDraw());
- ASSERT_FLOAT_EQ(0.50, c->GetRelativeWidth());
- ASSERT_FLOAT_EQ(100.0, c->GetPixelWidth());
+ ASSERT_FLOAT_EQ(0.50f, static_cast<float>(c->GetRelativeWidth()));
+ ASSERT_FLOAT_EQ(100.0f, static_cast<float>(c->GetPixelWidth()));
// Modifying the width of the parent will effect the child.
m->SetRelativeWidth(1.0);
ASSERT_TRUE(host->GetQueuedDraw());
- ASSERT_FLOAT_EQ(0.50, c->GetRelativeWidth());
- ASSERT_FLOAT_EQ(200.0, c->GetPixelWidth());
+ ASSERT_FLOAT_EQ(0.50f, static_cast<float>(c->GetRelativeWidth()));
+ ASSERT_FLOAT_EQ(200.0f, static_cast<float>(c->GetPixelWidth()));
// Modifying the width of the parent will effect the child.
m->SetPixelWidth(150.0);
ASSERT_TRUE(host->GetQueuedDraw());
- ASSERT_FLOAT_EQ(75.0, c->GetPixelWidth());
+ ASSERT_FLOAT_EQ(75.0f, static_cast<float>(c->GetPixelWidth()));
}

TEST_F(BasicElementTest, TestVisible) {
@@ -407,22 +407,22 @@ TEST_F(BasicElementTest, TestPixelX) {

view.SetSize(400, 300);
BasicElement *m = view.GetChildren()->AppendElement("muffin", NULL);
- ASSERT_FLOAT_EQ(0.0, m->GetPixelX());
+ ASSERT_FLOAT_EQ(0.0f, static_cast<float>(m->GetPixelX()));
m->SetPixelWidth(100.0);
m->SetPixelHeight(100.0);
m->SetPixelX(100.0);
ASSERT_TRUE(host->GetQueuedDraw());
- ASSERT_FLOAT_EQ(100.0, m->GetPixelX());
+ ASSERT_FLOAT_EQ(100.0f, static_cast<float>(m->GetPixelX()));
ggadget::BasicElement *c = m->GetChildren()->AppendElement("pie", NULL);
c->SetPixelX(50.0);
ASSERT_TRUE(host->GetQueuedDraw());
// Modifying the width of the parent will not effect the child.
m->SetPixelWidth(150.0);
ASSERT_TRUE(host->GetQueuedDraw());
- ASSERT_FLOAT_EQ(50.0, c->GetPixelX());
+ ASSERT_FLOAT_EQ(50.0f, static_cast<float>(c->GetPixelX()));
m->SetPixelX(-50.5);
ASSERT_TRUE(host->GetQueuedDraw());
- ASSERT_FLOAT_EQ(-50.5, m->GetPixelX());
+ ASSERT_FLOAT_EQ(-50.5f, static_cast<float>(m->GetPixelX()));
}

TEST_F(BasicElementTest, TestRelativeX) {
@@ -437,18 +437,18 @@ TEST_F(BasicElementTest, TestRelativeX) {
ASSERT_TRUE(host->GetQueuedDraw());
m->SetRelativeX(0.5);
ASSERT_TRUE(host->GetQueuedDraw());
- ASSERT_FLOAT_EQ(200.0, m->GetPixelX());
+ ASSERT_FLOAT_EQ(200.0f, static_cast<float>(m->GetPixelX()));
ggadget::BasicElement *c = m->GetChildren()->AppendElement("pie", NULL);
c->SetRelativeX(0.50);
ASSERT_TRUE(host->GetQueuedDraw());
- ASSERT_FLOAT_EQ(100.0, c->GetPixelX());
+ ASSERT_FLOAT_EQ(100.0f, static_cast<float>(c->GetPixelX()));
// Modifying the width of the parent will effect the child.
m->SetPixelWidth(100.0);
ASSERT_TRUE(host->GetQueuedDraw());
- ASSERT_FLOAT_EQ(50.0, c->GetPixelX());
+ ASSERT_FLOAT_EQ(50.0f, static_cast<float>(c->GetPixelX()));
m->SetRelativeX(-0.25);
ASSERT_TRUE(host->GetQueuedDraw());
- ASSERT_FLOAT_EQ(-100.0, m->GetPixelX());
+ ASSERT_FLOAT_EQ(-100.0f, static_cast<float>(m->GetPixelX()));
}

TEST_F(BasicElementTest, TestPixelY) {
@@ -457,22 +457,22 @@ TEST_F(BasicElementTest, TestPixelY) {

view.SetSize(400, 300);
BasicElement *m = view.GetChildren()->AppendElement("muffin", NULL);
- ASSERT_FLOAT_EQ(0.0, m->GetPixelY());
+ ASSERT_FLOAT_EQ(0.0f, static_cast<float>(m->GetPixelY()));
m->SetPixelWidth(100.0);
m->SetPixelHeight(100.0);
m->SetPixelY(100.0);
ASSERT_TRUE(host->GetQueuedDraw());
- ASSERT_FLOAT_EQ(100.0, m->GetPixelY());
+ ASSERT_FLOAT_EQ(100.0f, static_cast<float>(m->GetPixelY()));
ggadget::BasicElement *c = m->GetChildren()->AppendElement("pie", NULL);
c->SetPixelY(50.0);
ASSERT_TRUE(host->GetQueuedDraw());
// Modifying the height of the parent will not effect the child.
m->SetPixelHeight(150.0);
ASSERT_TRUE(host->GetQueuedDraw());
- ASSERT_FLOAT_EQ(50.0, c->GetPixelY());
+ ASSERT_FLOAT_EQ(50.0f, static_cast<float>(c->GetPixelY()));
m->SetPixelY(-150.5);
ASSERT_TRUE(host->GetQueuedDraw());
- ASSERT_FLOAT_EQ(-150.5, m->GetPixelY());
+ ASSERT_FLOAT_EQ(-150.5f, static_cast<float>(m->GetPixelY()));
}

TEST_F(BasicElementTest, TestRelativeY) {
@@ -487,18 +487,18 @@ TEST_F(BasicElementTest, TestRelativeY) {
ASSERT_TRUE(host->GetQueuedDraw());
m->SetRelativeY(0.5);
ASSERT_TRUE(host->GetQueuedDraw());
- ASSERT_FLOAT_EQ(150.0, m->GetPixelY());
+ ASSERT_FLOAT_EQ(150.0f, static_cast<float>(m->GetPixelY()));
ggadget::BasicElement *c = m->GetChildren()->AppendElement("pie", NULL);
c->SetRelativeY(0.50);
ASSERT_TRUE(host->GetQueuedDraw());
- ASSERT_FLOAT_EQ(75.0, c->GetPixelY());
+ ASSERT_FLOAT_EQ(75.0f, static_cast<float>(c->GetPixelY()));
// Modifying the height of the parent will effect the child.
m->SetPixelHeight(150.0);
ASSERT_TRUE(host->GetQueuedDraw());
- ASSERT_FLOAT_EQ(75.0, c->GetPixelY());
+ ASSERT_FLOAT_EQ(75.0f, static_cast<float>(c->GetPixelY()));
m->SetRelativeY(-0.125);
ASSERT_TRUE(host->GetQueuedDraw());
- ASSERT_FLOAT_EQ(-37.5, m->GetPixelY());
+ ASSERT_FLOAT_EQ(-37.5f, static_cast<float>(m->GetPixelY()));
}

// This test is not merely for BasicElement, but mixed test for xml_utils
@@ -576,9 +576,9 @@ TEST_F(BasicElementTest, XMLConstruction) {
ASSERT_STREQ("pie", p1->GetTagName());
ASSERT_STREQ("pie-tooltip", p1->GetTooltip().c_str());
ASSERT_TRUE(p1->XIsRelative());
- ASSERT_FLOAT_EQ(0.5, p1->GetRelativeX());
+ ASSERT_FLOAT_EQ(0.5f, static_cast<float>(p1->GetRelativeX()));
ASSERT_FALSE(p1->YIsRelative());
- ASSERT_FLOAT_EQ(100, p1->GetPixelY());
+ ASSERT_FLOAT_EQ(100.0f, static_cast<float>(p1->GetPixelY()));
ASSERT_EQ(1, p1->GetChildren()->GetCount());
}

diff --git a/ggadget/tests/digest_utils_test.cc b/ggadget/tests/digest_utils_test.cc
index 59177ef..0f44a71 100644
--- a/ggadget/tests/digest_utils_test.cc
+++ b/ggadget/tests/digest_utils_test.cc
@@ -68,7 +68,7 @@ TEST(DigestUtils, GenerateSHA1) {
};
char str[130];
for (int i = 0; i < 130; i++)
- str[i] = i;
+ str[i] = static_cast<char>(i);
for (int i = 117; i < 130; i++) {
ASSERT_TRUE(GenerateSHA1(std::string(str, i), &result));
ASSERT_EQ(std::string(digests117_130[i - 117]), ToHexString(result));
diff --git a/ggadget/tests/main_loop_test.h b/ggadget/tests/main_loop_test.h
index e2eaec9..90f0672 100644
--- a/ggadget/tests/main_loop_test.h
+++ b/ggadget/tests/main_loop_test.h
@@ -16,10 +16,12 @@

#ifndef GGADGET_TESTS_MAIN_LOOP_TEST_H__
#define GGADGET_TESTS_MAIN_LOOP_TEST_H__
+
#include <unistd.h>
#include <cstring>
#include <vector>
#include <string>
+#include <cstdlib>

#include "ggadget/logger.h"
#include "unittest/gtest.h"
diff --git a/ggadget/tests/native_main_loop.cc b/ggadget/tests/native_main_loop.cc
index 11c95bd..b329ad3 100644
--- a/ggadget/tests/native_main_loop.cc
+++ b/ggadget/tests/native_main_loop.cc
@@ -20,6 +20,7 @@
#include <unistd.h>
#include <time.h>
#include <fcntl.h>
+#include <limits.h>
#include <map>
#include <ggadget/common.h>
#include "native_main_loop.h"
@@ -289,7 +290,7 @@ class NativeMainLoop::Impl {
timeout = 0;
else if (timeout == -1 || (iter->second.next_time - now) <
static_cast<uint64_t>(timeout))
- timeout = iter->second.next_time - now;
+ timeout = static_cast<int>(iter->second.next_time - now);
}
}

diff --git a/ggadget/tests/string_utils_test.cc b/ggadget/tests/string_utils_test.cc
index 045a082..6888188 100644
--- a/ggadget/tests/string_utils_test.cc
+++ b/ggadget/tests/string_utils_test.cc
@@ -63,7 +63,7 @@ TEST(StringUtils, StringPrintf) {
EXPECT_STREQ("123", StringPrintf("%d", 123).c_str());
char *buf = new char[100000];
for (int i = 0; i < 100000; i++)
- buf[i] = (i % 50) + '0';
+ buf[i] = static_cast<char>((i % 50) + '0');
buf[99999] = 0;
EXPECT_STREQ(buf, StringPrintf("%s", buf).c_str());
delete buf;
diff --git a/ggadget/tests/variant_test.cc b/ggadget/tests/variant_test.cc
index 1aff3bc..b45cddc 100644
--- a/ggadget/tests/variant_test.cc
+++ b/ggadget/tests/variant_test.cc
@@ -139,7 +139,7 @@ void CheckDoubleVariant(T value, const char *str_value) {
}

TEST(Variant, TestDouble) {
- CheckDoubleVariant<float>(-12345.6789e-20, "-1.23457e-16");
+ CheckDoubleVariant<float>(-12345.6789e-20f, "-1.23457e-16");
CheckDoubleVariant<double>(30423.34932, "30423.3");
CheckDoubleVariant<double>(0, "0");
}

This is a semiautomated message from "gitmail". Complaints or suggestions?
Mail edy...@gmail.com.

Xianzhu Wang

unread,
Jul 9, 2008, 8:55:13 PM7/9/08
to google-gadgets...@googlegroups.com, jame...@gmail.com
1. You shoud use ASSERT_DOUBLE_EQ instead of ASSERT_FLOAT_EQ.
2. Isn't removing -Wconversion enough to eliminate the warnings?

2008/7/9 <edy...@gmail.com>:

> ASSERT_FA...
>
> [邮件部分隐藏]

Reply all
Reply to author
Forward
0 new messages