Feature [feature-requests:#1212]. Move Unicode conversions into UniConversion.

Move Unicode conversion functions UnicodeFromUTF8 and UTF8FromUTF32Character
into UniConversion.

3 files changed, 27 insertions, 47 deletions

diff --git a/test/unit/testUniConversion.cxx b/test/unit/testUniConversion.cxx
index 4d34abd60..4bb7d361a 100644
--- a/test/unit/testUniConversion.cxx
+++ b/test/unit/testUniConversion.cxx
@@ -75,6 +75,33 @@ TEST_CASE("UTF16Length") {
 
 TEST_CASE("UniConversion") {
 
+	// UnicodeFromUTF8
+
+	SECTION("UnicodeFromUTF8 ASCII") {
+		const unsigned char s[]={'a', 0};
+		REQUIRE(UnicodeFromUTF8(s) == 'a');
+	}
+
+	SECTION("UnicodeFromUTF8 Example1") {
+		const unsigned char s[]={0x24, 0};
+		REQUIRE(UnicodeFromUTF8(s) == 0x24);
+	}
+
+	SECTION("UnicodeFromUTF8 Example2") {
+		const unsigned char s[]={0xC2, 0xA2, 0};
+		REQUIRE(UnicodeFromUTF8(s) == 0xA2);
+	}
+
+	SECTION("UnicodeFromUTF8 Example3") {
+		const unsigned char s[]={0xE2, 0x82, 0xAC, 0};
+		REQUIRE(UnicodeFromUTF8(s) == 0x20AC);
+	}
+
+	SECTION("UnicodeFromUTF8 Example4") {
+		const unsigned char s[]={0xF0, 0x90, 0x8D, 0x88, 0};
+		REQUIRE(UnicodeFromUTF8(s) == 0x10348);
+	}
+
 	// UTF16FromUTF8
 
 	SECTION("UTF16FromUTF8 ASCII") {
diff --git a/test/unit/testUnicodeFromUTF8.cxx b/test/unit/testUnicodeFromUTF8.cxx
deleted file mode 100644
index 941a08a16..000000000
--- a/test/unit/testUnicodeFromUTF8.cxx
+++ /dev/null
@@ -1,46 +0,0 @@
-// Unit Tests for Scintilla internal data structures
-
-#include <cstring>
-
-#include <algorithm>
-
-#include "Platform.h"
-
-#include "UnicodeFromUTF8.h"
-
-#include "catch.hpp"
-
-using namespace Scintilla;
-
-// Test UnicodeFromUTF8.
-// Use examples from Wikipedia:
-// http://en.wikipedia.org/wiki/UTF-8
-
-TEST_CASE("UnicodeFromUTF8") {
-
-	SECTION("ASCII") {
-		const unsigned char s[]={'a', 0};
-		REQUIRE(UnicodeFromUTF8(s) == 'a');
-	}
-
-	SECTION("Example1") {
-		const unsigned char s[]={0x24, 0};
-		REQUIRE(UnicodeFromUTF8(s) == 0x24);
-	}
-
-	SECTION("Example2") {
-		const unsigned char s[]={0xC2, 0xA2, 0};
-		REQUIRE(UnicodeFromUTF8(s) == 0xA2);
-	}
-
-	SECTION("Example3") {
-		const unsigned char s[]={0xE2, 0x82, 0xAC, 0};
-		REQUIRE(UnicodeFromUTF8(s) == 0x20AC);
-	}
-
-	SECTION("Example4") {
-		const unsigned char s[]={0xF0, 0x90, 0x8D, 0x88, 0};
-		REQUIRE(UnicodeFromUTF8(s) == 0x10348);
-	}
-
-}
diff --git a/test/unit/unitTest.cxx b/test/unit/unitTest.cxx
index cdea417db..a98b740d8 100644
--- a/test/unit/unitTest.cxx
+++ b/test/unit/unitTest.cxx
@@ -10,7 +10,6 @@
         Decoration
         DecorationList
         CellBuffer
-        UnicodeFromUTF8
         UniConversion
 
     To do: