2 files changed, 27 insertions, 9 deletions
diff --git a/test/core/LoggerTest.cpp b/test/core/LoggerTest.cpp
index b4549ed..0c333ce 100644
--- a/test/core/LoggerTest.cpp
+++ b/test/core/LoggerTest.cpp
@@ -26,7 +26,7 @@ namespace ousia {
 
 struct Pos {
 	int line, column;
-	Pos(int line, int column) : line(line), column(column) {};
+	Pos(int line, int column) : line(line), column(column){};
 	int getLine() const { return line; }
 	int getColumn() const { return column; }
 };
@@ -52,13 +52,23 @@ TEST(TerminalLogger, log)
 	logger.fatalError("This is a test fatal error!", 10, 20);
 
 	try {
-		throw LoggableException{"A fatal exception"};
+		throw LoggableException{"A fatal exception", true};
 	}
 	catch (const LoggableException &ex) {
 		logger.log(ex);
 	}
 
-	logger.logAt(Severity::ERROR, "This is a positioned error", Pos(10, 20));
+	try {
+		throw LoggableException{"A fatal exception at position", true, Pos(10, 20)};
+	}
+	catch (const LoggableException &ex) {
+		logger.log(ex);
+	}
+
+	logger.logAt(Severity::ERROR, "This is a positioned log message",
+	             Pos(10, 20));
+	logger.debugAt("This is a positioned debug message", Pos(10, 20));
+	logger.noteAt("This is a positioned log error", Pos(10, 20));
 }
 }
 
diff --git a/test/core/CSSParserTest.cpp b/test/plugins/css/CSSParserTest.cpp
index a717093..84d4893 100644
--- a/test/core/CSSParserTest.cpp
+++ b/test/plugins/css/CSSParserTest.cpp
@@ -18,14 +18,18 @@
 
 #include <gtest/gtest.h>
 
-#include <core/CSSParser.hpp>
+#include <sstream>
+
+#include <plugins/css/CSSParser.hpp>
 
 namespace ousia {
+namespace parser {
+namespace css  {
 TEST(CSSParser, testParseSelectors)
 {
-	// create a selector Tree as input.
-	BufferedCharReader reader;
-	reader.feed("A>B,A B:r, C#a A[bla=\"blub\"], A::g(4,2,3)");
+	// create a string describing a SelectorTree as input.
+	std::stringstream input;
+	input << "A>B,A B:r, C#a A[bla=\"blub\"], A::g(4,2,3)";
 	/* This should describe the tree:
 	 * root_____
 	 * | \      \
@@ -34,9 +38,12 @@ TEST(CSSParser, testParseSelectors)
 	 * B B::r A[bla="blub"]
 	 */
 
+	// initialize an empty parser context.
+	StandaloneParserContext ctx;
+
 	// parse the input.
 	CSSParser instance;
-	Rooted<SelectorNode> root = instance.parse(reader);
+	Rooted<SelectorNode> root = instance.parse(input, ctx).cast<SelectorNode>();
 
 	// we expect three children of the root node overall.
 	ASSERT_EQ(3, root->getEdges().size());
@@ -109,4 +116,5 @@ TEST(CSSParser, testParseSelectors)
 	ASSERT_EQ(0, Ag->getEdges().size());
 }
 }
-
+}
+}