From 7847a935584cbf6c266d9d4aafa908dedcad4681 Mon Sep 17 00:00:00 2001 From: reger Date: Thu, 26 Jun 2014 02:56:45 +0200 Subject: [PATCH] fix AbstractParser.singleList not adding null strings - prevents null titles in oo... parser (as detected by ParserTest) - correct ParserTest dc_description check (dc_description allowed to return 0 length array) --- source/net/yacy/document/AbstractParser.java | 2 +- test/net/yacy/document/ParserTest.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/net/yacy/document/AbstractParser.java b/source/net/yacy/document/AbstractParser.java index 11cc0b131..79bb9e3e9 100644 --- a/source/net/yacy/document/AbstractParser.java +++ b/source/net/yacy/document/AbstractParser.java @@ -92,7 +92,7 @@ public abstract class AbstractParser implements Parser { public static List singleList(String t) { List c = new ArrayList(1); - c.add(t); + if (t != null) c.add(t); return c; } diff --git a/test/net/yacy/document/ParserTest.java b/test/net/yacy/document/ParserTest.java index 6582edbfb..aa0dcf161 100644 --- a/test/net/yacy/document/ParserTest.java +++ b/test/net/yacy/document/ParserTest.java @@ -49,7 +49,7 @@ public class ParserTest { assertThat(str.toString(), containsString("In München steht ein Hofbräuhaus, dort gibt es Bier in Maßkrügen")); assertThat(doc.dc_title(), containsString(testFile[2])); assertThat(doc.dc_creator(), containsString(testFile[3])); - assertThat(doc.dc_description()[0], containsString(testFile[4])); + if (testFile[4].length() > 0) assertThat(doc.dc_description()[0], containsString(testFile[4])); } } catch (final InterruptedException ex) {} } @@ -81,9 +81,9 @@ public class ParserTest { System.out.println("Parsed " + filename + ": " + str); assertThat(str.toString(), containsString("In München steht ein Hofbräuhaus, dort gibt es Bier in Maßkrügen")); - // assertThat(doc.dc_title(), containsString(testFile[2])); + assertThat(doc.dc_title(), containsString(testFile[2])); assertThat(doc.dc_creator(), containsString(testFile[3])); - assertThat(doc.dc_description()[0], containsString(testFile[4])); + if (testFile[4].length() > 0) assertThat(doc.dc_description()[0], containsString(testFile[4])); } } catch (final InterruptedException ex) {} } @@ -115,7 +115,7 @@ public class ParserTest { assertThat(str.toString(), containsString("In München steht ein Hofbräuhaus, dort gibt es Bier in Maßkrügen")); assertThat(doc.dc_title(), containsString(testFile[2])); assertThat(doc.dc_creator(), containsString(testFile[3])); - assertThat(doc.dc_description()[0], containsString(testFile[4])); + if (testFile[4].length() > 0) assertThat(doc.dc_description()[0], containsString(testFile[4])); } } catch (final InterruptedException ex) {} } @@ -147,7 +147,7 @@ public class ParserTest { assertThat(str.toString(), containsString("In München steht ein Hofbräuhaus, dort gibt es Bier in Maßkrügen")); assertThat(doc.dc_title(), containsString(testFile[2])); assertThat(doc.dc_creator(), containsString(testFile[3])); - assertThat(doc.dc_description()[0], containsString(testFile[4])); + if (testFile[4].length() > 0) assertThat(doc.dc_description()[0], containsString(testFile[4])); } } catch (final InterruptedException ex) {} }