From df938ff92ea02f26c594c610234754101138f646 Mon Sep 17 00:00:00 2001 From: Andreas Stöckel Date: Tue, 4 Mar 2014 15:16:06 +0000 Subject: added unit test framework git-svn-id: file:///var/local/svn/basicwriter@14 daaaf23c-2e50-4459-9457-1e69db5a47bf --- CMakeLists.txt | 58 +++++++++++++++++++++++++++++++------ lib/download_dependencies.sh | 6 ++++ src/main.cpp | 17 +++++++---- src/model/GraphNode.cpp | 54 +++++++++++++++++++++++++++++++++++ src/model/GraphNode.hpp | 68 ++++++++++++++++++++++++++++++++++++++++++++ src/model/domain/Domain.cpp | 20 +++++++++++++ src/model/domain/Domain.hpp | 40 ++++++++++++++++++++++++++ test/model/GraphNode.cpp | 34 ++++++++++++++++++++++ 8 files changed, 282 insertions(+), 15 deletions(-) create mode 100755 lib/download_dependencies.sh create mode 100644 src/model/GraphNode.cpp create mode 100644 src/model/GraphNode.hpp create mode 100644 src/model/domain/Domain.cpp create mode 100644 src/model/domain/Domain.hpp create mode 100644 test/model/GraphNode.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index da91330..f4cceee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,17 +4,57 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9) SET(CMAKE_AUTOMOC ON) FIND_PACKAGE(Qt5Widgets REQUIRED) -INCLUDE_DIRECTORIES(src/) - # Enable C++11 and all warnings SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -std=c++11") -ADD_EXECUTABLE(basicwriter - src/main.cpp - src/gui/notepad.cpp - src/gui/components/UIPaneFrame.cpp -# src/gui/components/UIGrid.cpp -# src/gui/components/GridTree.cpp +# Option for enabling testing. Turn on with 'cmake -Dtest=ON'. +OPTION(test "Build all tests." OFF) # Makes boolean 'test' available. + +# Unit test handling +if(test) + # Compile gtest + add_subdirectory(lib/gtest-1.7.0) + + # Enable testing and declare some variables used for compiling the test cases + enable_testing() + set(GTEST_INCLUDE_DIR ${gtest_SOURCE_DIR}/include ${gtest_SOURCE_DIR}) + set(GTEST_LIBRARIES gtest gtest_main) +endif() + +INCLUDE_DIRECTORIES(src/) + +ADD_LIBRARY(ousia_core + src/model/GraphNode +) + +ADD_EXECUTABLE(ousia + src/main +) + +TARGET_LINK_LIBRARIES(ousia + ousia_core ) -QT5_USE_MODULES(basicwriter Widgets) +QT5_USE_MODULES(ousia Widgets) + +if(test) + # Include the gtest include files and the src directory + INCLUDE_DIRECTORIES( + ${GTEST_INCLUDE_DIR} + src/ + ) + + # Add all unit test files + ADD_EXECUTABLE(ousia_test + test/model/GraphNode + ) + + TARGET_LINK_LIBRARIES(ousia_test + ${GTEST_LIBRARIES} + ousia_core + ) + + # Register the unit test + ADD_TEST(ousia_test ousia_test) +endif() + diff --git a/lib/download_dependencies.sh b/lib/download_dependencies.sh new file mode 100755 index 0000000..369c514 --- /dev/null +++ b/lib/download_dependencies.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +# Download and unzip googletest +wget https://googletest.googlecode.com/files/gtest-1.7.0.zip +unzip gtest-1.7.0.zip + diff --git a/src/main.cpp b/src/main.cpp index efe3031..5c01bc3 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,4 +1,3 @@ -#include #include #include #include @@ -7,11 +6,18 @@ #include #include +#include + +using namespace ousia; + int main(int argc, char *argv[]) { - QApplication a(argc, argv); - Notepad w; - w.show(); + std::shared_ptr nd1{new GraphNode("node1")}; + std::shared_ptr nd2{new GraphNode("node2", nd1)}; + + std::cout << nd2->getParent()->getName() << std::endl; + + return 0; // Open the file given as first argument /* QFile file(argv[1]); @@ -31,6 +37,5 @@ int main(int argc, char *argv[]) return 1; } return 0;*/ - - return a.exec(); } + diff --git a/src/model/GraphNode.cpp b/src/model/GraphNode.cpp new file mode 100644 index 0000000..affc3af --- /dev/null +++ b/src/model/GraphNode.cpp @@ -0,0 +1,54 @@ +/* + Ousía + Copyright (C) 2014 Benjamin Paaßen, Andreas Stöckel + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#include "GraphNode.hpp" + +#include +#include + +namespace ousia { + +GraphNode::GraphNode() : + parent(nullptr) +{ + // Do nothing here +} + +GraphNode::GraphNode(std::shared_ptr parent) : + parent(parent) +{ + // Do nothing here +} + +GraphNode::GraphNode(const std::string &name, std::shared_ptr parent) : + name(name), parent(parent) +{ + // Do nothing here +} + +const std::string GraphNode::getFullyQualifiedName() +{ + if (parent) { + std::stringstream ss; + ss << parent->getFullyQualifiedName() << "." << name; + return ss.str(); + } + return name; +} + +} diff --git a/src/model/GraphNode.hpp b/src/model/GraphNode.hpp new file mode 100644 index 0000000..39770dd --- /dev/null +++ b/src/model/GraphNode.hpp @@ -0,0 +1,68 @@ +/* + Ousía + Copyright (C) 2014 Benjamin Paaßen, Andreas Stöckel + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#ifndef _GRAPH_NODE_HPP_ +#define _GRAPH_NODE_HPP_ + +#include +#include + +namespace ousia { + +class GraphNode { + +private: + std::string name; + std::shared_ptr parent; + +public: + GraphNode(); + + GraphNode(std::shared_ptr parent); + + GraphNode(const std::string &name, std::shared_ptr parent = nullptr); + + const std::string& getName() + { + return name; + } + + const std::string getFullyQualifiedName(); + + void setName(const std::string &name) + { + this->name = name; + } + + std::shared_ptr getParent() + { + return std::shared_ptr(parent); + } + + void setParent(std::shared_ptr parent) + { + this->parent = parent; + } + + +}; + +} + +#endif /* _GRAPH_NODE_HPP_ */ + diff --git a/src/model/domain/Domain.cpp b/src/model/domain/Domain.cpp new file mode 100644 index 0000000..110e367 --- /dev/null +++ b/src/model/domain/Domain.cpp @@ -0,0 +1,20 @@ +/* + BasicWriter + Copyright (C) 2014 Benjamin Paaßen, Andreas Stöckel + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + + + diff --git a/src/model/domain/Domain.hpp b/src/model/domain/Domain.hpp new file mode 100644 index 0000000..98b440a --- /dev/null +++ b/src/model/domain/Domain.hpp @@ -0,0 +1,40 @@ +/* + Ousía + Copyright (C) 2014 Benjamin Paaßen, Andreas Stöckel + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#include +#include +#include + +#include + +namespace ousia { +namespace domain { + +class Domain : public GraphNode { + +private: + std::shared_ptr root; + std::vector> structures; + std::vector> categories; + std::vector> layers; + +}; + +} +} + diff --git a/test/model/GraphNode.cpp b/test/model/GraphNode.cpp new file mode 100644 index 0000000..a5596f5 --- /dev/null +++ b/test/model/GraphNode.cpp @@ -0,0 +1,34 @@ +/* + Ousía + Copyright (C) 2014 Benjamin Paaßen, Andreas Stöckel + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#include + +#include + +namespace ousia { + +TEST(GraphNodeTest, FullyQuallifiedNameTest) +{ + std::shared_ptr nd1{new GraphNode("node1")}; + std::shared_ptr nd2{new GraphNode("node2", nd1)}; + + ASSERT_STREQ("node1.node2", nd2->getFullyQualifiedName().c_str()); +} + +} + -- cgit v1.2.3