From 2615abe9cc7ef9f866a223448cc65a16a0f2b884 Mon Sep 17 00:00:00 2001
From: Roy Ivy III <rivy.dev@gmail.com>
Date: Wed, 7 Oct 2020 22:01:09 -0500
Subject: [PATCH] tests/factor ~ update RNG usage and variable reports to ease
 debugging

---
 Cargo.toml                   |  2 +-
 tests/by-util/test_factor.rs | 22 +++++++++++++++++-----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 7a5965107..0f2b63cb5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -331,7 +331,7 @@ pin_winapi-util = { version="0.1.2, < 0.1.3", package="winapi-util" } ## winapi-
 [dev-dependencies]
 filetime = "0.2"
 libc = "0.2"
-rand = "0.6"
+rand = "0.7"
 regex = "1.0"
 tempfile = "3.1"
 time = "0.1"
diff --git a/tests/by-util/test_factor.rs b/tests/by-util/test_factor.rs
index 358f38fd3..d0eaebac8 100644
--- a/tests/by-util/test_factor.rs
+++ b/tests/by-util/test_factor.rs
@@ -6,6 +6,7 @@
 // that was distributed with this source code.
 
 use crate::common::util::*;
+use std::time::SystemTime;
 
 #[path = "../../src/uu/factor/sieve.rs"]
 mod sieve;
@@ -13,7 +14,7 @@ use self::sieve::Sieve;
 
 extern crate rand;
 use self::rand::distributions::{Distribution, Uniform};
-use self::rand::{rngs::SmallRng, FromEntropy, Rng};
+use self::rand::{rngs::SmallRng, Rng, SeedableRng};
 
 const NUM_PRIMES: usize = 10000;
 const LOG_PRIMES: f64 = 14.0; // ceil(log2(NUM_PRIMES))
@@ -24,8 +25,13 @@ const NUM_TESTS: usize = 100;
 fn test_random() {
     let primes = Sieve::primes().take(NUM_PRIMES).collect::<Vec<u64>>();
 
-    let mut rng = SmallRng::from_entropy();
-    println!("(seed) rng={:?}", rng);
+    let rng_seed = SystemTime::now()
+        .duration_since(SystemTime::UNIX_EPOCH)
+        .unwrap()
+        .as_secs();
+    println!("rng_seed={:?}", rng_seed);
+
+    let mut rng = SmallRng::seed_from_u64(rng_seed);
     let mut rand_gt = move |min: u64| {
         let mut product = 1u64;
         let mut factors = Vec::new();
@@ -73,8 +79,12 @@ fn test_random() {
 
 #[test]
 fn test_random_big() {
-    let mut rng = SmallRng::from_entropy();
-    println!("(seed) rng={:?}", rng);
+    let rng_seed = SystemTime::now()
+        .duration_since(SystemTime::UNIX_EPOCH)
+        .unwrap()
+        .as_secs();
+    println!("rng_seed={:?}", rng_seed);
+    let mut rng = SmallRng::seed_from_u64(rng_seed);
     let bitrange_1 = Uniform::new(14usize, 51);
     let mut rand_64 = move || {
         // first, choose a random number of bits for the first factor
@@ -161,6 +171,8 @@ fn test_big_primes() {
 }
 
 fn run(instring: &[u8], outstring: &[u8]) {
+    println!("STDIN='{}'", String::from_utf8_lossy(instring));
+    println!("STDOUT(expected)='{}'", String::from_utf8_lossy(outstring));
     // now run factor
     new_ucmd!()
         .pipe_in(instring)