Skip to content

Commit

Permalink
Merge pull request #27 from chalharu/fix-rand
Browse files Browse the repository at this point in the history 
fixed error in test code for rand crate
  • Loading branch information
@chalharu
chalharu committed Jun 15, 2019
2 parents d772117 + 62b4c1f commit 6ae338f
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 76 deletions.
3 changes: 1 addition & 2 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ cfg-if = ">0.0.0"

[dev-dependencies]
simple_logger = { version = ">=0.0.0" }
rand = ">=0.6.0"
rand_xorshift = ">=0.1.0"
rand = ">=0.6.5"

[features]
default = [ "std", "bzip2", "gzip", "deflate", "zlib", "lzss" ]
Expand Down
23 changes: 5 additions & 18 deletions src/deflate/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,7 @@ mod tests {
use deflate::decoder::Deflater;
use deflate::encoder::Inflater;
use rand::distributions::Standard;
use rand::{Rng, SeedableRng};
use rand_xorshift::XorShiftRng;
use rand::{Rng, thread_rng};
use traits::decoder::DecodeExt;
use traits::encoder::EncodeExt;

Expand Down Expand Up @@ -187,30 +186,21 @@ mod tests {

#[test]
fn test_multiblocks() {
let mut rng = XorShiftRng::from_seed([
0xDA, 0xE1, 0x4B, 0x0B, 0xFF, 0xC2, 0xFE, 0x64, 0x23, 0xFE, 0x3F,
0x51, 0x6D, 0x3E, 0xA2, 0xF3,
]);
let mut rng = thread_rng();

check(&(rng.sample_iter(&Standard).take(323_742).collect::<Vec<_>>()));
}

#[test]
fn test_multiblocks2() {
let mut rng = XorShiftRng::from_seed([
0xDA, 0xE1, 0x4B, 0x0B, 0xFF, 0xC2, 0xFE, 0x64, 0x23, 0xFE, 0x3F,
0x51, 0x6D, 0x3E, 0xA2, 0xF3,
]);
let mut rng = thread_rng();

check(&(rng.sample_iter(&Standard).take(323_742).collect::<Vec<_>>()));
}

#[test]
fn test_multiblocks3() {
let mut rng = XorShiftRng::from_seed([
0xDA, 0xE1, 0x4B, 0x0B, 0xFF, 0xC2, 0xFE, 0x64, 0x23, 0xFE, 0x3F,
0x51, 0x6D, 0x3E, 0xA2, 0xF3,
]);
let mut rng = thread_rng();

check(
&(rng
Expand All @@ -221,10 +211,7 @@ mod tests {
}

fn test_rand_with_len(len: usize) {
let mut rng = XorShiftRng::from_seed([
0xDA, 0xE1, 0x4B, 0x0B, 0xFF, 0xC2, 0xFE, 0x64, 0x23, 0xFE, 0x3F,
0x51, 0x6D, 0x3E, 0xA2, 0xF3,
]);
let mut rng = thread_rng();

check(&(rng.sample_iter(&Standard).take(len).collect::<Vec<_>>()));
}
Expand Down
23 changes: 5 additions & 18 deletions src/gzip/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ mod tests {
use gzip::decoder::GZipDecoder;
use gzip::encoder::GZipEncoder;
use rand::distributions::Standard;
use rand::{Rng, SeedableRng};
use rand_xorshift::XorShiftRng;
use rand::{Rng, thread_rng};
use traits::decoder::DecodeExt;
use traits::encoder::EncodeExt;

Expand Down Expand Up @@ -63,30 +62,21 @@ mod tests {

#[test]
fn test_multiblocks() {
let mut rng = XorShiftRng::from_seed([
0xDA, 0xE1, 0x4B, 0x0B, 0xFF, 0xC2, 0xFE, 0x64, 0x23, 0xFE, 0x3F,
0x51, 0x6D, 0x3E, 0xA2, 0xF3,
]);
let mut rng = thread_rng();

check(&(rng.sample_iter(&Standard).take(323_742).collect::<Vec<_>>()));
}

#[test]
fn test_multiblocks2() {
let mut rng = XorShiftRng::from_seed([
0xDA, 0xE1, 0x4B, 0x0B, 0xFF, 0xC2, 0xFE, 0x64, 0x23, 0xFE, 0x3F,
0x51, 0x6D, 0x3E, 0xA2, 0xF3,
]);
let mut rng = thread_rng();

check(&(rng.sample_iter(&Standard).take(323_742).collect::<Vec<_>>()));
}

#[test]
fn test_multiblocks3() {
let mut rng = XorShiftRng::from_seed([
0xDA, 0xE1, 0x4B, 0x0B, 0xFF, 0xC2, 0xFE, 0x64, 0x23, 0xFE, 0x3F,
0x51, 0x6D, 0x3E, 0xA2, 0xF3,
]);
let mut rng = thread_rng();

check(
&(rng
Expand All @@ -97,10 +87,7 @@ mod tests {
}

fn test_rand_with_len(len: usize) {
let mut rng = XorShiftRng::from_seed([
0xDA, 0xE1, 0x4B, 0x0B, 0xFF, 0xC2, 0xFE, 0x64, 0x23, 0xFE, 0x3F,
0x51, 0x6D, 0x3E, 0xA2, 0xF3,
]);
let mut rng = thread_rng();

check(&(rng.sample_iter(&Standard).take(len).collect::<Vec<_>>()));
}
Expand Down
2 changes: 0 additions & 2 deletions src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,6 @@ extern crate alloc;
#[cfg(test)]
extern crate rand;
#[cfg(test)]
extern crate rand_xorshift;
#[cfg(test)]
extern crate simple_logger;

mod action;
Expand Down
23 changes: 5 additions & 18 deletions src/lzhuf/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@ mod tests {
use lzhuf::decoder::LzhufDecoder;
use lzhuf::encoder::LzhufEncoder;
use rand::distributions::Standard;
use rand::{Rng, SeedableRng};
use rand_xorshift::XorShiftRng;
use rand::{Rng, thread_rng};
use traits::decoder::DecodeExt;
use traits::encoder::EncodeExt;

Expand Down Expand Up @@ -92,30 +91,21 @@ mod tests {

#[test]
fn test_multiblocks1() {
let mut rng = XorShiftRng::from_seed([
0xDA, 0xE1, 0x4B, 0x0B, 0xFF, 0xC2, 0xFE, 0x64, 0x23, 0xFE, 0x3F,
0x51, 0x6D, 0x3E, 0xA2, 0xF3,
]);
let mut rng = thread_rng();

check(&(rng.sample_iter(&Standard).take(323_742).collect::<Vec<_>>()));
}

#[test]
fn test_multiblocks2() {
let mut rng = XorShiftRng::from_seed([
0xDA, 0xE1, 0x4B, 0x0B, 0xFF, 0xC2, 0xFE, 0x64, 0x23, 0xFE, 0x3F,
0x51, 0x6D, 0x3E, 0xA2, 0xF3,
]);
let mut rng = thread_rng();

check(&(rng.sample_iter(&Standard).take(323_742).collect::<Vec<_>>()));
}

#[test]
fn test_multiblocks3() {
let mut rng = XorShiftRng::from_seed([
0xDA, 0xE1, 0x4B, 0x0B, 0xFF, 0xC2, 0xFE, 0x64, 0x23, 0xFE, 0x3F,
0x51, 0x6D, 0x3E, 0xA2, 0xF3,
]);
let mut rng = thread_rng();

check(
&(rng
Expand All @@ -126,10 +116,7 @@ mod tests {
}

fn test_rand_with_len(len: usize) {
let mut rng = XorShiftRng::from_seed([
0xDA, 0xE1, 0x4B, 0x0B, 0xFF, 0xC2, 0xFE, 0x64, 0x23, 0xFE, 0x3F,
0x51, 0x6D, 0x3E, 0xA2, 0xF3,
]);
let mut rng = thread_rng();

check(&(rng.sample_iter(&Standard).take(len).collect::<Vec<_>>()));
}
Expand Down
23 changes: 5 additions & 18 deletions src/zlib/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ mod tests {
#[cfg(not(feature = "std"))]
use alloc::vec::Vec;
use rand::distributions::Standard;
use rand::{Rng, SeedableRng};
use rand_xorshift::XorShiftRng;
use rand::{Rng, thread_rng};
use traits::decoder::DecodeExt;
use traits::encoder::EncodeExt;
use zlib::decoder::ZlibDecoder;
Expand Down Expand Up @@ -63,30 +62,21 @@ mod tests {

#[test]
fn test_multiblocks() {
let mut rng = XorShiftRng::from_seed([
0xDA, 0xE1, 0x4B, 0x0B, 0xFF, 0xC2, 0xFE, 0x64, 0x23, 0xFE, 0x3F,
0x51, 0x6D, 0x3E, 0xA2, 0xF3,
]);
let mut rng = thread_rng();

check(&(rng.sample_iter(&Standard).take(323_742).collect::<Vec<_>>()));
}

#[test]
fn test_multiblocks2() {
let mut rng = XorShiftRng::from_seed([
0xDA, 0xE1, 0x4B, 0x0B, 0xFF, 0xC2, 0xFE, 0x64, 0x23, 0xFE, 0x3F,
0x51, 0x6D, 0x3E, 0xA2, 0xF3,
]);
let mut rng = thread_rng();

check(&(rng.sample_iter(&Standard).take(323_742).collect::<Vec<_>>()));
}

#[test]
fn test_multiblocks3() {
let mut rng = XorShiftRng::from_seed([
0xDA, 0xE1, 0x4B, 0x0B, 0xFF, 0xC2, 0xFE, 0x64, 0x23, 0xFE, 0x3F,
0x51, 0x6D, 0x3E, 0xA2, 0xF3,
]);
let mut rng = thread_rng();

check(
&(rng
Expand All @@ -97,10 +87,7 @@ mod tests {
}

fn test_rand_with_len(len: usize) {
let mut rng = XorShiftRng::from_seed([
0xDA, 0xE1, 0x4B, 0x0B, 0xFF, 0xC2, 0xFE, 0x64, 0x23, 0xFE, 0x3F,
0x51, 0x6D, 0x3E, 0xA2, 0xF3,
]);
let mut rng = thread_rng();

check(&(rng.sample_iter(&Standard).take(len).collect::<Vec<_>>()));
}
Expand Down

0 comments on commit 6ae338f

Please sign in to comment.