test fixes

Author: Heliozoa

tmc-client/src/tmc_client/api_v8.rs

@@ -70,6 +70,19 @@ fn assert_success(response: Response, url: &Url) -> Result<Response, ClientError
     }
 }
 
+/// Fetches data from the URL and writes it into the target.
+pub fn download(client: &TmcClient, url: Url, mut target: impl Write) -> Result<(), ClientError> {
+    let res = prepare_tmc_request(client, Method::GET, url.clone())
+        .send()
+        .map_err(|e| ClientError::ConnectionError(Method::GET, url.clone(), e))?;
+
+    let mut res = assert_success(res, &url)?;
+    let _bytes = res
+        .copy_to(&mut target)
+        .map_err(ClientError::HttpWriteResponse)?;
+    Ok(())
+}
+
 /// Fetches JSON from the given URL and deserializes it into T.
 pub fn get_json<T: DeserializeOwned>(
     client: &TmcClient,
@@ -88,19 +101,6 @@ pub fn get_json<T: DeserializeOwned>(
     Ok(json)
 }
 
-// fetches data from the URL and writes it into target
-fn download(client: &TmcClient, url: Url, mut target: impl Write) -> Result<(), ClientError> {
-    let res = prepare_tmc_request(client, Method::GET, url.clone())
-        .send()
-        .map_err(|e| ClientError::ConnectionError(Method::GET, url.clone(), e))?;
-
-    let mut res = assert_success(res, &url)?;
-    let _bytes = res
-        .copy_to(&mut target)
-        .map_err(ClientError::HttpWriteResponse)?;
-    Ok(())
-}
-
 /// get /api/v8/application/{client_name}/credentials
 /// Fetches oauth2 credentials info.
 pub fn get_credentials(client: &TmcClient, client_name: &str) -> Result<Credentials, ClientError> {

tmc-langs-cli/src/app.rs

@@ -251,7 +251,7 @@ pub enum Core {
         #[structopt(long)]
         submission_id: u32,
         /// If set, the exercise is submitted to the server before resetting it.
-        #[structopt(long, requires = "submission-url")]
+        #[structopt(long)]
         save_old_state: bool,
         /// The ID of the exercise.
         #[structopt(long)]
@@ -430,7 +430,7 @@ pub enum Core {
     #[structopt(long_about = SCHEMA_NULL)]
     ResetExercise {
         /// If set, the exercise is submitted to the server before resetting it.
-        #[structopt(long, requires = "submission-url")]
+        #[structopt(long)]
         save_old_state: bool,
         /// The ID of the exercise.
         #[structopt(long)]
@@ -804,8 +804,8 @@ mod core_test {
     fn download_model_solution() {
         get_matches_core(&[
             "download-model-solution",
-            "--solution-download-url",
-            "http://localhost",
+            "--exercise-id",
+            "0",
             "--target",
             "path",
         ]);
@@ -822,8 +822,6 @@ mod core_test {
             "path",
             "--submission-id",
             "2345",
-            "--submission-url",
-            "http://localhost",
         ]);
     }
 
@@ -900,7 +898,7 @@ mod core_test {
 
     #[test]
     fn get_unread_reviews() {
-        get_matches_core(&["get-unread-reviews", "--reviews-url", "http://localhost"]);
+        get_matches_core(&["get-unread-reviews", "--course-id", "0"]);
     }
 
     #[test]
@@ -929,8 +927,10 @@ mod core_test {
     fn mark_review_as_read() {
         get_matches_core(&[
             "mark-review-as-read",
-            "--review-update-url",
-            "http://localhost",
+            "--course-id",
+            "0",
+            "--review-id",
+            "1",
         ]);
     }
 
@@ -944,8 +944,8 @@ mod core_test {
             "msg",
             "--submission-path",
             "path",
-            "--submission-url",
-            "http://localhost",
+            "--exercise-id",
+            "0",
         ]);
     }
 
@@ -959,8 +959,8 @@ mod core_test {
             "msg",
             "--submission-path",
             "path",
-            "--submission-url",
-            "http://localhost",
+            "--exercise-id",
+            "0",
         ]);
     }
 
@@ -973,8 +973,6 @@ mod core_test {
             "1234",
             "--exercise-path",
             "path",
-            "--submission-url",
-            "http://localhost",
         ]);
     }
 
@@ -985,8 +983,8 @@ mod core_test {
             "--feedback",
             "1234",
             "answer",
-            "--feedback-url",
-            "http://localhost",
+            "--submission-id",
+            "0",
         ]);
     }
 
@@ -999,8 +997,8 @@ mod core_test {
             "fi",
             "--submission-path",
             "path",
-            "--submission-url",
-            "http://localhost",
+            "--exercise-id",
+            "0",
         ]);
     }
 
@@ -1011,11 +1009,7 @@ mod core_test {
 
     #[test]
     fn wait_for_submission() {
-        get_matches_core(&[
-            "wait-for-submission",
-            "--submission-url",
-            "http://localhost",
-        ]);
+        get_matches_core(&["wait-for-submission", "--submission-id", "0"]);
     }
 }