From 23c95321afcccdfebcaff33f8be07a07b8c435d7 Mon Sep 17 00:00:00 2001
From: Scott Kennedy <skennedy@google.com>
Date: Fri, 4 Apr 2014 11:03:06 -0700
Subject: Fix some tests

The Proguard changes broke a few

Change-Id: I7fb2caf7f9e3ceaf9fc14c54abf8a40d8d3ca9c1
---
 .../android/emailcommon/mail/AddressUnitTests.java | 37 +---------------------
 1 file changed, 1 insertion(+), 36 deletions(-)

(limited to 'tests')

diff --git a/tests/src/com/android/emailcommon/mail/AddressUnitTests.java b/tests/src/com/android/emailcommon/mail/AddressUnitTests.java
index 48186e464..32a10f908 100644
--- a/tests/src/com/android/emailcommon/mail/AddressUnitTests.java
+++ b/tests/src/com/android/emailcommon/mail/AddressUnitTests.java
@@ -20,9 +20,6 @@ import android.test.AndroidTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
 import org.apache.james.mime4j.decoder.DecoderUtil;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-
 /**
  * This is a series of unit tests for the Address class.  These tests must be locally
  * complete - no server(s) required.
@@ -71,7 +68,7 @@ public class AddressUnitTests extends AndroidTestCase {
     }
 
     // see documentation of DecoderUtil.decodeEncodedWords() for details
-    private String padEncoded(String s) {
+    private static String padEncoded(String s) {
         return "=?UTF-8?B?" + s + "?=";
     }
 
@@ -683,36 +680,4 @@ public class AddressUnitTests extends AndroidTestCase {
         // isAllValid() must accept empty address list as valid
         assertTrue("Empty address list is valid", Address.isAllValid(""));
     }
-
-    /**
-     * Legacy pack() used for testing legacyUnpack().
-     * The packed list is a comma separated list of:
-     * URLENCODE(address)[;URLENCODE(personal)]
-     * @See pack()
-     */
-    private static String legacyPack(Address[] addresses) {
-        if (addresses == null) {
-            return null;
-        } else if (addresses.length == 0) {
-            return "";
-        }
-        StringBuffer sb = new StringBuffer();
-        for (int i = 0, count = addresses.length; i < count; i++) {
-            Address address = addresses[i];
-            try {
-                sb.append(URLEncoder.encode(address.getAddress(), "UTF-8"));
-                if (address.getPersonal() != null) {
-                    sb.append(';');
-                    sb.append(URLEncoder.encode(address.getPersonal(), "UTF-8"));
-                }
-                if (i < count - 1) {
-                    sb.append(',');
-                }
-            }
-            catch (UnsupportedEncodingException uee) {
-                return null;
-            }
-        }
-        return sb.toString();
-    }
 }
-- 
cgit v1.2.3