Jelajahi Sumber

merged TestStringTools into StringTools.unit

Simon Krajewski 12 tahun lalu
induk
melakukan
c07afea735
3 mengubah file dengan 13 tambahan dan 34 penghapusan
  1. 0 1
      tests/unit/Test.hx
  2. 0 32
      tests/unit/TestStringTools.hx
  3. 13 1
      tests/unit/unitstd/StringTools.unit.hx

+ 0 - 1
tests/unit/Test.hx

@@ -232,7 +232,6 @@ class Test #if swf_mark implements mt.Protect #end {
 			new TestMeta(),
 			new TestMeta(),
 			new TestType(),
 			new TestType(),
 			new TestOrder(),
 			new TestOrder(),
-			new TestStringTools(),
 			#if !no_pattern_matching
 			#if !no_pattern_matching
 			new TestMatch(),
 			new TestMatch(),
 			#end
 			#end

+ 0 - 32
tests/unit/TestStringTools.hx

@@ -1,32 +0,0 @@
-package unit;
-
-class TestStringTools extends Test
-{
-
-	function testHtmlEscape() {
-		eq( StringTools.htmlEscape("<>&\"'"), "&lt;&gt;&amp;\"'");
-		eq( StringTools.htmlEscape("<>&\"'", true), "&lt;&gt;&amp;&quot;&#039;" );
-		eq( StringTools.htmlUnescape("&lt;&gt;&amp;&quot;&#039;"), "<>&\"'" );
-	}
-	
-	function testHex() {
-		eq( StringTools.hex(0xABCDEF,7), "0ABCDEF" );
-		eq( StringTools.hex(-1,8), "FFFFFFFF" );
-		eq( StringTools.hex(-481400000,8), "E34E6B40" );
-	}
-	
-	function testCCA() {
-		var str = "abc";
-		eq( StringTools.fastCodeAt(str, 0), "a".code );
-		eq( StringTools.fastCodeAt(str, 1), "b".code );
-		eq( StringTools.fastCodeAt(str, 2), "c".code );
-		eq(StringTools.fastCodeAt(String.fromCharCode(128), 0), 128);
-		eq(StringTools.fastCodeAt(String.fromCharCode(255), 0), 255);
-		f( StringTools.isEof(StringTools.fastCodeAt(str, 2)) );
-		t( StringTools.isEof(StringTools.fastCodeAt(str, 3)) );
-		
-		t( StringTools.isEof(StringTools.fastCodeAt("", 0)) );
-	}
-		
-	
-}

+ 13 - 1
tests/unit/unitstd/StringTools.unit.hx

@@ -105,6 +105,9 @@ StringTools.hex(4564562, 0) == "45A652";
 StringTools.hex(4564562, 1) == "45A652";
 StringTools.hex(4564562, 1) == "45A652";
 StringTools.hex( -1) == "FFFFFFFF";
 StringTools.hex( -1) == "FFFFFFFF";
 StringTools.hex( -2) == "FFFFFFFE";
 StringTools.hex( -2) == "FFFFFFFE";
+StringTools.hex(0xABCDEF, 7) == "0ABCDEF";
+StringTools.hex( -1, 8) == "FFFFFFFF";
+StringTools.hex( -481400000, 8) == "E34E6B40";
 
 
 // fastCodeAt
 // fastCodeAt
 var s = "foo1bar";
 var s = "foo1bar";
@@ -115,7 +118,16 @@ StringTools.fastCodeAt(s, 3) == 49;
 StringTools.fastCodeAt(s, 4) == 98;
 StringTools.fastCodeAt(s, 4) == 98;
 StringTools.fastCodeAt(s, 5) == 97;
 StringTools.fastCodeAt(s, 5) == 97;
 StringTools.fastCodeAt(s, 6) == 114;
 StringTools.fastCodeAt(s, 6) == 114;
-
+var str = "abc";
+StringTools.fastCodeAt(str, 0) == "a".code;
+StringTools.fastCodeAt(str, 1) == "b".code;
+StringTools.fastCodeAt(str, 2) == "c".code;
+StringTools.fastCodeAt(String.fromCharCode(128), 0) == 128;
+StringTools.fastCodeAt(String.fromCharCode(255), 0) == 255;
+StringTools.isEof(StringTools.fastCodeAt(str, 2)) == false;
+StringTools.isEof(StringTools.fastCodeAt(str, 3)) == true;
+StringTools.isEof(StringTools.fastCodeAt("", 0)) == true;
+		
 // isEOF
 // isEOF
 #if neko
 #if neko
 StringTools.isEof(null) == true;
 StringTools.isEof(null) == true;