Actually run x509 tests

2 files changed, 31 insertions, 36 deletions

diff --git a/openssl/src/x509/mod.rs b/openssl/src/x509/mod.rs
index 321161a2..8600031f 100644
--- a/openssl/src/x509/mod.rs
+++ b/openssl/src/x509/mod.rs
@@ -41,40 +41,7 @@ pub mod extension;
 pub mod store;
 
 #[cfg(test)]
-mod tests {
-    #[cfg(ossl110)]
-    use x509::X509Builder;
-
-    /// Tests `X509Ref::version` happy path.
-    #[cfg(ossl110)]
-    #[test]
-    fn x509_ref_version() {
-        let mut builder = X509Builder::new().unwrap();
-        let expected_version = 2;
-        builder
-            .set_version(expected_version)
-            .expect("Failed to set certificate version");
-        let cert = builder.build();
-        let actual_version = cert.version();
-        assert_eq!(
-            expected_version, actual_version,
-            "Obtained certificate version is incorrect",
-        );
-    }
-
-    /// Tests `X509Ref::version`. Checks case when no version has been set, so a default one is
-    /// returned.
-    #[cfg(ossl110)]
-    #[test]
-    fn x509_ref_version_no_version_set() {
-        let cert = X509Builder::new().unwrap().build();
-        let actual_version = cert.version();
-        assert_eq!(
-            0, actual_version,
-            "Default certificate version is incorrect",
-        );
-    }
-}
+mod tests;
 
 foreign_type_and_impl_send_sync! {
     type CType = ffi::X509_STORE_CTX;
diff --git a/openssl/src/x509/tests.rs b/openssl/src/x509/tests.rs
index 1f636b30..b11dac53 100644
--- a/openssl/src/x509/tests.rs
+++ b/openssl/src/x509/tests.rs
@@ -1,8 +1,7 @@
-use hex::{self, FromHex};
-
 use asn1::Asn1Time;
 use bn::{BigNum, MsbOption};
 use hash::MessageDigest;
+use hex::{self, FromHex};
 use nid::Nid;
 use pkey::{PKey, Private};
 use rsa::Rsa;
@@ -12,6 +11,8 @@ use x509::extension::{
     SubjectKeyIdentifier,
 };
 use x509::store::X509StoreBuilder;
+#[cfg(ossl110)]
+use x509::X509Builder;
 use x509::{X509Name, X509Req, X509StoreContext, X509VerifyResult, X509};
 
 fn pkey() -> PKey<Private> {
@@ -378,3 +379,30 @@ fn test_verify_fails() {
         .init(&store, &cert, &chain, |c| c.verify_cert())
         .unwrap());
 }
+
+#[cfg(ossl110)]
+#[test]
+fn x509_ref_version() {
+    let mut builder = X509Builder::new().unwrap();
+    let expected_version = 2;
+    builder
+        .set_version(expected_version)
+        .expect("Failed to set certificate version");
+    let cert = builder.build();
+    let actual_version = cert.version();
+    assert_eq!(
+        expected_version, actual_version,
+        "Obtained certificate version is incorrect",
+    );
+}
+
+#[cfg(ossl110)]
+#[test]
+fn x509_ref_version_no_version_set() {
+    let cert = X509Builder::new().unwrap().build();
+    let actual_version = cert.version();
+    assert_eq!(
+        0, actual_version,
+        "Default certificate version is incorrect",
+    );
+}