From b6553ce2f19a770260f38de30f0e3290b8791536 Mon Sep 17 00:00:00 2001 From: Jonas Granquist Date: Sat, 25 Feb 2012 08:59:26 +0100 Subject: [PATCH] Moved gtest to a new file --- GildedRose/cpp/GildedRose.h | 10 ---------- GildedRose/cpp/GildedRoseUnitTests.cc | 12 ++++++++++++ GildedRose/cpp/Makefile | 4 ++-- 3 files changed, 14 insertions(+), 12 deletions(-) create mode 100644 GildedRose/cpp/GildedRoseUnitTests.cc diff --git a/GildedRose/cpp/GildedRose.h b/GildedRose/cpp/GildedRose.h index c3ebb814..0cb1bbf9 100644 --- a/GildedRose/cpp/GildedRose.h +++ b/GildedRose/cpp/GildedRose.h @@ -1,5 +1,3 @@ -#include - #include using namespace std; @@ -113,11 +111,3 @@ void example() } -TEST(GildedRoseTest, Foo) { - vector items; - items.push_back(Item("Foo", 0, 0)); - GildedRose app(items); - app.updateQuality(); - EXPECT_EQ("fixme", app.items[0].name); -} - diff --git a/GildedRose/cpp/GildedRoseUnitTests.cc b/GildedRose/cpp/GildedRoseUnitTests.cc new file mode 100644 index 00000000..000cc6b5 --- /dev/null +++ b/GildedRose/cpp/GildedRoseUnitTests.cc @@ -0,0 +1,12 @@ +#include + +#include "GildedRose.h" + +TEST(GildedRoseTest, Foo) { + vector items; + items.push_back(Item("Foo", 0, 0)); + GildedRose app(items); + app.updateQuality(); + EXPECT_EQ("fixme", app.items[0].name); +} + diff --git a/GildedRose/cpp/Makefile b/GildedRose/cpp/Makefile index 460e959d..56b3f6c3 100644 --- a/GildedRose/cpp/Makefile +++ b/GildedRose/cpp/Makefile @@ -71,5 +71,5 @@ gtest_main.a : gtest-all.o gtest_main.o # $(GTEST_HEADERS) # $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/GildedRose.h -GildedRose : GildedRose.h gtest_main.a - $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(USER_DIR)/GildedRose.h -pthread $^ -o $@ +GildedRose : GildedRoseUnitTests.cc gtest_main.a + $(CXX) $(CPPFLAGS) $(CXXFLAGS) -pthread $^ -o $@