From e0eccba62f403734c5d35bd1705f581bdf833389 Mon Sep 17 00:00:00 2001 From: jmsgrogan Date: Sun, 7 Jun 2020 18:11:36 +0100 Subject: [PATCH] Move xml tools to uptr, start adding test setup. --- CMakeLists.txt | 3 ++- src/web/CMakeLists.txt | 8 +++++--- src/web/html/HtmlElement.h | 3 ++- src/web/xml/XmlDocument.h | 5 +++-- src/web/xml/XmlWriter.cpp | 6 ++++++ src/web/xml/XmlWriter.h | 12 ++++++++++++ src/web/xml/{ => xml-elements}/XmlAttribute.cpp | 0 src/web/xml/{ => xml-elements}/XmlAttribute.h | 0 src/web/xml/{ => xml-elements}/XmlElement.cpp | 0 src/web/xml/{ => xml-elements}/XmlElement.h | 3 ++- src/web/xml/{ => xml-elements}/XmlProlog.cpp | 0 src/web/xml/{ => xml-elements}/XmlProlog.h | 3 ++- test/CMakeLists.txt | 6 ++++++ test/test_runner.cpp | 4 ++++ 14 files changed, 44 insertions(+), 9 deletions(-) create mode 100644 src/web/xml/XmlWriter.cpp create mode 100644 src/web/xml/XmlWriter.h rename src/web/xml/{ => xml-elements}/XmlAttribute.cpp (100%) rename src/web/xml/{ => xml-elements}/XmlAttribute.h (100%) rename src/web/xml/{ => xml-elements}/XmlElement.cpp (100%) rename src/web/xml/{ => xml-elements}/XmlElement.h (96%) rename src/web/xml/{ => xml-elements}/XmlProlog.cpp (100%) rename src/web/xml/{ => xml-elements}/XmlProlog.h (94%) create mode 100644 test/CMakeLists.txt create mode 100644 test/test_runner.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index e197675..0093827 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,4 +8,5 @@ set(CMAKE_CXX_STANDARD_REQUIRED True) link_libraries(stdc++fs) add_subdirectory(src) -add_subdirectory(apps) \ No newline at end of file +add_subdirectory(apps) +add_subdirectory(test) \ No newline at end of file diff --git a/src/web/CMakeLists.txt b/src/web/CMakeLists.txt index 11c718a..3fec2da 100644 --- a/src/web/CMakeLists.txt +++ b/src/web/CMakeLists.txt @@ -1,9 +1,10 @@ list(APPEND web_LIB_INCLUDES xml/XmlParser.cpp xml/XmlDocument.cpp - xml/XmlElement.cpp - xml/XmlAttribute.cpp - xml/XmlProlog.cpp + xml/XmlWriter.cpp + xml/xml-elements/XmlElement.cpp + xml/xml-elements/XmlAttribute.cpp + xml/xml-elements/XmlProlog.cpp markdown/MarkdownParser.cpp html/HtmlWriter.cpp html/HtmlDocument.cpp @@ -18,6 +19,7 @@ target_include_directories(web PUBLIC "${PROJECT_SOURCE_DIR}/src/core/file_utilities" "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/xml" + "${CMAKE_CURRENT_SOURCE_DIR}/xml/xml-elements" "${CMAKE_CURRENT_SOURCE_DIR}/html" "${CMAKE_CURRENT_SOURCE_DIR}/markdown" ) \ No newline at end of file diff --git a/src/web/html/HtmlElement.h b/src/web/html/HtmlElement.h index 3ca13a9..f44c201 100644 --- a/src/web/html/HtmlElement.h +++ b/src/web/html/HtmlElement.h @@ -1,6 +1,7 @@ #pragma once #include -#include "XmlElement.h" + +#include "../xml/xml-elements/XmlElement.h" class HtmlElement : public XmlElement { diff --git a/src/web/xml/XmlDocument.h b/src/web/xml/XmlDocument.h index 530f054..5a4aee2 100644 --- a/src/web/xml/XmlDocument.h +++ b/src/web/xml/XmlDocument.h @@ -1,8 +1,9 @@ #pragma once #include #include -#include "XmlElement.h" -#include "XmlProlog.h" + +#include "xml-elements/XmlElement.h" +#include "xml-elements/XmlProlog.h" class XmlDocument { diff --git a/src/web/xml/XmlWriter.cpp b/src/web/xml/XmlWriter.cpp new file mode 100644 index 0000000..7afe9fb --- /dev/null +++ b/src/web/xml/XmlWriter.cpp @@ -0,0 +1,6 @@ +#include "XmlWriter.h" + +void XmlWriter::Write(File* file, XmlDocument* document) +{ + +} diff --git a/src/web/xml/XmlWriter.h b/src/web/xml/XmlWriter.h new file mode 100644 index 0000000..320ea6c --- /dev/null +++ b/src/web/xml/XmlWriter.h @@ -0,0 +1,12 @@ +#pragma once + +#include "File.h" +#include "XmlDocument.h" + +class XmlWriter +{ +public: + XmlWriter() = default; + + void Write(File* file, XmlDocument* document); +}; diff --git a/src/web/xml/XmlAttribute.cpp b/src/web/xml/xml-elements/XmlAttribute.cpp similarity index 100% rename from src/web/xml/XmlAttribute.cpp rename to src/web/xml/xml-elements/XmlAttribute.cpp diff --git a/src/web/xml/XmlAttribute.h b/src/web/xml/xml-elements/XmlAttribute.h similarity index 100% rename from src/web/xml/XmlAttribute.h rename to src/web/xml/xml-elements/XmlAttribute.h diff --git a/src/web/xml/XmlElement.cpp b/src/web/xml/xml-elements/XmlElement.cpp similarity index 100% rename from src/web/xml/XmlElement.cpp rename to src/web/xml/xml-elements/XmlElement.cpp diff --git a/src/web/xml/XmlElement.h b/src/web/xml/xml-elements/XmlElement.h similarity index 96% rename from src/web/xml/XmlElement.h rename to src/web/xml/xml-elements/XmlElement.h index 0de7b1d..bd34f41 100644 --- a/src/web/xml/XmlElement.h +++ b/src/web/xml/xml-elements/XmlElement.h @@ -2,7 +2,8 @@ #include #include #include -#include "XmlAttribute.h" + +#include "xml-elements/XmlAttribute.h" class XmlElement { diff --git a/src/web/xml/XmlProlog.cpp b/src/web/xml/xml-elements/XmlProlog.cpp similarity index 100% rename from src/web/xml/XmlProlog.cpp rename to src/web/xml/xml-elements/XmlProlog.cpp diff --git a/src/web/xml/XmlProlog.h b/src/web/xml/xml-elements/XmlProlog.h similarity index 94% rename from src/web/xml/XmlProlog.h rename to src/web/xml/xml-elements/XmlProlog.h index c9c6a0a..2898b9e 100644 --- a/src/web/xml/XmlProlog.h +++ b/src/web/xml/xml-elements/XmlProlog.h @@ -1,7 +1,8 @@ #pragma once #include #include -#include "XmlElement.h" + +#include "xml-elements/XmlElement.h" class XmlProlog : public XmlElement { diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt new file mode 100644 index 0000000..d7cfa30 --- /dev/null +++ b/test/CMakeLists.txt @@ -0,0 +1,6 @@ +add_executable(test_runner test_runner.cpp) +target_include_directories(test_runner PUBLIC + "${PROJECT_SOURCE_DIR}/test/" + ) +target_link_libraries(test_runner PUBLIC core + network database geometry audio graphics web) \ No newline at end of file diff --git a/test/test_runner.cpp b/test/test_runner.cpp new file mode 100644 index 0000000..905869d --- /dev/null +++ b/test/test_runner.cpp @@ -0,0 +1,4 @@ +int main() +{ + return 0; +}