ak/rxing
1
0
Fork 0
mirror of https://github.com/starovoid/rxing.git synced 2026-07-26 04:12:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix issue with metadata testing

Browse Source
This commit is contained in:
Henry Schimke
2023-02-01 12:23:00 -06:00
parent d29fece8bf
commit fb60cfc5a3
12 changed files with 169 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/common/abstract_black_box_test_case.rs
View File

@@ -175,8 +175,9 @@ impl<T: Reader> AbstractBlackBoxTestCase<T> {
.unwrap();
let mut expected_metadata_file: PathBuf = self.test_base.clone().to_path_buf();
expected_metadata_file.push(format!("{}.metadata", file_base_name.to_str().unwrap()));
expected_metadata_file.set_extension("txt");
expected_metadata_file
.push(format!("{}.metadata.txt", file_base_name.to_str().unwrap()));
// expected_metadata_file.set_extension("txt");
let expected_metadata_unfinished = if expected_metadata_file.exists() {
java_properties::read(
std::fs::File::open(expected_metadata_file)
@@ -189,10 +190,10 @@ impl<T: Reader> AbstractBlackBoxTestCase<T> {
} else {
HashMap::new()
};
let expected_metadata = HashMap::new();
let mut expected_metadata = HashMap::new();
for (k, v) in expected_metadata_unfinished {
let new_k = RXingResultMetadataType::from(k);
let _new_v = match new_k {
let new_v = match new_k {
RXingResultMetadataType::OTHER => RXingResultMetadataValue::OTHER(v),
RXingResultMetadataType::ORIENTATION => {
RXingResultMetadataValue::Orientation(v.parse().unwrap_or_default())
@@ -233,7 +234,14 @@ impl<T: Reader> AbstractBlackBoxTestCase<T> {
RXingResultMetadataType::SYMBOLOGY_IDENTIFIER => {
RXingResultMetadataValue::SymbologyIdentifier(v)
}
RXingResultMetadataType::IS_MIRRORED => {
RXingResultMetadataValue::IsMirrored(v.parse().unwrap())
}
RXingResultMetadataType::CONTENT_TYPE => {
RXingResultMetadataValue::ContentType(v)
}
};
expected_metadata.insert(new_k, new_v);
}
for x in 0..test_count {

11
tests/common/pdf_417_multiimage_span.rs
View File

@@ -334,10 +334,10 @@ impl<T: MultipleBarcodeReader + Reader> PDF417MultiImageSpanAbstractBlackBoxTest
} else {
HashMap::new()
};
let expected_metadata = HashMap::new();
let mut expected_metadata = HashMap::new();
for (k, v) in expected_metadata_unfinished {
let new_k = RXingResultMetadataType::from(k);
let _new_v = match new_k {
let new_v = match new_k {
RXingResultMetadataType::OTHER => RXingResultMetadataValue::OTHER(v),
RXingResultMetadataType::ORIENTATION => {
RXingResultMetadataValue::Orientation(v.parse().unwrap_or_default())
@@ -378,7 +378,14 @@ impl<T: MultipleBarcodeReader + Reader> PDF417MultiImageSpanAbstractBlackBoxTest
RXingResultMetadataType::SYMBOLOGY_IDENTIFIER => {
RXingResultMetadataValue::SymbologyIdentifier(v)
}
RXingResultMetadataType::IS_MIRRORED => {
RXingResultMetadataValue::IsMirrored(v.parse().unwrap())
}
RXingResultMetadataType::CONTENT_TYPE => {
RXingResultMetadataValue::ContentType(v)
}
};
expected_metadata.insert(new_k, new_v);
}
for x in 0..test_count {