[AC-614] : Unit test are now working by rishabh-997 · Pull Request #637 · openmrs/openmrs-contrib-android-client

rishabh-997 · 2019-12-18T20:37:16Z

Description of what I changed

The main problem arose because of the migration of android to androidx, to which ActiveAndroid class was not up to date. It had a non-editable caches.java file which was importing LruCache.java from the android.support.v4.util package but originally, this file is found in android.util package.

I started creating custom classes for the ActiveAndroid package recursively but I almost had to re-copy the entire ActiveAndroid library, so I removed the dependency and added code for the entire ActiveAndroid library. The size of the app will have no effect as new java files are compensated by removed dependency

Issue I worked on

JIRA Issue: https://issues.openmrs.org/browse/AC-614

Checklist: I completed these to help reviewers :)

My pull request only contains ONE single commit
(the number above, next to the 'Commits' tab is 1).

I have added tests to cover my changes. (If you refactored
existing code that was well tested you do not have to add tests)

All new and existing tests passed.

My pull request is based on the latest changes of the master branch.

rishabh-997 · 2019-12-18T20:54:17Z

Also, please suggest any suitable alternative in case you have in mind. The reason behind this problem has been stated in description @f4ww4z

rishabh-997 · 2019-12-20T22:33:09Z

@f4ww4z sir, one more file needs to be customized in this way which I'll do tomorrow to pass travis CI, do you think this would be correct fix or something else needs to be done too ?

f4ww4z · 2019-12-23T07:52:06Z

@rishabh-997 Yes you need to fix the failing test at https://travis-ci.org/openmrs/openmrs-contrib-android-client/builds/626888550#L867 . Make sure the test works locally first before committing.

f4ww4z · 2019-12-23T07:53:11Z

Also @rishabh-997 , please claim this task in GCI dashboard first.

rishabh-997 · 2019-12-23T08:54:33Z

Also @rishabh-997 , please claim this task in GCI dashboard first.

sir actually mobile internet has been taken down for some days because of riots going on here, can be little late, sorry for the delay.... will try to finish it up as soon as mobile networks are restored permanently

…ndroid-client into experiment

codecov-io · 2019-12-24T17:07:34Z

Codecov Report

❗ No coverage uploaded for pull request base (master@8cd532b). Click here to learn what that means.
The diff coverage is 0.66%.

@@            Coverage Diff            @@
##             master     #637   +/-   ##
=========================================
  Coverage          ?   12.61%           
=========================================
  Files             ?      231           
  Lines             ?    10610           
  Branches          ?      992           
=========================================
  Hits              ?     1338           
  Misses            ?     9191           
  Partials          ?       81

Impacted Files	Coverage Δ
.../java/org/openmrs/mobile/api/EncounterService.java	`0% <ø> (ø)`
...main/java/org/openmrs/mobile/dao/EncounterDAO.java	`0.7% <ø> (ø)`
...g/openmrs/mobile/utilities/ResourceSerializer.java	`50% <ø> (ø)`
...main/java/org/openmrs/mobile/models/Obscreate.java	`0% <ø> (ø)`
...n/java/org/openmrs/mobile/api/FormListService.java	`0% <ø> (ø)`
...n/java/org/openmrs/mobile/models/FormResource.java	`57.69% <ø> (ø)`
.../java/org/openmrs/mobile/models/EncounterType.java	`71.42% <ø> (ø)`
...ava/org/openmrs/mobile/models/Encountercreate.java	`0% <ø> (ø)`
...enmrs/mobile/api/repository/PatientRepository.java	`13.11% <ø> (ø)`
.../src/main/java/org/openmrs/mobile/models/Link.java	`0% <ø> (ø)`
... and 31 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8cd532b...e5616bc. Read the comment docs.

rishabh-997 · 2019-12-24T17:46:48Z

@f4ww4z here is one thing, I had no idea regarding this GCI thing, so I worked on it and resolved the issue, but I am not in GCI. I have worked hard to resolve this issue so can you review it, ill take care next time...

f4ww4z

Appreciated the effort @rishabh-997 ! See my comments below.

Do we really need to implement all of the serializers? e.g. BigDecimalSerializer, CalendarSerializer, etc.

Make sure your format your changes using AS's default formatter.

...client/src/main/java/org/openmrs/mobile/utilities/ActiveAndroid/content/ContentProvider.java

...rc/main/java/org/openmrs/mobile/utilities/ActiveAndroid/serializer/BigDecimalSerializer.java

f4ww4z · 2019-12-27T15:24:41Z

...ient/src/main/java/org/openmrs/mobile/utilities/ActiveAndroid/serializer/UUIDSerializer.java

@@ -0,0 +1,29 @@
+package org.openmrs.mobile.utilities.ActiveAndroid.serializer;


Add the OpenMRS license header. Do we need this serializer?

Do we need this serializer? @rishabh-997

actually, there were few files of active android which need not be created, but in order to remove the dependency completely from gradle, i copied all of them so there might not be any duplicates and app size wont increase... ill check , if these serializers are going unused, ill remove the file

...mrs-client/src/main/java/org/openmrs/mobile/utilities/ActiveAndroid/widget/ModelAdapter.java

rishabh-997 · 2019-12-27T23:17:06Z

@f4ww4z I have made the changes you requested, if there is no problem with the PR, then ill squash the commits

f4ww4z

See my comments below.

Do we really need to implement all of the serializers? e.g. BigDecimalSerializer, CalendarSerializer, etc.

@rishabh-997

f4ww4z · 2019-12-28T10:28:32Z

openmrs-client/src/main/java/org/openmrs/mobile/utilities/ActiveAndroid/app/Application.java

+    @Override
+    public void onCreate() {
+        super.onCreate();
+        ActiveAndroid.initialize(this);


Can you move this to https://github.com/openmrs/openmrs-contrib-android-client/blob/master/openmrs-client/src/main/java/org/openmrs/mobile/application/OpenMRS.java ?

f4ww4z · 2019-12-28T10:28:50Z

openmrs-client/src/main/java/org/openmrs/mobile/utilities/ActiveAndroid/app/Application.java

+    @Override
+    public void onTerminate() {
+        super.onTerminate();
+        ActiveAndroid.dispose();


f4ww4z · 2019-12-28T10:29:49Z

...client/src/main/java/org/openmrs/mobile/utilities/ActiveAndroid/content/ContentProvider.java

+    }
+
+    //////////////////////////////////////////////////////////////////////////////////////
+    // PUBLIC METHODS


This divider was already declared before.

f4ww4z · 2019-12-28T10:31:33Z

...ient/src/main/java/org/openmrs/mobile/utilities/ActiveAndroid/serializer/UUIDSerializer.java

@@ -0,0 +1,29 @@
+package org.openmrs.mobile.utilities.ActiveAndroid.serializer;


Do we need this serializer? @rishabh-997

f4ww4z

Looks good @rishabh-997 !

unit test are now working

7a1cecd

rishabh-997 mentioned this pull request Dec 20, 2019

Unit Test Error Fix #639

Closed

4 tasks

rishabh-997 added 6 commits December 24, 2019 14:18

stashing

9b174d3

stashing

25ab803

Merge branch 'master' of https://github.com/openmrs/openmrs-contrib-a…

5d581f1

…ndroid-client into experiment

Removed ActiveAndroid dependency and created custom one

7bdcd43

resolved conflicts

5a7ebec

resolved travis error

45373a7

rishabh-997 changed the title ~~[AC-635] : Unit test are now working~~ [AC-614] : Unit test are now working Dec 24, 2019

f4ww4z requested changes Dec 27, 2019

View reviewed changes

applied requested changes

5f32fd6

f4ww4z mentioned this pull request Dec 28, 2019

AC-635:Unit Test Error Fix #649

Closed

4 tasks

f4ww4z requested changes Dec 28, 2019

View reviewed changes

resolved requested hanges

e5616bc

rishabh-997 requested a review from f4ww4z December 28, 2019 13:41

f4ww4z approved these changes Dec 30, 2019

View reviewed changes

f4ww4z merged commit 21ee22d into openmrs:master Dec 30, 2019

f4ww4z pushed a commit that referenced this pull request Dec 31, 2019

[AC-614] Unit tests are now working (#637)

beaa1be

rishabh-997 added a commit to rishabh-997/openmrs-contrib-android-client that referenced this pull request Jan 5, 2020

[AC-614] Unit tests are now working (openmrs#637)

f515100

rishabh-997 deleted the experiment branch March 27, 2020 11:05

		@@ -0,0 +1,29 @@
		package org.openmrs.mobile.utilities.ActiveAndroid.serializer;

Conversation

rishabh-997 commented Dec 18, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description of what I changed

Issue I worked on

Checklist: I completed these to help reviewers :)

Uh oh!

rishabh-997 commented Dec 18, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rishabh-997 commented Dec 20, 2019

Uh oh!

f4ww4z commented Dec 23, 2019

Uh oh!

f4ww4z commented Dec 23, 2019

Uh oh!

rishabh-997 commented Dec 23, 2019

Uh oh!

codecov-io commented Dec 24, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

rishabh-997 commented Dec 24, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

f4ww4z left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

f4ww4z Dec 27, 2019

Choose a reason for hiding this comment

Uh oh!

f4ww4z Dec 28, 2019

Choose a reason for hiding this comment

Uh oh!

rishabh-997 Dec 28, 2019

Choose a reason for hiding this comment

Uh oh!

Uh oh!

rishabh-997 commented Dec 27, 2019

Uh oh!

f4ww4z left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

f4ww4z Dec 28, 2019

Choose a reason for hiding this comment

Uh oh!

f4ww4z Dec 28, 2019

Choose a reason for hiding this comment

Uh oh!

f4ww4z Dec 28, 2019

Choose a reason for hiding this comment

Uh oh!

f4ww4z Dec 28, 2019

Choose a reason for hiding this comment

Uh oh!

f4ww4z left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

rishabh-997 commented Dec 18, 2019 •

edited

Loading

rishabh-997 commented Dec 18, 2019 •

edited

Loading

codecov-io commented Dec 24, 2019 •

edited

Loading

rishabh-997 commented Dec 24, 2019 •

edited

Loading

f4ww4z left a comment •

edited

Loading