From 31a037460a9f89906bb13f8592bc50d4e874fad9 Mon Sep 17 00:00:00 2001 From: Martin Brodbeck Date: Fri, 20 Jul 2018 13:07:48 +0200 Subject: [PATCH] code cleanup (fixing tests but not sure why) --- src/core/article.h | 4 ++-- src/core/sale.h | 2 +- src/core/seller.h | 2 +- test/test_article.cpp | 1 + test/test_sale.cpp | 2 ++ test/test_seller.cpp | 2 +- 6 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/core/article.h b/src/core/article.h index f3b50d5..9b3f200 100644 --- a/src/core/article.h +++ b/src/core/article.h @@ -2,8 +2,8 @@ #define ARTICLE_H #include "entity.h" -#include "sale.h" -#include "seller.h" +//#include "sale.h" +//#include "seller.h" #include #include diff --git a/src/core/sale.h b/src/core/sale.h index 9aaf1fa..f039a69 100644 --- a/src/core/sale.h +++ b/src/core/sale.h @@ -7,7 +7,7 @@ #include "boost/date_time/posix_time/posix_time.hpp" -class Article; +//class Article; using ArticlesVec = std::vector; diff --git a/src/core/seller.h b/src/core/seller.h index e6670ce..e1da001 100644 --- a/src/core/seller.h +++ b/src/core/seller.h @@ -8,7 +8,7 @@ #include #include -class Article; +//class Article; class Seller : public Entity { diff --git a/test/test_article.cpp b/test/test_article.cpp index a92ed69..1b0fe75 100644 --- a/test/test_article.cpp +++ b/test/test_article.cpp @@ -1,6 +1,7 @@ #define BOOST_TEST_MODULE article #include "../src/core/article.h" +#include "../src/core/sale.h" #include diff --git a/test/test_sale.cpp b/test/test_sale.cpp index 5bd4374..fe5a600 100644 --- a/test/test_sale.cpp +++ b/test/test_sale.cpp @@ -1,6 +1,8 @@ #define BOOST_TEST_MODULE sale #include "../src/core/sale.h" +#include "../src/core/seller.h" +#include "../src/core/article.h" #include diff --git a/test/test_seller.cpp b/test/test_seller.cpp index 2b8f935..45a41d6 100644 --- a/test/test_seller.cpp +++ b/test/test_seller.cpp @@ -30,7 +30,7 @@ BOOST_AUTO_TEST_CASE(create_many) } BOOST_AUTO_TEST_CASE(with_article) { - Seller seller{}; + Seller seller{"Max", "Mustermann"}; auto article = std::make_unique
(); article->setDescription("Test article"); seller.addArticle(std::move(article));