commit 3cce9e3644b2adcd1cbe6a8654ea0517b514d0e0
author Paul Duffin <paulduffin@google.com> Tue Feb 21 18:01:15 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Feb 21 18:01:15 2017 +0000
tree 60cc4eeb0ccbac11affdc9a8551af11275df40fc
parent 103c8bdb6313936f8591320d5dae3f297372be84
parent 991c2e5ab8be3638116a335f6ddc9e13aac4912c

Use com.android.messaging.util.Assert instead of junit.framework.Assert
am: 991c2e5ab8

Change-Id: Ifb50be13961d566c58c25c3f9f6e7a4ac4b6a260

src/com/android/messaging/datamodel/data/ConversationParticipantsData.java

diff --git a/src/com/android/messaging/datamodel/data/ConversationParticipantsData.java b/src/com/android/messaging/datamodel/data/ConversationParticipantsData.java
index 0b5ef51..2ab1793 100644
--- a/src/com/android/messaging/datamodel/data/ConversationParticipantsData.java
+++ b/src/com/android/messaging/datamodel/data/ConversationParticipantsData.java
@@ -19,9 +19,9 @@
 import android.database.Cursor;
 import android.support.v4.util.SimpleArrayMap;
 
-import com.google.common.annotations.VisibleForTesting;
+import com.android.messaging.util.Assert;
 
-import junit.framework.Assert;
+import com.google.common.annotations.VisibleForTesting;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -84,7 +84,7 @@
                     return participant;
                 }
             }
-            Assert.fail();
+            Assert.fail("Could not find other participant");
         }
         return null;
     }