finish removing qtest

Author: c-cube

README.md

@@ -266,10 +266,10 @@ You need dune (formerly jbuilder).
 $ make
 ```
 
-To build and run tests (requires `oUnit`, [qtest](https://github.com/vincent-hugot/qtest), `gen`, `iter`):
+To build and run tests (requires `qcheck-core`, `gen`, `iter`):
 
 ```
-$ opam install oUnit qtest
+$ opam install qcheck-core
 $ make test
 ```
 
@@ -302,7 +302,7 @@ to list authors based on the git commits.
 Assuming your are in a clone of the repository:
 
 1. Some dependencies are required, you'll need
-  `opam install benchmark qcheck qtest iter gen mdx uutf`.
+  `opam install benchmark qcheck-core iter gen mdx uutf`.
 2. run `make all` to enable everything (including tests).
 3. make your changes, commit, push, and open a PR.
 4. use `make test` without moderation! It must pass before a PR
@@ -318,7 +318,7 @@ A few guidelines to follow the philosophy of containers:
 
 - no dependencies between basic modules (even just for signatures);
 - add `@since` tags for new functions;
-- add tests if possible (using [qtest](https://github.com/vincent-hugot/qtest/)).
+- add tests if possible (see `tests/` dir)
   There are numerous inline tests already,
   to see what it looks like search for comments starting with `(*$`
   in source files.

containers-data.opam

@@ -14,8 +14,7 @@ depends: [
   "dune" { >= "2.0" }
   "containers" { = version }
   "seq"
-  "qtest" { with-test }
-  "qcheck" { with-test }
+  "qcheck-core" { with-test }
   "ounit" { with-test }
   "iter" { with-test }
   "gen" { with-test }

containers-thread.opam

@@ -16,8 +16,7 @@ depends: [
   "dune-configurator"
   "containers" { = version }
   "iter" { with-test }
-  "qtest" { with-test }
-  "qcheck" { with-test }
+  "qcheck-core" { with-test }
   "ounit" { with-test }
   "uutf" { with-test }
   "odoc" { with-doc }

containers.opam

@@ -16,9 +16,7 @@ depends: [
   "dune-configurator"
   "seq" # compat
   "either" # compat
-  "qtest" { with-test }
-  "qcheck" { >= "0.14" & with-test }
-  "ounit2" { with-test }
+  "qcheck-core" { >= "0.14" & with-test }
   "yojson" { with-test }
   "iter" { with-test }
   "gen" { with-test }

qtest/dune

@@ -4,7 +4,6 @@ module Test = (val Containers_testlib.make ~__FILE__())
 open Test
 
 module Mixmap = struct
-  open CCMixmap;;
 
   t @@ fun () ->
     let module M = CCMixmap.Make(CCInt) in
@@ -138,7 +137,6 @@ module Mixtbl = struct
 end
 
 module Multiset = struct
-  open CCMultiSet;;
 
   t @@ fun () -> let module S = CCMultiSet.Make(String) in
       S.count (S.add_mult S.empty "a" 5) "a" = 5;;

qtest/make.ml

@@ -2,7 +2,6 @@
 
 module Test = (val Containers_testlib.make ~__FILE__())
 open Test
-open CCMutHeap;;
 
 type elt = {
   x: string;