Skip to content

Commit 7103c39

Browse files
committed
Move tuple tests into submodule
1 parent d9eec66 commit 7103c39

File tree

1 file changed

+54
-48
lines changed

1 file changed

+54
-48
lines changed

src/libcore/tuple.rs

+54-48
Original file line numberDiff line numberDiff line change
@@ -311,55 +311,61 @@ tuple_impls!(
311311
}
312312
)
313313

314-
#[test]
315-
fn test_tuple_ref() {
316-
let x = (~"foo", ~"bar");
317-
assert_eq!(x.first_ref(), &~"foo");
318-
assert_eq!(x.second_ref(), &~"bar");
319-
}
314+
#[cfg(test)]
315+
mod tests {
316+
use super::*;
317+
use clone::Clone;
318+
319+
#[test]
320+
fn test_tuple_ref() {
321+
let x = (~"foo", ~"bar");
322+
assert_eq!(x.first_ref(), &~"foo");
323+
assert_eq!(x.second_ref(), &~"bar");
324+
}
320325
321-
#[test]
322-
#[allow(non_implicitly_copyable_typarams)]
323-
fn test_tuple() {
324-
assert_eq!((948, 4039.48).first(), 948);
325-
assert_eq!((34.5, ~"foo").second(), ~"foo");
326-
assert_eq!(('a', 2).swap(), (2, 'a'));
327-
}
326+
#[test]
327+
#[allow(non_implicitly_copyable_typarams)]
328+
fn test_tuple() {
329+
assert_eq!((948, 4039.48).first(), 948);
330+
assert_eq!((34.5, ~"foo").second(), ~"foo");
331+
assert_eq!(('a', 2).swap(), (2, 'a'));
332+
}
328333
329-
#[test]
330-
fn test_clone() {
331-
let a = (1, ~"2");
332-
let b = a.clone();
333-
assert_eq!(a.first(), b.first());
334-
assert_eq!(a.second(), b.second());
335-
}
334+
#[test]
335+
fn test_clone() {
336+
let a = (1, ~"2");
337+
let b = a.clone();
338+
assert_eq!(a.first(), b.first());
339+
assert_eq!(a.second(), b.second());
340+
}
336341

337-
#[test]
338-
fn test_n_tuple() {
339-
let t = (0u8, 1u16, 2u32, 3u64, 4u, 5i8, 6i16, 7i32, 8i64, 9i, 10f32, 11f64);
340-
assert_eq!(t.n0(), 0u8);
341-
assert_eq!(t.n1(), 1u16);
342-
assert_eq!(t.n2(), 2u32);
343-
assert_eq!(t.n3(), 3u64);
344-
assert_eq!(t.n4(), 4u);
345-
assert_eq!(t.n5(), 5i8);
346-
assert_eq!(t.n6(), 6i16);
347-
assert_eq!(t.n7(), 7i32);
348-
assert_eq!(t.n8(), 8i64);
349-
assert_eq!(t.n9(), 9i);
350-
assert_eq!(t.n10(), 10f32);
351-
assert_eq!(t.n11(), 11f64);
352-
353-
assert_eq!(t.n0_ref(), &0u8);
354-
assert_eq!(t.n1_ref(), &1u16);
355-
assert_eq!(t.n2_ref(), &2u32);
356-
assert_eq!(t.n3_ref(), &3u64);
357-
assert_eq!(t.n4_ref(), &4u);
358-
assert_eq!(t.n5_ref(), &5i8);
359-
assert_eq!(t.n6_ref(), &6i16);
360-
assert_eq!(t.n7_ref(), &7i32);
361-
assert_eq!(t.n8_ref(), &8i64);
362-
assert_eq!(t.n9_ref(), &9i);
363-
assert_eq!(t.n10_ref(), &10f32);
364-
assert_eq!(t.n11_ref(), &11f64);
342+
#[test]
343+
fn test_n_tuple() {
344+
let t = (0u8, 1u16, 2u32, 3u64, 4u, 5i8, 6i16, 7i32, 8i64, 9i, 10f32, 11f64);
345+
assert_eq!(t.n0(), 0u8);
346+
assert_eq!(t.n1(), 1u16);
347+
assert_eq!(t.n2(), 2u32);
348+
assert_eq!(t.n3(), 3u64);
349+
assert_eq!(t.n4(), 4u);
350+
assert_eq!(t.n5(), 5i8);
351+
assert_eq!(t.n6(), 6i16);
352+
assert_eq!(t.n7(), 7i32);
353+
assert_eq!(t.n8(), 8i64);
354+
assert_eq!(t.n9(), 9i);
355+
assert_eq!(t.n10(), 10f32);
356+
assert_eq!(t.n11(), 11f64);
357+
358+
assert_eq!(t.n0_ref(), &0u8);
359+
assert_eq!(t.n1_ref(), &1u16);
360+
assert_eq!(t.n2_ref(), &2u32);
361+
assert_eq!(t.n3_ref(), &3u64);
362+
assert_eq!(t.n4_ref(), &4u);
363+
assert_eq!(t.n5_ref(), &5i8);
364+
assert_eq!(t.n6_ref(), &6i16);
365+
assert_eq!(t.n7_ref(), &7i32);
366+
assert_eq!(t.n8_ref(), &8i64);
367+
assert_eq!(t.n9_ref(), &9i);
368+
assert_eq!(t.n10_ref(), &10f32);
369+
assert_eq!(t.n11_ref(), &11f64);
370+
}
365371
}

0 commit comments

Comments
 (0)