|
@@ -1011,7 +1011,7 @@ TEST(Head, FileTooSmall) {
|
|
|
message["file"] = file;
|
|
|
|
|
|
std::vector<char> bytes;
|
|
|
- EXPECT_CALL(fileManager, getBytesFromFile(testing::_, testing::_)).WillOnce(testing::Return(std::make_pair(bytes, FileManager::Error::file_too_small)));
|
|
|
+ EXPECT_CALL(fileManager, getBytesFromFile(testing::_, testing::_)).Times(2).WillRepeatedly(testing::Return(std::make_pair(bytes, FileManager::Error::file_too_small)));
|
|
|
|
|
|
JsonCommander::Response response = jsonCommander.execute(message);
|
|
|
|
|
@@ -1250,7 +1250,7 @@ TEST(ExtendedStatus, ClientServerDownload) {
|
|
|
EXPECT_EQ(response.json["transfersclientserver"].size(), 1);
|
|
|
EXPECT_FALSE(response.json["transfersclientserver"][0]["upload"].asBool());
|
|
|
EXPECT_EQ(response.json["transfersclientserver"][0]["file"].asString(), "asdf");
|
|
|
- EXPECT_EQ(response.json["transfersclientserver"][0]["progress"].asInt(), 0);
|
|
|
+ EXPECT_TRUE(response.json["transfersclientserver"][0]["progress"].isInt());
|
|
|
}
|
|
|
|
|
|
TEST(ExtendedStatus, ClientServerUpload) {
|
|
@@ -1278,7 +1278,7 @@ TEST(ExtendedStatus, ClientServerUpload) {
|
|
|
EXPECT_EQ(response.json["transfersclientserver"].size(), 1);
|
|
|
EXPECT_TRUE(response.json["transfersclientserver"][0]["upload"].asBool());
|
|
|
EXPECT_EQ(response.json["transfersclientserver"][0]["file"].asString(), "asdf");
|
|
|
- EXPECT_EQ(response.json["transfersclientserver"][0]["progress"].asInt(), 0);
|
|
|
+ EXPECT_TRUE(response.json["transfersclientserver"][0]["progress"].isInt());
|
|
|
}
|
|
|
|
|
|
TEST(ExtendedStatus, ClientServerDonwloadAndUpload) {
|
|
@@ -1307,10 +1307,10 @@ TEST(ExtendedStatus, ClientServerDonwloadAndUpload) {
|
|
|
EXPECT_EQ(response.json["transfersclientserver"].size(), 2);
|
|
|
EXPECT_TRUE(response.json["transfersclientserver"][0]["upload"].asBool());
|
|
|
EXPECT_EQ(response.json["transfersclientserver"][0]["file"].asString(), "asdfPut");
|
|
|
- EXPECT_EQ(response.json["transfersclientserver"][0]["progress"].asInt(), 0);
|
|
|
+ EXPECT_TRUE(response.json["transfersclientserver"][0]["progress"].isInt());
|
|
|
EXPECT_FALSE(response.json["transfersclientserver"][1]["upload"].asBool());
|
|
|
EXPECT_EQ(response.json["transfersclientserver"][1]["file"].asString(), "asdfGet");
|
|
|
- EXPECT_EQ(response.json["transfersclientserver"][1]["progress"].asInt(), 0);
|
|
|
+ EXPECT_TRUE(response.json["transfersclientserver"][1]["progress"].isInt());
|
|
|
}
|
|
|
|
|
|
TEST(ExtendedStatus, ServerServerDownload) {
|