4 files changed, 72 insertions, 67 deletions
diff --git a/rand/tests/uniformity.rs b/rand/tests/uniformity.rs
deleted file mode 100644
index b8f74a6..0000000
--- a/rand/tests/uniformity.rs
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2018 Developers of the Rand project.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![cfg(feature = "std")]
-
-#[macro_use]
-extern crate average;
-extern crate rand;
-
-use std as core;
-use rand::FromEntropy;
-use rand::distributions::Distribution;
-use average::Histogram;
-
-const N_BINS: usize = 100;
-const N_SAMPLES: u32 = 1_000_000;
-const TOL: f64 = 1e-3;
-define_histogram!(hist, 100);
-use hist::Histogram as Histogram100;
-
-#[test]
-fn unit_sphere() {
-    const N_DIM: usize = 3;
-    let h = Histogram100::with_const_width(-1., 1.);
-    let mut histograms = [h.clone(), h.clone(), h];
-    let dist = rand::distributions::UnitSphereSurface::new();
-    let mut rng = rand::rngs::SmallRng::from_entropy();
-    for _ in 0..N_SAMPLES {
-        let v = dist.sample(&mut rng);
-        for i in 0..N_DIM {
-            histograms[i].add(v[i]).map_err(
-                |e| { println!("v: {}", v[i]); e }
-            ).unwrap();
-        }
-    }
-    for h in &histograms {
-        let sum: u64 = h.bins().iter().sum();
-        println!("{:?}", h);
-        for &b in h.bins() {
-            let p = (b as f64) / (sum as f64);
-            assert!((p - 1.0 / (N_BINS as f64)).abs() < TOL, "{}", p);
-        }
-    }
-}
-
-#[test]
-fn unit_circle() {
-    use ::std::f64::consts::PI;
-    let mut h = Histogram100::with_const_width(-PI, PI);
-    let dist = rand::distributions::UnitCircle::new();
-    let mut rng = rand::rngs::SmallRng::from_entropy();
-    for _ in 0..N_SAMPLES {
-        let v = dist.sample(&mut rng);
-        h.add(v[0].atan2(v[1])).unwrap();
-    }
-    let sum: u64 = h.bins().iter().sum();
-    println!("{:?}", h);
-    for &b in h.bins() {
-        let p = (b as f64) / (sum as f64);
-        assert!((p - 1.0 / (N_BINS as f64)).abs() < TOL, "{}", p);
-    }
-}
diff --git a/rand/tests/wasm_bindgen/Cargo.toml b/rand/tests/wasm_bindgen/Cargo.toml
new file mode 100644
index 0000000..e83c174
--- /dev/null
+++ b/rand/tests/wasm_bindgen/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+name = "rand_wasm_bindgen_test"
+description = "Minimal crate to test that rand can be build for web assembly target"
+version = "0.1.0"
+authors = ["The Rand Project Developers"]
+publish = false
+license = "MIT OR Apache-2.0"
+edition = "2018"
+
+[lib]
+crate-type = ["cdylib"]
+
+[dependencies]
+rand = { path = "../..", features = ["wasm-bindgen"] }
+wasm-bindgen = "0.2"
+wasm-bindgen-test = "0.2"
diff --git a/rand/tests/wasm_bindgen/js/index.js b/rand/tests/wasm_bindgen/js/index.js
new file mode 100644
index 0000000..a02fb59
--- /dev/null
+++ b/rand/tests/wasm_bindgen/js/index.js
@@ -0,0 +1,7 @@
+'use strict';
+
+const rand_wasm_bindgen_test = require('./rand_wasm_bindgen_test');
+
+console.log(rand_wasm_bindgen_test.generate_from_entropy());
+console.log(rand_wasm_bindgen_test.generate_from_os_rand());
+console.log(rand_wasm_bindgen_test.generate_from_seed());
diff --git a/rand/tests/wasm_bindgen/src/lib.rs b/rand/tests/wasm_bindgen/src/lib.rs
new file mode 100644
index 0000000..9af0b9e
--- /dev/null
+++ b/rand/tests/wasm_bindgen/src/lib.rs
@@ -0,0 +1,49 @@
+// Copyright 2018 Developers of the Rand project.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// Crate to test WASM with the `wasm-bindgen` lib.
+
+#![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk.png")]
+
+use rand::rngs::{OsRng, StdRng};
+use rand::{Rng, SeedableRng};
+use wasm_bindgen::prelude::*;
+
+#[wasm_bindgen]
+pub fn generate_from_seed(seed: u32) -> i32 {
+    StdRng::seed_from_u64(seed as u64).gen()
+}
+
+#[wasm_bindgen]
+pub fn generate_from_os_rand() -> i32 {
+    OsRng.gen()
+}
+
+#[wasm_bindgen]
+pub fn generate_from_entropy() -> i32 {
+    StdRng::from_entropy().gen()
+}
+
+pub mod tests {
+    use wasm_bindgen_test::*;
+
+    #[wasm_bindgen_test]
+    fn generate_from_seed() {
+        let _ = super::generate_from_seed(42);
+    }
+
+    #[wasm_bindgen_test]
+    fn generate_from_os_rand() {
+        let _ = super::generate_from_os_rand();
+    }
+
+    #[wasm_bindgen_test]
+    fn generate_from_entropy() {
+        let _ = super::generate_from_entropy();
+    }
+}