Browse Source

use explicit Array<Dynamic> for mixed tests

Nicolas Cannasse 13 years ago
parent
commit
21bbb10f84
4 changed files with 13 additions and 10 deletions
  1. 7 6
      tests/unit/TestBasetypes.hx
  2. 3 2
      tests/unit/TestMisc.hx
  3. 1 1
      tests/unit/TestReflect.hx
  4. 2 1
      tests/unit/TestSerialize.hx

+ 7 - 6
tests/unit/TestBasetypes.hx

@@ -91,17 +91,18 @@ class TestBasetypes extends Test {
 		eq(1 + 1 + 1 + 1 + "1", "41");
 		eq(1 + 1 + 1 + 1 + "1", "41");
 		eq("1" + 1 + 1 + 1 + 1, "11111");
 		eq("1" + 1 + 1 + 1 + 1, "11111");
 		eq(1 + 1 + "1" + 1 * 2, "212");
 		eq(1 + 1 + "1" + 1 * 2, "212");
+
+		// check recursive formating
+		var x = [[1], [2, 3]];
+		eq("" + x, "[[1],[2,3]]");
 		
 		
 		// Brackets around array values should not be stripped.
 		// Brackets around array values should not be stripped.
-		var x = [1, "hello"];
+		var x : Array<Dynamic> = [1, "hello"];
 		eq("" + x, "[1,hello]");
 		eq("" + x, "[1,hello]");
 		eq(x + "", "" + x);
 		eq(x + "", "" + x);
 		
 		
-		var x = [[1], [2, 3]];
-		eq("" + x, "[[1],[2,3]]");
-
 		// This is also true for iterables that are arrays.
 		// This is also true for iterables that are arrays.
-		var x:Iterable<Dynamic> = [1, "hello"];
+		var x:Iterable<Dynamic> = x;
 		eq("" + x, "[1,hello]");
 		eq("" + x, "[1,hello]");
 		eq(x + "", "" + x);
 		eq(x + "", "" + x);
 		
 		
@@ -120,7 +121,7 @@ class TestBasetypes extends Test {
 		eq( Std.string(e), "C(0,h)");
 		eq( Std.string(e), "C(0,h)");
 		
 		
 		// This also seems rather odd on some platforms.
 		// This also seems rather odd on some platforms.
-		var x = ["4", 1];
+		var x : Array<Dynamic> = ["4", 1];
 		t(Std.is(x[0], String));
 		t(Std.is(x[0], String));
 		t(Std.is(x[0] + x[0], String));
 		t(Std.is(x[0] + x[0], String));
 		t(Std.is(x[1] + x[1], Int));
 		t(Std.is(x[1] + x[1], Int));

+ 3 - 2
tests/unit/TestMisc.hx

@@ -399,8 +399,9 @@ class TestMisc extends Test {
 		id( "he\n\r\t\\\\llo");
 		id( "he\n\r\t\\\\llo");
 
 
 		deepId( {field: 4} );
 		deepId( {field: 4} );
-		deepId( {test: {nested: null}} );
-		deepId( {array: [1,2,3,"str"]} );
+		deepId( { test: { nested: null }} );
+		var mix : Array<Dynamic> = [1, 2, 3, "str"];
+		deepId( {array: mix} );
 		
 		
 		eq( haxe.Json.parse('"\\u00E9"'), "é" );
 		eq( haxe.Json.parse('"\\u00E9"'), "é" );
 		
 		

+ 1 - 1
tests/unit/TestReflect.hx

@@ -59,7 +59,7 @@ class SubClassWithProp extends ClassWithProp {
 
 
 class TestReflect extends Test {
 class TestReflect extends Test {
 
 
-	static var TYPES = [
+	static var TYPES : Array<Dynamic> = [
 		null,Int,String,Bool,Float,
 		null,Int,String,Bool,Float,
 		Array,Hash,List,Date,Xml,Math,
 		Array,Hash,List,Date,Xml,Math,
 		unit.MyEnum,unit.MyClass,unit.MySubClass,
 		unit.MyEnum,unit.MyClass,unit.MySubClass,

+ 2 - 1
tests/unit/TestSerialize.hx

@@ -8,7 +8,8 @@ class TestSerialize extends Test {
 
 
 	function test() {
 	function test() {
 		// basic types
 		// basic types
-		for( v in [null,true,false,0,1,1506,-0xABCDEF,12.3,-1e10,"hello","éé","\r\n","\n","   ",""] )
+		var values : Array<Dynamic> = [null, true, false, 0, 1, 1506, -0xABCDEF, 12.3, -1e10, "hello", "éé", "\r\n", "\n", "   ", ""];
+		for( v in values )
 			eq( id(v), v );
 			eq( id(v), v );
 
 
 		t( Math.isNaN(id(Math.NaN)) );
 		t( Math.isNaN(id(Math.NaN)) );