Move tests folder out of src/

orion-rs · Aug 29, 2018 · 21713dc · 21713dc
1 parent cc03fbe
commit 21713dc
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 51 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -38,7 +38,3 @@ pub mod default;
 
 /// Low-level API.
 pub mod hazardous;
-
-/// Testing module for orion.
-#[cfg(test)]
-pub mod tests;
diff --git a/src/tests/mod.rs b/src/tests/mod.rs
diff --git a/src/tests/custom_hkdf.rs → tests/custom_hkdf.rs b/src/tests/custom_hkdf.rs → tests/custom_hkdf.rs
@@ -28,8 +28,10 @@
 mod custom_hkdf {
 
     extern crate hex;
+    extern crate orion;
+
     use self::hex::decode;
-    use hazardous::hkdf::*;
+    use self::orion::hazardous::hkdf::*;
 
     fn hkdf_test_runner(
         excp_okm: &[u8],

diff --git a/src/tests/custom_pbkdf2.rs → tests/custom_pbkdf2.rs b/src/tests/custom_pbkdf2.rs → tests/custom_pbkdf2.rs
@@ -28,8 +28,10 @@
 mod custom_test_vectors {
 
     extern crate hex;
+    extern crate orion;
+
     use self::hex::decode;
-    use hazardous::pbkdf2::*;
+    use self::orion::hazardous::pbkdf2::*;
 
     #[test]
     fn sha512_test_case_1() {

diff --git a/src/tests/nist_hmac.rs → tests/nist_hmac.rs b/src/tests/nist_hmac.rs → tests/nist_hmac.rs
@@ -15,8 +15,10 @@
 
 // Testing against NIST CAVP HMACVS test vectors
 extern crate ring;
+extern crate orion;
+
 use self::ring::{error, test};
-use hazardous::hmac;
+use self::orion::hazardous::hmac;
 
 fn hmac_test_runner(
     key: &[u8],
@@ -45,8 +47,8 @@ fn hmac_test_runner(
 }
 
 #[test]
-fn hmac_tests() {
-    test::from_file("src/tests/test_data/HMAC_fmt.rsp", |section, test_case| {
+fn nist_hmac() {
+    test::from_file("tests/test_data/HMAC_fmt.rsp", |section, test_case| {
         assert_eq!(section, "");
         let digest_alg = test_case.consume_string("HMAC");
         let key_value = test_case.consume_bytes("Key");

diff --git a/src/tests/official_cshake.rs → tests/official_cshake.rs b/src/tests/official_cshake.rs → tests/official_cshake.rs
@@ -25,7 +25,9 @@
 #[cfg(test)]
 mod kcp_test_vectors {
 
-    use hazardous::cshake;
+    extern crate orion;
+
+    use self::orion::hazardous::cshake;
 
     #[test]
     fn cshake_256_test_case_1() {

diff --git a/src/tests/other_hkdf.rs → tests/other_hkdf.rs b/src/tests/other_hkdf.rs → tests/other_hkdf.rs
@@ -26,8 +26,10 @@
 mod other_hkdf {
 
     extern crate hex;
+    extern crate orion;
+
     use self::hex::decode;
-    use hazardous::hkdf::*;
+    use self::orion::hazardous::hkdf::*;
 
     fn hkdf_test_runner(
         excp_prk: &[u8],

diff --git a/src/tests/rfc_hmac.rs → tests/rfc_hmac.rs b/src/tests/rfc_hmac.rs → tests/rfc_hmac.rs
@@ -25,8 +25,10 @@
 mod rfc4231 {
 
     extern crate hex;
+    extern crate orion;
+
     use self::hex::decode;
-    use hazardous::hmac;
+    use self::orion::hazardous::hmac;
 
     fn hmac_test_runner(
         secret_key: &[u8],

diff --git a/src/tests/test_data/HMAC.rsp → tests/test_data/HMAC.rsp b/src/tests/test_data/HMAC.rsp → tests/test_data/HMAC.rsp
diff --git a/src/tests/test_data/HMAC_fmt.rsp → tests/test_data/HMAC_fmt.rsp b/src/tests/test_data/HMAC_fmt.rsp → tests/test_data/HMAC_fmt.rsp
diff --git a/src/tests/test_generation/make_nist_hmac.py → tests/test_generation/make_nist_hmac.py b/src/tests/test_generation/make_nist_hmac.py → tests/test_generation/make_nist_hmac.py