diff options
| -rw-r--r-- | app/src/androidTest/java/org/connectbot/StartupTest.java | 3 | ||||
| -rw-r--r-- | app/src/main/java/org/connectbot/util/HostDatabase.java | 17 |
2 files changed, 10 insertions, 10 deletions
diff --git a/app/src/androidTest/java/org/connectbot/StartupTest.java b/app/src/androidTest/java/org/connectbot/StartupTest.java index 2dc75dd..6bde448 100644 --- a/app/src/androidTest/java/org/connectbot/StartupTest.java +++ b/app/src/androidTest/java/org/connectbot/StartupTest.java @@ -58,8 +58,7 @@ public class StartupTest { @Before public void makeDatabasePristine() { - HostDatabase db = HostDatabase.get(InstrumentationRegistry.getTargetContext()); - db.resetDatabase(); + HostDatabase.resetInMemoryInstance(InstrumentationRegistry.getTargetContext()); mActivityRule.launchActivity(new Intent()); } diff --git a/app/src/main/java/org/connectbot/util/HostDatabase.java b/app/src/main/java/org/connectbot/util/HostDatabase.java index e842dad..bfa6c33 100644 --- a/app/src/main/java/org/connectbot/util/HostDatabase.java +++ b/app/src/main/java/org/connectbot/util/HostDatabase.java @@ -160,7 +160,11 @@ public class HostDatabase extends RobustSQLiteOpenHelper { } private HostDatabase(Context context) { - super(context, DB_NAME, null, DB_VERSION); + this(context, DB_NAME); + } + + private HostDatabase(Context context, String dbName) { + super(context, dbName, null, DB_VERSION); this.displayDensity = context.getResources().getDisplayMetrics().density; } @@ -222,13 +226,10 @@ public class HostDatabase extends RobustSQLiteOpenHelper { } @VisibleForTesting - public void resetDatabase() { - SQLiteDatabase db = getWritableDatabase(); - db.execSQL("DROP TABLE IF EXISTS " + TABLE_HOSTS); - db.execSQL("DROP TABLE IF EXISTS " + TABLE_PORTFORWARDS); - db.execSQL("DROP TABLE IF EXISTS " + TABLE_COLORS); - db.execSQL("DROP TABLE IF EXISTS " + TABLE_COLOR_DEFAULTS); - createTables(db); + public static void resetInMemoryInstance(Context context) { + synchronized (sInstanceLock) { + sInstance = new HostDatabase(context, null); + } } @Override |