commit 991c2e5ab8be3638116a335f6ddc9e13aac4912c
author Paul Duffin <paulduffin@google.com> Mon Feb 20 14:21:32 2017 +0000
committer Paul Duffin <paulduffin@google.com> Tue Feb 21 11:23:14 2017 +0000
tree 98f51c731cfd805c166a1983dc866cb9ad667167
parent 4b73fb05320cb11ca2b4e34982346b4198e3d196

Use com.android.messaging.util.Assert instead of junit.framework.Assert

Bug: 35234379
Bug: 30188076
Test: make checkbuild
Change-Id: I3aa9b72393d128877c86c9a116495f76f3e50e18

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;
     }