mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix javadoc for PDF417#determineDimensions

Browse source 
remove stacktrace when UT fails
This commit is contained in:
ftiercelin 2024-10-23 17:20:00 +01:00
parent a5f66f0a17
commit 068f67c529
2 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/src/main/java/com/google/zxing/pdf417/encoder/PDF417.java
View file

@ -693,12 +693,12 @@ public final class PDF417 {
* Determine optimal nr of columns and rows for the specified number of * Determine optimal nr of columns and rows for the specified number of
* codewords. * codewords.
* *
* @param sourceCodeWords number of code words
* @param errorCorrectionCodeWords number of error correction code words
* @param minCols minimum number of columns * @param minCols minimum number of columns
* @param maxCols maximum number of columns * @param maxCols maximum number of columns
* @param minRows minimum number of rows * @param minRows minimum number of rows
* @param maxRows maximum 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 * @return dimension object containing cols as width and rows as height
* @throws WriterException when dimensions can't be determined * @throws WriterException when dimensions can't be determined
*/ */

23
core/src/test/java/com/google/zxing/pdf417/encoder/PDF417EncoderTestCase.java
View file

@ -181,21 +181,18 @@ public final class PDF417EncoderTestCase extends Assert {
public static void testDimensions(String input, Dimensions dimensions) throws Exception { public static void testDimensions(String input, Dimensions dimensions) throws Exception {
int sourceCodeWords = 20; int sourceCodeWords = 20;
int errorCorrectionCodeWords = 8; int errorCorrectionCodeWords = 8;
try {
int[] calculated = PDF417.determineDimensions(dimensions.getMinCols(), dimensions.getMaxCols(), int[] calculated = PDF417.determineDimensions(dimensions.getMinCols(), dimensions.getMaxCols(),
dimensions.getMinRows(), dimensions.getMaxRows(), dimensions.getMinRows(), dimensions.getMaxRows(),
sourceCodeWords, errorCorrectionCodeWords); sourceCodeWords, errorCorrectionCodeWords);
assertNotNull(calculated);
assertEquals(2,calculated.length); assertNotNull(calculated);
assertTrue(dimensions.getMinCols() <= calculated[0]); assertEquals(2,calculated.length);
assertTrue(dimensions.getMaxCols() >= calculated[0]); assertTrue(dimensions.getMinCols() <= calculated[0]);
assertTrue(dimensions.getMinRows() <= calculated[1]); assertTrue(dimensions.getMaxCols() >= calculated[0]);
assertTrue(dimensions.getMaxRows() >= calculated[1]); assertTrue(dimensions.getMinRows() <= calculated[1]);
assertNotNull(generatePDF417BitMatrix(input, 371, null, dimensions)); assertTrue(dimensions.getMaxRows() >= calculated[1]);
} catch (Exception e) { assertNotNull(generatePDF417BitMatrix(input, 371, null, dimensions));
e.printStackTrace();
throw e;
}
} }
public static BitMatrix generatePDF417BitMatrix(final String barcodeText, final int width, public static BitMatrix generatePDF417BitMatrix(final String barcodeText, final int width,