Update tests

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

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

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

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

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

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),
))))
))
}