Consolidate std::str tests into stdtest::str

4 files changed, 28 insertions, 41 deletions

diff --git a/src/test/stdtest/stdtest.rc b/src/test/stdtest/stdtest.rc
index 8a6f66970d1..ce087b2e0ba 100644
--- a/src/test/stdtest/stdtest.rc
+++ b/src/test/stdtest/stdtest.rc
@@ -24,12 +24,10 @@ mod rand;
 mod run;
 mod sha1;
 mod sort;
-mod str_buf;
 mod str;
 mod task;
 mod test;
 mod uint;
-mod vec_str_conversions;
 
 // Local Variables:
 // mode: rust
diff --git a/src/test/stdtest/str.rs b/src/test/stdtest/str.rs
index 32497a8858b..c622728544f 100644
--- a/src/test/stdtest/str.rs
+++ b/src/test/stdtest/str.rs
@@ -285,3 +285,31 @@ fn as_buf_small() {
     });
     assert b == 100;
 }
+
+#[test]
+fn as_buf2() {
+    let s = ~"hello";
+    let sb = istr::as_buf(s, { |b| b });
+    let s_cstr = istr::str_from_cstr(sb);
+    assert (istr::eq(s_cstr, s));
+}
+
+#[test]
+fn vec_str_conversions() {
+    let s1: istr = ~"All mimsy were the borogoves";
+
+    let v: [u8] = istr::bytes(s1);
+    let s2: istr = istr::unsafe_from_bytes(v);
+    let i: uint = 0u;
+    let n1: uint = istr::byte_len(s1);
+    let n2: uint = vec::len::<u8>(v);
+    assert (n1 == n2);
+    while i < n1 {
+        let a: u8 = s1[i];
+        let b: u8 = s2[i];
+        log a;
+        log b;
+        assert (a == b);
+        i += 1u;
+    }
+}
diff --git a/src/test/stdtest/str_buf.rs b/src/test/stdtest/str_buf.rs
deleted file mode 100644
index e260a2e8abd..00000000000
--- a/src/test/stdtest/str_buf.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-// -*- rust -*-
-use std;
-import std::istr;
-
-#[test]
-fn test() {
-    let s = ~"hello";
-    let sb = istr::as_buf(s, { |b| b });
-    let s_cstr = istr::str_from_cstr(sb);
-    assert (istr::eq(s_cstr, s));
-}
diff --git a/src/test/stdtest/vec_str_conversions.rs b/src/test/stdtest/vec_str_conversions.rs
deleted file mode 100644
index bb8ad337e23..00000000000
--- a/src/test/stdtest/vec_str_conversions.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-// -*- rust -*-
-use std;
-import std::istr;
-import std::vec;
-
-#[test]
-fn test_simple() {
-    let s1: istr = ~"All mimsy were the borogoves";
-
-    let v: [u8] = istr::bytes(s1);
-    let s2: istr = istr::unsafe_from_bytes(v);
-    let i: uint = 0u;
-    let n1: uint = istr::byte_len(s1);
-    let n2: uint = vec::len::<u8>(v);
-    assert (n1 == n2);
-    while i < n1 {
-        let a: u8 = s1[i];
-        let b: u8 = s2[i];
-        log a;
-        log b;
-        assert (a == b);
-        i += 1u;
-    }
-}