X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=core%2Ftest%2Fsrc%2Fcom%2Fgoogle%2Fzxing%2Fclient%2Fresult%2FParsedReaderResultTestCase.java;h=00f34de6dd778d6504c79e9d56116c8b93269203;hb=e5d03a79a458340b69a57914a352f0a8841cdf69;hp=076601563ae751894a2c241e624a270f7ea50779;hpb=3f20333c84879b25cf70e145e543136ecf0f30bb;p=zxing.git

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 07660156..00f34de6 100644
--- a/core/test/src/com/google/zxing/client/result/ParsedReaderResultTestCase.java
+++ b/core/test/src/com/google/zxing/client/result/ParsedReaderResultTestCase.java
@@ -18,109 +18,285 @@ package com.google.zxing.client.result;
 
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.Result;
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
 
 /**
  * Tests {@link ParsedResult}.
  *
- * @author srowen@google.com (Sean Owen)
+ * @author Sean Owen
+ * @author dswitkin@google.com (Daniel Switkin)
  */
-public final class ParsedReaderResultTestCase extends TestCase {
+public final class ParsedReaderResultTestCase extends Assert {
 
+  @Test
   public void testTextType() {
-    doTestResult("foo", ParsedResultType.TEXT);
-    doTestResult("", ParsedResultType.TEXT);
-    doTestResult("This is a test", ParsedResultType.TEXT);
+    doTestResult("", "", ParsedResultType.TEXT);
+    doTestResult("foo", "foo", ParsedResultType.TEXT);
+    doTestResult("Hi.", "Hi.", ParsedResultType.TEXT);    
+    doTestResult("This is a test", "This is a test", ParsedResultType.TEXT);
+    doTestResult("This is a test\nwith newlines", "This is a test\nwith newlines",
+        ParsedResultType.TEXT);
+    doTestResult("This: a test with lots of @ nearly-random punctuation! No? OK then.",
+        "This: a test with lots of @ nearly-random punctuation! No? OK then.",
+        ParsedResultType.TEXT);
   }
 
+  @Test
   public void testBookmarkType() {
-    doTestResult("MEBKM:URL:google.com;;", ParsedResultType.URI);
-    doTestResult("MEBKM:URL:google.com;TITLE:Google;;", ParsedResultType.URI);
-    doTestResult("MEBKM:TITLE:Google;URL:google.com;;", ParsedResultType.URI);
-    doTestResult("MEBKM:URL:http://google.com;;", ParsedResultType.URI);
-    doTestResult("MEBKM:URL:HTTPS://google.com;;", ParsedResultType.URI);
+    doTestResult("MEBKM:URL:google.com;;", "http://google.com", ParsedResultType.URI);
+    doTestResult("MEBKM:URL:google.com;TITLE:Google;;", "Google\nhttp://google.com",
+        ParsedResultType.URI);
+    doTestResult("MEBKM:TITLE:Google;URL:google.com;;", "Google\nhttp://google.com",
+        ParsedResultType.URI);
+    doTestResult("MEBKM:URL:http://google.com;;", "http://google.com", ParsedResultType.URI);
+    doTestResult("MEBKM:URL:HTTPS://google.com;;", "https://google.com", ParsedResultType.URI);
   }
 
+  @Test
   public void testURLTOType() {
-    doTestResult("URLTO:foo:bar.com", ParsedResultType.URI);
-    doTestResult("URLTO::bar.com", ParsedResultType.URI);
-    doTestResult("URLTO::http://bar.com", ParsedResultType.URI);
+    doTestResult("urlto:foo:bar.com", "foo\nhttp://bar.com", ParsedResultType.URI);
+    doTestResult("URLTO:foo:bar.com", "foo\nhttp://bar.com", ParsedResultType.URI);
+    doTestResult("URLTO::bar.com", "http://bar.com", ParsedResultType.URI);
+    doTestResult("URLTO::http://bar.com", "http://bar.com", ParsedResultType.URI);
   }
 
+  @Test
   public void testEmailType() {
-    doTestResult("MATMSG:TO:srowen@example.org;;", ParsedResultType.EMAIL_ADDRESS);
-    doTestResult("MATMSG:TO:srowen@example.org;SUB:Stuff;;", ParsedResultType.EMAIL_ADDRESS);
-    doTestResult("MATMSG:TO:srowen@example.org;SUB:Stuff;BODY:This is some text;;", ParsedResultType.EMAIL_ADDRESS);
-    doTestResult("MATMSG:SUB:Stuff;BODY:This is some text;TO:srowen@example.org;;", ParsedResultType.EMAIL_ADDRESS);
-    doTestResult("TO:srowen@example.org;SUB:Stuff;BODY:This is some text;;", ParsedResultType.TEXT);
+    doTestResult("MATMSG:TO:srowen@example.org;;",
+        "srowen@example.org", ParsedResultType.EMAIL_ADDRESS);
+    doTestResult("MATMSG:TO:srowen@example.org;SUB:Stuff;;", "srowen@example.org\nStuff",
+        ParsedResultType.EMAIL_ADDRESS);
+    doTestResult("MATMSG:TO:srowen@example.org;SUB:Stuff;BODY:This is some text;;",
+        "srowen@example.org\nStuff\nThis is some text", ParsedResultType.EMAIL_ADDRESS);
+    doTestResult("MATMSG:SUB:Stuff;BODY:This is some text;TO:srowen@example.org;;",
+        "srowen@example.org\nStuff\nThis is some text", ParsedResultType.EMAIL_ADDRESS);
+    doTestResult("TO:srowen@example.org;SUB:Stuff;BODY:This is some text;;",
+        "TO:srowen@example.org;SUB:Stuff;BODY:This is some text;;", ParsedResultType.TEXT);
   }
 
+  @Test
   public void testEmailAddressType() {
-    doTestResult("srowen@example.org", ParsedResultType.EMAIL_ADDRESS);
-    doTestResult("mailto:srowen@example.org", ParsedResultType.EMAIL_ADDRESS);
-    doTestResult("srowen@example", ParsedResultType.TEXT);
-    doTestResult("srowen", ParsedResultType.TEXT);
-    doTestResult("Let's meet @ 2", ParsedResultType.TEXT);
+    doTestResult("srowen@example.org", "srowen@example.org", ParsedResultType.EMAIL_ADDRESS);
+    doTestResult("mailto:srowen@example.org", "srowen@example.org", ParsedResultType.EMAIL_ADDRESS);
+    doTestResult("MAILTO:srowen@example.org", "srowen@example.org", ParsedResultType.EMAIL_ADDRESS);
+    doTestResult("srowen@example", "srowen@example", ParsedResultType.EMAIL_ADDRESS);
+    doTestResult("srowen", "srowen", ParsedResultType.TEXT);
+    doTestResult("Let's meet @ 2", "Let's meet @ 2", ParsedResultType.TEXT);
   }
 
+  @Test
   public void testAddressBookType() {
-    doTestResult("MECARD:N:Sean Owen;;", ParsedResultType.ADDRESSBOOK);
-    doTestResult("MECARD:TEL:+12125551212;N:Sean Owen;;", ParsedResultType.ADDRESSBOOK);
-    doTestResult("MECARD:TEL:+12125551212;N:Sean Owen;URL:google.com;;", ParsedResultType.ADDRESSBOOK);
-    doTestResult("TEL:+12125551212;N:Sean Owen;;", ParsedResultType.TEXT);
+    doTestResult("MECARD:N:Sean Owen;;", "Sean Owen", ParsedResultType.ADDRESSBOOK);
+    doTestResult("MECARD:TEL:+12125551212;N:Sean Owen;;", "Sean Owen\n+12125551212",
+        ParsedResultType.ADDRESSBOOK);
+    doTestResult("MECARD:TEL:+12125551212;N:Sean Owen;URL:google.com;;",
+        "Sean Owen\n+12125551212\ngoogle.com", ParsedResultType.ADDRESSBOOK);
+    doTestResult("MECARD:TEL:+12125551212;N:Sean Owen;URL:google.com;EMAIL:srowen@example.org;",
+        "Sean Owen\n+12125551212\nsrowen@example.org\ngoogle.com", ParsedResultType.ADDRESSBOOK);
+    doTestResult("MECARD:ADR:76 9th Ave;N:Sean Owen;URL:google.com;EMAIL:srowen@example.org;",
+        "Sean Owen\n76 9th Ave\nsrowen@example.org\ngoogle.com", ParsedResultType.ADDRESSBOOK);
+    doTestResult("MECARD:BDAY:19760520;N:Sean Owen;URL:google.com;EMAIL:srowen@example.org;",
+        "Sean Owen\nsrowen@example.org\ngoogle.com\n19760520", ParsedResultType.ADDRESSBOOK);
+    doTestResult("MECARD:ORG:Google;N:Sean Owen;URL:google.com;EMAIL:srowen@example.org;",
+        "Sean Owen\nGoogle\nsrowen@example.org\ngoogle.com", ParsedResultType.ADDRESSBOOK);
+    doTestResult("MECARD:NOTE:ZXing Team;N:Sean Owen;URL:google.com;EMAIL:srowen@example.org;",
+        "Sean Owen\nsrowen@example.org\ngoogle.com\nZXing Team", ParsedResultType.ADDRESSBOOK);
+    doTestResult("N:Sean Owen;TEL:+12125551212;;", "N:Sean Owen;TEL:+12125551212;;",
+        ParsedResultType.TEXT);
   }
 
+  @Test
   public void testAddressBookAUType() {
-    doTestResult("MEMORY:\r\n", ParsedResultType.ADDRESSBOOK);
-    doTestResult("MEMORY:foo\r\nNAME1:Sean\r\n", ParsedResultType.ADDRESSBOOK);
-    doTestResult("TEL1:+12125551212\r\nMEMORY:\r\n", ParsedResultType.ADDRESSBOOK);
+    doTestResult("MEMORY:\r\n", "", ParsedResultType.ADDRESSBOOK);
+    doTestResult("MEMORY:foo\r\nNAME1:Sean\r\n", "Sean\nfoo", ParsedResultType.ADDRESSBOOK);
+    doTestResult("TEL1:+12125551212\r\nMEMORY:\r\n", "+12125551212", ParsedResultType.ADDRESSBOOK);
   }
 
-  public void testUPC() {
-    doTestResult("123456789012", ParsedResultType.UPC, BarcodeFormat.UPC_A);
-    doTestResult("1234567890123", ParsedResultType.UPC, BarcodeFormat.UPC_A);
-    doTestResult("12345678901", ParsedResultType.TEXT);
+  @Test
+  public void testBizcard() {
+    doTestResult("BIZCARD:N:Sean;X:Owen;C:Google;A:123 Main St;M:+12225551212;E:srowen@example.org;",
+        "Sean Owen\nGoogle\n123 Main St\n+12225551212\nsrowen@example.org", ParsedResultType.ADDRESSBOOK);
   }
 
+  @Test
+  public void testUPCA() {
+    doTestResult("123456789012", "123456789012", ParsedResultType.PRODUCT, BarcodeFormat.UPC_A);
+    doTestResult("1234567890123", "1234567890123", ParsedResultType.PRODUCT, BarcodeFormat.UPC_A);
+    doTestResult("12345678901", "12345678901", ParsedResultType.TEXT);
+  }
+
+  @Test
+  public void testUPCE() {
+    doTestResult("01234565", "01234565", ParsedResultType.PRODUCT, BarcodeFormat.UPC_E);
+  }
+
+  @Test
+  public void testEAN() {
+    doTestResult("00393157", "00393157", ParsedResultType.PRODUCT, BarcodeFormat.EAN_8);
+    doTestResult("00393158", "00393158", ParsedResultType.TEXT);
+    doTestResult("5051140178499", "5051140178499", ParsedResultType.PRODUCT, BarcodeFormat.EAN_13);
+    doTestResult("5051140178490", "5051140178490", ParsedResultType.TEXT);
+  }
+
+  @Test
+  public void testISBN() {
+    doTestResult("9784567890123", "9784567890123", ParsedResultType.ISBN, BarcodeFormat.EAN_13);
+    doTestResult("9794567890123", "9794567890123", ParsedResultType.ISBN, BarcodeFormat.EAN_13);
+    doTestResult("97845678901", "97845678901", ParsedResultType.TEXT);
+    doTestResult("97945678901", "97945678901", ParsedResultType.TEXT);
+  }
+
+  @Test
   public void testURI() {
-    doTestResult("http://google.com", ParsedResultType.URI);
-    doTestResult("google.com", ParsedResultType.URI);
-    doTestResult("https://google.com", ParsedResultType.URI);
-    doTestResult("HTTP://google.com", ParsedResultType.URI);
-    doTestResult("http://google.com/foobar", ParsedResultType.URI);
-    doTestResult("https://google.com:443/foobar", ParsedResultType.URI);
-    doTestResult("google.com:443/foobar", ParsedResultType.URI);
+    doTestResult("http://google.com", "http://google.com", ParsedResultType.URI);
+    doTestResult("google.com", "http://google.com", ParsedResultType.URI);
+    doTestResult("https://google.com", "https://google.com", ParsedResultType.URI);
+    doTestResult("HTTP://google.com", "http://google.com", ParsedResultType.URI);
+    doTestResult("http://google.com/foobar", "http://google.com/foobar", ParsedResultType.URI);
+    doTestResult("https://google.com:443/foobar", "https://google.com:443/foobar", ParsedResultType.URI);
+    doTestResult("google.com:443", "http://google.com:443", ParsedResultType.URI);
+    doTestResult("google.com:443/", "http://google.com:443/", ParsedResultType.URI);
+    doTestResult("google.com:443/foobar", "http://google.com:443/foobar", ParsedResultType.URI);
+    doTestResult("http://google.com:443/foobar", "http://google.com:443/foobar", ParsedResultType.URI);
+    doTestResult("https://google.com:443/foobar", "https://google.com:443/foobar", ParsedResultType.URI);
+    doTestResult("ftp://google.com/fake", "ftp://google.com/fake", ParsedResultType.URI);
+    doTestResult("gopher://google.com/obsolete", "gopher://google.com/obsolete", ParsedResultType.URI);
   }
 
+  @Test
   public void testGeo() {
-    doTestResult("geo:1,2", ParsedResultType.GEO);
-    doTestResult("geo:1,2,3", ParsedResultType.GEO);
-    doTestResult("geo:100.33,-32.3344,3.35", ParsedResultType.GEO);
-    doTestResult("geography", ParsedResultType.TEXT);
+    doTestResult("geo:1,2", "1.0, 2.0", ParsedResultType.GEO);
+    doTestResult("GEO:1,2", "1.0, 2.0", ParsedResultType.GEO);
+    doTestResult("geo:1,2,3", "1.0, 2.0, 3.0m", ParsedResultType.GEO);
+    doTestResult("geo:80.33,-32.3344,3.35", "80.33, -32.3344, 3.35m", ParsedResultType.GEO);
+    doTestResult("geo", "geo", ParsedResultType.TEXT);
+    doTestResult("geography", "geography", ParsedResultType.TEXT);
   }
 
+  @Test
   public void testTel() {
-    doTestResult("tel:+15551212", ParsedResultType.TEL);
-    doTestResult("tel:212 555 1212", ParsedResultType.TEL);
-    doTestResult("tel:2125551212", ParsedResultType.TEL);
-    doTestResult("telephone", ParsedResultType.TEXT);
+    doTestResult("tel:+15551212", "+15551212", ParsedResultType.TEL);
+    doTestResult("TEL:+15551212", "+15551212", ParsedResultType.TEL);
+    doTestResult("tel:212 555 1212", "212 555 1212", ParsedResultType.TEL);
+    doTestResult("tel:2125551212", "2125551212", ParsedResultType.TEL);
+    doTestResult("tel:212-555-1212", "212-555-1212", ParsedResultType.TEL);
+    doTestResult("tel", "tel", ParsedResultType.TEXT);
+    doTestResult("telephone", "telephone", ParsedResultType.TEXT);
+  }
+
+  @Test
+  public void testVCard() {
+    doTestResult("BEGIN:VCARD\r\nEND:VCARD", "", ParsedResultType.ADDRESSBOOK);
+    doTestResult("BEGIN:VCARD\r\nN:Owen;Sean\r\nEND:VCARD", "Sean Owen",
+        ParsedResultType.ADDRESSBOOK);
+    doTestResult("BEGIN:VCARD\r\nVERSION:2.1\r\nN:Owen;Sean\r\nEND:VCARD", "Sean Owen",
+        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", "", ParsedResultType.ADDRESSBOOK);
+  }
+
+  @Test
+  public void testVEvent() {
+    // UTC times
+    doTestResult("BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nSUMMARY:foo\r\nDTSTART:20080504T123456Z\r\n" +
+        "DTEND:20080505T234555Z\r\nEND:VEVENT\r\nEND:VCALENDAR",
+        "foo\n20080504T123456Z\n20080505T234555Z",
+        ParsedResultType.CALENDAR);
+    doTestResult("BEGIN:VEVENT\r\nSUMMARY:foo\r\nDTSTART:20080504T123456Z\r\n" +
+        "DTEND:20080505T234555Z\r\nEND:VEVENT", "foo\n20080504T123456Z\n20080505T234555Z",
+        ParsedResultType.CALENDAR);
+    // Local times
+    doTestResult("BEGIN:VEVENT\r\nSUMMARY:foo\r\nDTSTART:20080504T123456\r\n" +
+        "DTEND:20080505T234555\r\nEND:VEVENT", "foo\n20080504T123456\n20080505T234555",
+        ParsedResultType.CALENDAR);
+    // Date only (all day event)
+    doTestResult("BEGIN:VEVENT\r\nSUMMARY:foo\r\nDTSTART:20080504\r\n" +
+        "DTEND:20080505\r\nEND:VEVENT", "foo\n20080504\n20080505", ParsedResultType.CALENDAR);
+    // Start time only
+    doTestResult("BEGIN:VEVENT\r\nSUMMARY:foo\r\nDTSTART:20080504T123456Z\r\nEND:VEVENT",
+        "foo\n20080504T123456Z\n20080504T123456Z", ParsedResultType.CALENDAR);
+    doTestResult("BEGIN:VEVENT\r\nSUMMARY:foo\r\nDTSTART:20080504T123456\r\nEND:VEVENT",
+        "foo\n20080504T123456\n20080504T123456", ParsedResultType.CALENDAR);
+    doTestResult("BEGIN:VEVENT\r\nSUMMARY:foo\r\nDTSTART:20080504\r\nEND:VEVENT",
+        "foo\n20080504\n20080504", ParsedResultType.CALENDAR);
+    doTestResult("BEGIN:VEVENT\r\nDTEND:20080505T\r\nEND:VEVENT",
+        "BEGIN:VEVENT\r\nDTEND:20080505T\r\nEND:VEVENT", ParsedResultType.TEXT);
+    // Make sure illegal entries without newlines don't crash
+    doTestResult(
+        "BEGIN:VEVENTSUMMARY:EventDTSTART:20081030T122030ZDTEND:20081030T132030ZEND:VEVENT",
+        "begin:VEVENTSUMMARY:EventDTSTART:20081030T122030ZDTEND:20081030T132030ZEND:VEVENT",
+        ParsedResultType.URI);
+    // See above note on why this is URI
+    doTestResult("BEGIN:VEVENT", "begin:VEVENT", ParsedResultType.URI);
+  }
+
+  @Test
+  public void testSMS() {
+    doTestResult("sms:+15551212", "+15551212", ParsedResultType.SMS);
+    doTestResult("SMS:+15551212", "+15551212", ParsedResultType.SMS);
+    doTestResult("sms:+15551212;via=999333", "+15551212", ParsedResultType.SMS);
+    doTestResult("sms:+15551212?subject=foo&body=bar", "+15551212\nfoo\nbar", ParsedResultType.SMS);
+    doTestResult("sms:+15551212,+12124440101", "+15551212\n+12124440101", ParsedResultType.SMS);    
+  }
+
+  @Test
+  public void testSMSTO() {
+    doTestResult("SMSTO:+15551212", "+15551212", ParsedResultType.SMS);
+    doTestResult("smsto:+15551212", "+15551212", ParsedResultType.SMS);
+    doTestResult("smsto:+15551212:subject", "+15551212\nsubject", ParsedResultType.SMS);
+    doTestResult("smsto:+15551212:My message", "+15551212\nMy message", ParsedResultType.SMS);
+    // Need to handle question mark in the subject
+    doTestResult("smsto:+15551212:What's up?", "+15551212\nWhat's up?", ParsedResultType.SMS);
+    // Need to handle colon in the subject
+    doTestResult("smsto:+15551212:Directions: Do this", "+15551212\nDirections: Do this",
+        ParsedResultType.SMS);
+    doTestResult("smsto:212-555-1212:Here's a longer message. Should be fine.",
+        "212-555-1212\nHere's a longer message. Should be fine.",
+        ParsedResultType.SMS);
+  }
+
+  @Test
+  public void testMMS() {
+    doTestResult("mms:+15551212", "+15551212", ParsedResultType.SMS);
+    doTestResult("MMS:+15551212", "+15551212", ParsedResultType.SMS);
+    doTestResult("mms:+15551212;via=999333", "+15551212", ParsedResultType.SMS);
+    doTestResult("mms:+15551212?subject=foo&body=bar", "+15551212\nfoo\nbar", ParsedResultType.SMS);
+    doTestResult("mms:+15551212,+12124440101", "+15551212\n+12124440101", ParsedResultType.SMS);        
+  }
+
+  @Test
+  public void testMMSTO() {
+    doTestResult("MMSTO:+15551212", "+15551212", ParsedResultType.SMS);
+    doTestResult("mmsto:+15551212", "+15551212", ParsedResultType.SMS);
+    doTestResult("mmsto:+15551212:subject", "+15551212\nsubject", ParsedResultType.SMS);
+    doTestResult("mmsto:+15551212:My message", "+15551212\nMy message", ParsedResultType.SMS);
+    doTestResult("mmsto:+15551212:What's up?", "+15551212\nWhat's up?", ParsedResultType.SMS);
+    doTestResult("mmsto:+15551212:Directions: Do this", "+15551212\nDirections: Do this",
+        ParsedResultType.SMS);
+    doTestResult("mmsto:212-555-1212:Here's a longer message. Should be fine.",
+        "212-555-1212\nHere's a longer message. Should be fine.", ParsedResultType.SMS);
   }
 
   /*
+  @Test
   public void testNDEFText() {
     doTestResult(new byte[] {(byte)0xD1,(byte)0x01,(byte)0x05,(byte)0x54,
                              (byte)0x02,(byte)0x65,(byte)0x6E,(byte)0x68,
                              (byte)0x69},
-                 ParsedResultType.NDEF_TEXT);
+                 ParsedResultType.TEXT);
   }
 
+  @Test
   public void testNDEFURI() {
     doTestResult(new byte[] {(byte)0xD1,(byte)0x01,(byte)0x08,(byte)0x55,
                              (byte)0x01,(byte)0x6E,(byte)0x66,(byte)0x63,
                              (byte)0x2E,(byte)0x63,(byte)0x6F,(byte)0x6D},
-                 ParsedResultType.NDEF_URI);
+                 ParsedResultType.URI);
   }
 
+  @Test
   public void testNDEFSmartPoster() {
     doTestResult(new byte[] {(byte)0xD1,(byte)0x02,(byte)0x2F,(byte)0x53,
                              (byte)0x70,(byte)0x91,(byte)0x01,(byte)0x0E,
@@ -139,22 +315,19 @@ public final class ParsedReaderResultTestCase extends TestCase {
   }
    */
 
-  private static void doTestResult(String text, ParsedResultType type) {
-    doTestResult(text, type, null);
+  private static void doTestResult(String contents, String goldenResult, ParsedResultType type) {
+    doTestResult(contents, goldenResult, type, null);
   }
 
-  private static void doTestResult(String text, ParsedResultType type, BarcodeFormat format) {
-    Result fakeResult = new Result(text, null, null, format);
+  private static void doTestResult(String contents, String goldenResult, ParsedResultType type,
+                                   BarcodeFormat format) {
+    Result fakeResult = new Result(contents, null, null, format);
     ParsedResult result = ResultParser.parseResult(fakeResult);
     assertNotNull(result);
-    assertEquals(type, result.getType());
-  }
+    assertSame(type, result.getType());
 
-  private static void doTestResult(byte[] rawBytes, ParsedResultType type) {
-    Result fakeResult = new Result(null, rawBytes, null, null);
-    ParsedResult result = ResultParser.parseResult(fakeResult);
-    assertNotNull(result);
-    assertEquals(type, result.getType());
+    String displayResult = result.getDisplayResult();
+    assertEquals(goldenResult, displayResult);
   }
 
 }
\ No newline at end of file