replace junit's assert with my own

And have it log before throwing. Should be easier to track down asserts
coming from jni callbacks this way than in the C code.

xwords4/android/app/src/main/java/org/eehouse/android/xw4/AboutAlert.java

@@ -33,7 +33,6 @@ import android.widget.TextView;
 import java.text.DateFormat;
 import java.util.Date;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.loc.LocUtils;
 

xwords4/android/app/src/main/java/org/eehouse/android/xw4/Assert.java

@@ -0,0 +1,58 @@
+/* -*- compile-command: "find-and-gradle.sh insXw4Deb"; -*- */
+/*
+ * Copyright 2012 by Eric House (xwords@eehouse.org).  All rights
+ * reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+package org.eehouse.android.xw4;
+
+public class Assert {
+    private static final String TAG = Assert.class.getSimpleName();
+
+    public static void fail() {
+        assertTrue(false);
+    }
+
+    public static void assertFalse(boolean val)
+    {
+        assertTrue(! val);
+    }
+    
+    public static void assertTrue(boolean val) {
+        if (! val) {
+            Log.e( TAG, "firing assert!" );
+            DbgUtils.printStack( TAG );
+            junit.framework.Assert.fail();
+        }
+    }
+
+    public static void assertNotNull( Object val )
+    {
+        assertTrue( val != null );
+    }
+
+    public static void assertNull( Object val )
+    {
+        assertTrue( val == null );
+    }
+
+    public static void assertEquals( Object obj1, Object obj2 )
+    {
+        assertTrue( (obj1 == null && obj2 == null)
+                    || (obj1 != null && obj1.equals(obj2)) );
+    }
+}

xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java

@@ -27,7 +27,6 @@ import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DBUtils.SentInvitesInfo;
 import org.eehouse.android.xw4.DlgDelegate.Action;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java

@@ -34,7 +34,6 @@ import android.content.Intent;
 import android.os.Build;
 import android.support.v4.app.NotificationCompat;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.MultiService.DictFetchOwner;
 import org.eehouse.android.xw4.MultiService.MultiEvent;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/BiDiSockWrap.java

@@ -27,7 +27,6 @@ import java.net.Socket;
 import java.util.concurrent.LinkedBlockingQueue;
 import org.json.JSONObject;
 
-import junit.framework.Assert;
 
 public class BiDiSockWrap {
     private static final String TAG = BiDiSockWrap.class.getSimpleName();

xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardCanvas.java

@@ -31,7 +31,6 @@ import android.graphics.RectF;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.jni.BoardDims;
 import org.eehouse.android.xw4.jni.CommonPrefs;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardContainer.java

@@ -29,7 +29,6 @@ import android.view.View;
 import android.view.View.MeasureSpec;
 import android.graphics.Rect;
 
-import junit.framework.Assert;
 
 public class BoardContainer extends ViewGroup {
     private static final String TAG = BoardContainer.class.getSimpleName();

xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java

@@ -49,7 +49,6 @@ import java.util.Map;
 import java.util.Map;
 import java.util.Set;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DBUtils.SentInvitesInfo;
 import org.eehouse.android.xw4.DlgDelegate.Action;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardView.java

@@ -31,7 +31,6 @@ import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.jni.BoardDims;
 import org.eehouse.android.xw4.jni.BoardHandler;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/ChatDelegate.java

@@ -40,7 +40,6 @@ import android.widget.TextView;
 import java.text.DateFormat;
 import android.text.format.DateUtils;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DlgDelegate.Action;
 import org.eehouse.android.xw4.jni.JNIThread;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/CommsTransport.java

@@ -22,7 +22,6 @@ package org.eehouse.android.xw4;
 
 import android.content.Context;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.jni.CommsAddrRec;
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/ConnStatusHandler.java

@@ -32,7 +32,6 @@ import android.provider.Settings;
 import android.text.format.DateUtils;
 import android.text.format.Time;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType;
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnTypeSet;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/ConnViaViewLayout.java

@@ -30,7 +30,6 @@ import android.widget.LinearLayout;
 
 import java.util.Map;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType;
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnTypeSet;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBAlert.java

@@ -34,7 +34,6 @@ import org.eehouse.android.xw4.loc.LocUtils;
 
 import java.io.Serializable;
 
-import junit.framework.Assert;
 
 public class DBAlert extends XWDialogFragment {
     private static final String TAG = DBAlert.class.getSimpleName();

xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBUtils.java

@@ -33,7 +33,6 @@ import android.graphics.BitmapFactory;
 import android.os.Environment;
 import android.text.TextUtils;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DictUtils.DictLoc;
 import org.eehouse.android.xw4.DlgDelegate.DlgClickNotify.InviteMeans;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/DbgUtils.java

@@ -33,7 +33,6 @@ import java.util.Formatter;
 import java.util.Iterator;
 import java.util.Set;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.loc.LocUtils;
 

xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java

@@ -40,7 +40,6 @@ import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.TextView;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DlgDelegate.Action;
 import org.eehouse.android.xw4.DlgDelegate.ActionPair;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictBrowseDelegate.java

@@ -37,7 +37,6 @@ import android.widget.SectionIndexer;
 import android.widget.Spinner;
 import android.widget.TextView;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DlgDelegate.Action;
 import org.eehouse.android.xw4.jni.JNIUtilsImpl;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictLangCache.java

@@ -25,7 +25,6 @@ import android.content.res.Resources;
 import android.os.Handler;
 import android.widget.ArrayAdapter;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DictUtils.DictAndLoc;
 import org.eehouse.android.xw4.DictUtils.DictLoc;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictUtils.java

@@ -24,7 +24,6 @@ import android.content.Context;
 import android.content.res.AssetManager;
 import android.os.Environment;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.jni.JNIUtilsImpl;
 import org.eehouse.android.xw4.jni.XwJNI;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictsDelegate.java

@@ -45,7 +45,6 @@ import android.widget.ListView;
 import android.widget.PopupMenu;
 import android.widget.TextView;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DictUtils.DictAndLoc;
 import org.eehouse.android.xw4.DictUtils.DictLoc;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/DisablesItem.java

@@ -31,7 +31,6 @@ import android.widget.TextView;
 
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType;
 
-import junit.framework.Assert;
 
 public class DisablesItem extends LinearLayout {
     private CommsConnType m_type;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java

@@ -34,7 +34,6 @@ import android.view.View;
 
 import java.io.Serializable;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DBUtils.SentInvitesInfo;
 

xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegateAlert.java

@@ -31,7 +31,6 @@ import org.eehouse.android.xw4.DlgDelegate.Action;
 import org.eehouse.android.xw4.DlgDelegate.ActionPair;
 import org.eehouse.android.xw4.DlgDelegate.DlgClickNotify;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.loc.LocUtils;
 

xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgState.java

@@ -32,7 +32,6 @@ import java.util.List;
 import org.eehouse.android.xw4.DlgDelegate.Action;
 import org.eehouse.android.xw4.DlgDelegate.ActionPair;
 
-import junit.framework.Assert;
 
 public class DlgState implements Parcelable {
     private static final String TAG = DlgState.class.getSimpleName();

xwords4/android/app/src/main/java/org/eehouse/android/xw4/DwnldDelegate.java

@@ -34,7 +34,6 @@ import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
-import junit.framework.Assert;
 
 import java.io.File;
 import java.io.FileOutputStream;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/EnableSMSAlert.java

@@ -30,7 +30,6 @@ import android.widget.AdapterView;
 import android.widget.Button;
 import android.widget.Spinner;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.loc.LocUtils;
 

xwords4/android/app/src/main/java/org/eehouse/android/xw4/ExpiringDelegate.java

@@ -29,7 +29,6 @@ import android.graphics.drawable.Drawable;
 import android.os.Handler;
 import android.view.View;
 
-import junit.framework.Assert;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameConfigDelegate.java

@@ -45,7 +45,6 @@ import android.widget.TextView;
 import java.util.HashMap;
 import java.util.Map;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DictLangCache.LangsArrayAdapter;
 import org.eehouse.android.xw4.DlgDelegate.Action;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameListItem.java

@@ -33,7 +33,6 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.jni.GameSummary;
 import org.eehouse.android.xw4.jni.JNIThread;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameLock.java

@@ -20,7 +20,6 @@
 
 package org.eehouse.android.xw4;
 
-import junit.framework.Assert;
 
 import java.util.HashMap;
 

xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java

@@ -31,7 +31,6 @@ import android.text.Html;
 import android.text.TextUtils;
 import android.view.Display;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.jni.CommonPrefs;
 import org.eehouse.android.xw4.jni.CommsAddrRec;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java

@@ -44,7 +44,6 @@ import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.TextView;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DBUtils.GameChangeType;
 import org.eehouse.android.xw4.DBUtils.GameGroupInfo;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/HeaderWithExpander.java

@@ -27,7 +27,6 @@ import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.loc.LocUtils;
 

xwords4/android/app/src/main/java/org/eehouse/android/xw4/HostDelegate.java

@@ -26,7 +26,6 @@ import android.content.Intent;
 
 import org.eehouse.android.xw4.DlgDelegate.Action;
 
-import junit.framework.Assert;
 
 class HostDelegate extends DelegateBase {
     private static final String ACTION = "ACTION";

xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteChoicesAlert.java

@@ -31,7 +31,6 @@ import android.widget.Button;
 
 import java.util.ArrayList;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DlgDelegate.Action;
 import org.eehouse.android.xw4.DlgDelegate.ActionPair;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteDelegate.java

@@ -42,7 +42,6 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
-import junit.framework.Assert;
 
 abstract class InviteDelegate extends ListDelegateBase
     implements View.OnClickListener,

xwords4/android/app/src/main/java/org/eehouse/android/xw4/LookupAlert.java

@@ -26,7 +26,6 @@ import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
 import java.io.Serializable;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.loc.LocUtils;
 

xwords4/android/app/src/main/java/org/eehouse/android/xw4/LookupAlertView.java

@@ -36,7 +36,6 @@ import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.TextView;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.loc.LocUtils;
 

xwords4/android/app/src/main/java/org/eehouse/android/xw4/MainActivity.java

@@ -35,7 +35,6 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.LinearLayout;
 
-import junit.framework.Assert;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/MultiMsgSink.java

@@ -22,7 +22,6 @@ package org.eehouse.android.xw4;
 
 import android.content.Context;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.jni.CommsAddrRec;
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/MultiService.java

@@ -26,7 +26,6 @@ import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
 import android.os.Bundle;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.loc.LocUtils;
 

xwords4/android/app/src/main/java/org/eehouse/android/xw4/NagTurnReceiver.java

@@ -27,7 +27,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.text.TextUtils;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DBUtils.NeedsNagInfo;
 import org.eehouse.android.xw4.jni.GameSummary;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetLaunchInfo.java

@@ -39,7 +39,6 @@ import java.util.Iterator;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType;
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnTypeSet;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetStateCache.java

@@ -29,7 +29,6 @@ import android.net.NetworkInfo;
 import android.os.Build;
 import android.os.Handler;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType;
 

xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetUtils.java

@@ -23,7 +23,6 @@ package org.eehouse.android.xw4;
 import android.content.Context;
 import android.text.TextUtils;
 
-import junit.framework.Assert;
 
 import org.json.JSONArray;
 import org.json.JSONException;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/NotAgainAlert.java

@@ -30,7 +30,6 @@ import android.support.v4.app.DialogFragment;
 import org.eehouse.android.xw4.DlgDelegate.Action;
 import org.eehouse.android.xw4.DlgDelegate.ActionPair;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.loc.LocUtils;
 

xwords4/android/app/src/main/java/org/eehouse/android/xw4/OkOnlyAlert.java

@@ -30,7 +30,6 @@ import android.support.v4.app.DialogFragment;
 import org.eehouse.android.xw4.DlgDelegate.Action;
 import org.eehouse.android.xw4.DlgDelegate.ActionPair;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.loc.LocUtils;
 

xwords4/android/app/src/main/java/org/eehouse/android/xw4/Perms23.java

@@ -38,7 +38,6 @@ import org.eehouse.android.xw4.DlgDelegate.DlgClickNotify;
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType;
 import org.eehouse.android.xw4.loc.LocUtils;
 
-import junit.framework.Assert;
     
 public class Perms23 {
     private static final String TAG = Perms23.class.getSimpleName();

xwords4/android/app/src/main/java/org/eehouse/android/xw4/PrefsActivity.java

@@ -27,7 +27,6 @@ import android.os.Bundle;
 import android.preference.PreferenceActivity;
 import android.support.v4.app.DialogFragment;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DlgDelegate.Action;
 import org.eehouse.android.xw4.DlgDelegate.ConfirmThenBuilder;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/PrefsDelegate.java

@@ -36,7 +36,6 @@ import android.preference.PreferenceScreen;
 import android.view.View;
 import android.widget.Button;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DlgDelegate.Action;
 import org.eehouse.android.xw4.loc.LocUtils;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayInviteDelegate.java

@@ -52,7 +52,6 @@ import java.util.Set;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DlgDelegate.Action;
 

xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java

@@ -27,7 +27,6 @@ import android.os.Build;
 import android.os.Handler;
 import android.text.TextUtils;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.GameUtils.BackMoveResult;
 import org.eehouse.android.xw4.MultiService.DictFetchOwner;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/SMSInviteDelegate.java

@@ -36,7 +36,6 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DBUtils.SentInvitesInfo;
 import org.eehouse.android.xw4.DlgDelegate.Action;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/SMSService.java

@@ -34,7 +34,6 @@ import android.telephony.PhoneNumberUtils;
 import android.telephony.SmsManager;
 import android.telephony.TelephonyManager;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.MultiService.DictFetchOwner;
 import org.eehouse.android.xw4.MultiService.MultiEvent;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/StudyListDelegate.java

@@ -36,7 +36,6 @@ import android.widget.ArrayAdapter;
 import android.widget.ListView;
 import android.widget.Spinner;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DlgDelegate.Action;
 import org.eehouse.android.xw4.jni.GameSummary;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/TilePickAlert.java

@@ -31,7 +31,6 @@ import android.widget.Button;
 
 import java.io.Serializable;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DlgDelegate.Action;
 import org.eehouse.android.xw4.DlgDelegate.DlgClickNotify;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/TilePickView.java

@@ -38,7 +38,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import junit.framework.Assert;
 
 public class TilePickView extends LinearLayout {
     private static final String TAG = TilePickView.class.getSimpleName();

xwords4/android/app/src/main/java/org/eehouse/android/xw4/Toolbar.java

@@ -35,7 +35,6 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DlgDelegate.Action;
 import org.eehouse.android.xw4.DlgDelegate.HasDlgDelegate;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/Utils.java

@@ -74,7 +74,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.Perms23.Perm;
 import org.eehouse.android.xw4.jni.CommonPrefs;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirInviteDelegate.java

@@ -30,7 +30,6 @@ import android.widget.TextView;
 import java.util.Iterator;
 import java.util.Map;
 
-import junit.framework.Assert;
 
 public class WiDirInviteDelegate extends InviteDelegate
     implements WiDirService.DevSetListener {

xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirService.java

@@ -69,7 +69,6 @@ import org.eehouse.android.xw4.jni.CommsAddrRec;
 import org.eehouse.android.xw4.jni.XwJNI;
 import org.eehouse.android.xw4.loc.LocUtils;
 
-import junit.framework.Assert;
 
 public class WiDirService extends XWService {
     private static final String TAG = WiDirService.class.getSimpleName();

xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWActivity.java

@@ -40,7 +40,6 @@ import android.widget.ListView;
 
 import org.eehouse.android.xw4.DlgDelegate.Action;
 
-import junit.framework.Assert;
 
 public class XWActivity extends FragmentActivity
     implements Delegator, DlgDelegate.DlgClickNotify {

xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWApp.java

@@ -35,7 +35,6 @@ import org.eehouse.android.xw4.jni.XwJNI;
 
 import java.util.UUID;
 
-import junit.framework.Assert;
 
 import static android.arch.lifecycle.Lifecycle.Event.ON_ANY;
 

xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWConnAddrPreference.java

@@ -27,7 +27,6 @@ import android.preference.DialogPreference;
 import android.util.AttributeSet;
 import android.view.View;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DlgDelegate.Action;
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWDialogFragment.java

@@ -30,7 +30,6 @@ import android.view.View;
 import java.util.HashMap;
 import java.util.Map;
 
-import junit.framework.Assert;
 
 abstract class XWDialogFragment extends DialogFragment {
     private static final String TAG = XWDialogFragment.class.getSimpleName();

xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWExpListAdapter.java

@@ -23,7 +23,6 @@ package org.eehouse.android.xw4;
 import android.view.View;
 import android.view.ViewGroup;
 
-import junit.framework.Assert;
 
 import java.util.Arrays;
 import java.util.HashMap;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWFragment.java

@@ -36,7 +36,6 @@ import android.widget.ListView;
 import java.util.HashSet;
 import java.util.Set;
 
-import junit.framework.Assert;
 
 abstract class XWFragment extends Fragment implements Delegator {
     private static final String TAG = XWFragment.class.getSimpleName();

xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWPrefs.java

@@ -29,7 +29,6 @@ import android.text.TextUtils;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType;
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnTypeSet;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWService.java

@@ -25,7 +25,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.IBinder;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.MultiService.DictFetchOwner;
 import org.eehouse.android.xw4.MultiService.MultiEvent;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/CommsAddrRec.java

@@ -23,8 +23,7 @@ package org.eehouse.android.xw4.jni;
 import android.content.Context;
 import android.text.TextUtils;
 
-import junit.framework.Assert;
+import org.eehouse.android.xw4.Assert;
-
 import org.eehouse.android.xw4.BTService;
 import org.eehouse.android.xw4.GameUtils;
 import org.eehouse.android.xw4.Log;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/CurGameInfo.java

@@ -29,8 +29,8 @@ import java.util.HashSet;
 import java.util.Random;
 import org.json.JSONObject;
 
-import junit.framework.Assert;
 
+import org.eehouse.android.xw4.Assert;
 import org.eehouse.android.xw4.BuildConfig;
 import org.eehouse.android.xw4.DictLangCache;
 import org.eehouse.android.xw4.DictUtils;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/DUtilCtxt.java

@@ -23,8 +23,7 @@ package org.eehouse.android.xw4.jni;
 import android.content.Context;
 import android.telephony.PhoneNumberUtils;
 
-import junit.framework.Assert;
+import org.eehouse.android.xw4.Assert;
-
 import org.eehouse.android.xw4.XWApp;
 import org.eehouse.android.xw4.DBUtils;
 import org.eehouse.android.xw4.DevID;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/GameSummary.java

@@ -28,8 +28,7 @@ import java.util.Arrays;
 
 import org.json.JSONObject;
 
-import junit.framework.Assert;
+import org.eehouse.android.xw4.Assert;
-
 import org.eehouse.android.xw4.BuildConfig;
 import org.eehouse.android.xw4.DBUtils;
 import org.eehouse.android.xw4.Log;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/JNIThread.java

@@ -26,8 +26,7 @@ import android.graphics.Bitmap;
 import android.os.Handler;
 import android.os.Message;
 
-import junit.framework.Assert;
+import org.eehouse.android.xw4.Assert;
-
 import org.eehouse.android.xw4.BuildConfig;
 import org.eehouse.android.xw4.CommsTransport;
 import org.eehouse.android.xw4.ConnStatusHandler;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/JNIUtilsImpl.java

@@ -22,8 +22,7 @@ package org.eehouse.android.xw4.jni;
 
 import android.content.Context;
 
-import junit.framework.Assert;
+import org.eehouse.android.xw4.Assert;
-
 import org.eehouse.android.xw4.DBUtils;
 import org.eehouse.android.xw4.XWApp;
 import org.eehouse.android.xw4.Log;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/LocalPlayer.java

@@ -25,8 +25,7 @@ import android.text.TextUtils;
 
 import java.io.Serializable;
 
-import junit.framework.Assert;
+import org.eehouse.android.xw4.Assert;
-
 import org.eehouse.android.xw4.BuildConfig;
 import org.eehouse.android.xw4.R;
 import org.eehouse.android.xw4.Utils;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/UtilCtxtImpl.java

@@ -22,7 +22,6 @@ package org.eehouse.android.xw4.jni;
 
 import android.content.Context;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.Log;
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnTypeSet;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/XwJNI.java

@@ -24,8 +24,7 @@ import android.graphics.Rect;
 
 import java.util.Arrays;
 
-import junit.framework.Assert;
+import org.eehouse.android.xw4.Assert;
-
 import org.eehouse.android.xw4.Log;
 import org.eehouse.android.xw4.NetLaunchInfo;
 import org.eehouse.android.xw4.Utils;

xwords4/android/app/src/main/java/org/eehouse/android/xw4/loc/LocUtils.java

@@ -42,8 +42,8 @@ import android.widget.Spinner;
 import android.widget.SpinnerAdapter;
 import android.widget.TextView;
 
-import junit.framework.Assert;
 
+import org.eehouse.android.xw4.Assert;
 import org.eehouse.android.xw4.DBUtils;
 import org.eehouse.android.xw4.DbgUtils;
 import org.eehouse.android.xw4.Log;

xwords4/android/app/src/xw4/java/org/eehouse/android/xw4/GCMIntentService.java

@@ -29,7 +29,6 @@ import com.google.android.gcm.GCMRegistrar;
 
 import org.json.JSONArray;
 
-import junit.framework.Assert;
 
 public class GCMIntentService extends GCMBaseIntentService {
     private static final String TAG = GCMIntentService.class.getSimpleName();

xwords4/android/scripts/mk_xml.py

@@ -95,8 +95,8 @@ def printStrings( pairs, outfile, target ):
 package org.eehouse.android.xw4.loc;
 
 import android.content.Context;
-import junit.framework.Assert;
 
+import org.eehouse.android.xw4.Assert;
 import org.eehouse.android.xw4.R;
 import org.eehouse.android.xw4.Log;