1 files changed, 22 insertions, 20 deletions

diff --git a/test/source_type_test.cc b/test/source_type_test.cc
index 47d820d..288f1e5 100644
--- a/test/source_type_test.cc
+++ b/test/source_type_test.cc
@@ -1,38 +1,40 @@
-#include <uunit.h>
-
-#include <libctor.h>
+#include <ctor.h>
 #include <task_cc.h>
-#include <settings.h>
 
-std::ostream& operator<<(std::ostream& stream, const Language& lang)
+std::ostream& operator<<(std::ostream& stream, const ctor::language& lang);
+
+#include <uunit.h>
+
+std::ostream& operator<<(std::ostream& stream, const ctor::language& lang)
 {
 	switch(lang)
 	{
-	case Language::Auto:
-		stream << "Language::Auto";
+	case ctor::language::automatic:
+		stream << "ctor::language::automatic";
 		break;
-	case Language::C:
-		stream << "Language::C";
+	case ctor::language::c:
+		stream << "ctor::language::c";
 		break;
-	case Language::Cpp:
-		stream << "Language::Cpp";
+	case ctor::language::cpp:
+		stream << "ctor::language::cpp";
 		break;
-	case Language::Asm:
-		stream << "Language::Asm";
+	case ctor::language::assembler:
+		stream << "ctor::language::assembler";
 		break;
 	}
 
 	return stream;
 }
+
 class TestableTaskCC
 	: public TaskCC
 {
 public:
-	TestableTaskCC(const Source& source)
+	TestableTaskCC(const ctor::source& source)
 		: TaskCC({}, {}, "build", source)
 	{}
 
-	Language language() const
+	ctor::language language() const
 	{
 		return source_language;
 	}
@@ -51,22 +53,22 @@ public:
 	{
 		{ // c++
 			TestableTaskCC task("hello.cc");
-			uASSERT_EQUAL(Language::Cpp, task.language());
+			uASSERT_EQUAL(ctor::language::cpp, task.language());
 		}
 
 		{ // c
 			TestableTaskCC task("hello.c");
-			uASSERT_EQUAL(Language::C, task.language());
+			uASSERT_EQUAL(ctor::language::c, task.language());
 		}
 
 		{ // asm
 			TestableTaskCC task("hello.s");
-			uASSERT_EQUAL(Language::Asm, task.language());
+			uASSERT_EQUAL(ctor::language::assembler, task.language());
 		}
 
 		{ // custom/explicit language
-			TestableTaskCC task( {"hello.foo", Language::Asm} );
-			uASSERT_EQUAL(Language::Asm, task.language());
+			TestableTaskCC task( {"hello.foo", ctor::language::assembler} );
+			uASSERT_EQUAL(ctor::language::assembler, task.language());
 		}
 
 		// Note: Failure state will result in exit(1) so cannot be tested