Switch to the same test naming scheme across modules.

src/cryptonum/addition.rs

@@ -100,17 +100,18 @@ generate_adders!(U4096);
 generate_adders!(U8192);
 generate_adders!(U15360);
 
-#[cfg(test)]
-use testing::run_test;
-#[cfg(test)]
-use cryptonum::Decoder;
-
 macro_rules! generate_tests {
-    ($name: ident, $testname: ident, $modtestname: ident) => (
+    ( $( $name:ident ),* ) => {
         #[cfg(test)]
+        mod normal {
+            use cryptonum::Decoder;
+            use super::*;
+            use testing::run_test;
+
+            $(
                 #[test]
                 #[allow(non_snake_case)]
-        fn $testname() {
+                fn $name() {
                     let fname = format!("tests/math/addition{}.test",
                                         stringify!($name));
                     run_test(fname.to_string(), 3, |case| {
@@ -127,11 +128,19 @@ macro_rules! generate_tests {
                         assert_eq!(a, c);
                     });
                 }
+            )*
+        }
 
         #[cfg(test)]
+        mod slow_modular {
+            use cryptonum::encoding::Decoder;
+            use super::*;
+            use testing::run_test;
+
+            $(
                 #[test]
                 #[allow(non_snake_case)]
-        fn $modtestname() {
+                fn $name() {
                     let fname = format!("tests/math/modadd{}.test",
                                         stringify!($name));
                     run_test(fname.to_string(), 4, |case| {
@@ -149,17 +158,9 @@ macro_rules! generate_tests {
                         assert_eq!(a, c);
                     });
                 }
-    )
+            )*
+        }
+    }
 }
 
-generate_tests!(U192,u192,modU192);
-generate_tests!(U256,u256,modU256);
-generate_tests!(U384,u384,modU384);
-generate_tests!(U512,u512,modU512);
-generate_tests!(U576,u576,modU576);
-generate_tests!(U1024,u1024,modU1024);
-generate_tests!(U2048,u2048,modU2048);
-generate_tests!(U3072,u3072,modU3072);
-generate_tests!(U4096,u4096,modU4096);
-generate_tests!(U8192,u8192,modU8192);
-generate_tests!(U15360,u15360,modU15360);
+generate_tests!(U192, U256, U384, U512, U576, U1024, U2048, U3072, U4096, U8192, U15360);

src/cryptonum/division.rs

@@ -197,18 +197,19 @@ fn matching_bignum_ge(x: &[u64], y: &[u64]) -> bool
 }
 
 #[cfg(test)]
+mod normal {
     use testing::run_test;
-#[cfg(test)]
     use cryptonum::Decoder;
-#[cfg(test)]
-use cryptonum::{U192,U256,U384,U512,U576,U1024,U2048,U3072,U4096,U8192,U15360};
+    use cryptonum::{U192,U256,U384,U512,U576,U1024,
+                    U2048,U3072,U4096,U8192,U15360};
+    use super::*;
 
     macro_rules! generate_tests {
-    ($name: ident, $testname: ident) => (
+        ($name: ident) => (
             #[cfg(test)]
             #[test]
             #[allow(non_snake_case)]
-        fn $testname() {
+            fn $name() {
                 let fname = format!("tests/math/division{}.test",
                                     stringify!($name));
                 run_test(fname.to_string(), 4, |case| {
@@ -235,14 +236,15 @@ macro_rules! generate_tests {
         )
     }
 
-generate_tests!(U192,u192);
-generate_tests!(U256,u256);
-generate_tests!(U384,u384);
-generate_tests!(U512,u512);
-generate_tests!(U576,u576);
-generate_tests!(U1024,u1024);
-generate_tests!(U2048,u2048);
-generate_tests!(U3072,u3072);
-generate_tests!(U4096,u4096);
-generate_tests!(U8192,u8192);
-generate_tests!(U15360,u15360);
+    generate_tests!(U192);
+    generate_tests!(U256);
+    generate_tests!(U384);
+    generate_tests!(U512);
+    generate_tests!(U576);
+    generate_tests!(U1024);
+    generate_tests!(U2048);
+    generate_tests!(U3072);
+    generate_tests!(U4096);
+    generate_tests!(U8192);
+    generate_tests!(U15360);
+}

src/cryptonum/subtraction.rs

@@ -76,17 +76,18 @@ generate_subbers!(U4096);
 generate_subbers!(U8192);
 generate_subbers!(U15360);
 
-#[cfg(test)]
-use testing::run_test;
-#[cfg(test)]
-use cryptonum::Decoder;
-
 macro_rules! generate_tests {
-    ($name: ident, $testname: ident) => (
+    ( $( $name:ident ),* ) => {
         #[cfg(test)]
+        mod normal {
+            use cryptonum::Decoder;
+            use super::*;
+            use testing::run_test;
+
+            $(
                 #[test]
                 #[allow(non_snake_case)]
-        fn $testname() {
+                fn $name() {
                     let fname = format!("tests/math/subtraction{}.test",
                                         stringify!($name));
                     run_test(fname.to_string(), 3, |case| {
@@ -98,23 +99,14 @@ macro_rules! generate_tests {
                         let mut a = $name::from_bytes(abytes);
                         let b = $name::from_bytes(bbytes);
                         let c = $name::from_bytes(cbytes);
-                let r = &a - &b;
-                assert_eq!(r, c);
+                        assert_eq!(&a - &b, c);
                         a -= b;
                         assert_eq!(a, c);
                     });
                 }
-    )
+            )*
+        }
+    }
 }
 
-generate_tests!(U192,u192);
-generate_tests!(U256,u256);
-generate_tests!(U384,u384);
-generate_tests!(U512,u512);
-generate_tests!(U576,u576);
-generate_tests!(U1024,u1024);
-generate_tests!(U2048,u2048);
-generate_tests!(U3072,u3072);
-generate_tests!(U4096,u4096);
-generate_tests!(U8192,u8192);
-generate_tests!(U15360,u15360);
+generate_tests!(U192, U256, U384, U512, U576, U1024, U2048, U3072, U4096, U8192, U15360);