X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=core%2Ftest%2Fsrc%2Fcom%2Fgoogle%2Fzxing%2Fclient%2Fresult%2FCalendarParsedResultTestCase.java;h=d8bdb368a3be459242c492335150bc66b85f71a7;hb=e5d03a79a458340b69a57914a352f0a8841cdf69;hp=d44c34086710fa7fde747aa6c07de336d76a9f9e;hpb=979de1a6385df0bc4fcec36d9cd7e3e93abdcce0;p=zxing.git

diff --git a/core/test/src/com/google/zxing/client/result/CalendarParsedResultTestCase.java b/core/test/src/com/google/zxing/client/result/CalendarParsedResultTestCase.java
index d44c3408..d8bdb368 100644
--- a/core/test/src/com/google/zxing/client/result/CalendarParsedResultTestCase.java
+++ b/core/test/src/com/google/zxing/client/result/CalendarParsedResultTestCase.java
@@ -16,26 +16,75 @@
 
 package com.google.zxing.client.result;
 
-import junit.framework.TestCase;
-import com.google.zxing.Result;
 import com.google.zxing.BarcodeFormat;
+import com.google.zxing.Result;
+import org.junit.Assert;
+import org.junit.Test;
 
 /**
  * Tests {@link CalendarParsedResult}.
  *
  * @author Sean Owen
  */
-public final class CalendarParsedResultTestCase extends TestCase {
+public final class CalendarParsedResultTestCase extends Assert {
+
+  @Test
+  public void testStartEnd() {
+    doTest(
+        "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\n" +
+        "DTSTART:20080504T123456Z\r\n" +
+        "DTEND:20080505T234555Z\r\n" +
+        "END:VEVENT\r\nEND:VCALENDAR",
+        null, null, null, "20080504T123456Z", "20080505T234555Z", null);
+  }
+
+  @Test
+  public void testStart() {
+    doTest(
+        "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\n" +
+        "DTSTART:20080504T123456Z\r\n" +
+        "END:VEVENT\r\nEND:VCALENDAR",
+        null, null, null, "20080504T123456Z", "20080504T123456Z", null);
+  }
 
-  public void testVEvent() {
+  @Test
+  public void testSummary() {
+    doTest(
+        "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\n" +
+        "SUMMARY:foo\r\n" +
+        "DTSTART:20080504T123456Z\r\n" +
+        "END:VEVENT\r\nEND:VCALENDAR",
+        null, "foo", null, "20080504T123456Z", "20080504T123456Z", null);
+  }
+
+  @Test
+  public void testLocation() {
+    doTest(
+        "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\n" +
+        "LOCATION:Miami\r\n" +
+        "DTSTART:20080504T123456Z\r\n" +
+        "END:VEVENT\r\nEND:VCALENDAR",
+        null, null, "Miami", "20080504T123456Z", "20080504T123456Z", null);
+  }
+
+  @Test
+  public void testDescription() {
+    doTest(
+        "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\n" +
+        "DTSTART:20080504T123456Z\r\n" +
+        "DESCRIPTION:This is a test\r\n" +
+        "END:VEVENT\r\nEND:VCALENDAR",
+        "This is a test", null, null, "20080504T123456Z", "20080504T123456Z", null);
     doTest(
-        "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nSUMMARY:foo\r\nDTSTART:20080504T123456Z\r\nDTEND:20080505T234555Z\r\n" +
+        "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\n" +
+        "DTSTART:20080504T123456Z\r\n" +
+        "DESCRIPTION:This is a test\r\n\t with a continuation\r\n" +        
         "END:VEVENT\r\nEND:VCALENDAR",
-        null, "foo", null, "20080504T123456Z", "20080505T234555Z", null);
+        "This is a test with a continuation", null, null, "20080504T123456Z", "20080504T123456Z", null);
   }
 
   private static void doTest(String contents,
-                             String title,
+                             String description,
                              String summary,
                              String location,
                              String start,
@@ -45,7 +94,7 @@ public final class CalendarParsedResultTestCase extends TestCase {
     ParsedResult result = ResultParser.parseResult(fakeResult);
     assertSame(ParsedResultType.CALENDAR, result.getType());
     CalendarParsedResult calResult = (CalendarParsedResult) result;
-    assertEquals(title, calResult.getTitle());
+    assertEquals(description, calResult.getDescription());
     assertEquals(summary, calResult.getSummary());
     assertEquals(location, calResult.getLocation());
     assertEquals(start, calResult.getStart());