From 0b636410b3fce7fa134bfa3356a5d5316a028a1e Mon Sep 17 00:00:00 2001 From: Alexandre POMMIER Date: Wed, 3 Aug 2022 13:23:09 +0200 Subject: [PATCH] add test --- cpp05/ex02/AForm.hpp | 4 ++-- cpp05/ex02/Bureaucrat.cpp | 4 ++-- cpp05/ex02/Bureaucrat.hpp | 8 ++++---- cpp05/ex02/Makefile | 8 ++++++-- cpp05/ex02/PresidentialPardonForm.cpp | 12 ++++++------ cpp05/ex02/PresidentialPardonForm.hpp | 16 ++++++++-------- cpp05/ex02/main.cpp | 4 ++-- 7 files changed, 30 insertions(+), 26 deletions(-) diff --git a/cpp05/ex02/AForm.hpp b/cpp05/ex02/AForm.hpp index 84cd188..3f1428e 100644 --- a/cpp05/ex02/AForm.hpp +++ b/cpp05/ex02/AForm.hpp @@ -25,7 +25,7 @@ class AForm{ AForm(int signedGrade, int executionGrade, std::string name); AForm(const AForm& copy); - ~AForm(); + virtual ~AForm() = 0; AForm &operator=(const AForm& rhs); const std::string getName() const; @@ -33,7 +33,7 @@ class AForm{ int getExecutionGrade() const; int getIsSigned() const; - void checkGrade() const = 0; + void checkGrade() const; void beSigned(Bureaucrat &bureaucrat); diff --git a/cpp05/ex02/Bureaucrat.cpp b/cpp05/ex02/Bureaucrat.cpp index dcd4a3a..6b83330 100644 --- a/cpp05/ex02/Bureaucrat.cpp +++ b/cpp05/ex02/Bureaucrat.cpp @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/07/18 21:34:42 by apommier #+# #+# */ -/* Updated: 2022/07/22 11:13:32 by apommier ### ########.fr */ +/* Updated: 2022/08/02 18:18:19 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -74,7 +74,7 @@ void Bureaucrat::checkGrade() const throw Bureaucrat::GradeTooHighException(); } -void Bureaucrat::signForm(Form form) +void Bureaucrat::signForm(AForm form) { try { diff --git a/cpp05/ex02/Bureaucrat.hpp b/cpp05/ex02/Bureaucrat.hpp index c691d87..b710473 100644 --- a/cpp05/ex02/Bureaucrat.hpp +++ b/cpp05/ex02/Bureaucrat.hpp @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/07/18 21:34:43 by apommier #+# #+# */ -/* Updated: 2022/07/19 12:52:52 by apommier ### ########.fr */ +/* Updated: 2022/08/02 18:19:30 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -16,9 +16,9 @@ # include # include # include -# include "Form.hpp" +# include "AForm.hpp" -class Form; +class AForm; class Bureaucrat{ public: @@ -34,7 +34,7 @@ class Bureaucrat{ void downGrade(); void checkGrade() const; - void signForm(Form form); + void signForm(AForm form); class GradeTooLowException : public std::exception { diff --git a/cpp05/ex02/Makefile b/cpp05/ex02/Makefile index 6a35d3d..7f743d3 100644 --- a/cpp05/ex02/Makefile +++ b/cpp05/ex02/Makefile @@ -6,14 +6,18 @@ # By: apommier +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2022/07/18 21:34:54 by apommier #+# #+# # -# Updated: 2022/07/22 07:48:18 by apommier ### ########.fr # +# Updated: 2022/08/02 18:19:14 by apommier ### ########.fr # # # # **************************************************************************** # NAME = a.out SRCS = main.cpp\ Bureaucrat.cpp\ - Form.cpp + AForm.cpp\ + PresidentialPardonForm.cpp\ + RobotomyRequestForm.cpp\ + ShrubberyCreationForm.cpp + OBJS = ${SRCS:.cpp=.o} CC = c++ diff --git a/cpp05/ex02/PresidentialPardonForm.cpp b/cpp05/ex02/PresidentialPardonForm.cpp index 11f5f6d..1fc7ef1 100644 --- a/cpp05/ex02/PresidentialPardonForm.cpp +++ b/cpp05/ex02/PresidentialPardonForm.cpp @@ -6,28 +6,28 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/07/23 12:16:26 by apommier #+# #+# */ -/* Updated: 2022/07/23 12:35:33 by apommier ### ########.fr */ +/* Updated: 2022/08/02 18:22:30 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ -#include "PresidentialPardonForm.cpp" +#include "PresidentialPardonForm.hpp" -PresidentialPardonForm() +PresidentialPardonForm::PresidentialPardonForm() { } -PresidentialPardonForm(const PresidentialPardonForm& copy) +PresidentialPardonForm::PresidentialPardonForm(const PresidentialPardonForm& copy) { } -~PresidentialPardonForm() +PresidentialPardonForm::~PresidentialPardonForm() { } -PresidentialPardonForm &operator=(const PresidentialPardonForm& rhs) +PresidentialPardonForm &PresidentialPardonForm::operator=(const PresidentialPardonForm& rhs) { } \ No newline at end of file diff --git a/cpp05/ex02/PresidentialPardonForm.hpp b/cpp05/ex02/PresidentialPardonForm.hpp index 5387a0a..409b48f 100644 --- a/cpp05/ex02/PresidentialPardonForm.hpp +++ b/cpp05/ex02/PresidentialPardonForm.hpp @@ -5,8 +5,8 @@ /* +:+ +:+ +:+ */ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ -/* Created: 2022/07/23 12:16:28 by apommier #+# #+# */ -/* Updated: 2022/07/23 13:43:32 by apommier ### ########.fr */ +/* Created: 2022/08/02 18:21:41 by apommier #+# #+# */ +/* Updated: 2022/08/02 18:21:44 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -17,12 +17,12 @@ class PresidentialPardonForm : public AForm{ public : - - PresidentialPardonForm(); - PresidentialPardonForm(const PresidentialPardonForm& copy); - ~PresidentialPardonForm(); - PresidentialPardonForm &operator=(const PresidentialPardonForm& rhs); - + + PresidentialPardonForm(); + PresidentialPardonForm(const PresidentialPardonForm& copy); + ~PresidentialPardonForm(); + PresidentialPardonForm &operator=(const PresidentialPardonForm& rhs); + private : }; diff --git a/cpp05/ex02/main.cpp b/cpp05/ex02/main.cpp index 3f14eb3..0586ee7 100644 --- a/cpp05/ex02/main.cpp +++ b/cpp05/ex02/main.cpp @@ -6,11 +6,11 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/07/18 21:34:45 by apommier #+# #+# */ -/* Updated: 2022/07/19 12:42:13 by apommier ### ########.fr */ +/* Updated: 2022/08/02 18:04:36 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ -#include "Form.hpp" +#include "AForm.hpp" #include "Bureaucrat.hpp" int main()