[Mldonkey-commits] mldonkey config/Makefile.in distrib/ChangeLog t...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       10/09/08 16:29:23

Modified files:
        config         : Makefile.in 
        distrib        : ChangeLog 
Added files:
        tools          : tests.ml 

Log message:
        patch #7307

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/Makefile.in?cvsroot=mldonkey&r1=1.191&r2=1.192
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1472&r2=1.1473
http://cvs.savannah.gnu.org/viewcvs/mldonkey/tools/tests.ml?cvsroot=mldonkey&rev=1.1

Patches:
Index: config/Makefile.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/Makefile.in,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -b -r1.191 -r1.192
--- config/Makefile.in  1 Sep 2010 19:00:46 -0000       1.191
+++ config/Makefile.in  8 Sep 2010 16:29:23 -0000       1.192
@@ -572,6 +572,9 @@
 MLNET_CMXA=$(CDK_CMXA) magic.cmxa common.cmxa client.cmxa core.cmxa driver.cmxa
 MLNET_SRCS= $(MAIN_SRCS)
 
+TESTS_CMXA=$(CDK_CMXA) magic.cmxa common.cmxa client.cmxa core.cmxa
+TESTS_SRCS=tools/tests.ml
+
 ifeq ("$(GUI)", "newgui2")
 mlnet+gui_CMXA= \
   magic.cmxa cdk.cmxa common.cmxa client.cmxa core.cmxa driver.cmxa \
@@ -1339,6 +1342,7 @@
 EXPAND(CLUSTER,cluster)
 EXPAND(TESTRSS,testrss)
 EXPAND(SVG_CONVERTER,svg_converter)
+EXPAND(TESTS,tests)
 
 #######################################################################
 

Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1472
retrieving revision 1.1473
diff -u -b -r1.1472 -r1.1473
--- distrib/ChangeLog   8 Sep 2010 16:26:19 -0000       1.1472
+++ distrib/ChangeLog   8 Sep 2010 16:29:23 -0000       1.1473
@@ -15,6 +15,7 @@
 =========
 
 2010/09/08
+7307: New make target "tests" for unit tests (ygrek)
 7306: DC: show client brand, session transfer and duration (ygrek)
 
 2010/09/07

Index: tools/tests.ml
===================================================================
RCS file: tools/tests.ml
diff -N tools/tests.ml
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ tools/tests.ml      8 Sep 2010 16:29:23 -0000       1.1
@@ -0,0 +1,64 @@
+
+open Printf
+
+let pr fmt = ksprintf print_endline fmt
+
+let test ?n ?s f =
+  try
+    f ()
+  with
+    exn -> 
+      let msg = match s,n with
+      | Some s, Some n -> sprintf " %d %S" n s
+      | Some s, None -> sprintf " %S" s
+      | None, Some n -> sprintf " %d" n
+      | None, None -> ""
+      in
+      pr "Test%s failed: %s" msg (Printexc2.to_string exn)
+
+let test1 ?n ?s f x = test ?n ?s (fun () -> f x)
+
+let magnet s =
+  let magnet = CommonTypes.parse_magnet_url s in
+  pr "name: %S" magnet#name;
+  begin match magnet#size with Some size -> pr "size: %Ld" size | None -> () 
end;
+  pr "uids:";
+  List.iter (fun x -> pr "  %s" (CommonTypes.string_of_uid x)) magnet#uids;
+  pr ""
+
+let test_magnet () =
+  let t s = test1 ~s magnet s in
+  t 
"magnet:?xt=urn:tree:tiger:UXNWMYERN37HJNXB7V6KDJKZXMFBIQAGMDMYDBY&dn=DCPlusPlus-0.4032.exe";
+  t 
"magnet:?xt=urn:ed2k:354B15E68FB8F36D7CD88FF94116CDC1&xl=10826029&dn=mediawiki-1.15.1.tar.gz&xt=urn:tree:tiger:7N5OAMRNGMSSEUE3ORHOKWN4WWIQ5X4EBOOTLJY&xt=urn:btih:QHQXPYWMACKDWKP47RRVIV7VOURXFE5Q&tr=http%3A%2F%2Ftracker.example.org%2Fannounce.php%3Fuk%3D1111111111%26&as=http%3A%2F%2Fdownload.wikimedia.org%2Fmediawiki%2F1.15%2Fmediawiki-1.15.1.tar.gz&xs=http%3A%2F%2Fcache.example.org%2FXRX2PEFXOOEJFRVUCX6HMZMKS5TWG4K5&xs=dchub://example.org";
+  t 
"magnet:?xt=urn:ed2k:31D6CFE0D16AE931B73C59D7E0C089C0&xl=0&dn=zero_len.fil&xt=urn:bitprint:3I42H3S6NNFQ2MSVX7XZKYAYSCX5QBYJ.LWPNACQDBZRYXW3VHJVCJ64QBZNGHOHHHZWCLNQ&xt=urn:md5:D41D8CD98F00B204E9800998ECF8427E";
+  ()
+
+let test_shorten () =
+  let orig = "привет" in
+  for i = 0 to 100 do
+    test ~n:i ~s:"shorten" begin fun () ->
+      let s = DcGlobals.shorten_string orig i in
+      assert (s = String.sub orig 0 (min (String.length orig) (i*2)))
+    end
+  done;
+  ()
+
+let test_dc_parse () =
+  let t x s =
+    test ~s (fun () -> 
+      match DcProtocol.dc_parse false s with 
+      | DcProtocol.UnknownReq _ -> assert (not x)
+      | _ -> assert x)
+  in
+  t true "$ADCGET list /shared1/ 0 -1";
+  t true "$ADCGET file TTH/ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789012 1332982893 
9194387";
+  t false "$ADCGET tthl q 0 -1"
+
+let () =
+(*   let _ = Ip.addr_of_string "dchub://83.102.255.226" in *)
+(*   let _ = Url.of_string "/submit?q=dcn+dchub://example.com+411" in *)
+  test_magnet ();
+  test_shorten ();
+  test_dc_parse ();
+  pr "Tests finished";
+  ()