Remove tests mod (#55)

* Randomize test params

* Refactor tests location

Author: augustuswm

Cargo.lock

@@ -48,6 +48,8 @@ tokio = { version = "1.25.0", features = ["full"] }
 base64 = "^0.13"
 dirs = "^3.0.2"
 nom_pem = "4"
+rand = "0.8.5"
+rsa = "0.8.1"
 tokio = { version = "1.25.0", features = ["test-util"] }
 wiremock = "0.5.17"
 

docusign/Cargo.toml

@@ -2132,8 +2132,6 @@ pub mod template_views;
 ///
 ///The resource also includes a number of methods that allow you to retrieve and set the initials and signature for certain types of recipients on the document.
 pub mod templates;
-#[cfg(test)]
-mod tests;
 pub mod types;
 /// The UserCustomSettings resource provides methods that allow you to manage the custom settings for a user.
 ///

docusign/src/lib.rs

@@ -2301,8 +2301,6 @@ fn gen(
     {
         a("pub mod traits;");
     }
-    a("#[cfg(test)]");
-    a("mod tests;");
     // Hopefully there is never a "tag" named after these reserved libs.
     a("pub mod types;");
     a("#[doc(hidden)]");
@@ -3290,6 +3288,8 @@ tokio = {{ version = "1.25.0", features = ["full"] }}
 base64 = "^0.13"
 dirs = "^3.0.2"
 nom_pem = "4"
+rand = "0.8.5"
+rsa = "0.8.1"
 tokio = {{ version = "1.25.0", features = ["test-util"] }}
 wiremock = "0.5.17"
 

docusign/src/tests.rs renamed to docusign/tests/tests.rs

@@ -48,6 +48,8 @@ tokio = { version = "1.25.0", features = ["full"] }
 base64 = "^0.13"
 dirs = "^3.0.2"
 nom_pem = "4"
+rand = "0.8.5"
+rsa = "0.8.1"
 tokio = { version = "1.25.0", features = ["test-util"] }
 wiremock = "0.5.17"
 

generator/src/main.rs

@@ -68,8 +68,6 @@
 
 pub mod gifs;
 pub mod stickers;
-#[cfg(test)]
-mod tests;
 pub mod types;
 #[doc(hidden)]
 pub mod utils;

giphy/Cargo.toml

@@ -45,6 +45,8 @@ tokio = { version = "1.25.0", features = ["full"] }
 base64 = "^0.13"
 dirs = "^3.0.2"
 nom_pem = "4"
+rand = "0.8.5"
+rsa = "0.8.1"
 tokio = { version = "1.25.0", features = ["test-util"] }
 wiremock = "0.5.17"
 

giphy/src/lib.rs

@@ -231,17 +231,34 @@ impl PartialEq for InstallationTokenGenerator {
 
 #[cfg(test)]
 mod tests {
+    use super::*;
+    use rand::RngCore;
+    use rsa::{pkcs1::EncodeRsaPrivateKey, RsaPrivateKey};
     use std::time::Duration;
 
-    use super::*;
+    fn app_id() -> u64 {
+        let mut rng = rand::thread_rng();
+        rng.next_u64()
+    }
 
-    const APP_ID: u64 = 162665041;
-    const INSTALLATION_ID: u64 = 1780480419;
-    const PRIVATE_KEY: &[u8] = include_bytes!("dummy-rsa.der");
+    fn installation_id() -> u64 {
+        let mut rng = rand::thread_rng();
+        rng.next_u64()
+    }
+
+    fn private_key() -> Vec<u8> {
+        let mut rng = rand::thread_rng();
+        let private_key = RsaPrivateKey::new(&mut rng, 2048)
+            .unwrap()
+            .to_pkcs1_der()
+            .unwrap()
+            .to_bytes();
+        private_key.to_vec()
+    }
 
     #[tokio::test(start_paused = true)]
     async fn jwt_credentials_refreshes_when_necessary() {
-        let credentials = JWTCredentials::new(APP_ID, Vec::from(PRIVATE_KEY))
+        let credentials = JWTCredentials::new(app_id(), private_key())
             .expect("Should be able to create credentials");
 
         assert!(
@@ -266,10 +283,10 @@ mod tests {
 
     #[tokio::test(start_paused = true)]
     async fn installation_token_generator_expires_after_token_interval() {
-        let jwt_credentials = JWTCredentials::new(APP_ID, Vec::from(PRIVATE_KEY))
+        let jwt_credentials = JWTCredentials::new(app_id(), private_key())
             .expect("Should be able to create JWT credentials");
 
-        let generator = InstallationTokenGenerator::new(INSTALLATION_ID, jwt_credentials.clone());
+        let generator = InstallationTokenGenerator::new(installation_id(), jwt_credentials.clone());
 
         assert_eq!(
             None,

giphy/src/tests.rs renamed to giphy/tests/tests.rs

@@ -236,8 +236,6 @@ pub mod search;
 pub mod secret_scanning;
 /// Interact with GitHub Teams.
 pub mod teams;
-#[cfg(test)]
-mod tests;
 pub mod types;
 /// Interact with and view information about users and also current user.
 pub mod users;

github/Cargo.toml

@@ -1,26 +1,45 @@
+use rand::RngCore;
+use rsa::{pkcs1::EncodeRsaPrivateKey, RsaPrivateKey};
 use std::{mem, time::Duration};
 
 use wiremock::{
     matchers::{bearer_token, header, method, path},
     Mock, MockServer, ResponseTemplate,
 };
 
-use crate::{
+use octorust::{
     auth::{Credentials, InstallationTokenGenerator, JWTCredentials},
     types::InstallationToken,
     Client,
 };
 
-const APP_ID: u64 = 432376605;
-const INSTALLATION_ID: u64 = 260162224;
-const PRIVATE_KEY: &[u8] = include_bytes!("dummy-rsa.der");
+fn app_id() -> u64 {
+    let mut rng = rand::thread_rng();
+    rng.next_u64()
+}
+
+fn installation_id() -> u64 {
+    let mut rng = rand::thread_rng();
+    rng.next_u64()
+}
+
+fn private_key() -> Vec<u8> {
+    let mut rng = rand::thread_rng();
+    let private_key = RsaPrivateKey::new(&mut rng, 2048)
+        .unwrap()
+        .to_pkcs1_der()
+        .unwrap()
+        .to_bytes();
+    private_key.to_vec()
+}
 
 #[tokio::test]
 async fn refreshes_installation_token_once() {
+    let installation_id = installation_id();
+
     let server = MockServer::start().await;
 
-    let jwt =
-        JWTCredentials::new(APP_ID, Vec::from(PRIVATE_KEY)).expect("JWT creation should succeed");
+    let jwt = JWTCredentials::new(app_id(), private_key()).expect("JWT creation should succeed");
 
     // The JWT should be used to retrieve an installation token only once, even if requesting the
     // the token takes long enough for a second task to ask for one.
@@ -38,7 +57,7 @@ async fn refreshes_installation_token_once() {
         });
     Mock::given(method("POST"))
         .and(path(format!(
-            "/app/installations/{INSTALLATION_ID}/access_tokens"
+            "/app/installations/{installation_id}/access_tokens"
         )))
         .and(bearer_token(jwt.token()))
         .respond_with(auth_response)
@@ -54,7 +73,7 @@ async fn refreshes_installation_token_once() {
         .mount(&server)
         .await;
 
-    let token_generator = InstallationTokenGenerator::new(INSTALLATION_ID, jwt);
+    let token_generator = InstallationTokenGenerator::new(installation_id, jwt);
     let mut client = Client::new(
         concat!(env!("CARGO_PKG_NAME"), "/", env!("CARGO_PKG_VERSION")),
         Credentials::InstallationToken(token_generator),

github/src/auth.rs

@@ -50,6 +50,8 @@ tokio = { version = "1.25.0", features = ["full"] }
 base64 = "^0.13"
 dirs = "^3.0.2"
 nom_pem = "4"
+rand = "0.8.5"
+rsa = "0.8.1"
 tokio = { version = "1.25.0", features = ["test-util"] }
 wiremock = "0.5.17"
 

github/src/dummy-rsa.der

@@ -125,8 +125,6 @@ pub mod resources;
 pub mod role_assignments;
 pub mod roles;
 pub mod schemas;
-#[cfg(test)]
-mod tests;
 pub mod tokens;
 pub mod two_step_verification;
 pub mod types;

github/src/lib.rs

@@ -50,6 +50,8 @@ tokio = { version = "1.25.0", features = ["full"] }
 base64 = "^0.13"
 dirs = "^3.0.2"
 nom_pem = "4"
+rand = "0.8.5"
+rsa = "0.8.1"
 tokio = { version = "1.25.0", features = ["test-util"] }
 wiremock = "0.5.17"
 

github/src/tests.rs renamed to github/tests/tests.rs

@@ -117,8 +117,6 @@ pub mod colors;
 pub mod events;
 pub mod freebusy;
 pub mod settings;
-#[cfg(test)]
-mod tests;
 pub mod types;
 #[doc(hidden)]
 pub mod utils;

google/admin/Cargo.toml

@@ -50,6 +50,8 @@ tokio = { version = "1.25.0", features = ["full"] }
 base64 = "^0.13"
 dirs = "^3.0.2"
 nom_pem = "4"
+rand = "0.8.5"
+rsa = "0.8.1"
 tokio = { version = "1.25.0", features = ["test-util"] }
 wiremock = "0.5.17"
 

google/admin/src/lib.rs

@@ -111,8 +111,6 @@
 
 pub mod folders;
 pub mod operations;
-#[cfg(test)]
-mod tests;
 pub mod types;
 #[doc(hidden)]
 pub mod utils;

google/admin/src/tests.rs renamed to google/admin/tests/tests.rs

@@ -50,6 +50,8 @@ tokio = { version = "1.25.0", features = ["full"] }
 base64 = "^0.13"
 dirs = "^3.0.2"
 nom_pem = "4"
+rand = "0.8.5"
+rsa = "0.8.1"
 tokio = { version = "1.25.0", features = ["test-util"] }
 wiremock = "0.5.17"
 

google/calendar/Cargo.toml

@@ -119,8 +119,6 @@ pub mod permissions;
 pub mod replies;
 pub mod revisions;
 pub mod teamdrives;
-#[cfg(test)]
-mod tests;
 pub mod traits;
 pub mod types;
 #[doc(hidden)]

google/calendar/src/lib.rs

@@ -50,6 +50,8 @@ tokio = { version = "1.25.0", features = ["full"] }
 base64 = "^0.13"
 dirs = "^3.0.2"
 nom_pem = "4"
+rand = "0.8.5"
+rsa = "0.8.1"
 tokio = { version = "1.25.0", features = ["test-util"] }
 wiremock = "0.5.17"
 

google/calendar/src/tests.rs

@@ -110,8 +110,6 @@
 #![cfg_attr(docsrs, feature(doc_cfg))]
 
 pub mod groups;
-#[cfg(test)]
-mod tests;
 pub mod types;
 #[doc(hidden)]
 pub mod utils;

google/cloud-resource-manager/src/tests.rs renamed to google/calendar/tests/tests.rs

@@ -50,6 +50,8 @@ tokio = { version = "1.25.0", features = ["full"] }
 base64 = "^0.13"
 dirs = "^3.0.2"
 nom_pem = "4"
+rand = "0.8.5"
+rsa = "0.8.1"
 tokio = { version = "1.25.0", features = ["test-util"] }
 wiremock = "0.5.17"