Merge "Add additional tests for BluetoothMapContent" into tm-qpr-dev (67211bf7) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/map/BluetoothMapContent.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -830,8 +830,8 @@ public class BluetoothMapContent {
		}
		}

		private String getRecipientNameEmail(BluetoothMapMessageListingElement e, Cursor c,
		FilterInfo fi) {
		@VisibleForTesting
		String getRecipientNameEmail(Cursor c, FilterInfo fi) {

		String toAddress, ccAddress, bccAddress;
		toAddress = c.getString(fi.mMessageColToAddress);
		@@ -915,8 +915,8 @@ public class BluetoothMapContent {
		return sb.toString();
		}

		private String getRecipientAddressingEmail(BluetoothMapMessageListingElement e, Cursor c,
		FilterInfo fi) {
		@VisibleForTesting
		String getRecipientAddressingEmail(Cursor c, FilterInfo fi) {
		String toAddress, ccAddress, bccAddress;
		toAddress = c.getString(fi.mMessageColToAddress);
		ccAddress = c.getString(fi.mMessageColCcAddress);
		@@ -1028,7 +1028,7 @@ public class BluetoothMapContent {
		address = getAddressMms(mResolver, id, MMS_TO);
		} else if (fi.mMsgType == FilterInfo.TYPE_EMAIL) {
		/* Might be another way to handle addresses */
		address = getRecipientAddressingEmail(e, c, fi);
		address = getRecipientAddressingEmail(c, fi);
		}
		if (V) {
		Log.v(TAG, "setRecipientAddressing: " + address);
		@@ -1067,7 +1067,7 @@ public class BluetoothMapContent {
		}
		} else if (fi.mMsgType == FilterInfo.TYPE_EMAIL) {
		/* Might be another way to handle address and names */
		name = getRecipientNameEmail(e, c, fi);
		name = getRecipientNameEmail(c, fi);
		}
		if (V) {
		Log.v(TAG, "setRecipientName: " + name);

android/app/tests/unit/src/com/android/bluetooth/map/BluetoothMapContentTest.java

+46 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ import android.provider.ContactsContract;
		import android.provider.Telephony;
		import android.provider.Telephony.Threads;
		import android.telephony.TelephonyManager;
		import android.text.util.Rfc822Tokenizer;

		import androidx.test.runner.AndroidJUnit4;

		@@ -49,6 +50,9 @@ import org.mockito.Spy;
		@RunWith(AndroidJUnit4.class)
		public class BluetoothMapContentTest {
		private static final String TEST_TEXT = "text";
		private static final String TEST_TO_ADDRESS = "toName (toAddress) <to@google.com>";
		private static final String TEST_CC_ADDRESS = "ccName (ccAddress) <cc@google.com>";
		private static final String TEST_BCC_ADDRESS = "bccName (bccAddress) <bcc@google.com>";

		@Mock
		private BluetoothMapAccountItem mAccountItem;
		@@ -396,4 +400,46 @@ public class BluetoothMapContentTest {

		assertThat(mContent.mmsSelected(mParams)).isFalse();
		}

		@Test
		public void getRecipientNameEmail() {
		mInfo.mMessageColToAddress = 0;
		mInfo.mMessageColCcAddress = 1;
		mInfo.mMessageColBccAddress = 2;

		MatrixCursor cursor = new MatrixCursor(
		new String[]{"MessageColToAddress", "MessageColCcAddress", "MessageColBccAddress"});
		cursor.addRow(new Object[]{TEST_TO_ADDRESS, TEST_CC_ADDRESS, TEST_BCC_ADDRESS});
		cursor.moveToFirst();

		StringBuilder expected = new StringBuilder();
		expected.append(Rfc822Tokenizer.tokenize(TEST_TO_ADDRESS)[0].getName());
		expected.append("; ");
		expected.append(Rfc822Tokenizer.tokenize(TEST_CC_ADDRESS)[0].getName());
		expected.append("; ");
		expected.append(Rfc822Tokenizer.tokenize(TEST_BCC_ADDRESS)[0].getName());
		assertThat(mContent.getRecipientNameEmail(cursor, mInfo)).isEqualTo(
		expected.toString());
		}

		@Test
		public void getRecipientAddressingEmail() {
		mInfo.mMessageColToAddress = 0;
		mInfo.mMessageColCcAddress = 1;
		mInfo.mMessageColBccAddress = 2;

		MatrixCursor cursor = new MatrixCursor(
		new String[]{"MessageColToAddress", "MessageColCcAddress", "MessageColBccAddress"});
		cursor.addRow(new Object[]{TEST_TO_ADDRESS, TEST_CC_ADDRESS, TEST_BCC_ADDRESS});
		cursor.moveToFirst();

		StringBuilder expected = new StringBuilder();
		expected.append(Rfc822Tokenizer.tokenize(TEST_TO_ADDRESS)[0].getAddress());
		expected.append("; ");
		expected.append(Rfc822Tokenizer.tokenize(TEST_CC_ADDRESS)[0].getAddress());
		expected.append("; ");
		expected.append(Rfc822Tokenizer.tokenize(TEST_BCC_ADDRESS)[0].getAddress());
		assertThat(mContent.getRecipientAddressingEmail(cursor, mInfo)).isEqualTo(
		expected.toString());
		}
		}
		No newline at end of file