Navigation

Changeset 64 for trunk/test

Timestamp:

07/12/06 09:39:52 (2 years ago)

Author:

Jan-Klaas Kollhof

Message:

adding zip to iter module and naturla compare algorithm to strings module

Files:

r50	r64
9	9	var map = imprt('iter').map;
10	10	var list = imprt('iter').list;
	11	var zip = imprt('iter').zip;
11	12
12	13
…	…
63	64	});
64	65	t.assertEquals('map(range(0,20), item + 2) == 2 .. 22', n.join(","), a.join(","));
	66
	67
	68	var a=[1,2,3,4,5];
	69	var b=[5,4,3,2];
	70	var r = map(zip(a,b), function(a,b){
	71	return a + ':' + b;
	72	});
	73	t.assertEquals('zip([1,2,3,4,5], [5,4,3,2])', r.join(","), "1:5,2:4,3:3,4:2")
65	74	};
66	75
…	…
69	78	var iter = imprt('iter').iter;
70	79	var filter = imprt('iter').filter;
	80	var range = imprt('iter').range;
71	81
72	82	var testing = imprt('testing');
73	83
74		~~mod.__test__(testing);~~
	84
75	85
76	86	var task=function(){
…	…
96	106	print("Range iter \t\t" + testing.profile(function(){
97	107	var s=[];
98		iter(~~mod.~~range(0,99), function(item,i){
	108	iter(range(0,99), function(item,i){
99	109	s.push(r[item]);
100	110	task();
…	…
174	184	}));
175	185
	186
	187
	188
176	189	};
177	190	mod.__main__=function(){

r50	r64
2	2
3	3	mod.test=function(testing, logger){
4		imprt('strings');
	4	var strings = imprt('strings');
5	5
6	6	logger.log("testing strings");
…	…
10	10
11	11
12		var rslt = tmpl.exec({name:"test", b:2})
	12	var rslt = tmpl.exec({name:"test", b:2});
13	13	testing.assertEquals("template result", rslt, "Template (test) run at Thu Jan 1 00:00:00 UTC 1970\n\n loop 0\n\n loop 1\n\n loop 2\n\n loop 3\n\n loop 4\n\n loop 5\n\n loop 6\n\n loop 7\n\n loop 8\n\n loop 9\n\n------------\n\n b is set ? > <?\n foo\n\n------------\n0,1,2,3,4,5,6,7,8,9,\n-----------\n")
	14
14	15
	16	var a = ["jsolait 1","jsolait 11", "jsolait 2"];
	17	a.sort(strings.naturalCompare);
	18	testing.assertEquals("natural compare", a.join(", "), "jsolait 1, jsolait 2, jsolait 11");
15	19	};
16	20