Update tests and examples

LostQuasar · Sep 29, 2024 · 81c9f70 · 81c9f70
1 parent dacc111
commit 81c9f70
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -19,11 +19,19 @@ tokio = { version = "1.21.2", features = ["macros", "rt-multi-thread"] }
 A simple request to retrieve the API key user's id
 
 ```rs
-dotenv().ok();
-let user_test_id = dotenv::var("USER_TEST_ID").expect("missing USER_TEST_ID");
-let openshock_token = dotenv::var("OPENSHOCK_TOKEN").expect("missing OPENSHOCK_TOKEN");
-
-let openshock_api = OpenShockAPI::new(None, openshock_token);
-println!(openshock_api.get_user_info(None).await.unwrap().id);
+    dotenv().ok();
+    let openshock_token = dotenv::var("OPENSHOCK_TOKEN").expect("missing OPENSHOCK_TOKEN");
+    let app_name = env!("CARGO_PKG_NAME");
+    let app_version = env!("CARGO_PKG_VERSION");
+
+    assert_ne!(openshock_token, "");
+
+    openshock_api = OpenShockAPIBuilder::new()
+        .with_app(app_name.to_string(), Some(app_version.to_string()))
+        .with_default_api_token(openshock_token)
+        .build()
+        .unwrap();
+
+    println!(openshock_api.get_user_info(None).await.unwrap().id);
 ```
 
diff --git a/tests/tests.rs b/tests/tests.rs
@@ -1,5 +1,5 @@
 use dotenv::dotenv;
-use rzap::{api::{OpenShockAPI, ListShockerSource}, data_type::ControlType};
+use rzap::{api::{ListShockerSource, OpenShockAPI, OpenShockAPIBuilder}, data_type::ControlType};
 use std::hash::{DefaultHasher, Hash, Hasher};
 
 
@@ -9,15 +9,26 @@ fn calculate_hash<T: Hash>(t: &T) -> u64 {
     s.finish()
 }
 
-#[tokio::test]
-async fn get_shockers_test() {
+fn get_test_api() -> OpenShockAPI {
     dotenv().ok();
     let openshock_token = dotenv::var("OPENSHOCK_TOKEN").expect("missing OPENSHOCK_TOKEN");
-    let shocker_test_id = dotenv::var("SHOCKER_TEST_ID").expect("missing SHOCKER_TEST_ID");
+    let app_name = env!("CARGO_PKG_NAME");
+    let app_version = env!("CARGO_PKG_VERSION");
+
     assert_ne!(openshock_token, "");
-    assert_ne!(shocker_test_id, "");
 
-    let openshock_api = OpenShockAPI::new(None, openshock_token);
+    OpenShockAPIBuilder::new()
+        .with_app(app_name.to_string(), Some(app_version.to_string()))
+        .with_default_api_token(openshock_token)
+        .build()
+        .unwrap()
+}
+
+#[tokio::test]
+async fn get_shockers_test() {
+    let openshock_api = get_test_api();
+    let shocker_test_id = dotenv::var("SHOCKER_TEST_ID").expect("missing SHOCKER_TEST_ID");
+    assert_ne!(shocker_test_id, "");
 
     let result = openshock_api.get_shockers(ListShockerSource::Own, None).await;
     assert_eq!(
@@ -28,13 +39,10 @@ async fn get_shockers_test() {
 
 #[tokio::test]
 async fn post_control_test() {
-    dotenv().ok();
-    let openshock_token = dotenv::var("OPENSHOCK_TOKEN").expect("missing OPENSHOCK_TOKEN");
+    let openshock_api = get_test_api();
     let shocker_test_id = dotenv::var("SHOCKER_TEST_ID").expect("missing SHOCKER_TEST_ID");
-    assert_ne!(openshock_token, "");
     assert_ne!(shocker_test_id, "");
 
-    let openshock_api = OpenShockAPI::new(None, openshock_token);
     let result = openshock_api
         .post_control(shocker_test_id, ControlType::Sound, 1, 300, None)
         .await;
@@ -43,16 +51,13 @@ async fn post_control_test() {
 
 #[tokio::test]
 async fn get_user_info_test() {
-    dotenv().ok();
+    let openshock_api = get_test_api();
     let user_test_id = dotenv::var("USER_TEST_ID").expect("missing USER_TEST_ID");
-    let openshock_token = dotenv::var("OPENSHOCK_TOKEN").expect("missing OPENSHOCK_TOKEN");
     assert_ne!(user_test_id, "");
-    assert_ne!(openshock_token, "");
 
-    let openshock_api = OpenShockAPI::new(None, openshock_token);
-    let result = openshock_api.get_user_info(None).await;
+    let result: Result<rzap::data_type::SelfResponse, rzap::error::Error> = openshock_api.get_user_info(None).await;
     assert_eq!(
         calculate_hash(&result.unwrap().id),
         calculate_hash(&user_test_id)
     );
-}
+}