* Added some regression tests for lib that I wrote a while ago but

  didn't commit.  Also, run the tests when making a Nixpkgs tarball.

svn path=/nixpkgs/trunk/; revision=14802

1 files changed, 100 insertions, 6 deletions

diff --git a/pkgs/lib/tests.nix b/pkgs/lib/tests.nix
index 2e75d7f141f..395b4b3e17b 100644
--- a/pkgs/lib/tests.nix
+++ b/pkgs/lib/tests.nix
@@ -1,8 +1,102 @@
-let lib = import ./default.nix;
+with import ./default.nix;
 
-  miscTests = import ./misc-tests.nix;
+runTests {
 
-in
-  if lib.all (a : a == "ok") (lib.concatLists [ miscTests ]) then
-    throw "all tests have passed"
-    else "there has been a some lib test failures"
+  id = {
+    expr = id 1;
+    expected = 1;
+  };
+  
+  const = {
+    expr = const 2 3;
+    expected = 2;
+  };
+  
+  or = {
+    expr = or true false;
+    expected = true;
+  };
+  
+  and = {
+    expr = and true false;
+    expected = false;
+  };
+  
+  fix = {
+    expr = fix (x: {a = if x ? a then "a" else "b";});
+    expected = {a = "a";};
+  };
+
+  concatMapStrings = {
+    expr = concatMapStrings (x: x + ";") ["a" "b" "c"];
+    expected = "a;b;c;";
+  };
+
+  concatStringsSep = {
+    expr = concatStringsSep "," ["a" "b" "c"];
+    expected = "a,b,c";
+  };
+
+  filter = {
+    expr = filter (x: x != "a") ["a" "b" "c" "a"];
+    expected = ["b" "c"];
+  };
+
+  fold = {
+    expr = fold (builtins.add) 0 (range 0 100);
+    expected = 5050;
+  };
+
+  eqStrict = {
+    expr = all id [
+      (eqStrict 2 2)
+      (!eqStrict 3 2)
+      (eqStrict [2 1] [2 1])
+      (!eqStrict [1 3] [1 2])
+      (eqStrict {a = 7; b = 20;} {b= 20; a = 7;})
+      (eqStrict [{a = 7; b = 20;}] [{b= 20; a = 7;}])
+      (eqStrict {a = [7 8]; b = 20;} {b= 20; a = [7 8];})
+    ];
+    expected = true;
+  };
+
+  overridableDelayableArgsTest = {
+    expr = 
+      let res1 = defaultOverridableDelayableArgs id {};
+          res2 = defaultOverridableDelayableArgs id { a = 7; };
+          res3 = let x = defaultOverridableDelayableArgs id { a = 7; };
+                 in (x.merge) { b = 10; };
+          res4 = let x = defaultOverridableDelayableArgs id { a = 7; };
+                in (x.merge) ( x: { b = 10; });
+          res5 = let x = defaultOverridableDelayableArgs id { a = 7; };
+                in (x.merge) ( x: { a = __add x.a 3; });
+          res6 = let x = defaultOverridableDelayableArgs id { a = 7; mergeAttrBy = { a = __add; }; };
+                     y = x.merge {};
+                in (y.merge) { a = 10; };
+
+          resRem7 = res6.replace (a : removeAttrs a ["a"]);
+
+          resReplace6 = let x = defaultOverridableDelayableArgs id { a = 7; mergeAttrBy = { a = __add; }; };
+                            x2 = x.merge { a = 20; }; # now we have 27
+                        in (x2.replace) { a = 10; }; # and override the value by 10
+
+          # fixed tests (delayed args): (when using them add some comments, please)
+          resFixed1 = 
+                let x = defaultOverridableDelayableArgs id ( x : { a = 7; c = x.fixed.b; });
+                    y = x.merge (x : { name = "name-${builtins.toString x.fixed.c}"; });
+                in (y.merge) { b = 10; };
+          strip = attrs : removeAttrs attrs ["merge" "replace"];
+      in all id
+        [ (eqStrict (strip res1) { })
+          (eqStrict (strip res2) { a = 7; })
+          (eqStrict (strip res3) { a = 7; b = 10; })
+          (eqStrict (strip res4) { a = 7; b = 10; })
+          (eqStrict (strip res5) { a = 10; })
+          (eqStrict (strip res6) { a = 17; })
+          (eqStrict (strip resRem7) {})
+          (eqStrict (strip resFixed1) { a = 7; b = 10; c =10; name = "name-10"; })
+        ];
+    expected = true;
+  };
+  
+}