CLDEPARSER-19 #time 3h

LE, Duc-Anh · LE, Duc-Anh · commit 25c1341006ae · 2015-08-25T10:04:16.000+07:00
diff --git a/.gitignore b/.gitignore
@@ -92,3 +92,4 @@ Makefile.in
 # CMake & Builds generated files
 /.idea
 /CMake
+/Extra
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,6 +7,7 @@ add_subdirectory(Source/Exceptions)
 add_subdirectory(Source/Scanning)
 add_subdirectory(Source/Parsing)
 add_subdirectory(Source/Parsing/Json)
+add_subdirectory(Test)
 
 
 set(SOURCE_FILES
@@ -52,7 +53,6 @@ target_link_libraries(cldeparser scanner parser parser-json exceptions)
 add_executable(example-json Examples/example-json.cpp)
 target_link_libraries(example-json cldeparser-static)
 
-
 # Example - math
 add_executable(example-math Examples/example-math.cpp)
 target_link_libraries(example-math cldeparser-static)
@@ -67,3 +67,18 @@ install(TARGETS cldeparser-static cldeparser
         LIBRARY DESTINATION ./
         ARCHIVE DESTINATION ./
 )
+
+
+# Extra folder (containing supporting libraries such as gtest, gmock, valgrind ... Extra folder is not tracked)
+set(EXTRA_DIR "Extra")
+set(TEST_SOURCE
+        Test/main.cpp
+        Test/case01.hpp
+        Test/JsonParserInstance.cpp Test/JsonParserInstance.h Test/JsonTestFixture.cpp Test/JsonTestFixture.h)
+
+include_directories(${EXTRA_DIR}/gtest-1.7.0/include)
+LINK_DIRECTORIES(${EXTRA_DIR}/gtest-1.7.0/lib)
+
+# Targets
+add_executable(cldeparser-apptest ${TEST_SOURCE})
+target_link_libraries(cldeparser-apptest gtest cldeparser-static)
diff --git a/Examples/example-json.cpp b/Examples/example-json.cpp
@@ -40,7 +40,7 @@ int main() {
         auto filteredTokens = Scanning::TokenHelper::Filter(filteredCodes, tokens);
 
         // Parsing
-        auto sptrSyntaxModel = std::dynamic_pointer_cast<Parsing::Json::JsonSyntaxModel>(parser.Parse(filteredTokens));
+        auto sptrSyntaxModel = parser.ParseCast<Parsing::Json::JsonSyntaxModel>(filteredTokens);
         auto sptrJsonEntity = sptrSyntaxModel->CreateSPtrJsonEnity();
 
         std::cout << "Input:  " << example << std::endl;
diff --git a/Source/ParserSingle.cpp b/Source/ParserSingle.cpp
@@ -8,12 +8,18 @@
 
 namespace CLDEParser {
 
-    SPtrSyntaxModel ParserSingle::Parse(SPtrTokenVector const &sptrTokens) {
+    SPtrSyntaxModel ParserSingle::Parse(SPtrTokenVector const &sptrTokens) const {
 
         auto iterator = sptrTokens.cbegin();
 
         try {
 
+            // Empty string returns a nullptr entity
+            if(iterator == sptrTokens.cend()){
+                return _sptrDerivative->SyntaxModel();
+            }
+
+            // Process
             if (!_sptrDerivative->Derive(iterator)) {
                 int code = (int) Exceptions::ParserException::ParserExceptionCode::UnmatchedToken;
                 throw Exceptions::ParserException{code, iterator};
diff --git a/Source/ParserSingle.h b/Source/ParserSingle.h
@@ -26,7 +26,12 @@ namespace CLDEParser {
         virtual ~ParserSingle() = default;
 
         // Locals
-        virtual SPtrSyntaxModel Parse(SPtrTokenVector const &sptrTokens);
+        virtual SPtrSyntaxModel Parse(SPtrTokenVector const &sptrTokens) const;
+
+        template<typename T>
+        std::shared_ptr<T> ParseCast(SPtrTokenVector const &sptrTokens) const {
+            return std::dynamic_pointer_cast<T>(Parse(sptrTokens));
+        }
     };
 }
 
diff --git a/Source/Parsing/Json/JsonSyntaxModel.cpp b/Source/Parsing/Json/JsonSyntaxModel.cpp
@@ -19,7 +19,7 @@ namespace CLDEParser {
 
             SPtrJsonEntity JsonSyntaxModel::CreateSPtrJsonEnity() {
                 auto iterator = _sptrSyntaxNodeQueue.cbegin();
-                return createSPtrJsonEntity(iterator);
+                return (iterator != _sptrSyntaxNodeQueue.cend()) ? createSPtrJsonEntity(iterator) : SPtrJsonEntity{};
             }
 
             SPtrJsonEntity JsonSyntaxModel::createSPtrJsonEntity(SPtrJsonSyntaxNodeIterator &iterator) {
diff --git a/Source/Scanner.cpp b/Source/Scanner.cpp
@@ -13,7 +13,7 @@ namespace CLDEParser {
         return _tokenizers;
     }
 
-    SPtrTokenVector Scanner::Scan(const std::string &string) {
+    SPtrTokenVector Scanner::Scan(const std::string &string) const {
 
         SPtrTokenizerList matchedTokenizers;
         SPtrTokenVector tokens;
@@ -60,7 +60,7 @@ namespace CLDEParser {
 
     SPtrToken Scanner::ProcessAndMoveNext(std::string::const_iterator &cIter,
                                           std::string::const_iterator &cEnd,
-                                          SPtrTokenizerList &matchedTokenizers) {
+                                          SPtrTokenizerList &matchedTokenizers) const {
 
         std::vector<SPtrTokenizerList::const_iterator> unmatched;
         SPtrTokenizer sptrTokenizer;
diff --git a/Source/Scanner.h b/Source/Scanner.h
@@ -26,14 +26,14 @@ namespace CLDEParser {
 
         // Locals
         SPtrTokenizerVector &Tokenizers();
-        SPtrTokenVector Scan(const std::string &string);
-        int exceptionTokenNo() const { return _exceptionTokenNo; }
+        SPtrTokenVector Scan(const std::string &string) const;
+        int ExceptionTokenNo() const { return _exceptionTokenNo; }
         void setExceptionTokenNo(int exceptionTokenNo) { _exceptionTokenNo = exceptionTokenNo; }
 
     protected:
         SPtrToken ProcessAndMoveNext(std::string::const_iterator &cIter,
                                      std::string::const_iterator &cEnd,
-                                     SPtrTokenizerList &matchedTokenizers);
+                                     SPtrTokenizerList &matchedTokenizers) const;
     };
 }
 
diff --git a/Test/CMakeLists.txt b/Test/CMakeLists.txt
@@ -0,0 +1,6 @@
+cmake_minimum_required(VERSION 3.2)
+project(cldeparser)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+
+
diff --git a/Test/JsonParserInstance.cpp b/Test/JsonParserInstance.cpp
@@ -0,0 +1,50 @@
+//
+// Created by LE, Duc Anh on 8/25/15.
+//
+
+#include "JsonParserInstance.h"
+
+namespace CLDEParser {
+    namespace Test {
+
+        JsonParserInstance::JsonParserInstance()
+                : _scanner{}, _parser{Parsing::ParserFactory::CreateJsonDerivative()} {
+            //
+            init();
+        }
+
+        void JsonParserInstance::init() {
+            _scanner.Tokenizers().push_back(Scanning::TokenizerFactory::CreateSpace());
+            _scanner.Tokenizers().push_back(Scanning::TokenizerFactory::CreateTab());
+            _scanner.Tokenizers().push_back(Scanning::TokenizerFactory::CreateNull());
+            _scanner.Tokenizers().push_back(Scanning::TokenizerFactory::CreateBoolTrue());
+            _scanner.Tokenizers().push_back(Scanning::TokenizerFactory::CreateBoolFalse());
+            _scanner.Tokenizers().push_back(Scanning::TokenizerFactory::CreateNumberInteger());
+            _scanner.Tokenizers().push_back(Scanning::TokenizerFactory::CreateNumber());
+            _scanner.Tokenizers().push_back(Scanning::TokenizerFactory::CreateId());
+            _scanner.Tokenizers().push_back(Scanning::TokenizerFactory::CreateString());
+            _scanner.Tokenizers().push_back(Scanning::TokenizerFactory::CreateColon());
+            _scanner.Tokenizers().push_back(Scanning::TokenizerFactory::CreateComma());
+            _scanner.Tokenizers().push_back(Scanning::TokenizerFactory::CreateCurlyBraceOpen());
+            _scanner.Tokenizers().push_back(Scanning::TokenizerFactory::CreateCurlyBraceClosing());
+            _scanner.Tokenizers().push_back(Scanning::TokenizerFactory::CreateBracketOpen());
+            _scanner.Tokenizers().push_back(Scanning::TokenizerFactory::CreateBracketClosing());
+        }
+
+        Parsing::Json::SPtrJsonEntity JsonParserInstance::Parse(std::string const &json) const {
+
+            // Scanning
+            auto tokens = _scanner.Scan(json);
+            auto filteredCodes = Scanning::TokenHelper::DefaultFilterCodes();
+            auto filteredTokens = Scanning::TokenHelper::Filter(filteredCodes, tokens);
+
+            // Parsing
+            auto sptrSyntaxModel = _parser.ParseCast<Parsing::Json::JsonSyntaxModel>(filteredTokens);
+            auto sptrJsonEntity = sptrSyntaxModel->CreateSPtrJsonEnity();
+
+            return sptrJsonEntity;
+        }
+    }
+}
+
+
diff --git a/Test/JsonParserInstance.h b/Test/JsonParserInstance.h
@@ -0,0 +1,40 @@
+//
+// Created by LE, Duc Anh on 8/25/15.
+//
+
+#ifndef CLDEPARSER_TEST_PARSERINSTANCE_H
+#define CLDEPARSER_TEST_PARSERINSTANCE_H
+
+#include "../Source/CLDEParser.h"
+#include "../Source/Parsing/Json/Json.h"
+
+namespace CLDEParser {
+    namespace Test {
+
+        class JsonParserInstance {
+
+            Scanner _scanner;
+            ParserSingle _parser;
+
+            void init();
+
+        public:
+            JsonParserInstance();
+            JsonParserInstance(const JsonParserInstance &) = default;
+            JsonParserInstance(JsonParserInstance &&) = default;
+            JsonParserInstance &operator=(const JsonParserInstance &) = default;
+            JsonParserInstance &operator=(JsonParserInstance &&) = default;
+            virtual ~JsonParserInstance() = default;
+
+            // Accessors & Mutators
+            Scanner &scanner() { return _scanner; }
+            ParserSingle &parser() { return _parser; }
+
+            // Locals
+            Parsing::Json::SPtrJsonEntity Parse(std::string const &json) const;
+        };
+    }
+}
+
+
+#endif //CLDEPARSER_TEST_PARSERINSTANCE_H
diff --git a/Test/JsonTestFixture.cpp b/Test/JsonTestFixture.cpp
@@ -0,0 +1,13 @@
+//
+// Created by LE, Duc Anh on 8/25/15.
+//
+
+#include "JsonTestFixture.h"
+
+
+void CLDEParser::Test::JsonTestFixture::SetUp() {
+    //
+}
+void CLDEParser::Test::JsonTestFixture::TearDown() {
+    //
+}
diff --git a/Test/JsonTestFixture.h b/Test/JsonTestFixture.h
@@ -0,0 +1,37 @@
+//
+// Created by LE, Duc Anh on 8/25/15.
+//
+
+#ifndef CLDEPARSER_TEST_JSONTESTFIXTURE_H
+#define CLDEPARSER_TEST_JSONTESTFIXTURE_H
+
+#include <gtest/gtest.h>
+#include "JsonParserInstance.h"
+
+namespace CLDEParser {
+    namespace Test {
+
+        class JsonTestFixture : public ::testing::Test {
+
+            JsonParserInstance _parserInstance;
+
+        public:
+            JsonTestFixture() = default;
+            JsonTestFixture(const JsonTestFixture &) = default;
+            JsonTestFixture(JsonTestFixture &&) = default;
+            JsonTestFixture &operator=(const JsonTestFixture &) = default;
+            JsonTestFixture &operator=(JsonTestFixture &&) = default;
+            virtual ~JsonTestFixture() = default;
+
+            // Accessors
+            const JsonParserInstance &parserInstance() const { return _parserInstance; }
+
+        protected:
+            virtual void SetUp() override;
+            virtual void TearDown() override;
+        };
+    }
+}
+
+
+#endif //CLDEPARSER_TEST_JSONTESTFIXTURE_H
diff --git a/Test/case01.hpp b/Test/case01.hpp
@@ -0,0 +1,17 @@
+#ifndef CLDEPARSER_TEST_CASE01_HPP
+#define CLDEPARSER_TEST_CASE01_HPP
+
+#include "JsonTestFixture.h"
+
+namespace CLDEParser {
+    namespace Test {
+
+        TEST_F(JsonTestFixture, case00_Empty) {
+            std::string example{};
+            auto jsonObj = parserInstance().Parse(example);
+            ASSERT_TRUE(jsonObj.get() == nullptr);
+        }
+    }
+}
+
+#endif//CLDEPARSER_TEST_CASE01_HPP
diff --git a/Test/main.cpp b/Test/main.cpp
@@ -0,0 +1,13 @@
+//
+// Created by LE, Duc Anh on 8/25/15.
+//
+
+#include <iostream>
+#include <gtest/gtest.h>
+#include "case01.hpp"
+
+int main(int argc, char *argv[]) {
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}
+

-Original file line number
+Diff line change
 # CMake & Builds generated files
 /.idea
 /CMake
 +/Extra
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ namespace CLDEParser {`
`19`	`19`
`20`	`20`	`SPtrJsonEntity JsonSyntaxModel::CreateSPtrJsonEnity() {`
`21`	`21`	`auto iterator = _sptrSyntaxNodeQueue.cbegin();`
`22`		`- return createSPtrJsonEntity(iterator);`
	`22`	`+ return (iterator != _sptrSyntaxNodeQueue.cend()) ? createSPtrJsonEntity(iterator) : SPtrJsonEntity{};`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`SPtrJsonEntity JsonSyntaxModel::createSPtrJsonEntity(SPtrJsonSyntaxNodeIterator &iterator) {`