Skip to content

Commit

Permalink
Merge branch 'task/cht-1201-fix-test-windows' into 'develop'
Browse files Browse the repository at this point in the history 
CHT-1201: Fix tests execution in Windows

See merge request megachat/MEGAchat!1893
  • Loading branch information
Jose Manuel Otero Mato committed Apr 15, 2024
2 parents c018b47 + adb2098 commit ea8dddb
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 97 deletions.
133 changes: 42 additions & 91 deletions tests/sdk_test/sdk_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,24 @@
#include <direct.h>
#endif

#include <filesystem>
#include <memory>

using namespace mega;
using namespace megachat;
using namespace std;
namespace fs = std::filesystem;
using CleanupFunction = MegaChatApiTest::MegaMrProper::CleanupFunction;

std::string MegaChatApiTest::DEFAULT_PATH = "./";
// IMPORTANT: Ensure that your build system copies the FILE_IMAGE_NAME to the directory where the binary is located.
const std::string MegaChatApiTest::FILE_IMAGE_NAME = "logo.png";
const std::string MegaChatApiTest::PATH_IMAGE = "PATH_IMAGE";

const std::string MegaChatApiTest::LOCAL_PATH = "./tmp"; // no ending slash
// The following paths need to end with a trailing /
fs::path MegaChatApiTest::DEFAULT_PATH = fs::path(".") / "";
const fs::path MegaChatApiTest::LOCAL_PATH = fs::path(".") / "tmp" / "";
const fs::path MegaChatApiTest::DOWNLOAD_PATH = LOCAL_PATH / "download" / "";

const std::string MegaChatApiTest::REMOTE_PATH = "/";
const std::string MegaChatApiTest::DOWNLOAD_PATH = LOCAL_PATH + "/download/";
std::string MegaChatApiTest::PROC_SPECIFIC_PATH;
std::string USER_AGENT_DESCRIPTION = "MEGAChatTest";

Expand Down Expand Up @@ -333,27 +335,27 @@ bool MegaChatApiTest::initFS()

PROC_SPECIFIC_PATH = "./test_pid_" + std::to_string(pid);

if (!filesystem::create_directory(PROC_SPECIFIC_PATH))
if (!fs::create_directory(PROC_SPECIFIC_PATH))
{
std::cout << "FATAL ERROR: Failed to create directory " << PROC_SPECIFIC_PATH << endl;
return false;
}

std::error_code ec;
filesystem::current_path(PROC_SPECIFIC_PATH, ec);
fs::current_path(PROC_SPECIFIC_PATH, ec);
if (ec)
{
std::cout << "FATAL ERROR: Failed to change work directory to " << PROC_SPECIFIC_PATH << ": " << ec.message() << endl;
return false;
}

if (!filesystem::create_directory(LOCAL_PATH))
if (!fs::create_directory(LOCAL_PATH))
{
std::cout << "FATAL ERROR: Failed to create directory " << LOCAL_PATH << endl;
std::cout << "FATAL ERROR: Failed to create directory " << LOCAL_PATH.string() << endl;
return false;
}

DEFAULT_PATH = "../"; // set it up 1 level after changing work directory
DEFAULT_PATH = fs::path("..") / ""; // set it up 1 level after changing work directory

return true;
}
Expand Down Expand Up @@ -3364,11 +3366,12 @@ TEST_F(MegaChatApiTest, Attachment)
chatroomListener->clearMessages(a1); // will be set at confirmation
chatroomListener->clearMessages(a2); // will be set at reception

std::string formatDate = dateToString() + "_Attachment_test";
std::string fileName = dateToString() + "_Attachment_test";
std::string fileContent = "This is the content of file: " + fileName;

LOG_debug << "#### Test1: Upload new file ####";
ASSERT_NO_FATAL_FAILURE(createFile(formatDate, LOCAL_PATH, formatDate));
MegaNode* nodeSent = uploadFile(a1, formatDate, LOCAL_PATH, REMOTE_PATH);
ASSERT_NO_FATAL_FAILURE(createFile(fileName, LOCAL_PATH, fileContent));
MegaNode* nodeSent = uploadFile(a1, fileName, LOCAL_PATH, REMOTE_PATH);
ASSERT_TRUE(nodeSent);

LOG_debug << "#### Test2: Send file as attachment to chatroom ####";
Expand All @@ -3378,6 +3381,8 @@ TEST_F(MegaChatApiTest, Attachment)

LOG_debug << "#### Test3: Download received file ####";
ASSERT_TRUE(downloadNode(a2, nodeReceived)) << "Cannot download node attached to message";
auto downloadedFilePath = DOWNLOAD_PATH / fileName;
ASSERT_TRUE(fs::exists(downloadedFilePath));

LOG_debug << "#### Test4: Import received file into the cloud ####";
ASSERT_TRUE(importNode(a2, nodeReceived, FILE_IMAGE_NAME)) << "Cannot import node attached to message";
Expand Down Expand Up @@ -3406,9 +3411,8 @@ TEST_F(MegaChatApiTest, Attachment)
ASSERT_EQ(msgReceived->getHandleOfAction(), nodeSent->getHandle()) << "Handle of attached nodes don't match";

// Remove the downloaded file to try to download it again after revoke
std::string filePath = DOWNLOAD_PATH + std::string(formatDate);
std::string secondaryFilePath = DOWNLOAD_PATH + std::string("remove");
rename(filePath.c_str(), secondaryFilePath.c_str());
auto secondaryFilePath = DOWNLOAD_PATH / std::string("remove");
fs::rename(downloadedFilePath, secondaryFilePath);

LOG_debug << "#### Test6: Download received file again --> no access ####";
ASSERT_FALSE(downloadNode(1, nodeReceived)) << "Download succeed, when it should fail";
Expand All @@ -3423,7 +3427,7 @@ TEST_F(MegaChatApiTest, Attachment)
nodeSent = NULL;

LOG_debug << "#### Test7: Upload an image to check previews / thumbnails ####";
std::string path = DEFAULT_PATH;
fs::path path = DEFAULT_PATH;
if (getenv(PATH_IMAGE.c_str()) != NULL)
{
path = getenv(PATH_IMAGE.c_str());
Expand All @@ -3437,13 +3441,13 @@ TEST_F(MegaChatApiTest, Attachment)
nodeReceived = msgSent->getMegaNodeList()->get(0)->copy();

LOG_debug << "#### Test8: Download the thumbnail ####";
std::string thumbnailPath = LOCAL_PATH + "/thumbnail0.jpg";
std::string thumbnailPath = (LOCAL_PATH / "thumbnail0.jpg").string();
RequestTracker getThumbnailTracker(megaApi[a1]);
megaApi[a1]->getThumbnail(nodeSent, thumbnailPath.c_str(), &getThumbnailTracker);
ASSERT_EQ(getThumbnailTracker.waitForResult(), API_OK) << "Failed to get thumbnail. Error: " << getThumbnailTracker.getErrorString();

LOG_debug << "#### Test9: Download the thumbnail ####";
thumbnailPath = LOCAL_PATH + "/thumbnail1.jpg";
thumbnailPath = (LOCAL_PATH / "thumbnail1.jpg").string();
RequestTracker getThumbnailTracker2(megaApi[a2]);
megaApi[a2]->getThumbnail(nodeReceived, thumbnailPath.c_str(), &getThumbnailTracker2);
ASSERT_EQ(getThumbnailTracker2.waitForResult(), API_OK) << "Failed to get thumbnail (2). Error: " << getThumbnailTracker2.getErrorString();
Expand Down Expand Up @@ -9527,19 +9531,18 @@ unsigned int MegaChatApiTest::getMegaApiIndex(MegaApi *api)
return apiIndex;
}

void MegaChatApiTest::createFile(const string &fileName, const string &sourcePath, const string &contain)
void MegaChatApiTest::createFile(const string &fileName, const fs::path &sourcePath, const string &content)
{
std::string filePath = sourcePath + "/" + fileName;
FILE* fileDescriptor = fopen(filePath.c_str(), "w");
ASSERT_TRUE(fileDescriptor) << "File " << filePath << " could not be opened for writing";
fprintf(fileDescriptor, "%s", contain.c_str());
fclose(fileDescriptor);
fs::path filePath = sourcePath / fileName;
std::ofstream fileStream(filePath, std::ios::out);
ASSERT_TRUE(fileStream.is_open()) << "File " << filePath.string() << " could not be opened for writing";
fileStream << content;
}

MegaNode *MegaChatApiTest::uploadFile(int accountIndex, const std::string& fileName, const std::string& sourcePath, const std::string& targetPath)
MegaNode *MegaChatApiTest::uploadFile(int accountIndex, const std::string& fileName, const fs::path& sourcePath, const std::string& targetPath)
{
addTransfer(accountIndex);
std::string filePath = sourcePath + "/" + fileName;
std::string filePath = (sourcePath / fileName).string();
mNodeUploadHandle[accountIndex] = INVALID_HANDLE;
std::unique_ptr<MegaNode> targetNode(megaApi[accountIndex]->getNodeByPath(targetPath.c_str()));
megaApi[accountIndex]->startUpload(filePath.c_str()
Expand Down Expand Up @@ -9579,19 +9582,14 @@ bool &MegaChatApiTest::isNotTransferRunning(int accountIndex)

bool MegaChatApiTest::downloadNode(int accountIndex, MegaNode *nodeToDownload)
{
struct stat st = {}; // init all members to default values (0)
if (stat(DOWNLOAD_PATH.c_str(), &st) == -1)
if (!fs::exists(DOWNLOAD_PATH))
{
#ifdef _WIN32
_mkdir(DOWNLOAD_PATH.c_str());
#else
mkdir(DOWNLOAD_PATH.c_str(), 0700);
#endif
fs::create_directory(DOWNLOAD_PATH);
}

static const std::string downloadPathStr = DOWNLOAD_PATH.string();
addTransfer(accountIndex);
megaApi[accountIndex]->startDownload(nodeToDownload,
DOWNLOAD_PATH.c_str(),
downloadPathStr.c_str(),
nullptr, /*customName*/
nullptr, /*appData*/
false, /*startFirst*/
Expand Down Expand Up @@ -9643,68 +9641,22 @@ void MegaChatApiTest::getContactRequest(unsigned int accountIndex, bool outgoing
delete crl;
}

int MegaChatApiTest::purgeLocalTree(const std::string &path)
int MegaChatApiTest::purgeLocalTree(const fs::path& path)
{
#ifdef _WIN32
// should be reimplemented, maybe using std::filesystem
std::cout << "Manually purge local tree: " << path << std::endl;
return 0;

#else
DIR *directory = opendir(path.c_str());
size_t path_len = path.length();
int r = -1;

if (directory)
try
{
struct dirent *p;
r = 0;
while (!r && (p=readdir(directory)))
if (fs::exists(path) && fs::is_directory(path))
{
int r2 = -1;
char *buf;
size_t len;
/* Skip the names "." and ".." as we don't want to recurse on them. */
if (!strcmp(p->d_name, ".") || !strcmp(p->d_name, ".."))
{
continue;
}

len = path_len + strlen(p->d_name) + 2;
buf = (char *)malloc(len);

if (buf)
{
struct stat statbuf;
snprintf(buf, len, "%s/%s", path.c_str(), p->d_name);
if (!stat(buf, &statbuf))
{
if (S_ISDIR(statbuf.st_mode))
{
r2 = purgeLocalTree(buf);
}
else
{
r2 = unlink(buf);
}
}

free(buf);
}

r = r2;
fs::remove_all(path);
return 0;
}

closedir(directory);
return -1;
}

if (!r)
catch (const fs::filesystem_error& e)
{
r = rmdir(path.c_str());
std::cerr << "Error removing " << path << ": " << e.what() << '\n';
return -1;
}

return r;
#endif
}

void MegaChatApiTest::purgeCloudTree(unsigned int accountIndex, MegaNode *node)
Expand Down Expand Up @@ -11116,7 +11068,6 @@ MegaChatRequest *TestMegaChatRequestListener::getMegaChatRequest() const

bool RequestListener::waitForResponse(unsigned int timeout)
{
assert(!mFinished);
timeout *= 1000000; // convert to micro-seconds
unsigned int tWaited = 0; // microseconds
bool connRetried = false;
Expand Down
13 changes: 7 additions & 6 deletions tests/sdk_test/sdk_test.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#include <chatClient.h>
#include <future>
#include <fstream> // Win build requires it
#include <filesystem>

#ifdef __GNUC__
#pragma GCC diagnostic push
Expand Down Expand Up @@ -828,8 +829,8 @@ class MegaChatApiTest :
unsigned int getMegaChatApiIndex(megachat::MegaChatApi *api);
unsigned int getMegaApiIndex(::mega::MegaApi *api);

void createFile(const std::string &fileName, const std::string &sourcePath, const std::string &contain);
::mega::MegaNode *uploadFile(int accountIndex, const std::string &fileName, const std::string &sourcePath, const std::string &targetPath);
void createFile(const std::string &fileName, const std::filesystem::path &sourcePath, const std::string &contain);
::mega::MegaNode *uploadFile(int accountIndex, const std::string &fileName, const std::filesystem::path &sourcePath, const std::string &targetPath);
void addTransfer(int accountIndex);
bool &isNotTransferRunning(int accountIndex);

Expand All @@ -838,7 +839,7 @@ class MegaChatApiTest :

void getContactRequest(unsigned int accountIndex, bool outgoing, int expectedSize = 1);

static int purgeLocalTree(const std::string& path);
static int purgeLocalTree(const std::filesystem::path& path);
void purgeCloudTree(unsigned int accountIndex, ::mega::MegaNode* node);
void clearAndLeaveChats(unsigned accountIndex, const std::vector<megachat::MegaChatHandle>& skipChats);
void removePendingContactRequest(unsigned int accountIndex);
Expand Down Expand Up @@ -982,13 +983,13 @@ class MegaChatApiTest :
bool mLoggedInAllChats[NUM_ACCOUNTS];
std::vector <megachat::MegaChatHandle>mChatListUpdated[NUM_ACCOUNTS];
bool mChatsUpdated[NUM_ACCOUNTS];
static std::string DEFAULT_PATH;
static const std::string PATH_IMAGE;
static const std::string FILE_IMAGE_NAME;

static const std::string LOCAL_PATH;
static const std::string REMOTE_PATH;
static const std::string DOWNLOAD_PATH;
static std::filesystem::path DEFAULT_PATH;
static const std::filesystem::path DOWNLOAD_PATH;
static const std::filesystem::path LOCAL_PATH;
static std::string PROC_SPECIFIC_PATH;

// implementation for MegaListener
Expand Down

0 comments on commit ea8dddb

Please sign in to comment.