Small style stuff

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

diff --git a/core/test/src/com/google/zxing/client/result/EmailAddressParsedResultTestCase.java b/core/test/src/com/google/zxing/client/result/EmailAddressParsedResultTestCase.java
index dfb37c4..1611ea8 100644 (file)
--- a/core/test/src/com/google/zxing/client/result/EmailAddressParsedResultTestCase.java
+++ b/core/test/src/com/google/zxing/client/result/EmailAddressParsedResultTestCase.java
@@ -16,22 +16,25 @@
 
 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 EmailAddressParsedResult}.
  *
  * @author Sean Owen
  */
-public final class EmailAddressParsedResultTestCase extends TestCase {
+public final class EmailAddressParsedResultTestCase extends Assert {
 
+  @Test
   public void testEmailAddress() {
     doTest("srowen@example.org", "srowen@example.org", null, null);
     doTest("mailto:srowen@example.org", "srowen@example.org", null, null);
   }
 
+  @Test
   public void testEmailDocomo() {
     doTest("MATMSG:TO:srowen@example.org;;", "srowen@example.org", null, null);
     doTest("MATMSG:TO:srowen@example.org;SUB:Stuff;;", "srowen@example.org", "Stuff", null);
@@ -39,10 +42,18 @@ public final class EmailAddressParsedResultTestCase extends TestCase {
         "Stuff", "This is some text");
   }
 
+  @Test
+  public void testSMTP() {
+    doTest("smtp:srowen@example.org", "srowen@example.org", null, null);
+    doTest("SMTP:srowen@example.org", "srowen@example.org", null, null);
+    doTest("smtp:srowen@example.org:foo", "srowen@example.org", "foo", null);
+    doTest("smtp:srowen@example.org:foo:bar", "srowen@example.org", "foo", "bar");
+  }
+
   private static void doTest(String contents, String email, String subject, String body) {
     Result fakeResult = new Result(contents, null, null, BarcodeFormat.QR_CODE);
     ParsedResult result = ResultParser.parseResult(fakeResult);
-    assertEquals(ParsedResultType.EMAIL_ADDRESS, result.getType());
+    assertSame(ParsedResultType.EMAIL_ADDRESS, result.getType());
     EmailAddressParsedResult emailResult = (EmailAddressParsedResult) result;
     assertEquals(email, emailResult.getEmailAddress());
     assertEquals("mailto:" + email, emailResult.getMailtoURI());