From: srowen Date: Mon, 23 Nov 2009 09:37:58 +0000 (+0000) Subject: Fixed unit test fail from vCard change X-Git-Url: http://git.rot13.org/?p=zxing.git;a=commitdiff_plain;h=0af49296e8a12ac3c3201731435b0657fe6c4767 Fixed unit test fail from vCard change git-svn-id: http://zxing.googlecode.com/svn/trunk@1122 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- diff --git a/core/src/com/google/zxing/client/result/VCardResultParser.java b/core/src/com/google/zxing/client/result/VCardResultParser.java index 865fec41..047c3420 100644 --- a/core/src/com/google/zxing/client/result/VCardResultParser.java +++ b/core/src/com/google/zxing/client/result/VCardResultParser.java @@ -115,6 +115,9 @@ final class VCardResultParser extends ResultParser { } private static boolean isLikeVCardDate(String value) { + if (value == null) { + return true; + } // Not really sure this is true but matches practice // Mach YYYYMMDD if (isStringOfDigits(value, 8)) { diff --git a/core/test/src/com/google/zxing/client/result/ParsedReaderResultTestCase.java b/core/test/src/com/google/zxing/client/result/ParsedReaderResultTestCase.java index f785e892..5141bb84 100644 --- a/core/test/src/com/google/zxing/client/result/ParsedReaderResultTestCase.java +++ b/core/test/src/com/google/zxing/client/result/ParsedReaderResultTestCase.java @@ -181,8 +181,7 @@ public final class ParsedReaderResultTestCase extends TestCase { ParsedResultType.ADDRESSBOOK); doTestResult("BEGIN:VCARD\r\nADR;HOME:123 Main St\r\nVERSION:2.1\r\nN:Owen;Sean\r\nEND:VCARD", "Sean Owen\n123 Main St", ParsedResultType.ADDRESSBOOK); - doTestResult("BEGIN:VCARD", "begin:VCARD", - ParsedResultType.URI); // yeah we end up guessing "URI" here + doTestResult("BEGIN:VCARD", "", ParsedResultType.ADDRESSBOOK); } public void testVEvent() {