update jacoco

Author: VREMSoftwareDevelopment

app/build.properties

@@ -1,6 +1,6 @@
 #Build Properties
-#Tue Jun 06 10:38:09 EDT 2023
-version_build=11
+#Sun Jun 11 11:45:25 EDT 2023
+version_build=12
 version_major=3
 version_minor=0
 version_patch=11

app/jacoco.gradle

@@ -19,21 +19,21 @@
 apply plugin: "jacoco"
 
 jacoco {
-    toolVersion = "0.8.9"
+    toolVersion = "0.8.10"
 }
 
-// FIXME: Gradle 8 & Jacoco where is exec file
 def executionPath = 'outputs/unit_test_code_coverage/debugUnitTest/testDebugUnitTest.exec'
 
 def fileFilter = [
-    '**/R.class',
-    '**/R$*.class',
-    '**/BuildConfig.*',
-    '**/databinding/*.*',
-    '**/Manifest*.*',
-    '**/*Test*.*',
-    'android/**/*.*',
-    '**/com/jjoe64/*'
+        '**/R.class',
+        '**/R$*.class',
+        '**/BuildConfig.*',
+        '**/databinding/*.*',
+        '**/Manifest*.*',
+        '**/*Test*.*',
+        'android/**/*.*',
+        '**/com/jjoe64/*',
+        '**/com/vrem/wifianalyzer/settings/SharedPreferences*'
 ]
 
 def classJavaDir = "$project.buildDir/intermediates/javac/debug/classes"
@@ -65,6 +65,7 @@ task jacocoTestCoverageVerification(type: JacocoCoverageVerification, dependsOn:
     violationRules {
         failOnViolation = true
         rule {
+            element = 'BUNDLE'
             limit {
                 counter = 'INSTRUCTION'
                 minimum = 0.96
@@ -90,5 +91,28 @@ task jacocoTestCoverageVerification(type: JacocoCoverageVerification, dependsOn:
                 minimum = 0.99
             }
         }
+        rule {
+            element = 'CLASS'
+            limit {
+                counter = 'INSTRUCTION'
+                minimum = 0.67
+            }
+            limit {
+                counter = 'BRANCH'
+                minimum = 0.50
+            }
+            limit {
+                counter = 'COMPLEXITY'
+                minimum = 0.33
+            }
+            limit {
+                counter = 'LINE'
+                minimum = 0.60
+            }
+            limit {
+                counter = 'METHOD'
+                minimum = 0.33
+            }
+        }
     }
 }

app/src/main/kotlin/com/vrem/wifianalyzer/settings/Data.kt

@@ -17,9 +17,9 @@
  */
 package com.vrem.wifianalyzer.settings
 
-class Data(val code: String, val name: String) : Comparable<Data> {
+data class Data(val code: String, val name: String) : Comparable<Data> {
 
     override fun compareTo(other: Data): Int =
-            compareBy<Data> { it.name }.thenBy { it.code }.compare(this, other)
+        compareBy<Data> { it.name }.thenBy { it.code }.compare(this, other)
 
 }

app/src/main/kotlin/com/vrem/wifianalyzer/settings/Repository.kt

@@ -23,12 +23,6 @@ import android.content.SharedPreferences.OnSharedPreferenceChangeListener
 import androidx.preference.PreferenceManager
 import com.vrem.wifianalyzer.R
 
-inline fun SharedPreferences.edit(func: SharedPreferences.Editor.() -> Unit) {
-    val editor: SharedPreferences.Editor = edit()
-    editor.func()
-    editor.apply()
-}
-
 class Repository(private val context: Context) {
 
     fun initializeDefaultValues(): Unit = defaultValues(context, R.xml.settings, false)

app/src/main/kotlin/com/vrem/wifianalyzer/settings/SharedPreferences.kt

@@ -0,0 +1,26 @@
+/*
+ * WiFiAnalyzer
+ * Copyright (C) 2015 - 2023 VREM Software Development <[email protected]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+package com.vrem.wifianalyzer.settings
+
+import android.content.SharedPreferences
+
+inline fun SharedPreferences.edit(func: SharedPreferences.Editor.() -> Unit) {
+    val editor: SharedPreferences.Editor = edit()
+    editor.func()
+    editor.apply()
+}

app/src/test/kotlin/com/vrem/wifianalyzer/settings/DataTest.kt

@@ -0,0 +1,59 @@
+/*
+ * WiFiAnalyzer
+ * Copyright (C) 2015 - 2023 VREM Software Development <[email protected]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+
+package com.vrem.wifianalyzer.settings
+
+import org.junit.Test
+import kotlin.test.assertEquals
+
+internal class DataTest {
+
+    @Test
+    fun compareToWhenAreSame() {
+        // setup
+        val data1 = Data("name", "code")
+        val data2 = Data("name", "code")
+        // execute
+        val actual = data1.compareTo(data2)
+        // validate
+        assertEquals(0, actual)
+    }
+
+    @Test
+    fun compareToWhenCodesAreDifferent() {
+        // setup
+        val data1 = Data("name", "code1")
+        val data2 = Data("name", "code2")
+        // execute
+        val actual = data1.compareTo(data2)
+        // validate
+        assertEquals(-1, actual)
+    }
+
+    @Test
+    fun compareToWhenNamesAreDifferent() {
+        // setup
+        val data1 = Data("name1", "code")
+        val data2 = Data("name2", "code")
+        // execute
+        val actual = data1.compareTo(data2)
+        // validate
+        assertEquals(-1, actual)
+    }
+
+}