Skip to content

Commit d8ebabf

Browse files
author
Stryhelski
committed
Remove unnecessary test, change the name of the tests
Remove testInvalidImagePathWithoutDot because it has the same logic as corruptedImageWithoutExtensionTest Prefix Test is now a postfix in test naming DEVSIX-6464
1 parent 4fca76d commit d8ebabf

1 file changed

Lines changed: 13 additions & 47 deletions

File tree

pdfocr-api/src/test/java/com/itextpdf/pdfocr/PdfInputImageTest.java

Lines changed: 13 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ This file is part of the iText (R) project.
2222
*/
2323
package com.itextpdf.pdfocr;
2424

25+
import com.itextpdf.pdfocr.exceptions.PdfOcrExceptionMessageConstant;
2526
import com.itextpdf.pdfocr.exceptions.PdfOcrInputException;
2627
import com.itextpdf.pdfocr.helpers.PdfHelper;
2728
import com.itextpdf.pdfocr.logs.PdfOcrLogMessageConstant;
@@ -32,79 +33,44 @@ This file is part of the iText (R) project.
3233

3334
import java.io.File;
3435
import org.junit.Assert;
35-
import org.junit.Rule;
3636
import org.junit.Test;
3737
import org.junit.experimental.categories.Category;
38-
import org.junit.rules.ExpectedException;
3938

4039
@Category(IntegrationTest.class)
4140
public class PdfInputImageTest extends ExtendedITextTest {
42-
@Rule
43-
public ExpectedException junitExpectedException = ExpectedException.none();
4441

4542
@LogMessages(messages = {
4643
@LogMessage(messageTemplate = PdfOcrLogMessageConstant.CANNOT_READ_INPUT_IMAGE)
4744
})
4845
@Test
49-
public void testCorruptedImage() {
50-
junitExpectedException.expect(PdfOcrInputException.class);
46+
public void corruptedImageTest() {
5147
File file = new File(PdfHelper.getImagesTestDirectory()
5248
+ "corrupted.jpg");
53-
String realOutput = PdfHelper.getTextFromPdf(file, "testCorruptedImage");
54-
Assert.assertNotNull(realOutput);
55-
Assert.assertEquals("", realOutput);
49+
Exception e = Assert.assertThrows(PdfOcrInputException.class,
50+
() -> PdfHelper.getTextFromPdf(file, "testCorruptedImage"));
51+
Assert.assertEquals(PdfOcrExceptionMessageConstant.CANNOT_READ_INPUT_IMAGE, e.getMessage());
5652
}
5753

5854
@LogMessages(messages = {
5955
@LogMessage(messageTemplate = PdfOcrLogMessageConstant.CANNOT_READ_INPUT_IMAGE)
6056
})
6157
@Test
62-
public void testCorruptedImageWithoutExtension() {
63-
junitExpectedException.expect(PdfOcrInputException.class);
64-
58+
public void corruptedImageWithoutExtensionTest() {
6559
File file = new File(PdfHelper.getImagesTestDirectory()
6660
+ "corrupted");
67-
String realOutput = PdfHelper.getTextFromPdf(file, "testCorruptedImageWithoutExtension");
68-
Assert.assertNotNull(realOutput);
69-
Assert.assertEquals("", realOutput);
70-
}
71-
72-
@LogMessages(messages = {
73-
@LogMessage(messageTemplate = PdfOcrLogMessageConstant.CANNOT_READ_INPUT_IMAGE)
74-
})
75-
@Test
76-
public void testInvalidImagePathWithoutDot() {
77-
junitExpectedException.expect(PdfOcrInputException.class);
78-
79-
File file = new File("testName");
80-
String realOutput = PdfHelper.getTextFromPdf(file, "testInvalidImagePathWithoutDot");
81-
Assert.assertNotNull(realOutput);
82-
Assert.assertEquals("", realOutput);
61+
Exception e = Assert.assertThrows(PdfOcrInputException.class,
62+
() -> PdfHelper.getTextFromPdf(file, "testCorruptedImageWithoutExtension"));
63+
Assert.assertEquals(PdfOcrExceptionMessageConstant.CANNOT_READ_INPUT_IMAGE, e.getMessage());
8364
}
8465

8566
@LogMessages(messages = {
8667
@LogMessage(messageTemplate = PdfOcrLogMessageConstant.CANNOT_READ_INPUT_IMAGE)
8768
})
8869
@Test
89-
public void testInvalidImagePathWithDot() {
90-
junitExpectedException.expect(PdfOcrInputException.class);
91-
70+
public void invalidPathWithDotTest() {
9271
File file = new File("test.Name");
93-
String realOutput = PdfHelper.getTextFromPdf(file, "testInvalidImagePathWithDot");
94-
Assert.assertNotNull(realOutput);
95-
Assert.assertEquals("", realOutput);
96-
}
97-
98-
@LogMessages(messages = {
99-
@LogMessage(messageTemplate = PdfOcrLogMessageConstant.CANNOT_READ_INPUT_IMAGE)
100-
})
101-
@Test
102-
public void testValidImageWithoutExtension() {
103-
junitExpectedException.expect(PdfOcrInputException.class);
104-
105-
File file = new File(PdfHelper.getImagesTestDirectory() + "numbers_01");
106-
String realOutput = PdfHelper.getTextFromPdf(file, "testValidImageWithoutExtension");
107-
Assert.assertNotNull(realOutput);
108-
Assert.assertEquals("", realOutput);
72+
Exception e = Assert.assertThrows(PdfOcrInputException.class,
73+
() -> PdfHelper.getTextFromPdf(file, "testInvalidPathWithDot"));
74+
Assert.assertEquals(PdfOcrExceptionMessageConstant.CANNOT_READ_INPUT_IMAGE, e.getMessage());
10975
}
11076
}

0 commit comments

Comments
 (0)