|
@@ -65,8 +65,7 @@ TEST(testConnect, TooFewArgs) {
|
|
|
|
|
|
// check things
|
|
|
EXPECT_EQ(retvalCmd.type, CmdMan::error);
|
|
|
- EXPECT_EQ(retvalCmd.msg["command"].asString(), "connect");
|
|
|
- EXPECT_FALSE(retvalCmd.msg["accept"].asBool());
|
|
|
+ EXPECT_EQ(retvalCmd.msg["command"].asString(), "error");
|
|
|
EXPECT_NE(retvalCmd.msg["error"].asString(), "");
|
|
|
|
|
|
EXPECT_TRUE(cm.isNotConnected());
|
|
@@ -144,6 +143,56 @@ TEST(testConnect, Negative) {
|
|
|
EXPECT_TRUE(cm.isNotConnected());
|
|
|
}
|
|
|
|
|
|
+TEST(testConnect, AlreadyConnected) {
|
|
|
+ FileManMock fm;
|
|
|
+ CmdManForTest cm(fm, dummyDebugPrint);
|
|
|
+ cm.initConnected();
|
|
|
+
|
|
|
+ std::string cmd;
|
|
|
+ std::vector<std::string> args;
|
|
|
+ CmdMan::CmdRet retvalCmd;
|
|
|
+
|
|
|
+ // prepare cmd/args
|
|
|
+ cmd = "connect";
|
|
|
+ args = {"1.222.33.4", "1337"};
|
|
|
+
|
|
|
+ // stick into cmdman
|
|
|
+ retvalCmd = cm.execute(cmd, args);
|
|
|
+ // cm.stateSetConnectionOk() not called
|
|
|
+
|
|
|
+ // check things
|
|
|
+ EXPECT_EQ(retvalCmd.type, CmdMan::error);
|
|
|
+ EXPECT_EQ(retvalCmd.msg["command"].asString(), "error");
|
|
|
+ EXPECT_NE(retvalCmd.msg["error"].asString(), "");
|
|
|
+
|
|
|
+ EXPECT_TRUE(cm.isConnected());
|
|
|
+}
|
|
|
+
|
|
|
+TEST(testConnect, AlreadyLoggedIn) {
|
|
|
+ FileManMock fm;
|
|
|
+ CmdManForTest cm(fm, dummyDebugPrint);
|
|
|
+ cm.initLoggedIn();
|
|
|
+
|
|
|
+ std::string cmd;
|
|
|
+ std::vector<std::string> args;
|
|
|
+ CmdMan::CmdRet retvalCmd;
|
|
|
+
|
|
|
+ // prepare cmd/args
|
|
|
+ cmd = "connect";
|
|
|
+ args = {"1.222.33.4", "1337"};
|
|
|
+
|
|
|
+ // stick into cmdman
|
|
|
+ retvalCmd = cm.execute(cmd, args);
|
|
|
+ // cm.stateSetConnectionOk() not called
|
|
|
+
|
|
|
+ // check things
|
|
|
+ EXPECT_EQ(retvalCmd.type, CmdMan::error);
|
|
|
+ EXPECT_EQ(retvalCmd.msg["command"].asString(), "error");
|
|
|
+ EXPECT_NE(retvalCmd.msg["error"].asString(), "");
|
|
|
+
|
|
|
+ EXPECT_TRUE(cm.isLoggedIn());
|
|
|
+}
|
|
|
+
|
|
|
/* =====================================
|
|
|
* tests for
|
|
|
* version check, signup, login
|
|
@@ -244,7 +293,6 @@ TEST(testVersion, AlreadyLoggedIn) {
|
|
|
|
|
|
// check things
|
|
|
EXPECT_EQ(retvalCmd.type, CmdMan::error);
|
|
|
- // TODO: check some more things maybe
|
|
|
|
|
|
EXPECT_TRUE(cm.isLoggedIn());
|
|
|
}
|
|
@@ -337,8 +385,7 @@ TEST(testLogin, TooFewArgs) {
|
|
|
|
|
|
// check things
|
|
|
EXPECT_EQ(retvalCmd.type, CmdMan::error);
|
|
|
- EXPECT_EQ(retvalCmd.msg["command"].asString(), "login");
|
|
|
- EXPECT_FALSE(retvalCmd.msg["accept"].asBool());
|
|
|
+ EXPECT_EQ(retvalCmd.msg["command"].asString(), "error");
|
|
|
EXPECT_NE(retvalCmd.msg["error"].asString(), "");
|
|
|
|
|
|
EXPECT_TRUE(cm.isVersionChecked());
|
|
@@ -498,8 +545,7 @@ TEST(testSignup, TooFewArgs) {
|
|
|
|
|
|
// check things
|
|
|
EXPECT_EQ(retvalCmd.type, CmdMan::error);
|
|
|
- EXPECT_EQ(retvalCmd.msg["command"].asString(), "signup");
|
|
|
- EXPECT_FALSE(retvalCmd.msg["accept"].asBool());
|
|
|
+ EXPECT_EQ(retvalCmd.msg["command"].asString(), "error");
|
|
|
EXPECT_NE(retvalCmd.msg["error"].asString(), "");
|
|
|
|
|
|
EXPECT_TRUE(cm.isVersionChecked());
|
|
@@ -560,7 +606,7 @@ TEST(testDisconnect, NotLoggedIn) {
|
|
|
retvalCmd = cm.execute(cmd, args);
|
|
|
|
|
|
// check things
|
|
|
- EXPECT_EQ(retvalCmd.type, CmdMan::send | CmdMan::close);
|
|
|
+ EXPECT_EQ(retvalCmd.type, CmdMan::send | CmdMan::close | CmdMan::noanswerexpected);
|
|
|
EXPECT_FALSE(retvalCmd.msg["login"].asBool());
|
|
|
EXPECT_EQ(retvalCmd.msg["user"].asString(), "");
|
|
|
EXPECT_EQ(retvalCmd.msg["pass"].asString(), "");
|
|
@@ -641,7 +687,7 @@ TEST(testExit, NotLoggedIn) {
|
|
|
|
|
|
retvalCmdDisconnect = cm.execute("disconnect", args);
|
|
|
|
|
|
- EXPECT_EQ(retvalCmdDisconnect.type, CmdMan::send | CmdMan::close);
|
|
|
+ EXPECT_EQ(retvalCmdDisconnect.type, CmdMan::send | CmdMan::close | CmdMan::noanswerexpected);
|
|
|
EXPECT_FALSE(retvalCmdDisconnect.msg["login"].asBool());
|
|
|
EXPECT_EQ(retvalCmdDisconnect.msg["user"].asString(), "");
|
|
|
EXPECT_EQ(retvalCmdDisconnect.msg["pass"].asString(), "");
|
|
@@ -697,8 +743,7 @@ TEST(testPut, TooFewArgs) {
|
|
|
|
|
|
// check things
|
|
|
EXPECT_EQ(retvalCmd.type, CmdMan::error);
|
|
|
- EXPECT_EQ(retvalCmd.msg["command"].asString(), "put");
|
|
|
- EXPECT_FALSE(retvalCmd.msg["accept"].asBool());
|
|
|
+ EXPECT_EQ(retvalCmd.msg["command"].asString(), "error");
|
|
|
EXPECT_NE(retvalCmd.msg["error"].asString(), "");
|
|
|
|
|
|
EXPECT_TRUE(cm.isLoggedIn());
|
|
@@ -1169,7 +1214,7 @@ TEST(testHead, TooFewArgs) {
|
|
|
retvalCmd = cm.execute(cmd, args);
|
|
|
|
|
|
EXPECT_EQ(retvalCmd.type, CmdMan::error);
|
|
|
- EXPECT_EQ(retvalCmd.msg["command"].asString(), "head");
|
|
|
+ EXPECT_EQ(retvalCmd.msg["command"].asString(), "error");
|
|
|
EXPECT_NE(retvalCmd.msg["error"].asString(), "");
|
|
|
|
|
|
retvalHdl = cm.handle(root);
|
|
@@ -1273,8 +1318,7 @@ TEST(testGet, TooFewArgs) {
|
|
|
|
|
|
// check things
|
|
|
EXPECT_EQ(retvalCmd.type, CmdMan::error);
|
|
|
- EXPECT_EQ(retvalCmd.msg["command"].asString(), "get");
|
|
|
- EXPECT_FALSE(retvalCmd.msg["accept"].asBool());
|
|
|
+ EXPECT_EQ(retvalCmd.msg["command"].asString(), "error");
|
|
|
EXPECT_NE(retvalCmd.msg["error"].asString(), "");
|
|
|
|
|
|
EXPECT_TRUE(cm.isLoggedIn());
|
|
@@ -2337,8 +2381,7 @@ TEST(testDeleteme, TooFewArgs) {
|
|
|
|
|
|
// check things
|
|
|
EXPECT_EQ(retvalCmd.type, CmdMan::error);
|
|
|
- EXPECT_EQ(retvalCmd.msg["command"].asString(), "deleteme");
|
|
|
- EXPECT_FALSE(retvalCmd.msg["accept"].asBool());
|
|
|
+ EXPECT_EQ(retvalCmd.msg["command"].asString(), "error");
|
|
|
EXPECT_NE(retvalCmd.msg["error"].asString(), "");
|
|
|
|
|
|
EXPECT_TRUE(cm.isLoggedIn());
|
|
@@ -2431,8 +2474,7 @@ TEST(testDeletefile, TooFewArgs) {
|
|
|
|
|
|
// check things
|
|
|
EXPECT_EQ(retvalCmd.type, CmdMan::error);
|
|
|
- EXPECT_EQ(retvalCmd.msg["command"].asString(), "deletefile");
|
|
|
- EXPECT_FALSE(retvalCmd.msg["accept"].asBool());
|
|
|
+ EXPECT_EQ(retvalCmd.msg["command"].asString(), "error");
|
|
|
EXPECT_NE(retvalCmd.msg["error"].asString(), "");
|
|
|
|
|
|
EXPECT_TRUE(cm.isLoggedIn());
|
|
@@ -2772,8 +2814,7 @@ TEST(testKeyfile, TooFewArgs) {
|
|
|
|
|
|
// check things
|
|
|
EXPECT_EQ(retvalCmd.type, CmdMan::error);
|
|
|
- EXPECT_EQ(retvalCmd.msg["command"].asString(), "keyfile");
|
|
|
- EXPECT_FALSE(retvalCmd.msg["accept"].asBool());
|
|
|
+ EXPECT_EQ(retvalCmd.msg["command"].asString(), "error");
|
|
|
EXPECT_NE(retvalCmd.msg["error"].asString(), "");
|
|
|
|
|
|
EXPECT_TRUE(cm.isLoggedIn());
|
|
@@ -2984,8 +3025,7 @@ TEST(testQueue, TooFewArgs) {
|
|
|
|
|
|
// check things
|
|
|
EXPECT_EQ(retvalCmd.type, CmdMan::error);
|
|
|
- EXPECT_EQ(retvalCmd.msg["command"].asString(), "queue");
|
|
|
- EXPECT_FALSE(retvalCmd.msg["accept"].asBool());
|
|
|
+ EXPECT_EQ(retvalCmd.msg["command"].asString(), "error");
|
|
|
EXPECT_NE(retvalCmd.msg["error"].asString(), "");
|
|
|
|
|
|
EXPECT_TRUE(cm.isLoggedIn());
|
|
@@ -3079,8 +3119,7 @@ TEST(testDequeue, TooFewArgs) {
|
|
|
|
|
|
// check things
|
|
|
EXPECT_EQ(retvalCmd.type, CmdMan::error);
|
|
|
- EXPECT_EQ(retvalCmd.msg["command"].asString(), "dequeue");
|
|
|
- EXPECT_FALSE(retvalCmd.msg["accept"].asBool());
|
|
|
+ EXPECT_EQ(retvalCmd.msg["command"].asString(), "error");
|
|
|
EXPECT_NE(retvalCmd.msg["error"].asString(), "");
|
|
|
|
|
|
EXPECT_TRUE(cm.isLoggedIn());
|
|
@@ -3167,8 +3206,8 @@ TEST(testCommandsWithRequiredLogin, NotLoggedInOrNotConnected) {
|
|
|
CmdMan::CmdRet retval1, retval2, retval3;
|
|
|
|
|
|
// prepare cmd/args
|
|
|
- std::vector<std::string> cmds = {"put", "get", "list", "extendedlist", "putdata", "getdata", "listdata", "extendedlistdata",
|
|
|
- "head", "deletefile", "deleteme", "extendedstatus"};
|
|
|
+ std::vector<std::string> cmds = {"put", "get", "list", "extendedlist", "putdata", "getdata", "listdata", "extendedlistdata",
|
|
|
+ "head", "deletefile", "deleteme", "extendedstatus", "notifications", "queue", "dequeue"};
|
|
|
// as every command works fine with too many args, we will simply pass three to all of them
|
|
|
std::vector<std::string> args = {"arg1", "arg2", "arg3"};
|
|
|
|