Merge branch 'develop' into feature-33539

Author: zikani03

.github/workflows/main.yml

@@ -6,16 +6,20 @@ on:
       - '*'
 #    tags:
 #      - '!v*'
+  pull_request:
+    branches:
+      - '*'
+    types: [opened, synchronize, reopened]
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Setup JDK 17
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '17'
@@ -31,7 +35,10 @@ jobs:
 
       - name: build
         run: |
-          ./gradlew assembleDebug --stacktrace
+          ./gradlew assembleDemoProdDebug --stacktrace
+
+      - name: Run gradle tests
+        run: ./gradlew testDemoProdDebugUnitTest
 
       - name: Environment info
         run: |
@@ -44,7 +51,7 @@ jobs:
 
       - name: build
         run: |
-          ./gradlew bundleDebug --stacktrace
+          ./gradlew bundleDemoProdDebug --stacktrace
 
       - name: Environment info
         run: |

.github/workflows/manual.yml

@@ -11,6 +11,10 @@ on:
         description: Display name of the application
         required: false
         default: Policies Manual
+      app_version:
+        description: Version of the application
+        required: true
+        default: v1.0.0
       app_dir:
         description: Name of the folder in Documents, default IMIS-CLI
         required: false
@@ -34,23 +38,23 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Setup JDK 17
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '17'
           cache: 'gradle'
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.gradle/caches
             ~/.gradle/wrapper
           key: ${{ runner.os }}-${{ github.event.inputs.application_id }}-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}-${{ hashFiles('**/buildSrc/**/*.kt') }}
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.android
@@ -88,11 +92,27 @@ jobs:
         run: |
           gradle --version
 
+      # Run Tests Build
+      - name: Run gradle tests
+        run: ./gradlew testCliDebugUnitTest
+
       - uses: actions/upload-artifact@v4
         with:
           name: openimis-policies-apk-${{github.run_number}}-${{github.sha}}
           path: ./app/build/outputs/**/*.apk
 
+      #publish in release
+      - name: Edit release ${{ github.event.inputs.app_version }}
+        uses: softprops/action-gh-release@v1
+        with:
+          tag_name: ${{ github.event.inputs.app_version }} # Sets the release tag to the pushed tag name (e.g., v1.0.0)
+          name: ${{ github.event.inputs.app_version }} # Sets the release name to the pushed tag name (e.g., Release v1.0.0)
+          files: ./app/build/outputs/**/*.apk
+          draft: false
+          prerelease: false
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
 #      - name: build
 #        run: |
 #          ./gradlew bundleDebug --stacktrace

app/build.gradle

@@ -206,6 +206,13 @@ android {
     buildFeatures {
         buildConfig true
     }
+
+    testOptions {
+        unitTests {
+            includeAndroidResources = true
+            returnDefaultValues = true
+        }
+    }
 }
 
 apollo {
@@ -219,6 +226,14 @@ apollo {
     ]
 }
 
+tasks.withType(Test).configureEach {
+    testLogging {
+        events "passed", "skipped", "failed"
+        exceptionFormat "full"
+        showStandardStreams = false
+    }
+}
+
 dependencies {
     implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
     implementation 'com.squareup.okhttp3:okhttp:4.11.0'
@@ -241,10 +256,16 @@ dependencies {
     implementation 'androidx.recyclerview:recyclerview:1.3.2'
     implementation 'org.apache.commons:commons-lang3:3.12.0'
     implementation 'cz.msebera.android:httpclient:4.5.8'
+    implementation 'androidx.test:core:1.7.0'
 
     androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
+
+    // unit tests
     testImplementation 'junit:junit:4.13.2'
     implementation 'io.sentry:sentry-android:4.2.0'
+    testImplementation 'org.mockito:mockito-core:5.5.0'
+    testImplementation 'org.robolectric:robolectric:4.11.1'
 }
+

app/robolectric.properties

@@ -0,0 +1,5 @@
+# app/src/test/resources/robolectric.properties
+
+# this line force Robolectric to use the legacy SQLite implementation
+# which is more stable and does not depend on native binaries.
+sqliteMode=LEGACY

app/src/main/java/org/openimis/imispolicies/Acquire.java

@@ -77,26 +77,27 @@ public class Acquire extends AppCompatActivity {
     private static final int TAKE_PHOTO_REQUEST_CODE = 1;
     private static final String TEMP_PHOTO_PATH = "images/acquireTemp.jpg";
 
-    private Global global;
+    protected Global global;
+    protected ImageManager imageManager;
 
     private ImageButton btnScan, btnTakePhoto;
     private Button btnSubmit;
     private EditText etCHFID;
     private ImageView iv;
     private ProgressDialog pd;
-    private Bitmap theImage;
+    protected Bitmap theImage;
     private String Path = null;
     private int result = 0;
 
     private double Longitude, Latitude;
     private LocationManager lm;
     private String towers;
-    private ClientAndroidInterface ca;
-    private SQLHandler sqlHandler;
-    private Uri tempPhotoUri;
+    protected ClientAndroidInterface ca;
+    protected SQLHandler sqlHandler;
+    protected Uri tempPhotoUri;
 
-    private Picasso picasso;
-    private StorageManager storageManager;
+    protected Picasso picasso;
+    protected StorageManager storageManager;
 
     private final Target imageTarget = new Target() {
         @Override
@@ -115,6 +116,10 @@ public void onPrepareLoad(Drawable placeHolderDrawable) {
         }
     };
 
+    protected SQLHandler createSqlHandler() {
+        return new SQLHandler(this);
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -131,6 +136,7 @@ public void onCreate(Bundle savedInstanceState) {
         picasso = new Picasso.Builder(this).build();
         storageManager = StorageManager.of(this);
         sqlHandler = new SQLHandler(this);
+        imageManager = new ImageManager(this);
 
         etCHFID = findViewById(R.id.etCHFID);
         iv = findViewById(R.id.imageView);
@@ -140,9 +146,13 @@ public void onCreate(Bundle savedInstanceState) {
 
         File tempPhotoFile = FileUtils.createTempFile(this, TEMP_PHOTO_PATH);
         if (tempPhotoFile != null) {
-            tempPhotoUri = FileProvider.getUriForFile(this,
+            tempPhotoUri = global.isRunningTest()
+                    ? Uri.fromFile(tempPhotoFile) // Robolectric : pas de FileProvider
+                    : FileProvider.getUriForFile(
+                    this,
                     String.format("%s.fileprovider", BuildConfig.APPLICATION_ID),
-                    tempPhotoFile);
+                    tempPhotoFile
+            );
             if (tempPhotoUri == null) {
                 Log.w(LOG_TAG, "Failed to create temp photo URI");
             }
@@ -162,7 +172,9 @@ public void afterTextChanged(Editable text) {
                 File photoFile = null;
                 String insureeNumber = text.toString();
                 if (!insureeNumber.isEmpty()) {
-                    photoFile = ImageManager.of(Acquire.this).getNewestInsureeImage(insureeNumber);
+                    photoFile = global.isRunningTest()
+                            ? new File(insureeNumber + ".jpg")
+                            : imageManager.getNewestInsureeImage(insureeNumber);
                 }
                 if (photoFile != null) {
                     picasso.load(photoFile)
@@ -314,7 +326,7 @@ private int SubmitData() throws IOException, UserException {
         String date = AppInformation.DateTimeInfo.getDefaultFileDatetimeFormatter().format(new Date());
         String fName = etCHFID.getText() + "_" + global.getOfficerCode() + "_" + date + "_" + Latitude + "_" + Longitude + ".jpg";
 
-        File[] oldInsureeImages = ImageManager.of(this).getInsureeImages(etCHFID.getText().toString());
+        File[] oldInsureeImages = imageManager.getInsureeImages(etCHFID.getText().toString());
 
         File file = new File(global.getSubdirectory("Images"), fName);
         if (file.exists()) {