From cda4e3c346e77e4d3fd9f4b96821289d9a5818f1 Mon Sep 17 00:00:00 2001 From: Hamza Ahmed Khan Date: Thu, 18 May 2023 16:32:44 +0500 Subject: [PATCH] Fix failing tests --- .../repository/helper/OpenSRPDatabaseErrorHandler.java | 2 +- .../repository/helper/OpenSRPDatabaseErrorHandlerTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/opensrp-core/src/main/java/org/smartregister/repository/helper/OpenSRPDatabaseErrorHandler.java b/opensrp-core/src/main/java/org/smartregister/repository/helper/OpenSRPDatabaseErrorHandler.java index 495951baa..07d1716af 100644 --- a/opensrp-core/src/main/java/org/smartregister/repository/helper/OpenSRPDatabaseErrorHandler.java +++ b/opensrp-core/src/main/java/org/smartregister/repository/helper/OpenSRPDatabaseErrorHandler.java @@ -35,7 +35,7 @@ public void onCorruption(SQLiteDatabase dbObj) { } private void deleteDatabaseFile(String fileName) { - if (fileName.equalsIgnoreCase(":memory:") || fileName.trim().length() == 0) { + if (fileName == null || fileName.equalsIgnoreCase(":memory:") || fileName.trim().length() == 0) { Timber.e("Cannot delete database. Provided filename is not valid: %s", fileName); return; } diff --git a/opensrp-core/src/test/java/org/smartregister/repository/helper/OpenSRPDatabaseErrorHandlerTest.java b/opensrp-core/src/test/java/org/smartregister/repository/helper/OpenSRPDatabaseErrorHandlerTest.java index 334c7ff53..ef0e95456 100644 --- a/opensrp-core/src/test/java/org/smartregister/repository/helper/OpenSRPDatabaseErrorHandlerTest.java +++ b/opensrp-core/src/test/java/org/smartregister/repository/helper/OpenSRPDatabaseErrorHandlerTest.java @@ -34,7 +34,7 @@ public void testOnCorruptionCallShouldCloseDatabaseObjectIfOpen(){ @Test public void testOnCorruptionShouldDeleteCurrentDBFile() throws IOException { - SQLiteDatabase database = Mockito.mock(SQLiteDatabase.class); + SQLiteDatabase database = Mockito.mock(SQLiteDatabase.class, Mockito.CALLS_REAL_METHODS); Mockito.doReturn(true).when(database).isOpen(); String dbPath = "src/test/assets/drishti.db";