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

Update tests

Browse Source
This commit is contained in:
Steve Cook
2023-03-01 22:49:07 -05:00
parent c5460debe1
commit 70b1ef270f
10 changed files with 33 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/maxicode/detector.rs
View File

@@ -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();

4
src/multi/multi_test_case.rs
View File

@@ -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

2
src/multi/qrcode/qr_code_multi_reader.rs
View File

@@ -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");

4
src/oned/rss/expanded/rss_expanded_image_2_binary_test_tase.rs
View File

@@ -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");

4
src/oned/rss/expanded/rss_expanded_image_2_result_test_case.rs
View File

@@ -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");

4
src/oned/rss/expanded/rss_expanded_image_2_string_test_case.rs
View File

@@ -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");

16
src/oned/rss/expanded/rss_expanded_internal_test_case.rs
View File

@@ -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");

8
src/oned/rss/expanded/test_case_util.rs
View File

@@ -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<GlobalHistogramBinarizer<BufferedImageLuminanceSource>> {
let bufferedImage = getBufferedImage(fileName);
BinaryBitmap::new(Rc::new(GlobalHistogramBinarizer::new(Box::new(
BinaryBitmap::new(GlobalHistogramBinarizer::new(
BufferedImageLuminanceSource::new(bufferedImage),
))))
))
}

13
tests/common/abstract_black_box_test_case.rs
View File

@@ -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<T: Reader> AbstractBlackBoxTestCase<T> {
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<T: Reader> AbstractBlackBoxTestCase<T> {
}
}
fn decode(
fn decode<B: Binarizer>(
&mut self,
source: &mut BinaryBitmap,
source: &mut BinaryBitmap<B>,
rotation: f32,
expected_text: &str,
expected_metadata: &HashMap<RXingResultMetadataType, RXingResultMetadataValue>,

20
tests/common/pdf_417_multiimage_span.rs
View File

@@ -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<T: MultipleBarcodeReader + Reader> 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<T: MultipleBarcodeReader + Reader> 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<T: MultipleBarcodeReader + Reader> PDF417MultiImageSpanAbstractBlackBoxTest
}
}
fn decode(
fn decode<B: Binarizer>(
&mut self,
source: &mut BinaryBitmap,
source: &mut BinaryBitmap<B>,
rotation: f32,
expected_text: &str,
expected_metadata: &HashMap<RXingResultMetadataType, RXingResultMetadataValue>,
@@ -754,8 +748,8 @@ impl<T: MultipleBarcodeReader + Reader> PDF417MultiImageSpanAbstractBlackBoxTest
}
}
fn decode_pdf417(
source: &mut BinaryBitmap,
fn decode_pdf417<B: Binarizer>(
source: &mut BinaryBitmap<B>,
try_harder: bool,
barcode_reader: &mut T,
) -> Result<Vec<RXingResult>> {