Merge pull request jmtth#78 from codastream/fix-make-test-pass

Ilia1177 · web-flow · commit 85e9cab159d8 · 2025-10-14T10:53:44.000+02:00
restore tests
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
@@ -22,13 +22,13 @@ jobs:
       run: make formator
     - name: static checks
       run: make tidy
-  #test:
-  #  runs-on: ubuntu-22.04 
-  #  steps:
-  #  - uses: actions/checkout@v4
-  #  - name: Install dependencies
-  #    run: sudo apt-get update && sudo apt-get install -y clang-12 make
-  #  - name: build
-  #    run: make -C test
-  #  - name: test
-  #    run: ./test/test
+  test:
+   runs-on: ubuntu-22.04 
+   steps:
+   - uses: actions/checkout@v4
+   - name: Install dependencies
+     run: sudo apt-get update && sudo apt-get install -y clang-12 make
+   - name: build
+     run: make -C test
+   - name: test
+     run: ./test/test
diff --git a/Makefile b/Makefile
@@ -4,9 +4,15 @@ NAME			:=	ircserv
 OS 				:= $(shell uname)
 
 CXX				:=	clang++
-CXXFLAGS		:=	-Wall -Wextra -Werror -std=c++98 -g -MMD -O0 -fsanitize=address -fno-omit-frame-pointer
-LDFLAGS			:=	-no-pie -fsanitize=address
+CXXFLAGS		:=	-Wall -Wextra -Werror -std=c++98 -g -MMD 
+LDFLAGS			:=	
 MAKEFLAGS		:=	--no-print-directory
+ASANFLAGS		:=	-fsanitize=address -O0 -g
+
+ifeq ($(MAKECMDGOALS),asan)
+CXXFLAGS += $(ASANFLAGS)
+LDFLAGS += $(ASANFLAGS)
+endif
 
 INCLUDES		:=	-Iincludes\
 					-Iincludes/channels\
@@ -102,7 +108,7 @@ $(OBJ_DIRS) :
 	@mkdir -p logs
 
 asan : all
-	ASAN_OPTIONS=detect_leaks=1:log_path=logs/asan.log:atexit_print_stats=true ./ircserv 9999 password
+@ASAN_OPTIONS=detect_leaks=1:log_path=logs/asan.log:atexit_print_stats=true ./ircserv 9999 password
 
 forminette:
 	@echo "$(YELLOW)=== Checking code format ===$(NOC)"
@@ -136,9 +142,6 @@ fclean : clean
 re : fclean
 	@make
 
-run sanitize : all
-	ASAN_OPTIONS=detect_leaks=1:log_path=asan.log:atexit_print_stats=true ./ircserv 9999 password
-
 .PHONY : all clean fclean re
 
 -include $(DEPS)
diff --git a/codes.conf b/codes.conf
@@ -91,7 +91,7 @@
 413=ERR_NOTOPLEVEL:Not a top-level domain
 414=ERR_WILDTOPLEVEL:Wildcard in top-level domain
 415=ERR_BADMASK:Bad mask
-421=ERR_UNKNOWNCOMMAND:Unknown command# Unknown command (sorry guys)
+421=ERR_UNKNOWNCOMMAND:Unknown command (sorry guys)
 422=ERR_NOMOTD:No message of the day
 423=ERR_NOADMININFO:No admin info
 424=ERR_FILEERROR:File error
diff --git a/includes/consts.hpp b/includes/consts.hpp
@@ -6,7 +6,7 @@
 /*   By: fpetit <fpetit@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/09/18 23:38:52 by npolack           #+#    #+#             */
-/*   Updated: 2025/10/08 14:16:13 by fpetit           ###   ########.fr       */
+/*   Updated: 2025/10/13 23:25:51 by fpetit           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -21,7 +21,7 @@
 #define PERM_777                  777
 #define EPOCH_TIME_START          1900
 #define NO_LIMIT                  (-1)
-#define SERVER_NAME               "hazardous.irc"
+#define SERVER_NAME               "hazardous.irc.serv"
 #define SERVER_CONF_FILE          "irc.conf"
 #define SERVER_CONF_FILE_FOR_TEST "../irc.conf"
 #define CODES_CONF_FILE           "codes.conf"
diff --git a/includes/server/Config.hpp b/includes/server/Config.hpp
@@ -45,6 +45,7 @@ class Config
 	void _set_nickname_max_len(std::string& value);
 };
 extern const Config ircConfig;
+extern const Config ircConfigTest;
 extern const Config ircCodes;
 
 #endif
diff --git a/srcs/commands/CmdFactory.cpp b/srcs/commands/CmdFactory.cpp
@@ -102,7 +102,7 @@ ICommand* CmdFactory::make_command(Server& server, Client& client, std::string&
             return (this->*ptr[i])(server, client, params);
         }
     }
-    rh.process_response(client, ERR_UNKNOWNCOMMAND, params);
+    rh.process_response(client, ERR_UNKNOWNCOMMAND, commandLine);
 
     return NULL;
 }
diff --git a/srcs/commands/Kick.cpp b/srcs/commands/Kick.cpp
@@ -148,9 +148,7 @@ void Kick::execute(Server& server, Client& client)
                 validUsers += *nickIt;
                 channel->remove_member(*targetUser);
                 std::string messageParam = channel->get_name() + " " + targetUser->get_nickname();
-                // if (!comment.empty())
-                //     messageParam.append(" :").append(comment);
-                LOG_dt_CMD("before broadcast");
+                LOG_d_CMD("before broadcast");
                 rh.process_response(*targetUser, TRANSFER_KICK, messageParam, &client, comment);
             }
         }
@@ -159,5 +157,6 @@ void Kick::execute(Server& server, Client& client)
         validChans += *chanNamesIt;
         broadcastMsg.append(validChans).append(" ").append(validUsers);
         channel->broadcast(server, TRANSFER_KICK, broadcastMsg, &client, comment);
+        rh.process_response(client, TRANSFER_KICK, broadcastMsg, &client, comment);
     }
 }
diff --git a/srcs/commands/Mode.cpp b/srcs/commands/Mode.cpp
@@ -99,6 +99,10 @@ ReplyCode Mode::check_args(Server& server, Client& client, std::vector<std::stri
             rh.process_response(client, ERR_NEEDMOREPARAMS, "MODE");
             return PROCESSED_ERROR;
         }
+        if (modes[i] == 'o' && operation == '-' && i >= modeParams.size()) {
+            rh.process_response(client, ERR_NEEDMOREPARAMS, "MODE");
+            return PROCESSED_ERROR;
+        }
         if (modes[i] == 'l' && operation == '+') {
             if (modeParams[i].find_first_not_of(digits) != std::string::npos) {
                 LOG_DV_CMD(modeParams[i]);
diff --git a/srcs/server/Config.cpp b/srcs/server/Config.cpp
@@ -9,6 +9,7 @@
 
 const Config ircConfig(SERVER_CONF_FILE);
 const Config ircCodes(CODES_CONF_FILE);
+const Config ircConfigTest(SERVER_CONF_FILE_FOR_TEST);
 
 Config::Config() :
     _name(SERVER_NAME),
diff --git a/test/include/fakeClient.hpp b/test/include/fakeClient.hpp
@@ -12,7 +12,7 @@
 
 std::unique_ptr<TcpSocket> make_client_socket(int port);
 void                       send_line(const TcpSocket& so, const std::string& msg);
-std::string                recv_lines(const TcpSocket& so);
+std::string                recv_lines(const TcpSocket& so, const std::string& nick="");
 void                       do_cmd(const TcpSocket& so, const std::string& msg);
 
 #endif
diff --git a/test/include/testUtils.hpp b/test/include/testUtils.hpp
@@ -122,6 +122,7 @@ static const std::string& validModePlusKLMsg          = "MODE #chan +kl key 10\r
 static const std::string& invalidModeUnknownModeMsg   = "MODE #chan +z\r\n";
 static const std::string& invalidModeUnknownChanMsg   = "MODE #ch +i\r\n";
 static const std::string& validModeUnknownUserMsg     = "MODE #chan +o pouic\r\n";
+static const std::string& invalidModeMinusONoUserMsg  = "MODE #chan -o\r\n";
 static const std::string& invalidModeNoChanMsg        = "MODE +l 4\r\n";
 
 static const std::string& validPartMsg = "PART #chan\r\n";
diff --git a/test/srcs/AssertReply.cpp b/test/srcs/AssertReply.cpp
@@ -224,7 +224,7 @@ AssertReply& AssertReply::is_empty()
 AssertReply&
 AssertReply::is_formatted(ReplyCode code, const std::string& clientNick, const std::string& params, const std::string& trailing)
 {
-    std::string expectedStart = std::string(":" + ircConfig.get_name()) + " " + utils::code_to_str(code) + " " + clientNick + " ";
+    std::string expectedStart = std::string(":" + ircConfigTest.get_name()) + " " + utils::code_to_str(code) + " " + clientNick + " ";
     if (params.empty() && trailing.empty())
         return this->has_code(code).matches_entirely(expectedStart + ircCodes.trailing(code));
     else if (!params.empty() && trailing.empty())
@@ -238,7 +238,7 @@ AssertReply::is_formatted(ReplyCode code, const std::string& clientNick, const s
 AssertReply&
 AssertReply::is_formatted_transfer(const std::string& clientNick, const std::string& params, const std::string& trailing)
 {
-    std::string expectedStart = std::string(":" + clientNick + "!" + clientNick + "@" + ircConfig.get_name()) + " ";
+    std::string expectedStart = std::string(":" + clientNick + "!" + clientNick + "@" + ircConfigTest.get_name()) + " ";
     if (trailing.empty())
         return this->matches_entirely(expectedStart + params);
     else
diff --git a/test/srcs/fakeClient.cpp b/test/srcs/fakeClient.cpp
@@ -99,7 +99,7 @@ void send_line(const TcpSocket& so, const std::string& msg)
     std::this_thread::sleep_for(std::chrono::milliseconds(SERVER_SEND_WAIT_MS));
 }
 
-std::string recv_lines(const TcpSocket& so)
+std::string recv_lines(const TcpSocket& so, const std::string& nick)
 {
     char buffer[RECEIVE_BUFFER];
 
@@ -133,8 +133,9 @@ std::string recv_lines(const TcpSocket& so)
                 LOG_TEST.debug("recv_line: recv nothing to receive", strerror(errno));
             } else {
                 buffer[bytesReceived] = '\0';
-                result                = std::string(static_cast<char*>(buffer));
-                LOG_D_TEST("received " + TO_STRING(bytesReceived) + " bytes", result);
+                result                += std::string(static_cast<char*>(buffer));
+                std::string dest = nick.empty() ? "" : " for " + nick;
+                LOG_D_TEST("received " + TO_STRING(bytesReceived) + " bytes" + dest, result);
                 if (result.find("\r\n") != std::string::npos)
                     break;
             }
diff --git a/test/srcs/testJoin.cpp b/test/srcs/testJoin.cpp
@@ -96,7 +96,7 @@ void valid_join_should_send_rpl_and_broadcast(Server& s)
         AssertReply ar(reply);
         ar.is_formatted_transfer(userNick, "JOIN #chan", "");
         ar.is_formatted(RPL_NOTOPIC, userNick, "#chan");
-        ar.is_formatted(RPL_NAMREPLY, userNick, "#chan", "@" + opNick + " " + userNick);
+        ar.is_formatted(RPL_NAMREPLY, userNick, "= #chan", "@" + opNick + " " + userNick);
         ar.is_formatted(RPL_ENDOFNAMES, userNick, "#chan");
 
         // test 2
@@ -203,7 +203,7 @@ void mode_plusi_with_invite_should_send_rpl_and_broadcast(Server& s)
         std::string reply = recv_lines(so);
         AssertReply ar(reply);
         ar.is_formatted(RPL_NOTOPIC, userNick, "#chan");
-        // ar.is_formatted(RPL_NAMREPLY, userNick, "#chan", "@" + opNick + " " + userNick); // commenting to check if pass
+        ar.is_formatted(RPL_NAMREPLY, userNick, "= #chan", userNick + " @" + opNick);
         ar.is_formatted(RPL_ENDOFNAMES, userNick, "#chan");
 
         // test 2 other members get broadcast message
@@ -395,10 +395,7 @@ void test_join(Server& s, t_results* r)
     run_test(r, [&] { mode_plusk_no_key_should_err(s); }, "+k <key>");
     run_test(r, [&] { mode_plusk_wrong_yek_should_err(s); }, "A user try to join with wrong yek");
     run_test(r, [&] { mode_plusk_wrong_keyy_should_err(s); }, "A user try to join with wrong keyy");
-    run_test(
-        r,
-        [&] { mode_plusi_with_invite_should_send_rpl_and_broadcast(s); },
-        "+i after being invited.");
+    run_test(r, [&] { mode_plusi_with_invite_should_send_rpl_and_broadcast(s); }, "+i after being invited.");
     run_test(r, [&] { mode_plusl_should_block_join_if_max_reached(s); }, "+l <limit>");
     run_test(r, [&] { mode_plusl_zeroarg_should_block_join(s); }, "+l 0");
     run_test(r, [&] { mode_minusk_should_lift_block(s); }, "-k <key>");
diff --git a/test/srcs/testKick.cpp b/test/srcs/testKick.cpp
@@ -30,7 +30,7 @@
 /**
  @brief integration test - normal case
 */
-void op_existing_chan_valid_user_should_notice(Server& s)
+void op_existing_chan_valid_user_should_broadcast(Server& s)
 {
     try {
         TEST_SETUP(test, s, 2);
@@ -42,12 +42,12 @@ void op_existing_chan_valid_user_should_notice(Server& s)
         // test
         send_line(soOp, validKickMsg);
         // as a member, operator receives the notice
-        std::string reply = recv_lines(soOp);
+        std::string reply = recv_lines(soOp, opNick);
         AssertReply ar(reply);
         ar.is_formatted_transfer(opNick, "KICK #chan roro");
 
         // kicked user gets a notice
-        reply = recv_lines(so);
+        reply = recv_lines(so, userNick);
         ar.handle_new_reply(reply);
         ar.is_formatted_transfer(opNick, "KICK #chan roro");
 
@@ -255,7 +255,7 @@ void op_valid_inexistent_channel_should_err(Server& s)
 void test_kick(Server& s, t_results* r)
 {
     print_test_series("command KICK");
-    run_test(r, [&] { op_existing_chan_valid_user_should_notice(s); }, "single kick");
+    run_test(r, [&] { op_existing_chan_valid_user_should_broadcast(s); }, "single kick");
     run_test(r, [&] { op_existing_chan_valid_users_should_notice(s); }, "combo double kick");
     run_test(r, [&] { no_op_should_err(s); }, "no op");
     run_test(r, [&] { op_missing_chan_should_err(s); }, "no chan");
diff --git a/test/srcs/testMode.cpp b/test/srcs/testMode.cpp
@@ -492,6 +492,27 @@ void mode_o_unknown_user_should_err(Server& s)
     }
 }
 
+/**
+ @brief integration test - error case
+*/
+void mode_minuso_noarg_user_should_err(Server& s)
+{
+    try {
+        TEST_SETUP(test, s, 2);
+        TcpSocket& sop = *sockets.at(0);
+        make_op(sop);
+
+        // test 1
+        send_line(sop, invalidModeMinusONoUserMsg);
+        std::string reply = recv_lines(sop);
+        AssertReply ar(reply);
+        ar.is_formatted(ERR_NEEDMOREPARAMS, opNick, "MODE");
+
+    } catch (const std::runtime_error& e) {
+        LOG_TEST.error(e.what());
+    }
+}
+
 void test_mode(Server& s, t_results* r)
 {
     print_test_series("command MODE");
@@ -516,4 +537,5 @@ void test_mode(Server& s, t_results* r)
     run_test(r, [&] { unknown_chan_should_err(s); }, "unknown chan");
     run_test(r, [&] { mode_l_negativearg_should_err(s); }, "+l -1");
     run_test(r, [&] { mode_o_unknown_user_should_err(s); }, "+o unknown");
+    run_test(r, [&] { mode_minuso_noarg_user_should_err(s); }, "-o no user");
 }
diff --git a/test/srcs/testPing.cpp b/test/srcs/testPing.cpp
@@ -32,7 +32,7 @@ void valid_ping_should_pong(Server& s)
         // test
         std::string reply = recv_lines(so);
         AssertReply ar(reply);
-        ar.matches_entirely(":" + ircConfig.get_name() + " PONG :" + token);
+        ar.matches_entirely(":" + ircConfigTest.get_name() + " PONG :" + token);
 
     } catch (const std::runtime_error& e) {
         LOG_TEST.error(e.what());
diff --git a/test/srcs/testWho.cpp b/test/srcs/testWho.cpp
@@ -30,7 +30,7 @@
  */
 static std::string build_who_params(const std::string& foundNick, const std::string& chan, const std::string& flag)
 {
-    return chan + " " + foundNick + " localhost " + ircConfig.get_name() + " " + foundNick + " " + flag;
+    return chan + " " + foundNick + " localhost " + ircConfigTest.get_name() + " " + foundNick + " " + flag;
 }
 
 /*************************************************************

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ ICommand* CmdFactory::make_command(Server& server, Client& client, std::string&`
`102`	`102`	`return (this->*ptr[i])(server, client, params);`
`103`	`103`	`}`
`104`	`104`	`}`
`105`		`- rh.process_response(client, ERR_UNKNOWNCOMMAND, params);`
	`105`	`+ rh.process_response(client, ERR_UNKNOWNCOMMAND, commandLine);`
`106`	`106`
`107`	`107`	`return NULL;`
`108`	`108`	`}`
Original file line number	Diff line number	Diff line change
`@@ -148,9 +148,7 @@ void Kick::execute(Server& server, Client& client)`
`148`	`148`	`validUsers += *nickIt;`
`149`	`149`	`channel->remove_member(*targetUser);`
`150`	`150`	`std::string messageParam = channel->get_name() + " " + targetUser->get_nickname();`
`151`		`- // if (!comment.empty())`
`152`		`- // messageParam.append(" :").append(comment);`
`153`		`- LOG_dt_CMD("before broadcast");`
	`151`	`+ LOG_d_CMD("before broadcast");`
`154`	`152`	`rh.process_response(*targetUser, TRANSFER_KICK, messageParam, &client, comment);`
`155`	`153`	`}`
`156`	`154`	`}`
`@@ -159,5 +157,6 @@ void Kick::execute(Server& server, Client& client)`
`159`	`157`	`validChans += *chanNamesIt;`
`160`	`158`	`broadcastMsg.append(validChans).append(" ").append(validUsers);`
`161`	`159`	`channel->broadcast(server, TRANSFER_KICK, broadcastMsg, &client, comment);`
	`160`	`+ rh.process_response(client, TRANSFER_KICK, broadcastMsg, &client, comment);`
`162`	`161`	`}`
`163`	`162`	`}`