Merge pull request #117 from Y-Note-SAS/feature-35233

Unit tests for Insuree Inquiry

Author: zikani03

.gitignore

@@ -26,6 +26,9 @@ proguard/
 # Log Files
 *.log
 
+# Java heap dump files
+*.hprof
+
 # Android Studio Navigation editor temp files
 .navigation/
 

claimManagement/src/main/java/org/openimis/imisclaims/ClaimActivity.java

@@ -712,7 +712,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         }
     }
 
-    private boolean isValidData() {
+    protected boolean isValidData() {
 
         if (etHealthFacility.getText().length() == 0) {
             showValidationDialog(etHealthFacility, getResources().getString(R.string.MissingHealthFacility));
@@ -793,7 +793,7 @@ private boolean isValidData() {
         return true;
     }
 
-    private boolean isValidInsureeNumber() {
+    protected boolean isValidInsureeNumber() {
         Escape escape = new Escape();
         return escape.CheckCHFID(etInsureeNumber.getText().toString());
     }

claimManagement/src/main/java/org/openimis/imisclaims/EnquireActivity.java

@@ -201,7 +201,7 @@ protected AlertDialog ShowDialog(final TextView tv, String msg) {
 
     @SuppressLint({"WrongConstant", "Range"})
     @Nullable
-    private Insuree getDataFromDb(String chfid) {
+    protected Insuree getDataFromDb(String chfid) {
         try {
             SQLiteDatabase db = openOrCreateDatabase(SQLHandler.DB_NAME_DATA, SQLiteDatabase.OPEN_READONLY, null);
             String[] columns = {"CHFID", "Photo", "InsureeName", "DOB", "Gender", "ProductCode", "ProductName", "ExpiryDate", "Status", "DedType", "Ded1", "Ded2", "Ceiling1", "Ceiling2"};
@@ -271,13 +271,22 @@ private Insuree getDataFromDb(String chfid) {
 
     }
 
+    protected Insuree createFetchInsureeInquire(String chfid) {
+        try {
+            return new FetchInsureeInquire().execute(chfid);
+        } catch (Exception e) {
+            Log.e(LOG_TAG, "Fetching online enquire failed", e);
+            return null;
+        }
+    }
+
     @WorkerThread
-    private void getInsureeInfo() {
+    protected void getInsureeInfo() {
         runOnUiThread(this::ClearForm);
         String chfid = etCHFID.getText().toString();
         if (global.isNetworkAvailable()) {
             try {
-                Insuree insuree = new FetchInsureeInquire().execute(chfid);
+                Insuree insuree = createFetchInsureeInquire(chfid);
                 runOnUiThread(() -> renderResult(insuree));
             } catch (HttpException e) {
                 if (e.getCode() == HttpURLConnection.HTTP_NOT_FOUND) {

claimManagement/src/main/java/org/openimis/imisclaims/SynchronizeService.java

@@ -56,9 +56,10 @@ public class SynchronizeService extends JobIntentService {
 
     private static final String claimResponseLine = "[%s] %s";
 
-    private Global global;
-    private SQLHandler sqlHandler;
-    private StorageManager storageManager;
+    protected Global global;
+    protected SQLHandler sqlHandler;
+    protected StorageManager storageManager;
+    protected PostNewClaims postNewClaims;
 
     @Override
     public void onCreate() {
@@ -68,6 +69,10 @@ public void onCreate() {
         storageManager = StorageManager.of(this);
     }
 
+    public void setPostNewClaims(PostNewClaims postNewClaims) {
+        this.postNewClaims = postNewClaims;
+    }
+
     public static void uploadClaims(Context context) {
         Intent intent = new Intent();
         intent.setAction(ACTION_UPLOAD_CLAIMS);
@@ -98,7 +103,7 @@ protected void onHandleWork(@NonNull Intent intent) {
         }
     }
 
-    private void handleUploadClaims() {
+    protected void handleUploadClaims() {
         if (!global.isNetworkAvailable()) {
             broadcastError(getResources().getString(R.string.CheckInternet), ACTION_UPLOAD_CLAIMS);
             return;
@@ -111,7 +116,10 @@ private void handleUploadClaims() {
         }
 
         try {
-            List<PostNewClaims.Result> results = new PostNewClaims().execute(PendingClaim.fromJson(claims));
+            if (postNewClaims == null) {
+                postNewClaims = new PostNewClaims();
+            }
+            List<PostNewClaims.Result> results = postNewClaims.execute(PendingClaim.fromJson(claims));
             JSONArray claimStatus = processClaimResponse(results);
             broadcastSyncSuccess(claimStatus);
         } catch (Exception e) {
@@ -121,7 +129,7 @@ private void handleUploadClaims() {
         }
     }
 
-    private JSONArray processClaimResponse(List<PostNewClaims.Result> results) {
+    protected JSONArray processClaimResponse(List<PostNewClaims.Result> results) {
         JSONArray jsonResults = new JSONArray();
         String date = AppInformation.DateTimeInfo.getDefaultIsoDatetimeFormatter().format(new Date());
         for (PostNewClaims.Result result : results) {
@@ -257,7 +265,7 @@ private Uri createClaimExportZip(ArrayList<File> exportedClaims) {
                 zipFile);
     }
 
-    private void handleGetClaimCount() {
+    protected void handleGetClaimCount() {
         JSONObject counts = sqlHandler.getClaimCounts();
 
         int enteredCount = counts.optInt(SQLHandler.CLAIM_UPLOAD_STATUS_ENTERED, 0);