Skip to content

Commit 2d1d072

Browse files
committed
fix test
1 parent 4d11dd4 commit 2d1d072

2 files changed

Lines changed: 6 additions & 13 deletions

File tree

src/main/java/org/jadice/filetype/matchers/PDFMatcher.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,8 @@ public class PDFMatcher extends Matcher {
8080
public static final String TEXT_LANGUAGE_CONFIDENCE_VALUES = "text-language-confidence-values";
8181

8282

83-
private final static boolean languageCheck;
84-
85-
static {
86-
languageCheck = "true".equalsIgnoreCase(System.getProperty(PDFMatcher.class.getName() + ".languageCheck", "false"));
83+
private static boolean checkLanguage() {
84+
return "true".equalsIgnoreCase(System.getProperty(PDFMatcher.class.getName() + ".languageCheck", "false"));
8785
}
8886

8987
private static boolean lookForText() {
@@ -292,7 +290,7 @@ private static void addTextInfo(final Map<String, Object> pdfDetails, final PDDo
292290
final String pdfText = new PDFTextStripper().getText(doc);
293291
pdfDetails.put(TEXT_LENGTH_PER_PAGE_KEY, textLengthPerPages);
294292
pdfDetails.put(TEXT_LENGTH_KEY, pdfText.replaceAll("([\\r\\n])", "").length());
295-
if (languageCheck)
293+
if (checkLanguage())
296294
addLanguageInformation(pdfDetails, pdfText);
297295
}
298296
}

src/test/java/TestPDFMatcher.java

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,8 @@ class TestPDFMatcher {
3636

3737
private static Analyzer ANALYZER;
3838

39-
@BeforeEach
40-
public void init(TestInfo testInfo) throws AnalyzerException {
41-
try {
42-
if (testInfo.getTestMethod().get().getName().equals("testContainsText"))
43-
System.setProperty(PDFMatcher.class.getName() + ".languageCheck", "true");
44-
} catch (Exception e) {
45-
e.printStackTrace();
46-
}
39+
@BeforeAll
40+
public static void init(TestInfo testInfo) throws AnalyzerException {
4741
ANALYZER = Analyzer.getInstance("/magic.xml");
4842
}
4943

@@ -135,6 +129,7 @@ void numberOfPagesPortableCollectionPdf() throws IOException {
135129
@ParameterizedTest
136130
@CsvFileSource(resources = "/pdf/signed.csv", numLinesToSkip = 1)
137131
void testSignedPDFs(final String urlString, final int expectedSignatureCount) throws IOException {
132+
System.setProperty(PDFMatcher.class.getName() + ".languageCheck", "true");
138133
final Map<String, Object> result = ANALYZER.analyze(new URL(urlString).openStream());
139134
assertNotNull(result);
140135
assertThat(result, hasKey(PDFMatcher.DETAILS_KEY));

0 commit comments

Comments
 (0)