From ce743a7e119336d0f136973ca3122330fd41edd6 Mon Sep 17 00:00:00 2001
From: Eric House <eehouse@eehouse.org>
Date: Sun, 5 Jun 2022 09:46:33 -0700
Subject: [PATCH] cleanup: tweak assertions

---
 .../main/java/org/eehouse/android/xw4/DBHelper.java |  1 +
 .../main/java/org/eehouse/android/xw4/DBUtils.java  | 13 ++++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBHelper.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBHelper.java
index 04a61e499..a25e33b5b 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBHelper.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBHelper.java
@@ -639,6 +639,7 @@ public class DBHelper extends SQLiteOpenHelper {
     public static int update( SQLiteDatabase db, TABLE_NAMES table, ContentValues values,
                               String selection )
     {
+        // returns number of rows impacted
         return db.update( table.toString(), values, selection, null );
     }
 
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBUtils.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBUtils.java
index 7027707e8..bc3ee0bb0 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBUtils.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBUtils.java
@@ -1943,8 +1943,11 @@ public class DBUtils {
             cursor.close();
         }
 
-        if ( null != result && null == result.fullSum ) { // force generation
-            result = null;
+        if ( null != result ) {
+            Assert.assertTrueNR( !TextUtils.isEmpty(result.isoCode ) );
+            if ( null == result.fullSum ) { // force generation
+                result = null;
+            }
         }
 
         return result;
@@ -1953,12 +1956,12 @@ public class DBUtils {
     public static void dictsSetInfo( Context context, DictUtils.DictAndLoc dal,
                                      DictInfo info )
     {
+        Assert.assertTrueNR( ! TextUtils.isEmpty( info.isoCode ) );
+
         String selection =
             String.format( NAME_FMT, DBHelper.DICTNAME, dal.name );
         ContentValues values = new ContentValues();
 
-        Assert.assertTrueNR( null != info.isoCode && ! info.isoCode.equals("null") );
-
         values.put( DBHelper.ISOCODE, info.isoCode );
         values.put( DBHelper.LANGNAME, info.langName );
         values.put( DBHelper.WORDCOUNT, info.wordCount );
@@ -1972,7 +1975,7 @@ public class DBUtils {
             if ( 0 == result ) {
                 values.put( DBHelper.DICTNAME, dal.name );
                 long rowid = insert( TABLE_NAMES.DICTINFO, values );
-                Assert.assertTrue( rowid > 0 || !BuildConfig.DEBUG );
+                Assert.assertTrueNR( 0 < rowid );
             }
         }
     }