From 068f67c52950eb07ee2ff77977ef0ec011e0a9f9 Mon Sep 17 00:00:00 2001 From: ftiercelin Date: Wed, 23 Oct 2024 17:20:00 +0100 Subject: [PATCH] fix javadoc for PDF417#determineDimensions remove stacktrace when UT fails --- .../google/zxing/pdf417/encoder/PDF417.java | 4 ++-- .../pdf417/encoder/PDF417EncoderTestCase.java | 23 ++++++++----------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/core/src/main/java/com/google/zxing/pdf417/encoder/PDF417.java b/core/src/main/java/com/google/zxing/pdf417/encoder/PDF417.java index 363c9bf10..3402bb3d1 100644 --- a/core/src/main/java/com/google/zxing/pdf417/encoder/PDF417.java +++ b/core/src/main/java/com/google/zxing/pdf417/encoder/PDF417.java @@ -693,12 +693,12 @@ public final class PDF417 { * Determine optimal nr of columns and rows for the specified number of * codewords. * - * @param sourceCodeWords number of code words - * @param errorCorrectionCodeWords number of error correction code words * @param minCols minimum number of columns * @param maxCols maximum number of columns * @param minRows minimum number of rows * @param maxRows maximum number of rows + * @param sourceCodeWords number of code words + * @param errorCorrectionCodeWords number of error correction code words * @return dimension object containing cols as width and rows as height * @throws WriterException when dimensions can't be determined */ diff --git a/core/src/test/java/com/google/zxing/pdf417/encoder/PDF417EncoderTestCase.java b/core/src/test/java/com/google/zxing/pdf417/encoder/PDF417EncoderTestCase.java index 9adcc16fc..5374877a6 100644 --- a/core/src/test/java/com/google/zxing/pdf417/encoder/PDF417EncoderTestCase.java +++ b/core/src/test/java/com/google/zxing/pdf417/encoder/PDF417EncoderTestCase.java @@ -181,21 +181,18 @@ public final class PDF417EncoderTestCase extends Assert { public static void testDimensions(String input, Dimensions dimensions) throws Exception { int sourceCodeWords = 20; int errorCorrectionCodeWords = 8; - try { - int[] calculated = PDF417.determineDimensions(dimensions.getMinCols(), dimensions.getMaxCols(), + + int[] calculated = PDF417.determineDimensions(dimensions.getMinCols(), dimensions.getMaxCols(), dimensions.getMinRows(), dimensions.getMaxRows(), sourceCodeWords, errorCorrectionCodeWords); - assertNotNull(calculated); - assertEquals(2,calculated.length); - assertTrue(dimensions.getMinCols() <= calculated[0]); - assertTrue(dimensions.getMaxCols() >= calculated[0]); - assertTrue(dimensions.getMinRows() <= calculated[1]); - assertTrue(dimensions.getMaxRows() >= calculated[1]); - assertNotNull(generatePDF417BitMatrix(input, 371, null, dimensions)); - } catch (Exception e) { - e.printStackTrace(); - throw e; - } + + assertNotNull(calculated); + assertEquals(2,calculated.length); + assertTrue(dimensions.getMinCols() <= calculated[0]); + assertTrue(dimensions.getMaxCols() >= calculated[0]); + assertTrue(dimensions.getMinRows() <= calculated[1]); + assertTrue(dimensions.getMaxRows() >= calculated[1]); + assertNotNull(generatePDF417BitMatrix(input, 371, null, dimensions)); } public static BitMatrix generatePDF417BitMatrix(final String barcodeText, final int width,