commit 117cd5e0e6c6a046426d3ff40354095e1e7d4cae
author Andrew Walbran <qwandor@google.com> Fri Aug 13 11:42:13 2021 +0000
committer Jooyung Han <jooyung@google.com> Tue Aug 17 10:07:30 2021 +0900
tree 6c4781f8e04c057a244c3c84e7aa0665b5664185
parent 5817c77734db7cfada0c94ac90f4a01db35c35a9

Clean up imports, formatting and tests.

Bug: n/a
Test: atest libapkverify.test libapkverify.integration_test
Change-Id: I39686d17927741297aa3feb02ed6043ee770933b

apkverify/tests/apkverify_test.rs

diff --git a/apkverify/tests/apkverify_test.rs b/apkverify/tests/apkverify_test.rs
index 3366524..ade4468 100644
--- a/apkverify/tests/apkverify_test.rs
+++ b/apkverify/tests/apkverify_test.rs
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-use apkverify::{assert_contains, verify};
+use apkverify::{testing::assert_contains, verify};
 use std::matches;
 
 #[test]
@@ -26,14 +26,14 @@
 fn test_verify_v3_digest_mismatch() {
     let res = verify("tests/data/v3-only-with-rsa-pkcs1-sha512-8192-digest-mismatch.apk");
     assert!(res.is_err());
-    assert_contains!(res.err().unwrap().to_string(), "Digest mismatch");
+    assert_contains(&res.unwrap_err().to_string(), "Digest mismatch");
 }
 
 #[test]
-fn test_verify_v3_cert_and_publick_key_mismatch() {
+fn test_verify_v3_cert_and_public_key_mismatch() {
     let res = verify("tests/data/v3-only-cert-and-public-key-mismatch.apk");
     assert!(res.is_err());
-    assert_contains!(res.err().unwrap().to_string(), "Public key mismatch");
+    assert_contains(&res.unwrap_err().to_string(), "Public key mismatch");
 }
 
 #[test]
@@ -42,7 +42,7 @@
     let res = verify("tests/data/v2-only-truncated-cd.apk");
     // TODO(jooyung): consider making a helper for err assertion
     assert!(matches!(
-        res.err().unwrap().root_cause().downcast_ref::<ZipError>().unwrap(),
+        res.unwrap_err().root_cause().downcast_ref::<ZipError>().unwrap(),
         ZipError::InvalidArchive(_),
     ));
 }