summaryrefslogtreecommitdiff
path: root/test/core
diff options
context:
space:
mode:
Diffstat (limited to 'test/core')
-rw-r--r--test/core/BufferedCharReaderTest.cpp185
-rw-r--r--test/core/CodeTokenizerTest.cpp26
-rw-r--r--test/core/RegistryTest.cpp2
-rw-r--r--test/core/TokenizerTest.cpp14
-rw-r--r--test/core/common/CharReaderTest.cpp (renamed from test/core/utils/CharReaderTest.cpp)4
-rw-r--r--test/core/common/LoggerTest.cpp (renamed from test/core/LoggerTest.cpp)2
-rw-r--r--test/core/common/UtilsTest.cpp (renamed from test/core/UtilsTest.cpp)2
-rw-r--r--test/core/common/VariantReaderTest.cpp (renamed from test/core/variant/ReaderTest.cpp)70
-rw-r--r--test/core/common/VariantTest.cpp (renamed from test/core/variant/VariantTest.cpp)2
9 files changed, 58 insertions, 249 deletions
diff --git a/test/core/BufferedCharReaderTest.cpp b/test/core/BufferedCharReaderTest.cpp
deleted file mode 100644
index b3498f7..0000000
--- a/test/core/BufferedCharReaderTest.cpp
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- Ousía
- Copyright (C) 2014, 2015 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 <http://www.gnu.org/licenses/>.
-*/
-
-#include <string>
-#include <iostream>
-
-#include "gtest/gtest.h"
-
-#include <core/BufferedCharReader.hpp>
-
-namespace ousia{
-
-TEST(BufferedCharReaderTest, SimpleReadTest)
-{
- std::string testStr{"this is a test"};
- char c;
-
- // Feed a test string into the reader
- BufferedCharReader reader{testStr};
-
- // Try to read the test string
- std::string res;
- while (!reader.atEnd()) {
- ASSERT_TRUE(reader.read(&c));
- res.append(&c, 1);
- }
-
- // The two strings must equal
- ASSERT_STREQ(testStr.c_str(), res.c_str()) ;
-
- // We must now be at line 1, column 15
- ASSERT_EQ(1, reader.getLine());
- ASSERT_EQ(testStr.size() + 1, reader.getColumn());
-
- // If we call either read or peek, false is returned
- ASSERT_FALSE(reader.read(&c));
- ASSERT_FALSE(reader.peek(&c));
-}
-
-TEST(BufferedCharReaderTest, SimplePeekTest)
-{
- std::string testStr{"this is a test"};
- char c;
-
- // Feed a test string into the reader
- BufferedCharReader reader{testStr};
-
- // Try to read the test string
- std::string res;
- while (reader.peek(&c)) {
- res.append(&c, 1);
- }
-
- // Peeking does not trigger the "atEnd" flag
- ASSERT_FALSE(reader.atEnd());
-
- // The two strings must equal
- ASSERT_STREQ(testStr.c_str(), res.c_str());
-
- // We must now be at line 1, column 1 and NOT at the end of the stream
- ASSERT_EQ(1, reader.getLine());
- ASSERT_EQ(1, reader.getColumn());
- ASSERT_FALSE(reader.atEnd());
-
- // If we consume the peek, we must be at line 1, column 15 and we should be
- // at the end of the stream
- reader.consumePeek();
- ASSERT_EQ(1, reader.getLine());
- ASSERT_EQ(testStr.size() + 1, reader.getColumn());
- ASSERT_TRUE(reader.atEnd());
-
- // If we call either read or peek, false is returned
- ASSERT_FALSE(reader.read(&c));
- ASSERT_FALSE(reader.peek(&c));
-}
-
-TEST(BufferedCharReaderTest, SplittedPeakTest)
-{
- std::string testStr{"this is a test"};
- char c;
-
- // Feed a test string into the reader
- BufferedCharReader reader;
-
- // Try to peek the test string, feed char after char into the reader
- std::string res;
- for (unsigned int i = 0; i < testStr.length(); i++) {
- reader.feed(std::string(&testStr[i], 1));
- while (reader.peek(&c)) {
- res.append(&c, 1);
- }
- }
- reader.close();
-
- // Consume the peeked data
- ASSERT_FALSE(reader.atEnd());
- reader.consumePeek();
- ASSERT_TRUE(reader.atEnd());
-
- // The two strings must equal
- ASSERT_STREQ(testStr.c_str(), res.c_str()) ;
-
- // We must now be at line 1, column 15
- ASSERT_EQ(1, reader.getLine());
- ASSERT_EQ(testStr.size() + 1, reader.getColumn());
-
- // If we call either read or peek, false is returned
- ASSERT_FALSE(reader.read(&c));
- ASSERT_FALSE(reader.peek(&c));
-}
-
-TEST(BufferedCharReaderTest, RowColumnCounterTest)
-{
- // Feed a test string into the reader
- BufferedCharReader reader{"1\n\r2\n3\r\n\n4"};
-
- // We should currently be in line 1, column 1
- ASSERT_EQ(1, reader.getLine());
- ASSERT_EQ(1, reader.getColumn());
-
- // Read two characters
- char c;
- for (int i = 0; i < 2; i++) reader.read(&c);
- ASSERT_EQ(2, reader.getLine());
- ASSERT_EQ(1, reader.getColumn());
-
- // Read two characters
- for (int i = 0; i < 2; i++) reader.read(&c);
- ASSERT_EQ(3, reader.getLine());
- ASSERT_EQ(1, reader.getColumn());
-
- // Read three characters
- for (int i = 0; i < 3; i++) reader.read(&c);
- ASSERT_EQ(5, reader.getLine());
- ASSERT_EQ(1, reader.getColumn());
-}
-
-TEST(BufferedCharReaderTest, LinebreakSubstitutionTest)
-{
- // Feed a test string into the reader
- BufferedCharReader reader{"this\n\ris\n\rjust\na test\r\n\rtest\n\r"};
-
- // Read all characters from the test string
- std::string res;
- char c;
- while (reader.read(&c)) {
- res.append(&c, 1);
- }
-
- // Test for equality
- ASSERT_STREQ("this\nis\njust\na test\n\ntest\n", res.c_str());
-}
-
-TEST(BufferedCharReaderTest, RowColumnCounterUTF8Test)
-{
- // Feed a test string with some umlauts into the reader
- BufferedCharReader reader{"\x61\xc3\x96\xc3\x84\xc3\x9c\xc3\x9f"};
-
- // Read all bytes
- char c;
- while (reader.read(&c));
-
- // The sequence above equals 5 UTF-8 characters (so after reading all the
- // cursor is at position 6)
- ASSERT_EQ(1, reader.getLine());
- ASSERT_EQ(6, reader.getColumn());
-}
-
-}
-
diff --git a/test/core/CodeTokenizerTest.cpp b/test/core/CodeTokenizerTest.cpp
index 1432564..4d11622 100644
--- a/test/core/CodeTokenizerTest.cpp
+++ b/test/core/CodeTokenizerTest.cpp
@@ -32,15 +32,15 @@ static const int CURLY_CLOSE = 41;
TEST(CodeTokenizer, testTokenizer)
{
- BufferedCharReader reader;
- reader.feed("/**\n"); // 1
- reader.feed(" * Some Block Comment\n"); // 2
- reader.feed(" */\n"); // 3
- reader.feed("var my_string = 'My \\'String\\'';\n"); // 4
- reader.feed("// and a line comment\n"); // 5
- reader.feed("var my_obj = { a = 4;}"); // 6
- // 123456789012345678901234567890123456789
- // 0 1 2 3
+ CharReader reader{
+ "/**\n" // 1
+ " * Some Block Comment\n" // 2
+ " */\n" // 3
+ "var my_string = 'My \\'String\\'';\n" // 4
+ "// and a line comment\n" // 5
+ "var my_obj = { a = 4;}"}; // 6
+ // 123456789012345678901234567890123456789
+ // 0 1 2 3
TokenTreeNode root{{{"/*", 1},
{"*/", 2},
{"//", 3},
@@ -68,10 +68,10 @@ TEST(CodeTokenizer, testTokenizer)
{STRING, "My 'String'", 17, 4, 32, 4},
{TOKEN_TEXT, ";", 32, 4, 33, 4},
{LINEBREAK, "\n", 33, 4, 1, 5},
- //this is slightly counter-intuitive but makes sense if you think about
- //it: As a line comment is ended by a line break the line break is
- //technically still a part of the line comment and thus the ending
- //is in the next line.
+ // this is slightly counter-intuitive but makes sense if you think about
+ // it: As a line comment is ended by a line break the line break is
+ // technically still a part of the line comment and thus the ending
+ // is in the next line.
{LINE_COMMENT, " and a line comment", 1, 5, 1, 6},
{TOKEN_TEXT, "var", 1, 6, 4, 6},
{TOKEN_TEXT, "my_obj", 5, 6, 11, 6},
diff --git a/test/core/RegistryTest.cpp b/test/core/RegistryTest.cpp
index e06011a..22365f2 100644
--- a/test/core/RegistryTest.cpp
+++ b/test/core/RegistryTest.cpp
@@ -22,7 +22,7 @@
#include <sstream>
-#include <core/Logger.hpp>
+#include <core/common/Logger.hpp>
namespace ousia {
diff --git a/test/core/TokenizerTest.cpp b/test/core/TokenizerTest.cpp
index da6b578..2b80662 100644
--- a/test/core/TokenizerTest.cpp
+++ b/test/core/TokenizerTest.cpp
@@ -18,7 +18,7 @@
#include <gtest/gtest.h>
-#include <core/BufferedCharReader.hpp>
+#include <core/common/CharReader.hpp>
#include <core/Tokenizer.hpp>
@@ -65,10 +65,9 @@ TEST(Tokenizer, testTokenization)
{
TokenTreeNode root{{{"/", 1}, {"/*", 2}, {"*/", 3}}};
- BufferedCharReader reader;
- reader.feed("Test/Test /* Block Comment */");
- // 12345678901234567890123456789
- // 0 1 2
+ CharReader reader{"Test/Test /* Block Comment */"};
+ // 12345678901234567890123456789
+ // 0 1 2
std::vector<Token> expected = {
{TOKEN_TEXT, "Test", 1, 1, 5, 1},
@@ -97,10 +96,7 @@ TEST(Tokenizer, testIncompleteTokens)
{
TokenTreeNode root{{{"ab", 1}, {"c", 2}}};
- BufferedCharReader reader;
- reader.feed("ac");
- // 1234567890
- // 0 1
+ CharReader reader{"ac"};
std::vector<Token> expected = {
{TOKEN_TEXT, "a", 1, 1, 2, 1},
diff --git a/test/core/utils/CharReaderTest.cpp b/test/core/common/CharReaderTest.cpp
index eb04a8e..06b9d45 100644
--- a/test/core/utils/CharReaderTest.cpp
+++ b/test/core/common/CharReaderTest.cpp
@@ -22,10 +22,9 @@
#include "gtest/gtest.h"
-#include <core/utils/CharReader.hpp>
+#include <core/common/CharReader.hpp>
namespace ousia {
-namespace utils {
/* Test data */
@@ -819,5 +818,4 @@ TEST(CharReaderTest, context)
}
}
}
-}
diff --git a/test/core/LoggerTest.cpp b/test/core/common/LoggerTest.cpp
index abb76de..54c67f9 100644
--- a/test/core/LoggerTest.cpp
+++ b/test/core/common/LoggerTest.cpp
@@ -20,7 +20,7 @@
#include <gtest/gtest.h>
-#include <core/Logger.hpp>
+#include <core/common/Logger.hpp>
namespace ousia {
diff --git a/test/core/UtilsTest.cpp b/test/core/common/UtilsTest.cpp
index 0a7d2a3..2858038 100644
--- a/test/core/UtilsTest.cpp
+++ b/test/core/common/UtilsTest.cpp
@@ -18,7 +18,7 @@
#include <gtest/gtest.h>
-#include <core/Utils.hpp>
+#include <core/common/Utils.hpp>
namespace ousia {
diff --git a/test/core/variant/ReaderTest.cpp b/test/core/common/VariantReaderTest.cpp
index 43e85a5..d9bb74e 100644
--- a/test/core/variant/ReaderTest.cpp
+++ b/test/core/common/VariantReaderTest.cpp
@@ -19,7 +19,7 @@
#include <iostream>
#include <gtest/gtest.h>
-#include <core/variant/Reader.hpp>
+#include <core/common/VariantReader.hpp>
namespace ousia {
namespace variant {
@@ -32,7 +32,7 @@ TEST(Reader, readString)
// Simple, double quoted string
{
CharReader reader("\"hello world\"");
- auto res = Reader::parseString(reader, logger);
+ auto res = VariantReader::parseString(reader, logger);
ASSERT_TRUE(res.first);
ASSERT_EQ("hello world", res.second);
}
@@ -40,7 +40,7 @@ TEST(Reader, readString)
// Simple, double quoted string with whitespace
{
CharReader reader(" \"hello world\" ");
- auto res = Reader::parseString(reader, logger);
+ auto res = VariantReader::parseString(reader, logger);
ASSERT_TRUE(res.first);
ASSERT_EQ("hello world", res.second);
}
@@ -48,7 +48,7 @@ TEST(Reader, readString)
// Simple, single quoted string
{
CharReader reader("'hello world'");
- auto res = Reader::parseString(reader, logger);
+ auto res = VariantReader::parseString(reader, logger);
ASSERT_TRUE(res.first);
ASSERT_EQ("hello world", res.second);
}
@@ -56,7 +56,7 @@ TEST(Reader, readString)
// Escape characters
{
CharReader reader("'\\'\\\"\\b\\f\\n\\r\\t\\v'");
- auto res = Reader::parseString(reader, logger);
+ auto res = VariantReader::parseString(reader, logger);
ASSERT_TRUE(res.first);
ASSERT_EQ("'\"\b\f\n\r\t\v", res.second);
}
@@ -67,7 +67,7 @@ TEST(Reader, parseUnescapedString)
// Simple case
{
CharReader reader("hello world;");
- auto res = Reader::parseUnescapedString(reader, logger, {';'});
+ auto res = VariantReader::parseUnescapedString(reader, logger, {';'});
ASSERT_TRUE(res.first);
ASSERT_EQ("hello world", res.second);
}
@@ -75,7 +75,7 @@ TEST(Reader, parseUnescapedString)
// Simple case with whitespace
{
CharReader reader(" hello world ; ");
- auto res = Reader::parseUnescapedString(reader, logger, {';'});
+ auto res = VariantReader::parseUnescapedString(reader, logger, {';'});
ASSERT_TRUE(res.first);
ASSERT_EQ("hello world", res.second);
}
@@ -83,7 +83,7 @@ TEST(Reader, parseUnescapedString)
// Linebreaks
{
CharReader reader(" hello\nworld ; ");
- auto res = Reader::parseUnescapedString(reader, logger, {';'});
+ auto res = VariantReader::parseUnescapedString(reader, logger, {';'});
ASSERT_TRUE(res.first);
ASSERT_EQ("hello\nworld", res.second);
}
@@ -91,7 +91,7 @@ TEST(Reader, parseUnescapedString)
// End of stream
{
CharReader reader(" hello world ");
- auto res = Reader::parseUnescapedString(reader, logger, {';'});
+ auto res = VariantReader::parseUnescapedString(reader, logger, {';'});
ASSERT_TRUE(res.first);
ASSERT_EQ("hello world", res.second);
}
@@ -104,49 +104,49 @@ TEST(Reader, parseInteger)
// Valid integers
{
CharReader reader("0 ");
- auto res = Reader::parseInteger(reader, logger, noDelim);
+ auto res = VariantReader::parseInteger(reader, logger, noDelim);
ASSERT_TRUE(res.first);
ASSERT_EQ(0, res.second);
}
{
CharReader reader("42 ");
- auto res = Reader::parseInteger(reader, logger, noDelim);
+ auto res = VariantReader::parseInteger(reader, logger, noDelim);
ASSERT_TRUE(res.first);
ASSERT_EQ(42, res.second);
}
{
CharReader reader("-42");
- auto res = Reader::parseInteger(reader, logger, noDelim);
+ auto res = VariantReader::parseInteger(reader, logger, noDelim);
ASSERT_TRUE(res.first);
ASSERT_EQ(-42, res.second);
}
{
CharReader reader(" -0x4A2 ");
- auto res = Reader::parseInteger(reader, logger, noDelim);
+ auto res = VariantReader::parseInteger(reader, logger, noDelim);
ASSERT_TRUE(res.first);
ASSERT_EQ(-0x4A2, res.second);
}
{
CharReader reader(" 0Xaffe");
- auto res = Reader::parseInteger(reader, logger, noDelim);
+ auto res = VariantReader::parseInteger(reader, logger, noDelim);
ASSERT_TRUE(res.first);
ASSERT_EQ(0xAFFE, res.second);
}
{
CharReader reader("0x7FFFFFFFFFFFFFFF");
- auto res = Reader::parseInteger(reader, logger, noDelim);
+ auto res = VariantReader::parseInteger(reader, logger, noDelim);
ASSERT_TRUE(res.first);
ASSERT_EQ(0x7FFFFFFFFFFFFFFFL, res.second);
}
{
CharReader reader("-0x7FFFFFFFFFFFFFFF");
- auto res = Reader::parseInteger(reader, logger, noDelim);
+ auto res = VariantReader::parseInteger(reader, logger, noDelim);
ASSERT_TRUE(res.first);
ASSERT_EQ(-0x7FFFFFFFFFFFFFFFL, res.second);
}
@@ -154,25 +154,25 @@ TEST(Reader, parseInteger)
// Invalid integers
{
CharReader reader("-");
- auto res = Reader::parseInteger(reader, logger, noDelim);
+ auto res = VariantReader::parseInteger(reader, logger, noDelim);
ASSERT_FALSE(res.first);
}
{
CharReader reader("0a");
- auto res = Reader::parseInteger(reader, logger, noDelim);
+ auto res = VariantReader::parseInteger(reader, logger, noDelim);
ASSERT_FALSE(res.first);
}
{
CharReader reader("-0xag");
- auto res = Reader::parseInteger(reader, logger, noDelim);
+ auto res = VariantReader::parseInteger(reader, logger, noDelim);
ASSERT_FALSE(res.first);
}
{
CharReader reader("0x8000000000000000");
- auto res = Reader::parseInteger(reader, logger, noDelim);
+ auto res = VariantReader::parseInteger(reader, logger, noDelim);
ASSERT_FALSE(res.first);
}
}
@@ -182,49 +182,49 @@ TEST(Reader, parseDouble)
// Valid doubles
{
CharReader reader("1.25");
- auto res = Reader::parseDouble(reader, logger, noDelim);
+ auto res = VariantReader::parseDouble(reader, logger, noDelim);
ASSERT_TRUE(res.first);
ASSERT_EQ(1.25, res.second);
}
{
CharReader reader(".25");
- auto res = Reader::parseDouble(reader, logger, noDelim);
+ auto res = VariantReader::parseDouble(reader, logger, noDelim);
ASSERT_TRUE(res.first);
ASSERT_EQ(.25, res.second);
}
{
CharReader reader(".25e1");
- auto res = Reader::parseDouble(reader, logger, noDelim);
+ auto res = VariantReader::parseDouble(reader, logger, noDelim);
ASSERT_TRUE(res.first);
ASSERT_EQ(2.5, res.second);
}
{
CharReader reader("-2.5e-1");
- auto res = Reader::parseDouble(reader, logger, noDelim);
+ auto res = VariantReader::parseDouble(reader, logger, noDelim);
ASSERT_TRUE(res.first);
ASSERT_EQ(-0.25, res.second);
}
{
CharReader reader("-50e-2");
- auto res = Reader::parseDouble(reader, logger, noDelim);
+ auto res = VariantReader::parseDouble(reader, logger, noDelim);
ASSERT_TRUE(res.first);
ASSERT_EQ(-0.5, res.second);
}
{
CharReader reader("-1.");
- auto res = Reader::parseDouble(reader, logger, noDelim);
+ auto res = VariantReader::parseDouble(reader, logger, noDelim);
ASSERT_TRUE(res.first);
ASSERT_EQ(-1., res.second);
}
{
CharReader reader("-50.e-2");
- auto res = Reader::parseDouble(reader, logger, {'.'});
+ auto res = VariantReader::parseDouble(reader, logger, {'.'});
ASSERT_TRUE(res.first);
ASSERT_EQ(-50, res.second);
}
@@ -232,13 +232,13 @@ TEST(Reader, parseDouble)
// Invalid doubles
{
CharReader reader(".e1");
- auto res = Reader::parseDouble(reader, logger, noDelim);
+ auto res = VariantReader::parseDouble(reader, logger, noDelim);
ASSERT_FALSE(res.first);
}
{
CharReader reader("0e100000");
- auto res = Reader::parseDouble(reader, logger, noDelim);
+ auto res = VariantReader::parseDouble(reader, logger, noDelim);
ASSERT_FALSE(res.first);
}
}
@@ -249,7 +249,7 @@ TEST(Reader, parseArray)
{
CharReader reader("[\"Hello, World\", unescaped\n string ,\n"
"1234, 0.56, true, false, null]");
- auto res = Reader::parseArray(reader, logger);
+ auto res = VariantReader::parseArray(reader, logger);
ASSERT_TRUE(res.first);
// Make sure array has the correct size
@@ -276,7 +276,7 @@ TEST(Reader, parseArray)
// Ending with comma
{
CharReader reader("[ 'test' ,]");
- auto res = Reader::parseArray(reader, logger);
+ auto res = VariantReader::parseArray(reader, logger);
ASSERT_TRUE(res.first);
// Make sure the array has the correct size
@@ -292,7 +292,7 @@ TEST(Reader, parseArray)
// Recovery from invalid values
{
CharReader reader("[ 0invalidNumber, str, 1invalid]");
- auto res = Reader::parseArray(reader, logger);
+ auto res = VariantReader::parseArray(reader, logger);
ASSERT_TRUE(res.first);
// Make sure the array has the correct size
@@ -315,7 +315,7 @@ TEST(Reader, parseGeneric)
// Simple case, unescaped string
{
CharReader reader("hello world");
- auto res = Reader::parseGeneric(reader, logger, {';'});
+ auto res = VariantReader::parseGeneric(reader, logger, {';'});
ASSERT_TRUE(res.first);
ASSERT_TRUE(res.second.isString());
ASSERT_EQ("hello world", res.second.asString());
@@ -324,7 +324,7 @@ TEST(Reader, parseGeneric)
// Simple case, double quoted string
{
CharReader reader(" \"hello world\" ");
- auto res = Reader::parseGeneric(reader, logger, {';'});
+ auto res = VariantReader::parseGeneric(reader, logger, {';'});
ASSERT_TRUE(res.first);
ASSERT_TRUE(res.second.isString());
ASSERT_EQ("hello world", res.second.asString());
@@ -333,7 +333,7 @@ TEST(Reader, parseGeneric)
// Simple case, single quoted string
{
CharReader reader(" 'hello world' ");
- auto res = Reader::parseGeneric(reader, logger, {';'});
+ auto res = VariantReader::parseGeneric(reader, logger, {';'});
ASSERT_TRUE(res.first);
ASSERT_TRUE(res.second.isString());
ASSERT_EQ("hello world", res.second.asString());
diff --git a/test/core/variant/VariantTest.cpp b/test/core/common/VariantTest.cpp
index e51cf36..580846e 100644
--- a/test/core/variant/VariantTest.cpp
+++ b/test/core/common/VariantTest.cpp
@@ -20,7 +20,7 @@
#include <gtest/gtest.h>
-#include <core/variant/Variant.hpp>
+#include <core/common/Variant.hpp>
namespace ousia {
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-01 13:41:27 +0000