fixup! moving things to new naming

Author: szokeasaurusrex

tests/integration/_cases/proguard/proguard-upload-no-upload.trycmd

@@ -1,7 +1,7 @@
 ```
-$ sentry-cli proguard upload tests/integration/_fixtures/proguard.txt --no-upload
+$ sentry-cli proguard upload tests/integration/_fixtures/proguard/no-line-info.txt --no-upload
 ? success
-warning: ignoring proguard mapping 'tests/integration/_fixtures/proguard.txt': Proguard mapping does not contain line information
+warning: ignoring proguard mapping 'tests/integration/_fixtures/proguard/no-line-info.txt': Proguard mapping does not contain line information
 > skipping upload.
 
 ```

tests/integration/_cases/upload_proguard/upload_proguard-no-upload.trycmd

@@ -1,7 +1,7 @@
 ```
-$ sentry-cli upload-proguard tests/integration/_fixtures/proguard.txt --no-upload
+$ sentry-cli upload-proguard tests/integration/_fixtures/proguard/no-line-info.txt --no-upload
 ? success
-warning: ignoring proguard mapping 'tests/integration/_fixtures/proguard.txt': Proguard mapping does not contain line information
+warning: ignoring proguard mapping 'tests/integration/_fixtures/proguard/no-line-info.txt': Proguard mapping does not contain line information
 > skipping upload.
 
 ```

…d_proguard/chunk_upload_needs_upload.bin …ard/upload/chunk_upload_needs_upload.bintests/integration/_expected_requests/upload_proguard/chunk_upload_needs_upload.bin renamed to tests/integration/_expected_requests/proguard/upload/chunk_upload_needs_upload.bin tests/integration/_expected_requests/upload_proguard/chunk_upload_needs_upload.bin renamed to tests/integration/_expected_requests/proguard/upload/chunk_upload_needs_upload.bin

@@ -64,7 +64,7 @@ fn chunk_upload_already_there() {
         .assert_cmd([
             "proguard",
             "upload",
-            "tests/integration/_fixtures/upload_proguard/mapping.txt",
+            "tests/integration/_fixtures/proguard/upload/mapping.txt",
         ])
         .with_default_token()
         .run_and_assert(AssertCommand::Success)
@@ -76,7 +76,7 @@ fn chunk_upload_needs_upload() {
 
     let call_count = AtomicU8::new(0);
     let expected_chunk_body = fs::read(
-        "tests/integration/_expected_requests/upload_proguard/chunk_upload_needs_upload.bin",
+        "tests/integration/_expected_requests/proguard/upload/chunk_upload_needs_upload.bin",
     )
     .expect("expected chunk upload request file should be readable");
 
@@ -159,7 +159,7 @@ fn chunk_upload_needs_upload() {
         .assert_cmd([
             "proguard",
             "upload",
-            "tests/integration/_fixtures/upload_proguard/mapping.txt",
+            "tests/integration/_fixtures/proguard/upload/mapping.txt",
         ])
         .with_default_token()
         .run_and_assert(AssertCommand::Success)
@@ -171,7 +171,7 @@ fn chunk_upload_two_files() {
 
     let call_count = AtomicU8::new(0);
     let expected_chunk_body =
-        fs::read("tests/integration/_expected_requests/upload_proguard/chunk_upload_two_files.bin")
+        fs::read("tests/integration/_expected_requests/proguard/upload/chunk_upload_two_files.bin")
             .expect("expected chunk upload request file should be readable");
 
     TestManager::new()
@@ -280,8 +280,8 @@ fn chunk_upload_two_files() {
         .assert_cmd([
             "proguard",
             "upload",
-            "tests/integration/_fixtures/upload_proguard/mapping.txt",
-            "tests/integration/_fixtures/upload_proguard/mapping-2.txt",
+            "tests/integration/_fixtures/proguard/upload/mapping.txt",
+            "tests/integration/_fixtures/proguard/upload/mapping-2.txt",
         ])
         .with_default_token()
         .run_and_assert(AssertCommand::Success)

…load_proguard/chunk_upload_two_files.bin …oguard/upload/chunk_upload_two_files.bintests/integration/_expected_requests/upload_proguard/chunk_upload_two_files.bin renamed to tests/integration/_expected_requests/proguard/upload/chunk_upload_two_files.bin tests/integration/_expected_requests/upload_proguard/chunk_upload_two_files.bin renamed to tests/integration/_expected_requests/proguard/upload/chunk_upload_two_files.bin

@@ -63,7 +63,7 @@ fn chunk_upload_already_there() {
         )
         .assert_cmd([
             "upload-proguard",
-            "tests/integration/_fixtures/upload_proguard/mapping.txt",
+            "tests/integration/_fixtures/proguard/upload/mapping.txt",
         ])
         .with_default_token()
         .run_and_assert(AssertCommand::Success)
@@ -75,7 +75,7 @@ fn chunk_upload_needs_upload() {
 
     let call_count = AtomicU8::new(0);
     let expected_chunk_body = fs::read(
-        "tests/integration/_expected_requests/upload_proguard/chunk_upload_needs_upload.bin",
+        "tests/integration/_expected_requests/proguard/upload/chunk_upload_needs_upload.bin",
     )
     .expect("expected chunk upload request file should be readable");
 
@@ -156,7 +156,7 @@ fn chunk_upload_needs_upload() {
         )
         .assert_cmd([
             "upload-proguard",
-            "tests/integration/_fixtures/upload_proguard/mapping.txt",
+            "tests/integration/_fixtures/proguard/upload/mapping.txt",
         ])
         .with_default_token()
         .run_and_assert(AssertCommand::Success)
@@ -168,7 +168,7 @@ fn chunk_upload_two_files() {
 
     let call_count = AtomicU8::new(0);
     let expected_chunk_body =
-        fs::read("tests/integration/_expected_requests/upload_proguard/chunk_upload_two_files.bin")
+        fs::read("tests/integration/_expected_requests/proguard/upload/chunk_upload_two_files.bin")
             .expect("expected chunk upload request file should be readable");
 
     TestManager::new()
@@ -277,8 +277,8 @@ fn chunk_upload_two_files() {
         )
         .assert_cmd([
             "upload-proguard",
-            "tests/integration/_fixtures/upload_proguard/mapping.txt",
-            "tests/integration/_fixtures/upload_proguard/mapping-2.txt",
+            "tests/integration/_fixtures/proguard/upload/mapping.txt",
+            "tests/integration/_fixtures/proguard/upload/mapping-2.txt",
         ])
         .with_default_token()
         .run_and_assert(AssertCommand::Success)