diff --git a/containers-data.opam b/containers-data.opam index a66b0802..bc3be037 100644 --- a/containers-data.opam +++ b/containers-data.opam @@ -15,7 +15,6 @@ depends: [ "containers" { = version } "seq" "qcheck-core" { with-test } - "ounit" { with-test } "iter" { with-test } "gen" { with-test } #"mdx" { with-test & >= "1.5.0" & < "2.0.0" } diff --git a/containers-thread.opam b/containers-thread.opam index 2fdb8034..56acb973 100644 --- a/containers-thread.opam +++ b/containers-thread.opam @@ -17,7 +17,6 @@ depends: [ "containers" { = version } "iter" { with-test } "qcheck-core" { with-test } - "ounit" { with-test } "uutf" { with-test } "odoc" { with-doc } ] diff --git a/src/core/CCVector.ml b/src/core/CCVector.ml index 07ccf4da..28c24d4d 100644 --- a/src/core/CCVector.ml +++ b/src/core/CCVector.ml @@ -143,9 +143,9 @@ let clear_and_reset v = push v ("hello"^"world"); Weak.set a 0 (Some (get v 0)); Gc.full_major(); Gc.compact(); - OUnit2.assert_bool "is alive" (Weak.check a 0); + assert_bool "is alive" (Weak.check a 0); Gc.full_major(); Gc.compact(); - OUnit2.assert_equal None (Weak.get a 0); + assert_equal None (Weak.get a 0); *) let[@inline] is_empty v = v.size = 0 diff --git a/src/data/CCMixtbl.mli b/src/data/CCMixtbl.mli index 25fecddc..7019542f 100644 --- a/src/data/CCMixtbl.mli +++ b/src/data/CCMixtbl.mli @@ -11,23 +11,23 @@ let tbl = CCMixtbl.create 10 ;; - OUnit2.assert_equal None (CCMixtbl.get ~inj:inj_int tbl "a");; + assert_equal None (CCMixtbl.get ~inj:inj_int tbl "a");; CCMixtbl.set inj_int tbl "a" 1;; - OUnit2.assert_equal (Some 1) (CCMixtbl.get ~inj:inj_int tbl "a");; + assert_equal (Some 1) (CCMixtbl.get ~inj:inj_int tbl "a");; let inj_string = CCMixtbl.create_inj () ;; CCMixtbl.set inj_string tbl "b" "Hello"; - OUnit2.assert_equal (Some "Hello") (CCMixtbl.get inj_string tbl "b");; - OUnit2.assert_equal None (CCMixtbl.get inj_string tbl "a");; - OUnit2.assert_equal (Some 1) (CCMixtbl.get inj_int tbl "a");; + assert_equal (Some "Hello") (CCMixtbl.get inj_string tbl "b");; + assert_equal None (CCMixtbl.get inj_string tbl "a");; + assert_equal (Some 1) (CCMixtbl.get inj_int tbl "a");; CCMixtbl.set inj_string tbl "a" "Bye";; - OUnit2.assert_equal None (CCMixtbl.get inj_int tbl "a");; - OUnit2.assert_equal (Some "Bye") (CCMixtbl.get inj_string tbl "a");; + assert_equal None (CCMixtbl.get inj_int tbl "a");; + assert_equal (Some "Bye") (CCMixtbl.get inj_string tbl "a");; ]} @since 0.6 *)