From 70b1ef270f56f905326c4445fe53fc3b33ec0225 Mon Sep 17 00:00:00 2001 From: Steve Cook Date: Wed, 1 Mar 2023 22:49:07 -0500 Subject: [PATCH] Update tests --- src/maxicode/detector.rs | 2 +- src/multi/multi_test_case.rs | 4 ++-- src/multi/qrcode/qr_code_multi_reader.rs | 2 +- .../rss_expanded_image_2_binary_test_tase.rs | 4 ++-- .../rss_expanded_image_2_result_test_case.rs | 4 ++-- .../rss_expanded_image_2_string_test_case.rs | 4 ++-- .../rss_expanded_internal_test_case.rs | 16 +++++++-------- src/oned/rss/expanded/test_case_util.rs | 8 ++++---- tests/common/abstract_black_box_test_case.rs | 13 ++++-------- tests/common/pdf_417_multiimage_span.rs | 20 +++++++------------ 10 files changed, 33 insertions(+), 44 deletions(-) diff --git a/src/maxicode/detector.rs b/src/maxicode/detector.rs index 11a475e..bd62c77 100644 --- a/src/maxicode/detector.rs +++ b/src/maxicode/detector.rs @@ -1143,7 +1143,7 @@ mod detector_test { let filename = image; let img = image::open(filename).unwrap(); let lum_src = BufferedImageLuminanceSource::new(img); - let binarizer = HybridBinarizer::new(Box::new(lum_src)); + let binarizer = HybridBinarizer::new(lum_src); let bitmatrix = binarizer.get_black_matrix().unwrap(); // let i: image::DynamicImage = bitmatrix.into(); diff --git a/src/multi/multi_test_case.rs b/src/multi/multi_test_case.rs index eb8d199..641b8d4 100644 --- a/src/multi/multi_test_case.rs +++ b/src/multi/multi_test_case.rs @@ -38,7 +38,7 @@ fn testMulti() { .decode() .expect("must decode"); let source = BufferedImageLuminanceSource::new(image); - let mut bitmap = BinaryBitmap::new(Rc::new(HybridBinarizer::new(Box::new(source)))); + let mut bitmap = BinaryBitmap::new(HybridBinarizer::new(source)); let mut reader = GenericMultipleBarcodeReader::new(MultiFormatReader::default()); let results = reader @@ -65,7 +65,7 @@ fn testMultiQR() { .decode() .expect("must decode"); let source = BufferedImageLuminanceSource::new(image); - let mut bitmap = BinaryBitmap::new(Rc::new(HybridBinarizer::new(Box::new(source)))); + let mut bitmap = BinaryBitmap::new(HybridBinarizer::new(source)); let mut reader = GenericMultipleBarcodeReader::new(MultiFormatReader::default()); let results = reader diff --git a/src/multi/qrcode/qr_code_multi_reader.rs b/src/multi/qrcode/qr_code_multi_reader.rs index 4c36afc..5744892 100644 --- a/src/multi/qrcode/qr_code_multi_reader.rs +++ b/src/multi/qrcode/qr_code_multi_reader.rs @@ -249,7 +249,7 @@ mod multi_qr_code_test_case { .decode() .expect("must decode"); let source = BufferedImageLuminanceSource::new(image); - let mut bitmap = BinaryBitmap::new(Rc::new(HybridBinarizer::new(Box::new(source)))); + let mut bitmap = BinaryBitmap::new(HybridBinarizer::new(source)); let mut reader = QRCodeMultiReader::new(); let results = reader.decode_multiple(&mut bitmap).expect("must decode"); diff --git a/src/oned/rss/expanded/rss_expanded_image_2_binary_test_tase.rs b/src/oned/rss/expanded/rss_expanded_image_2_binary_test_tase.rs index 3e64023..4a8328b 100644 --- a/src/oned/rss/expanded/rss_expanded_image_2_binary_test_tase.rs +++ b/src/oned/rss/expanded/rss_expanded_image_2_binary_test_tase.rs @@ -174,9 +174,9 @@ fn assertCorrectImage2binary(fileName: &str, expected: &str) { let path = format!("test_resources/blackbox/rssexpanded-1/{fileName}"); let image = image::open(path).expect("file exists"); - let binaryMap = BinaryBitmap::new(Rc::new(GlobalHistogramBinarizer::new(Box::new( + let binaryMap = BinaryBitmap::new(GlobalHistogramBinarizer::new( BufferedImageLuminanceSource::new(image), - )))); + )); let rowNumber = binaryMap.get_height() / 2; let row = binaryMap.get_black_row(rowNumber).expect("row"); diff --git a/src/oned/rss/expanded/rss_expanded_image_2_result_test_case.rs b/src/oned/rss/expanded/rss_expanded_image_2_result_test_case.rs index cc3c3d5..af0da46 100644 --- a/src/oned/rss/expanded/rss_expanded_image_2_result_test_case.rs +++ b/src/oned/rss/expanded/rss_expanded_image_2_result_test_case.rs @@ -71,9 +71,9 @@ fn assertCorrectImage2result(fileName: &str, expected: ExpandedProductParsedRXin let path = format!("test_resources/blackbox/rssexpanded-1/{fileName}"); let image = image::open(path).expect("image must exist"); - let binaryMap = BinaryBitmap::new(Rc::new(GlobalHistogramBinarizer::new(Box::new( + let binaryMap = BinaryBitmap::new(GlobalHistogramBinarizer::new( BufferedImageLuminanceSource::new(image), - )))); + )); let rowNumber = binaryMap.get_height() / 2; let row = binaryMap.get_black_row(rowNumber).expect("get row"); diff --git a/src/oned/rss/expanded/rss_expanded_image_2_string_test_case.rs b/src/oned/rss/expanded/rss_expanded_image_2_string_test_case.rs index 2b1729b..f0d45cc 100644 --- a/src/oned/rss/expanded/rss_expanded_image_2_string_test_case.rs +++ b/src/oned/rss/expanded/rss_expanded_image_2_string_test_case.rs @@ -184,9 +184,9 @@ fn assertCorrectImage2string(fileName: &str, expected: &str) { let path = format!("test_resources/blackbox/rssexpanded-1/{fileName}"); let image = image::open(path).expect("load image"); - let binaryMap = BinaryBitmap::new(Rc::new(GlobalHistogramBinarizer::new(Box::new( + let binaryMap = BinaryBitmap::new(GlobalHistogramBinarizer::new( BufferedImageLuminanceSource::new(image), - )))); + )); let rowNumber = binaryMap.get_height() / 2; let row = binaryMap.get_black_row(rowNumber).expect("get row"); diff --git a/src/oned/rss/expanded/rss_expanded_internal_test_case.rs b/src/oned/rss/expanded/rss_expanded_internal_test_case.rs index 0712c44..c8b4339 100644 --- a/src/oned/rss/expanded/rss_expanded_internal_test_case.rs +++ b/src/oned/rss/expanded/rss_expanded_internal_test_case.rs @@ -42,9 +42,9 @@ use super::RSSExpandedReader; #[test] fn testFindFinderPatterns() { let image = readImage("2.png"); - let binaryMap = BinaryBitmap::new(Rc::new(GlobalHistogramBinarizer::new(Box::new( + let binaryMap = BinaryBitmap::new(GlobalHistogramBinarizer::new( BufferedImageLuminanceSource::new(image), - )))); + )); let rowNumber = binaryMap.get_height() as u32 / 2; let row = binaryMap.get_black_row(rowNumber as usize).expect("ok"); let mut previousPairs = Vec::new(); //new ArrayList<>(); @@ -88,9 +88,9 @@ fn testFindFinderPatterns() { #[test] fn testRetrieveNextPairPatterns() { let image = readImage("3.png"); - let binaryMap = BinaryBitmap::new(Rc::new(GlobalHistogramBinarizer::new(Box::new( + let binaryMap = BinaryBitmap::new(GlobalHistogramBinarizer::new( BufferedImageLuminanceSource::new(image), - )))); + )); let rowNumber = binaryMap.get_height() as u32 / 2; let row = binaryMap.get_black_row(rowNumber as usize).expect("create"); let mut previousPairs = Vec::new(); //new ArrayList<>(); @@ -116,9 +116,9 @@ fn testRetrieveNextPairPatterns() { #[test] fn testDecodeCheckCharacter() { let image = readImage("3.png"); - let binaryMap = BinaryBitmap::new(Rc::new(GlobalHistogramBinarizer::new(Box::new( + let binaryMap = BinaryBitmap::new(GlobalHistogramBinarizer::new( BufferedImageLuminanceSource::new(image.clone()), - )))); + )); let row = binaryMap .get_black_row(binaryMap.get_height() / 2) .expect("create"); @@ -144,9 +144,9 @@ fn testDecodeCheckCharacter() { #[test] fn testDecodeDataCharacter() { let image = readImage("3.png"); - let binaryMap = BinaryBitmap::new(Rc::new(GlobalHistogramBinarizer::new(Box::new( + let binaryMap = BinaryBitmap::new(GlobalHistogramBinarizer::new( BufferedImageLuminanceSource::new(image.clone()), - )))); + )); let row = binaryMap .get_black_row(binaryMap.get_height() / 2) .expect("create"); diff --git a/src/oned/rss/expanded/test_case_util.rs b/src/oned/rss/expanded/test_case_util.rs index 989c0b3..8fd9ed1 100644 --- a/src/oned/rss/expanded/test_case_util.rs +++ b/src/oned/rss/expanded/test_case_util.rs @@ -28,7 +28,7 @@ use std::rc::Rc; use image::DynamicImage; -use crate::{common::GlobalHistogramBinarizer, BinaryBitmap, BufferedImageLuminanceSource}; +use crate::{common::GlobalHistogramBinarizer, BinaryBitmap, BufferedImageLuminanceSource, Binarizer}; fn getBufferedImage(fileName: &str) -> DynamicImage { let path = format!("test_resources/blackbox/rssexpandedstacked-2/{fileName}"); @@ -36,10 +36,10 @@ fn getBufferedImage(fileName: &str) -> DynamicImage { image::open(path).expect("load image") } -pub(crate) fn getBinaryBitmap(fileName: &str) -> BinaryBitmap { +pub(crate) fn getBinaryBitmap(fileName: &str) -> BinaryBitmap> { let bufferedImage = getBufferedImage(fileName); - BinaryBitmap::new(Rc::new(GlobalHistogramBinarizer::new(Box::new( + BinaryBitmap::new(GlobalHistogramBinarizer::new( BufferedImageLuminanceSource::new(bufferedImage), - )))) + )) } diff --git a/tests/common/abstract_black_box_test_case.rs b/tests/common/abstract_black_box_test_case.rs index bb24d9c..ee69eab 100644 --- a/tests/common/abstract_black_box_test_case.rs +++ b/tests/common/abstract_black_box_test_case.rs @@ -25,12 +25,7 @@ use std::{ }; use encoding::Encoding; -use rxing::{ - common::{HybridBinarizer, Result}, - pdf417::PDF417RXingResultMetadata, - BarcodeFormat, BinaryBitmap, BufferedImageLuminanceSource, DecodeHintType, DecodeHintValue, - RXingResultMetadataType, RXingResultMetadataValue, Reader, -}; +use rxing::{common::{HybridBinarizer, Result}, pdf417::PDF417RXingResultMetadata, BarcodeFormat, BinaryBitmap, BufferedImageLuminanceSource, DecodeHintType, DecodeHintValue, RXingResultMetadataType, RXingResultMetadataValue, Reader, Binarizer}; use super::TestRXingResult; @@ -251,7 +246,7 @@ impl AbstractBlackBoxTestCase { let rotation = self.test_rxing_results.get(x).unwrap().get_rotation(); let rotated_image = Self::rotate_image(&image, rotation); let source = BufferedImageLuminanceSource::new(rotated_image); - let mut bitmap = BinaryBitmap::new(Rc::new(HybridBinarizer::new(Box::new(source)))); + let mut bitmap = BinaryBitmap::new(HybridBinarizer::new(source)); // if file_base_name == "15" { // let mut f = File::create("test_file_output.txt").unwrap(); @@ -422,9 +417,9 @@ impl AbstractBlackBoxTestCase { } } - fn decode( + fn decode( &mut self, - source: &mut BinaryBitmap, + source: &mut BinaryBitmap, rotation: f32, expected_text: &str, expected_metadata: &HashMap, diff --git a/tests/common/pdf_417_multiimage_span.rs b/tests/common/pdf_417_multiimage_span.rs index 7a98925..cbf8b21 100644 --- a/tests/common/pdf_417_multiimage_span.rs +++ b/tests/common/pdf_417_multiimage_span.rs @@ -24,13 +24,7 @@ use std::{ }; use encoding::Encoding; -use rxing::{ - common::{HybridBinarizer, Result}, - multi::MultipleBarcodeReader, - pdf417::PDF417RXingResultMetadata, - BarcodeFormat, BinaryBitmap, BufferedImageLuminanceSource, DecodeHintType, DecodeHintValue, - RXingResult, RXingResultMetadataType, RXingResultMetadataValue, Reader, -}; +use rxing::{common::{HybridBinarizer, Result}, multi::MultipleBarcodeReader, pdf417::PDF417RXingResultMetadata, BarcodeFormat, BinaryBitmap, BufferedImageLuminanceSource, DecodeHintType, DecodeHintValue, RXingResult, RXingResultMetadataType, RXingResultMetadataValue, Reader, Binarizer}; use super::TestRXingResult; @@ -181,7 +175,7 @@ impl PDF417MultiImageSpanAbstractBlackBoxTest let rotated_image = Self::rotate_image(&image, rotation); let source = BufferedImageLuminanceSource::new(rotated_image); let mut bitmap = - BinaryBitmap::new(Rc::new(HybridBinarizer::new(Box::new(source)))); + BinaryBitmap::new(HybridBinarizer::new(source)); if let Ok(res) = Self::decode_pdf417(&mut bitmap, false, &mut self.barcode_reader) @@ -395,7 +389,7 @@ impl PDF417MultiImageSpanAbstractBlackBoxTest let rotation = self.test_rxing_results.get(x).unwrap().get_rotation(); let rotated_image = Self::rotate_image(&image, rotation); let source = BufferedImageLuminanceSource::new(rotated_image); - let mut bitmap = BinaryBitmap::new(Rc::new(HybridBinarizer::new(Box::new(source)))); + let mut bitmap = BinaryBitmap::new(HybridBinarizer::new(source)); // if file_base_name == "15" { // let mut f = File::create("test_file_output.txt").unwrap(); @@ -566,9 +560,9 @@ impl PDF417MultiImageSpanAbstractBlackBoxTest } } - fn decode( + fn decode( &mut self, - source: &mut BinaryBitmap, + source: &mut BinaryBitmap, rotation: f32, expected_text: &str, expected_metadata: &HashMap, @@ -754,8 +748,8 @@ impl PDF417MultiImageSpanAbstractBlackBoxTest } } - fn decode_pdf417( - source: &mut BinaryBitmap, + fn decode_pdf417( + source: &mut BinaryBitmap, try_harder: bool, barcode_reader: &mut T, ) -> Result> {