At last update to JUnit 4.x

[zxing.git] / core / test / src / com / google / zxing / client / result / ParsedReaderResultTestCase.java

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 da5fec6..00f34de 100644 (file)
--- a/core/test/src/com/google/zxing/client/result/ParsedReaderResultTestCase.java
+++ b/core/test/src/com/google/zxing/client/result/ParsedReaderResultTestCase.java
@@ -18,7 +18,8 @@ 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}.
@@ -26,8 +27,9 @@ import junit.framework.TestCase;
  * @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("", "", ParsedResultType.TEXT);
     doTestResult("foo", "foo", ParsedResultType.TEXT);
@@ -40,6 +42,7 @@ public final class ParsedReaderResultTestCase extends TestCase {
         ParsedResultType.TEXT);
   }
 
+  @Test
   public void testBookmarkType() {
     doTestResult("MEBKM:URL:google.com;;", "http://google.com", ParsedResultType.URI);
     doTestResult("MEBKM:URL:google.com;TITLE:Google;;", "Google\nhttp://google.com",
@@ -50,6 +53,7 @@ public final class ParsedReaderResultTestCase extends TestCase {
     doTestResult("MEBKM:URL:HTTPS://google.com;;", "https://google.com", ParsedResultType.URI);
   }
 
+  @Test
   public void testURLTOType() {
     doTestResult("urlto:foo:bar.com", "foo\nhttp://bar.com", ParsedResultType.URI);
     doTestResult("URLTO:foo:bar.com", "foo\nhttp://bar.com", ParsedResultType.URI);
@@ -57,6 +61,7 @@ public final class ParsedReaderResultTestCase extends TestCase {
     doTestResult("URLTO::http://bar.com", "http://bar.com", ParsedResultType.URI);
   }
 
+  @Test
   public void testEmailType() {
     doTestResult("MATMSG:TO:srowen@example.org;;",
         "srowen@example.org", ParsedResultType.EMAIL_ADDRESS);
@@ -70,6 +75,7 @@ public final class ParsedReaderResultTestCase extends TestCase {
         "TO:srowen@example.org;SUB:Stuff;BODY:This is some text;;", ParsedResultType.TEXT);
   }
 
+  @Test
   public void testEmailAddressType() {
     doTestResult("srowen@example.org", "srowen@example.org", ParsedResultType.EMAIL_ADDRESS);
     doTestResult("mailto:srowen@example.org", "srowen@example.org", ParsedResultType.EMAIL_ADDRESS);
@@ -79,6 +85,7 @@ public final class ParsedReaderResultTestCase extends TestCase {
     doTestResult("Let's meet @ 2", "Let's meet @ 2", ParsedResultType.TEXT);
   }
 
+  @Test
   public void testAddressBookType() {
     doTestResult("MECARD:N:Sean Owen;;", "Sean Owen", ParsedResultType.ADDRESSBOOK);
     doTestResult("MECARD:TEL:+12125551212;N:Sean Owen;;", "Sean Owen\n+12125551212",
@@ -99,27 +106,32 @@ public final class ParsedReaderResultTestCase extends TestCase {
         ParsedResultType.TEXT);
   }
 
+  @Test
   public void testAddressBookAUType() {
     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);
   }
 
+  @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);
@@ -127,6 +139,7 @@ public final class ParsedReaderResultTestCase extends TestCase {
     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);
@@ -134,26 +147,24 @@ public final class ParsedReaderResultTestCase extends TestCase {
     doTestResult("97945678901", "97945678901", ParsedResultType.TEXT);
   }
 
+  @Test
   public void testURI() {
     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("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("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);
+    doTestResult("gopher://google.com/obsolete", "gopher://google.com/obsolete", ParsedResultType.URI);
   }
 
+  @Test
   public void testGeo() {
     doTestResult("geo:1,2", "1.0, 2.0", ParsedResultType.GEO);
     doTestResult("GEO:1,2", "1.0, 2.0", ParsedResultType.GEO);
@@ -163,6 +174,7 @@ public final class ParsedReaderResultTestCase extends TestCase {
     doTestResult("geography", "geography", ParsedResultType.TEXT);
   }
 
+  @Test
   public void testTel() {
     doTestResult("tel:+15551212", "+15551212", ParsedResultType.TEL);
     doTestResult("TEL:+15551212", "+15551212", ParsedResultType.TEL);
@@ -173,6 +185,7 @@ public final class ParsedReaderResultTestCase extends TestCase {
     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",
@@ -184,6 +197,7 @@ public final class ParsedReaderResultTestCase extends TestCase {
     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" +
@@ -218,6 +232,7 @@ public final class ParsedReaderResultTestCase extends TestCase {
     doTestResult("BEGIN:VEVENT", "begin:VEVENT", ParsedResultType.URI);
   }
 
+  @Test
   public void testSMS() {
     doTestResult("sms:+15551212", "+15551212", ParsedResultType.SMS);
     doTestResult("SMS:+15551212", "+15551212", ParsedResultType.SMS);
@@ -226,6 +241,7 @@ public final class ParsedReaderResultTestCase extends TestCase {
     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);
@@ -241,6 +257,7 @@ public final class ParsedReaderResultTestCase extends TestCase {
         ParsedResultType.SMS);
   }
 
+  @Test
   public void testMMS() {
     doTestResult("mms:+15551212", "+15551212", ParsedResultType.SMS);
     doTestResult("MMS:+15551212", "+15551212", ParsedResultType.SMS);
@@ -249,6 +266,7 @@ public final class ParsedReaderResultTestCase extends TestCase {
     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);
@@ -262,6 +280,7 @@ public final class ParsedReaderResultTestCase extends TestCase {
   }
 
   /*
+  @Test
   public void testNDEFText() {
     doTestResult(new byte[] {(byte)0xD1,(byte)0x01,(byte)0x05,(byte)0x54,
                              (byte)0x02,(byte)0x65,(byte)0x6E,(byte)0x68,
@@ -269,6 +288,7 @@ public final class ParsedReaderResultTestCase extends TestCase {
                  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,
@@ -276,6 +296,7 @@ public final class ParsedReaderResultTestCase extends TestCase {
                  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,