Skip to content

Commit c959eee

Browse files
committed
Add in new gtests and update events cmd
1 parent 97a0293 commit c959eee

5 files changed

Lines changed: 58 additions & 45 deletions

File tree

include/create_container_cmd.hh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ struct CreateContainerRequest {
1717
std::vector<std::string> cmd;
1818
};
1919

20+
struct HostConfig {
21+
std::string hostName;
22+
};
23+
2024
class CreateContainerCmd
2125
: public SynchDockerCmd<model::CreateContainerResponse>,
2226
public std::enable_shared_from_this<CreateContainerCmd> {

tests/create_container_cmd_test.cc

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,21 @@
99

1010
namespace dockercpp::command::test {
1111

12-
// TEST(create_container_cmd_Test, toJson) {
13-
// auto createContainerCmd = command::CreateContainerCmdImpl(
14-
// std::move(std::make_unique<command::exec::CreateContainerCmdExec>()),
15-
// "alpine");
12+
TEST(create_container_cmd_Test, toJson) {
13+
auto createContainerCmd = command::CreateContainerCmdImpl(
14+
std::move(std::make_unique<command::exec::CreateContainerCmdExec>()),
15+
"alpine");
1616

17-
// createContainerCmd.withHost("local");
17+
createContainerCmd.withHost("local");
1818

19-
// auto expectedResponse = nlohmann::json::parse(R"(
20-
// {"Hostname":"local","Image":"alpine"}
21-
// )");
19+
auto expectedResponse = nlohmann::json::parse(R"(
20+
{"Hostname":"local","Image":"alpine"}
21+
)");
2222

23-
// nlohmann::json json = createContainerCmd.getRequest();
23+
nlohmann::json json = createContainerCmd.getRequest();
2424

25-
// spdlog::info("Json {}", json.dump());
25+
spdlog::info("Json {}", json.dump());
2626

27-
// ASSERT_TRUE(json == expectedResponse);
28-
// }
27+
ASSERT_TRUE(json == expectedResponse);
28+
}
2929
} // namespace dockercpp::command::test

tests/events_cmd_exec_test.cc

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "../src/events_cmd_exec.hh"
1+
#include "events_cmd_exec.hh"
22

33
#include <gmock/gmock.h>
44
#include <gtest/gtest.h>
@@ -9,14 +9,14 @@
99

1010
namespace dockercpp::command::exec {
1111

12-
// TEST(EventsTest, create) {
13-
// auto eventsExec = std::make_unique<command::exec::EventsCmdExec>();
12+
TEST(EventsTest, create) {
13+
auto eventsExec = std::make_unique<command::exec::EventsCmdExec>();
1414

15-
// auto eventsCmd = std::make_shared<command::EventsCmdImpl>(std::move(eventsExec));
16-
// eventsCmd->withSince(1234567890)
17-
// .withUntil(2234567890);
15+
auto eventsCmd = std::make_shared<command::EventsCmdImpl>(std::move(eventsExec));
16+
eventsCmd->withSince(1234567890)
17+
.withUntil(2234567890);
1818

19-
// auto result = eventsCmd->exec();
20-
// }
19+
ASSERT_EQ(2234567890, eventsCmd->getUntil());
20+
}
2121

2222
} // namespace dockercpp::command::exec

tests/events_cmd_test.cc

Lines changed: 34 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#include <gtest/gtest.h>
22
#include <memory>
3+
#include "events_cmd_exec.hh"
34

45
#include "events_cmd.hh"
5-
#include "docker_client.hh"
66

7-
using namespace dockercpp::command;
7+
namespace dockercpp::command::exec::test {
88

99
class EventsCmdTest : public ::testing::Test {
1010
protected:
@@ -17,35 +17,44 @@ class EventsCmdTest : public ::testing::Test {
1717
}
1818
};
1919

20-
// TEST_F(EventsCmdTest, TestEventsCmdWithSince) {
21-
// std::unique_ptr<events::Exec> exec = std::make_unique<events::Exec>();
22-
// EventsCmdImpl cmd(std::move(exec));
20+
TEST_F(EventsCmdTest, TestEventsCmdWithSince) {
21+
auto eventsExec = std::make_unique<command::exec::EventsCmdExec>();
2322

24-
// int64_t testSince = 1234567890;
25-
// cmd.withSince(testSince);
23+
auto cmd = std::make_shared<command::EventsCmdImpl>(std::move(eventsExec));
24+
25+
int64_t testSince = 1234567890;
26+
cmd->withSince(testSince);
2627

27-
// EXPECT_EQ(cmd.getSince(), testSince);
28-
// }
28+
EXPECT_EQ(cmd->getSince(), testSince);
29+
}
2930

30-
// TEST_F(EventsCmdTest, TestEventsCmdWithUntil) {
31-
// std::unique_ptr<events::Exec> exec = std::make_unique<events::Exec>();
32-
// EventsCmdImpl cmd(std::move(exec));
31+
TEST_F(EventsCmdTest, TestEventsCmdWithUntil) {
32+
auto eventsExec = std::make_unique<command::exec::EventsCmdExec>();
3333

34-
// int64_t testUntil = 1234567890;
35-
// cmd.withUntil(testUntil);
34+
auto cmd = std::make_shared<command::EventsCmdImpl>(std::move(eventsExec));
35+
36+
37+
int64_t testUntil = 1234567890;
38+
cmd->withUntil(testUntil);
3639

37-
// EXPECT_EQ(cmd.getUntil(), testUntil);
38-
// }
40+
EXPECT_EQ(cmd->getUntil(), testUntil);
41+
}
3942

40-
// TEST_F(EventsCmdTest, TestEventsCmdChaining) {
41-
// std::unique_ptr<events::Exec> exec = std::make_unique<events::Exec>();
42-
// EventsCmdImpl cmd(std::move(exec));
43+
TEST_F(EventsCmdTest, TestEventsCmdChaining) {
44+
auto eventsExec = std::make_unique<command::exec::EventsCmdExec>();
4345

44-
// int64_t testSince = 1234567890;
45-
// int64_t testUntil = 2234567890;
46+
auto cmd = std::make_shared<command::EventsCmdImpl>(std::move(eventsExec));
47+
48+
49+
int64_t testSince = 1234567890;
50+
int64_t testUntil = 2234567890;
4651

47-
// cmd.withSince(testSince).withUntil(testUntil);
52+
cmd->withSince(testSince).withUntil(testUntil);
53+
54+
EXPECT_EQ(cmd->getSince(), testSince);
55+
EXPECT_EQ(cmd->getUntil(), testUntil);
56+
}
57+
58+
59+
}
4860

49-
// EXPECT_EQ(cmd.getSince(), testSince);
50-
// EXPECT_EQ(cmd.getUntil(), testUntil);
51-
// }

0 commit comments

Comments
 (0)