Bläddra i källkod

Rename XmlParserMock class

- rename XMLParserMock class and move it to the test package
Patrick-Christopher Mattulat 3 år sedan
förälder
incheckning
12b5ee5e12

+ 3 - 3
CMakeLists.txt

@@ -85,7 +85,6 @@ set(SOURCE_FILES
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/xml/XmlDeclaration.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/xml/XmlDocument.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/xml/XmlReader.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/xml/XmlParserMock.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/StandardOutputWriter.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/logic/Narrator.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/logic/IListener.cpp
@@ -147,7 +146,7 @@ if (${LS_STD_BUILD_WITH_TESTS})
             ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/io/xml/XmlDeclarationTest.cpp
             ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/io/xml/XmlDocumentTest.cpp
             ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/io/xml/XmlReaderTest.cpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/io/xml/XmlParserMockTest.cpp
+            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/io/xml/XmlParserTestWrapperTest.cpp
             ${CMAKE_CURRENT_SOURCE_DIR}/test/classes/observer/TestDataCar.cpp
             ${CMAKE_CURRENT_SOURCE_DIR}/test/classes/observer/TestDataMercedesCar.cpp
             ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/logic/NarratorTest.cpp
@@ -179,7 +178,8 @@ if (${LS_STD_BUILD_WITH_TESTS})
             ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/exception/IllegalArgumentExceptionTest.cpp
             ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/exception/IllegalArithmeticOperationExceptionTest.cpp
             ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/exception/IncompleteJsonExceptionTest.cpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/exception/NullPointerExceptionTest.cpp)
+            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/exception/NullPointerExceptionTest.cpp
+            ${CMAKE_CURRENT_SOURCE_DIR}/test/classes/io/xml/XmlParserTestWrapper.cpp)
 endif ()
 
 ##########################################################

+ 0 - 23
source/ls_std/io/xml/XmlParserMock.cpp

@@ -1,23 +0,0 @@
-/*
- * Author:          Patrick-Christopher Mattulat
- * Company:         Lynar Studios
- * E-Mail:          webmaster@lynarstudios.com
- * Created:         2020-10-18
- * Changed:         2021-05-02
- *
- * */
-
-#include <ls_std/io/xml/XmlParserMock.hpp>
-
-ls_std::XmlParserMock::XmlParserMock() : ls_std::XmlParser(nullptr)
-{}
-
-std::pair<std::string, std::string> ls_std::XmlParserMock::readAttribute(const ls_std::byte_field &_data)
-{
-  return ls_std::XmlParser::_readAttribute_(_data);
-}
-
-std::list<std::pair<std::string, std::string>> ls_std::XmlParserMock::readAttributes(ls_std::byte_field _data)
-{
-  return ls_std::XmlParser::_readAttributes_(std::move(_data));
-}

+ 10 - 10
test/cases/io/xml/XmlParserMockTest.cpp → test/cases/io/xml/XmlParserTestWrapperTest.cpp

@@ -8,16 +8,16 @@
  * */
 
 #include <gtest/gtest.h>
-#include <ls_std/io/xml/XmlParserMock.hpp>
+#include <classes/io/xml/XmlParserTestWrapper.hpp>
 
 namespace
 {
-  class XmlParserMockTest : public ::testing::Test
+  class XmlParserTestWrapperTest : public ::testing::Test
   {
     protected:
 
-      XmlParserMockTest() = default;
-      ~XmlParserMockTest() override = default;
+      XmlParserTestWrapperTest() = default;
+      ~XmlParserTestWrapperTest() override = default;
 
       void SetUp() override
       {}
@@ -26,23 +26,23 @@ namespace
       {}
   };
 
-  TEST_F(XmlParserMockTest, readAttribute)
+  TEST_F(XmlParserTestWrapperTest, readAttribute)
   {
-    std::pair<std::string, std::string> attribute = ls_std::XmlParserMock::readAttribute(R"(name="tim")");
+    std::pair<std::string, std::string> attribute = ls_std_test::XmlParserTestWrapper::readAttribute(R"(name="tim")");
     ASSERT_TRUE(attribute.first == "name");
     ASSERT_TRUE(attribute.second == "tim");
 
-    attribute = ls_std::XmlParserMock::readAttribute(R"(id="dialog_001")");
+    attribute = ls_std_test::XmlParserTestWrapper::readAttribute(R"(id="dialog_001")");
     ASSERT_TRUE(attribute.first == "id");
     ASSERT_TRUE(attribute.second == "dialog_001");
   }
 
-  TEST_F(XmlParserMockTest, readAttributes)
+  TEST_F(XmlParserTestWrapperTest, readAttributes)
   {
     // first case
 
     std::string tag = R"(<?xml version="1.0" encoding="UTF-8" ?>)";
-    std::list<std::pair<std::string, std::string>> attributes = ls_std::XmlParserMock::readAttributes(tag);
+    std::list<std::pair<std::string, std::string>> attributes = ls_std_test::XmlParserTestWrapper::readAttributes(tag);
 
     ASSERT_EQ(2, attributes.size());
 
@@ -57,7 +57,7 @@ namespace
     // second case
 
     tag = R"(<stateMachine name="test_machine">)";
-    attributes = ls_std::XmlParserMock::readAttributes(tag);
+    attributes = ls_std_test::XmlParserTestWrapper::readAttributes(tag);
 
     ASSERT_EQ(1, attributes.size());
 

+ 23 - 0
test/classes/io/xml/XmlParserTestWrapper.cpp

@@ -0,0 +1,23 @@
+/*
+ * Author:          Patrick-Christopher Mattulat
+ * Company:         Lynar Studios
+ * E-Mail:          webmaster@lynarstudios.com
+ * Created:         2020-10-18
+ * Changed:         2021-05-02
+ *
+ * */
+
+#include "XmlParserTestWrapper.hpp"
+
+ls_std_test::XmlParserTestWrapper::XmlParserTestWrapper() : ls_std::XmlParser(nullptr)
+{}
+
+std::pair<std::string, std::string> ls_std_test::XmlParserTestWrapper::readAttribute(const ls_std::byte_field &_data)
+{
+  return ls_std::XmlParser::_readAttribute_(_data);
+}
+
+std::list<std::pair<std::string, std::string>> ls_std_test::XmlParserTestWrapper::readAttributes(ls_std::byte_field _data)
+{
+  return ls_std::XmlParser::_readAttributes_(std::move(_data));
+}

+ 5 - 5
include/ls_std/io/xml/XmlParserMock.hpp → test/classes/io/xml/XmlParserTestWrapper.hpp

@@ -10,16 +10,16 @@
 #ifndef LS_STD_XML_PARSER_MOCK_HPP
 #define LS_STD_XML_PARSER_MOCK_HPP
 
-#include "XmlParser.hpp"
+#include <ls_std/io/xml/XmlParser.hpp>
 
-namespace ls_std
+namespace ls_std_test
 {
-  class XmlParserMock : public ls_std::XmlParser
+  class XmlParserTestWrapper : public ls_std::XmlParser
   {
     public:
 
-      XmlParserMock();
-      ~XmlParserMock() override = default;
+      XmlParserTestWrapper();
+      ~XmlParserTestWrapper() override = default;
 
       static std::pair<std::string, std::string> readAttribute(const ls_std::byte_field &_data);
       static std::list<std::pair<std::string, std::string>> readAttributes(ls_std::byte_field _data);