Skip to content

Commit 250e236

Browse files
brsonalexcrichton
authored andcommitted
Move core::bool tests to run-pass
These are closer to language tests than library.
1 parent 4203dcb commit 250e236

File tree

2 files changed

+77
-99
lines changed

2 files changed

+77
-99
lines changed

src/libcore/bool.rs

Lines changed: 0 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -12,102 +12,3 @@
1212
1313
#![doc(primitive = "bool")]
1414

15-
#[cfg(test)]
16-
mod tests {
17-
use realstd::prelude::*;
18-
use super::to_bit;
19-
20-
#[test]
21-
fn test_to_bit() {
22-
assert_eq!(to_bit::<u8>(true), 1u8);
23-
assert_eq!(to_bit::<u8>(false), 0u8);
24-
}
25-
26-
#[test]
27-
fn test_eq() {
28-
assert_eq!(false.eq(&true), false);
29-
assert_eq!(false == false, true);
30-
assert_eq!(false != true, true);
31-
assert_eq!(false.ne(&false), false);
32-
}
33-
34-
#[test]
35-
fn test_bitand() {
36-
assert_eq!(false.bitand(&false), false);
37-
assert_eq!(true.bitand(&false), false);
38-
assert_eq!(false.bitand(&true), false);
39-
assert_eq!(true.bitand(&true), true);
40-
41-
assert_eq!(false & false, false);
42-
assert_eq!(true & false, false);
43-
assert_eq!(false & true, false);
44-
assert_eq!(true & true, true);
45-
}
46-
47-
#[test]
48-
fn test_bitor() {
49-
assert_eq!(false.bitor(&false), false);
50-
assert_eq!(true.bitor(&false), true);
51-
assert_eq!(false.bitor(&true), true);
52-
assert_eq!(true.bitor(&true), true);
53-
54-
assert_eq!(false | false, false);
55-
assert_eq!(true | false, true);
56-
assert_eq!(false | true, true);
57-
assert_eq!(true | true, true);
58-
}
59-
60-
#[test]
61-
fn test_bitxor() {
62-
assert_eq!(false.bitxor(&false), false);
63-
assert_eq!(true.bitxor(&false), true);
64-
assert_eq!(false.bitxor(&true), true);
65-
assert_eq!(true.bitxor(&true), false);
66-
67-
assert_eq!(false ^ false, false);
68-
assert_eq!(true ^ false, true);
69-
assert_eq!(false ^ true, true);
70-
assert_eq!(true ^ true, false);
71-
}
72-
73-
#[test]
74-
fn test_not() {
75-
assert_eq!(!true, false);
76-
assert_eq!(!false, true);
77-
}
78-
79-
#[test]
80-
fn test_to_str() {
81-
let s = false.to_str();
82-
assert_eq!(s.as_slice(), "false");
83-
let s = true.to_str();
84-
assert_eq!(s.as_slice(), "true");
85-
}
86-
87-
#[test]
88-
fn test_ord() {
89-
assert!(true > false);
90-
assert!(!(false > true));
91-
92-
assert!(false < true);
93-
assert!(!(true < false));
94-
95-
assert!(false <= false);
96-
assert!(false >= false);
97-
assert!(true <= true);
98-
assert!(true >= true);
99-
100-
assert!(false <= true);
101-
assert!(!(false >= true));
102-
assert!(true >= false);
103-
assert!(!(true <= false));
104-
}
105-
106-
#[test]
107-
fn test_totalord() {
108-
assert!(true.cmp(&true) == Equal);
109-
assert!(false.cmp(&false) == Equal);
110-
assert!(true.cmp(&false) == Greater);
111-
assert!(false.cmp(&true) == Less);
112-
}
113-
}

src/test/run-pass/bool.rs

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
// Basic boolean tests
12+
13+
fn main() {
14+
assert_eq!(false.eq(&true), false);
15+
assert_eq!(false == false, true);
16+
assert_eq!(false != true, true);
17+
assert_eq!(false.ne(&false), false);
18+
19+
assert_eq!(false.bitand(&false), false);
20+
assert_eq!(true.bitand(&false), false);
21+
assert_eq!(false.bitand(&true), false);
22+
assert_eq!(true.bitand(&true), true);
23+
24+
assert_eq!(false & false, false);
25+
assert_eq!(true & false, false);
26+
assert_eq!(false & true, false);
27+
assert_eq!(true & true, true);
28+
29+
assert_eq!(false.bitor(&false), false);
30+
assert_eq!(true.bitor(&false), true);
31+
assert_eq!(false.bitor(&true), true);
32+
assert_eq!(true.bitor(&true), true);
33+
34+
assert_eq!(false | false, false);
35+
assert_eq!(true | false, true);
36+
assert_eq!(false | true, true);
37+
assert_eq!(true | true, true);
38+
39+
assert_eq!(false.bitxor(&false), false);
40+
assert_eq!(true.bitxor(&false), true);
41+
assert_eq!(false.bitxor(&true), true);
42+
assert_eq!(true.bitxor(&true), false);
43+
44+
assert_eq!(false ^ false, false);
45+
assert_eq!(true ^ false, true);
46+
assert_eq!(false ^ true, true);
47+
assert_eq!(true ^ true, false);
48+
49+
assert_eq!(!true, false);
50+
assert_eq!(!false, true);
51+
52+
let s = false.to_str();
53+
assert_eq!(s.as_slice(), "false");
54+
let s = true.to_str();
55+
assert_eq!(s.as_slice(), "true");
56+
57+
assert!(true > false);
58+
assert!(!(false > true));
59+
60+
assert!(false < true);
61+
assert!(!(true < false));
62+
63+
assert!(false <= false);
64+
assert!(false >= false);
65+
assert!(true <= true);
66+
assert!(true >= true);
67+
68+
assert!(false <= true);
69+
assert!(!(false >= true));
70+
assert!(true >= false);
71+
assert!(!(true <= false));
72+
73+
assert!(true.cmp(&true) == Equal);
74+
assert!(false.cmp(&false) == Equal);
75+
assert!(true.cmp(&false) == Greater);
76+
assert!(false.cmp(&true) == Less);
77+
}

0 commit comments

Comments
 (0)