Skip to content

Commit 9ce019f

Browse files
chore: Fix CAWG test (was lacking a timestamp) and update tests (#1273)
1 parent 82c2064 commit 9ce019f

File tree

6 files changed

+9
-15
lines changed

6 files changed

+9
-15
lines changed

c2pa_c_ffi/src/c_api.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1835,8 +1835,9 @@ mod tests {
18351835
let json = unsafe { c2pa_reader_json(reader) };
18361836
assert!(!json.is_null());
18371837
let json_str = unsafe { CString::from_raw(json) };
1838+
println!("JSON Report: {}", json_str.to_str().unwrap());
18381839
let json_report = json_str.to_str().unwrap();
18391840
assert!(json_report.contains("cawg.identity"));
1840-
assert!(json_report.contains("cawg.ica.credential_valid"));
1841+
assert!(json_report.contains("cawg.identity.well-formed"));
18411842
}
18421843
}

c2pa_c_ffi/src/json_api.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,11 @@ mod tests {
117117
fn test_verify_from_file_cawg_identity() {
118118
let path = test_path("tests/fixtures/C_with_CAWG_data.jpg");
119119
let result = read_file(&path, None);
120+
dbg!(&result);
120121
assert!(result.is_ok());
121122
let json_report = result.unwrap();
122123
println!("{json_report}");
123124
assert!(json_report.contains("cawg.identity"));
124-
assert!(json_report.contains("cawg.ica.credential_valid"));
125+
assert!(json_report.contains("cawg.identity.well-formed"));
125126
}
126127
}
-53.5 KB
Loading

cli/tests/integration.rs

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -544,12 +544,8 @@ fn tool_read_image_with_cawg_data() -> Result<(), Box<dyn Error>> {
544544
.assert()
545545
.success()
546546
.stdout(str::contains("cawg.identity"))
547-
.stdout(str::contains("https://behance.net"))
548-
.stdout(str::contains("verifiedIdentities"))
549-
.stdout(str::contains("cawg.ica.credential_valid"))
550-
.stdout(str::contains("cawg.social_media"))
551-
.stdout(str::contains("VerifiableCredential"))
552-
.stdout(str::contains("IdentityClaimsAggregationCredential"));
547+
.stdout(str::contains("c2pa.assertions/cawg.training-mining"))
548+
.stdout(str::contains("cawg.identity.well-formed"));
553549
Ok(())
554550
}
555551

@@ -563,11 +559,7 @@ fn tool_read_image_with_details_with_cawg_data() -> Result<(), Box<dyn Error>> {
563559
.success()
564560
.stdout(str::contains("assertion_store"))
565561
.stdout(str::contains("cawg.identity"))
566-
.stdout(str::contains("https://behance.net"))
567-
.stdout(str::contains("verifiedIdentities"))
568-
.stdout(str::contains("cawg.ica.credential_valid"))
569-
.stdout(str::contains("cawg.social_media"))
570-
.stdout(str::contains("VerifiableCredential"))
571-
.stdout(str::contains("IdentityClaimsAggregationCredential"));
562+
.stdout(str::contains("c2pa.assertions/cawg.training-mining"))
563+
.stdout(str::contains("cawg.identity.well-formed"));
572564
Ok(())
573565
}

sdk/examples/cawg_identity.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ mod cawg {
8787
CERTS,
8888
PRIVATE_KEY,
8989
SigningAlg::Es256,
90-
None,
90+
Some("http://timestamp.digicert.com".to_string()),
9191
)?;
9292

9393
let cawg_raw_signer = raw_signature::async_signer_from_cert_chain_and_private_key(
-53.5 KB
Loading

0 commit comments

Comments
 (0)