From 14262c73119349fd5452db0811a577febbc77670 Mon Sep 17 00:00:00 2001
From: Graydon Hoare <graydon@mozilla.com>
Date: Tue, 24 Aug 2010 09:09:04 -0700
Subject: Rename lib tests, enable lib-int.rs using _str.eq for now.

---
 src/test/run-pass/int-lib.rs  | 15 -------------
 src/test/run-pass/lib-int.rs  | 15 +++++++++++++
 src/test/run-pass/lib-str.rs  | 16 ++++++++++++++
 src/test/run-pass/lib-task.rs |  6 ++++++
 src/test/run-pass/lib-vec.rs  | 49 +++++++++++++++++++++++++++++++++++++++++++
 src/test/run-pass/str-lib.rs  | 16 --------------
 src/test/run-pass/task-lib.rs |  6 ------
 src/test/run-pass/vec-lib.rs  | 49 -------------------------------------------
 8 files changed, 86 insertions(+), 86 deletions(-)
 delete mode 100644 src/test/run-pass/int-lib.rs
 create mode 100644 src/test/run-pass/lib-int.rs
 create mode 100644 src/test/run-pass/lib-str.rs
 create mode 100644 src/test/run-pass/lib-task.rs
 create mode 100644 src/test/run-pass/lib-vec.rs
 delete mode 100644 src/test/run-pass/str-lib.rs
 delete mode 100644 src/test/run-pass/task-lib.rs
 delete mode 100644 src/test/run-pass/vec-lib.rs

(limited to 'src/test')

diff --git a/src/test/run-pass/int-lib.rs b/src/test/run-pass/int-lib.rs
deleted file mode 100644
index ce39de43..00000000
--- a/src/test/run-pass/int-lib.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-use std;
-
-import std._int;
-
-fn test_to_str() {
-  check (_int.to_str(0, 10u) == "0");
-  check (_int.to_str(1, 10u) == "1");
-  check (_int.to_str(-1, 10u) == "-1");
-  check (_int.to_str(255, 16u) == "ff");
-  check (_int.to_str(-71, 36u) == "-1z");
-}
-
-fn main() {
-  test_to_str();
-}
diff --git a/src/test/run-pass/lib-int.rs b/src/test/run-pass/lib-int.rs
new file mode 100644
index 00000000..ecca40b9
--- /dev/null
+++ b/src/test/run-pass/lib-int.rs
@@ -0,0 +1,15 @@
+use std;
+
+import std._int;
+import std._str.eq;
+
+fn test_to_str() {
+  check (eq(_int.to_str(0, 10u), "0"));
+  check (eq(_int.to_str(1, 10u), "1"));
+  check (eq(_int.to_str(-1, 10u), "-1"));
+  check (eq(_int.to_str(255, 16u), "ff"));
+}
+
+fn main() {
+  test_to_str();
+}
diff --git a/src/test/run-pass/lib-str.rs b/src/test/run-pass/lib-str.rs
new file mode 100644
index 00000000..585f9b8d
--- /dev/null
+++ b/src/test/run-pass/lib-str.rs
@@ -0,0 +1,16 @@
+use std;
+import std._str;
+
+fn test_bytes_len() {
+  check (_str.byte_len("") == 0u);
+  check (_str.byte_len("hello world") == 11u);
+  check (_str.byte_len("\x63") == 1u);
+  check (_str.byte_len("\xa2") == 2u);
+  check (_str.byte_len("\u03c0") == 2u);
+  check (_str.byte_len("\u2620") == 3u);
+  check (_str.byte_len("\U0001d11e") == 4u);
+}
+
+fn main() {
+  test_bytes_len();
+}
diff --git a/src/test/run-pass/lib-task.rs b/src/test/run-pass/lib-task.rs
new file mode 100644
index 00000000..18499f4e
--- /dev/null
+++ b/src/test/run-pass/lib-task.rs
@@ -0,0 +1,6 @@
+use std;
+import std._task;
+
+fn main() {
+  _task.sleep(1000000u);
+}
\ No newline at end of file
diff --git a/src/test/run-pass/lib-vec.rs b/src/test/run-pass/lib-vec.rs
new file mode 100644
index 00000000..ccd83d33
--- /dev/null
+++ b/src/test/run-pass/lib-vec.rs
@@ -0,0 +1,49 @@
+use std;
+
+fn test_init_elt() {
+  let vec[uint] v = std._vec.init_elt[uint](5 as uint, 3 as uint);
+  check (std._vec.len[uint](v) == (3 as uint));
+  check (v.(0) == (5 as uint));
+  check (v.(1) == (5 as uint));
+  check (v.(2) == (5 as uint));
+}
+
+fn id(uint x) -> uint {
+  ret x;
+}
+fn test_init_fn() {
+  let fn(uint)->uint op = id;
+  let vec[uint] v = std._vec.init_fn[uint](op, (5 as uint));
+  check (std._vec.len[uint](v) == (5 as uint));
+  check (v.(0) == (0 as uint));
+  check (v.(1) == (1 as uint));
+  check (v.(2) == (2 as uint));
+  check (v.(3) == (3 as uint));
+  check (v.(4) == (4 as uint));
+}
+
+fn test_slice() {
+  let vec[int] v = vec(1,2,3,4,5);
+  auto v2 = std._vec.slice[int](v, 2, 4);
+  check (std._vec.len[int](v2) == (2 as uint));
+  check (v2.(0) == 3);
+  check (v2.(1) == 4);
+}
+
+fn test_map() {
+  fn square(&int x) -> int { ret x * x; }
+  let std.util.operator[int, int] op = square;
+  let vec[int] v = vec(1, 2, 3, 4, 5);
+  let vec[int] s = std._vec.map[int, int](op, v);
+  let int i = 0;
+  while (i < 5) {
+    check (v.(i) == s.(i));
+    i += 1;
+  }
+}
+
+fn main() {
+  test_init_elt();
+  //XFAIL: test_init_fn();  // Segfaults.
+  test_slice();
+}
diff --git a/src/test/run-pass/str-lib.rs b/src/test/run-pass/str-lib.rs
deleted file mode 100644
index 585f9b8d..00000000
--- a/src/test/run-pass/str-lib.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-use std;
-import std._str;
-
-fn test_bytes_len() {
-  check (_str.byte_len("") == 0u);
-  check (_str.byte_len("hello world") == 11u);
-  check (_str.byte_len("\x63") == 1u);
-  check (_str.byte_len("\xa2") == 2u);
-  check (_str.byte_len("\u03c0") == 2u);
-  check (_str.byte_len("\u2620") == 3u);
-  check (_str.byte_len("\U0001d11e") == 4u);
-}
-
-fn main() {
-  test_bytes_len();
-}
diff --git a/src/test/run-pass/task-lib.rs b/src/test/run-pass/task-lib.rs
deleted file mode 100644
index 18499f4e..00000000
--- a/src/test/run-pass/task-lib.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use std;
-import std._task;
-
-fn main() {
-  _task.sleep(1000000u);
-}
\ No newline at end of file
diff --git a/src/test/run-pass/vec-lib.rs b/src/test/run-pass/vec-lib.rs
deleted file mode 100644
index ccd83d33..00000000
--- a/src/test/run-pass/vec-lib.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-use std;
-
-fn test_init_elt() {
-  let vec[uint] v = std._vec.init_elt[uint](5 as uint, 3 as uint);
-  check (std._vec.len[uint](v) == (3 as uint));
-  check (v.(0) == (5 as uint));
-  check (v.(1) == (5 as uint));
-  check (v.(2) == (5 as uint));
-}
-
-fn id(uint x) -> uint {
-  ret x;
-}
-fn test_init_fn() {
-  let fn(uint)->uint op = id;
-  let vec[uint] v = std._vec.init_fn[uint](op, (5 as uint));
-  check (std._vec.len[uint](v) == (5 as uint));
-  check (v.(0) == (0 as uint));
-  check (v.(1) == (1 as uint));
-  check (v.(2) == (2 as uint));
-  check (v.(3) == (3 as uint));
-  check (v.(4) == (4 as uint));
-}
-
-fn test_slice() {
-  let vec[int] v = vec(1,2,3,4,5);
-  auto v2 = std._vec.slice[int](v, 2, 4);
-  check (std._vec.len[int](v2) == (2 as uint));
-  check (v2.(0) == 3);
-  check (v2.(1) == 4);
-}
-
-fn test_map() {
-  fn square(&int x) -> int { ret x * x; }
-  let std.util.operator[int, int] op = square;
-  let vec[int] v = vec(1, 2, 3, 4, 5);
-  let vec[int] s = std._vec.map[int, int](op, v);
-  let int i = 0;
-  while (i < 5) {
-    check (v.(i) == s.(i));
-    i += 1;
-  }
-}
-
-fn main() {
-  test_init_elt();
-  //XFAIL: test_init_fn();  // Segfaults.
-  test_slice();
-}
-- 
cgit v1.2.3