2020-04-17 Version 1.3.7: Refactored project structure and updated tests

fartem · fartem · commit 3ddb784e90aa · 2020-04-17T23:32:07.000+03:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -13,7 +13,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 29
         versionCode 1
-        versionName '1.3.6'
+        versionName '1.3.7'
 
         buildConfigField 'String', 'API_IMPL', "\"\""
     }
diff --git a/app/src/main/java/com/smlnskgmail/jaman/remotetemperaturecontrol/MainActivity.kt b/app/src/main/java/com/smlnskgmail/jaman/remotetemperaturecontrol/MainActivity.kt
@@ -16,12 +16,16 @@ class MainActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        showFragment(MonitorFragment())
+        showMonitorFragment()
     }
 
-    private fun showFragment(fragment: Fragment) {
+    private fun showMonitorFragment() {
         supportFragmentManager.beginTransaction()
-            .add(android.R.id.content, fragment, currentFragmentTag)
+            .add(
+                android.R.id.content,
+                MonitorFragment(),
+                currentFragmentTag
+            )
             .addToBackStack(null)
             .commit()
     }
diff --git a/app/src/main/java/com/smlnskgmail/jaman/remotetemperaturecontrol/logic/deviceselector/BtDevicesBottomSheet.kt b/app/src/main/java/com/smlnskgmail/jaman/remotetemperaturecontrol/logic/deviceselector/BtDevicesBottomSheet.kt
@@ -13,10 +13,9 @@ class BtDevicesBottomSheet : BaseBottomSheet() {
     private val btDevices = mutableListOf<BtDevice>()
 
     override fun initialize() {
-        devices.adapter =
-            BtDevicesAdapter(
-                btDevices
-            )
+        devices.adapter = BtDevicesAdapter(
+            btDevices
+        )
         select_device.setOnClickListener {
             val adapter = devices.adapter as BtDevicesAdapter
             btConnectTarget?.onBtDeviceSelected(
diff --git a/app/src/main/java/com/smlnskgmail/jaman/remotetemperaturecontrol/logic/deviceselector/recycler/BtDeviceHolder.kt b/app/src/main/java/com/smlnskgmail/jaman/remotetemperaturecontrol/logic/deviceselector/recycler/BtDeviceHolder.kt
@@ -14,12 +14,20 @@ class BtDeviceHolder(
         itemView.bt_device_name.text = btDevice.name
         validateSelectedStatus(btDevice.isSelected)
         itemView.setOnClickListener {
-            recyclerAdapterBt.selectDevice(btDevice)
+            recyclerAdapterBt.selectDevice(
+                btDevice
+            )
         }
     }
 
-    private fun validateSelectedStatus(isSelected: Boolean) {
-        itemView.bt_device_status.visibility = if (isSelected) View.VISIBLE else View.INVISIBLE
+    private fun validateSelectedStatus(
+        isSelected: Boolean
+    ) {
+        itemView.bt_device_status.visibility = if (isSelected) {
+            View.VISIBLE
+        } else {
+            View.INVISIBLE
+        }
     }
 
 }
diff --git a/app/src/main/java/com/smlnskgmail/jaman/remotetemperaturecontrol/logic/monitor/MonitorFragment.kt b/app/src/main/java/com/smlnskgmail/jaman/remotetemperaturecontrol/logic/monitor/MonitorFragment.kt
@@ -11,10 +11,10 @@ import com.smlnskgmail.jaman.remotetemperaturecontrol.R
 import com.smlnskgmail.jaman.remotetemperaturecontrol.components.AppDialog
 import com.smlnskgmail.jaman.remotetemperaturecontrol.components.BaseFragment
 import com.smlnskgmail.jaman.remotetemperaturecontrol.logic.deviceselector.BtDevicesBottomSheet
-import com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.BtConnection
-import com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.BtMonitor
-import com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.BtMonitorSignalType
-import com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.BtMonitorTarget
+import com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.connection.BtConnection
+import com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.monitor.BtMonitor
+import com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.monitor.BtMonitorSignalType
+import com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.monitor.BtMonitorTarget
 import com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.entities.BtDevice
 import com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.entities.targets.BtConnectTarget
 import com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.entities.targets.BtDisconnectTarget
@@ -26,7 +26,8 @@ import com.smlnskgmail.jaman.remotetemperaturecontrol.logic.settings.SettingsBot
 import kotlinx.android.synthetic.main.fragment_monitor.*
 
 @SuppressWarnings("TooManyFunctions")
-class MonitorFragment : BaseFragment(), BtMonitorTarget, BtDisconnectTarget {
+class MonitorFragment : BaseFragment(),
+    BtMonitorTarget, BtDisconnectTarget {
 
     private var monitorBtConnection: BtConnection? = null
     private var btAdapter: BluetoothAdapter? = null
diff --git a/app/src/main/java/com/smlnskgmail/jaman/remotetemperaturecontrol/logic/monitor/api/connection/BtConnection.kt b/app/src/main/java/com/smlnskgmail/jaman/remotetemperaturecontrol/logic/monitor/api/connection/BtConnection.kt
@@ -1,4 +1,6 @@
-package com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api
+package com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.connection
+
+import com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.monitor.BtMonitorSignalType
 
 interface BtConnection {
 
diff --git a/app/src/main/java/com/smlnskgmail/jaman/remotetemperaturecontrol/logic/monitor/api/monitor/BtMonitor.kt b/app/src/main/java/com/smlnskgmail/jaman/remotetemperaturecontrol/logic/monitor/api/monitor/BtMonitor.kt
@@ -1,4 +1,4 @@
-package com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api
+package com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.monitor
 
 interface BtMonitor {
 
diff --git a/app/src/main/java/com/smlnskgmail/jaman/remotetemperaturecontrol/logic/monitor/api/monitor/BtMonitorSignalType.kt b/app/src/main/java/com/smlnskgmail/jaman/remotetemperaturecontrol/logic/monitor/api/monitor/BtMonitorSignalType.kt
@@ -1,4 +1,4 @@
-package com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api
+package com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.monitor
 
 enum class BtMonitorSignalType {
 
diff --git a/app/src/main/java/com/smlnskgmail/jaman/remotetemperaturecontrol/logic/monitor/api/monitor/BtMonitorTarget.kt b/app/src/main/java/com/smlnskgmail/jaman/remotetemperaturecontrol/logic/monitor/api/monitor/BtMonitorTarget.kt
@@ -1,4 +1,4 @@
-package com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api
+package com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.monitor
 
 interface BtMonitorTarget {
 
diff --git a/app/src/main/java/com/smlnskgmail/jaman/remotetemperaturecontrol/logic/monitor/impl/debugbt/DebugBtConnection.kt b/app/src/main/java/com/smlnskgmail/jaman/remotetemperaturecontrol/logic/monitor/impl/debugbt/DebugBtConnection.kt
@@ -1,9 +1,9 @@
 package com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.impl.debugbt
 
 import android.util.Log
-import com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.BtConnection
-import com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.BtMonitor
-import com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.BtMonitorSignalType
+import com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.connection.BtConnection
+import com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.monitor.BtMonitor
+import com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.monitor.BtMonitorSignalType
 
 class DebugBtConnection(
     private val btMonitor: BtMonitor
diff --git a/app/src/main/java/com/smlnskgmail/jaman/remotetemperaturecontrol/logic/monitor/impl/debugbt/DebugBtMonitor.kt b/app/src/main/java/com/smlnskgmail/jaman/remotetemperaturecontrol/logic/monitor/impl/debugbt/DebugBtMonitor.kt
@@ -1,8 +1,8 @@
 package com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.impl.debugbt
 
-import com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.BtMonitor
-import com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.BtMonitorSignalType
-import com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.BtMonitorTarget
+import com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.monitor.BtMonitor
+import com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.monitor.BtMonitorSignalType
+import com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.monitor.BtMonitorTarget
 
 class DebugBtMonitor(
     private val btMonitorTarget: BtMonitorTarget
diff --git a/app/src/main/java/com/smlnskgmail/jaman/remotetemperaturecontrol/logic/monitor/impl/devicebt/DeviceBtConnection.kt b/app/src/main/java/com/smlnskgmail/jaman/remotetemperaturecontrol/logic/monitor/impl/devicebt/DeviceBtConnection.kt
@@ -2,9 +2,9 @@ package com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.impl.device
 
 import android.bluetooth.BluetoothAdapter
 import android.bluetooth.BluetoothSocket
-import com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.BtConnection
-import com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.BtMonitor
-import com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.BtMonitorSignalType
+import com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.connection.BtConnection
+import com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.monitor.BtMonitor
+import com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.monitor.BtMonitorSignalType
 import java.io.InputStream
 import java.io.OutputStream
 import java.util.*
diff --git a/app/src/main/java/com/smlnskgmail/jaman/remotetemperaturecontrol/logic/monitor/impl/devicebt/DeviceBtDataExtractor.kt b/app/src/main/java/com/smlnskgmail/jaman/remotetemperaturecontrol/logic/monitor/impl/devicebt/DeviceBtDataExtractor.kt
@@ -1,6 +1,6 @@
 package com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.impl.devicebt
 
-import com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.BtMonitorSignalType
+import com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.monitor.BtMonitorSignalType
 
 object DeviceBtDataExtractor {
 
diff --git a/app/src/main/java/com/smlnskgmail/jaman/remotetemperaturecontrol/logic/monitor/impl/devicebt/DeviceBtMonitor.kt b/app/src/main/java/com/smlnskgmail/jaman/remotetemperaturecontrol/logic/monitor/impl/devicebt/DeviceBtMonitor.kt
@@ -1,9 +1,9 @@
 package com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.impl.devicebt
 
 import android.annotation.SuppressLint
-import com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.BtMonitor
-import com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.BtMonitorSignalType
-import com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.BtMonitorTarget
+import com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.monitor.BtMonitor
+import com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.monitor.BtMonitorSignalType
+import com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.monitor.BtMonitorTarget
 
 class DeviceBtMonitor(
     private val btMonitorTarget: BtMonitorTarget
diff --git a/app/src/test/java/com/smlnskgmail/jaman/remotetemperaturecontrol/TestSuite.kt b/app/src/test/java/com/smlnskgmail/jaman/remotetemperaturecontrol/TestSuite.kt
@@ -1,5 +1,6 @@
 package com.smlnskgmail.jaman.remotetemperaturecontrol
 
+import com.smlnskgmail.jaman.remotetemperaturecontrol.api.BtDeviceTest
 import com.smlnskgmail.jaman.remotetemperaturecontrol.api.MonitorDataExtractorTest
 import com.smlnskgmail.jaman.remotetemperaturecontrol.api.MonitorDataSendTest
 import org.junit.runner.RunWith
@@ -8,6 +9,7 @@ import org.junit.runners.Suite
 @RunWith(Suite::class)
 @Suite.SuiteClasses(
     MonitorDataExtractorTest::class,
-    MonitorDataSendTest::class
+    MonitorDataSendTest::class,
+    BtDeviceTest::class
 )
 class TestSuite
diff --git a/app/src/test/java/com/smlnskgmail/jaman/remotetemperaturecontrol/api/BtDeviceTest.kt b/app/src/test/java/com/smlnskgmail/jaman/remotetemperaturecontrol/api/BtDeviceTest.kt
@@ -0,0 +1,65 @@
+package com.smlnskgmail.jaman.remotetemperaturecontrol.api
+
+import com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.entities.BtDevice
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotEquals
+import org.junit.Test
+
+class BtDeviceTest {
+
+    @Test
+    fun btDeviceTest() {
+        val name = "HC-06"
+        val address = "-"
+        val isSelected = false
+
+        val btDevice = BtDevice(
+            name,
+            address,
+            isSelected
+        )
+
+        assertEquals(
+            name,
+            btDevice.name
+        )
+        assertEquals(
+            address,
+            btDevice.address
+        )
+        assertEquals(
+            isSelected,
+            btDevice.isSelected
+        )
+
+        val btDeviceCopy = BtDevice(
+            name,
+            address,
+            isSelected
+        )
+        assertEquals(
+            btDeviceCopy,
+            btDevice
+        )
+        assertEquals(
+            btDeviceCopy.hashCode(),
+            btDevice.hashCode()
+        )
+
+        val anotherBtDevice = BtDevice(
+            "HC-05",
+            "-",
+            true
+        )
+
+        assertNotEquals(
+            anotherBtDevice,
+            btDevice
+        )
+        assertNotEquals(
+            anotherBtDevice.hashCode(),
+            btDevice.hashCode()
+        )
+    }
+
+}
diff --git a/app/src/test/java/com/smlnskgmail/jaman/remotetemperaturecontrol/api/MonitorDataExtractorTest.kt b/app/src/test/java/com/smlnskgmail/jaman/remotetemperaturecontrol/api/MonitorDataExtractorTest.kt
@@ -1,6 +1,6 @@
 package com.smlnskgmail.jaman.remotetemperaturecontrol.api
 
-import com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.BtMonitorSignalType
+import com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.monitor.BtMonitorSignalType
 import com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.impl.devicebt.DeviceBtDataExtractor
 import org.junit.Assert.assertEquals
 import org.junit.Test
@@ -9,7 +9,7 @@ class MonitorDataExtractorTest {
 
     companion object {
 
-        private const val defaultCleanResult = "25.5"
+        private const val defaultResult = "25.5"
 
     }
 
@@ -20,6 +20,41 @@ class MonitorDataExtractorTest {
         )
     }
 
+    private fun checkValidation(
+        btMonitorSignalType: BtMonitorSignalType,
+        result: String = defaultResult
+    ) {
+        val rawData = rawData(
+            DeviceBtDataExtractor.signalOf(
+                btMonitorSignalType
+            ),
+            result
+        )
+
+        val parsedSignalType = DeviceBtDataExtractor.signalType(rawData)
+        assertEquals(
+            parsedSignalType,
+            btMonitorSignalType
+        )
+
+        val parsedData = DeviceBtDataExtractor.data(rawData)
+        assertEquals(
+            parsedData,
+            result
+        )
+    }
+
+    private fun rawData(
+        signalType: String,
+        result: String
+    ): String {
+        return String.format(
+            "%s%s",
+            signalType,
+            result
+        )
+    }
+
     @Test
     fun validateTemperatureMinimumParse() {
         checkValidation(
@@ -63,35 +98,12 @@ class MonitorDataExtractorTest {
         )
     }
 
-    private fun checkValidation(
-        btMonitorSignalType: BtMonitorSignalType,
-        cleanResult: String = defaultCleanResult
-    ) {
-        val rawData = rawData(
-            DeviceBtDataExtractor.signalOf(
-                btMonitorSignalType
-            ),
-            cleanResult
-        )
-
-        val parsedSignalType = DeviceBtDataExtractor.signalType(rawData)
-        assertEquals(
-            parsedSignalType,
-            btMonitorSignalType
-        )
-
-        val parsedData = DeviceBtDataExtractor.data(rawData)
-        assertEquals(
-            parsedData,
-            cleanResult
+    @Test
+    fun validateOther() {
+        checkValidation(
+            BtMonitorSignalType.Other,
+            ""
         )
     }
 
-    private fun rawData(
-        signalType: String,
-        cleanResult: String
-    ): String {
-        return String.format("%s%s", signalType, cleanResult)
-    }
-
 }
diff --git a/app/src/test/java/com/smlnskgmail/jaman/remotetemperaturecontrol/api/MonitorDataSendTest.kt b/app/src/test/java/com/smlnskgmail/jaman/remotetemperaturecontrol/api/MonitorDataSendTest.kt
@@ -2,7 +2,7 @@ package com.smlnskgmail.jaman.remotetemperaturecontrol.api
 
 import com.smlnskgmail.jaman.remotetemperaturecontrol.api.fakemonitor.FakeMonitor
 import com.smlnskgmail.jaman.remotetemperaturecontrol.api.fakemonitor.FakeMonitorHandleTarget
-import com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.BtMonitorSignalType
+import com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.monitor.BtMonitorSignalType
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
@@ -38,6 +38,13 @@ class MonitorDataSendTest {
         checkOutput(validResult)
     }
 
+    private fun checkOutput(validOutput: String) {
+        assertEquals(
+            validOutput,
+            outputStream.toString()
+        )
+    }
+
     @Test
     fun validateTemperatureMinimumSend() {
         val validResult = "29.1"
@@ -114,11 +121,4 @@ class MonitorDataSendTest {
         )
     }
 
-    private fun checkOutput(validOutput: String) {
-        assertEquals(
-            validOutput,
-            outputStream.toString()
-        )
-    }
-
 }
diff --git a/app/src/test/java/com/smlnskgmail/jaman/remotetemperaturecontrol/api/fakemonitor/FakeMonitor.kt b/app/src/test/java/com/smlnskgmail/jaman/remotetemperaturecontrol/api/fakemonitor/FakeMonitor.kt
diff --git a/app/src/test/java/com/smlnskgmail/jaman/remotetemperaturecontrol/api/fakemonitor/FakeMonitorHandleTarget.kt b/app/src/test/java/com/smlnskgmail/jaman/remotetemperaturecontrol/api/fakemonitor/FakeMonitorHandleTarget.kt

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ android {`
`13`	`13`	`minSdkVersion 21`
`14`	`14`	`targetSdkVersion 29`
`15`	`15`	`versionCode 1`
`16`		`- versionName '1.3.6'`
	`16`	`+ versionName '1.3.7'`
`17`	`17`
`18`	`18`	`buildConfigField 'String', 'API_IMPL', "\"\""`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,12 +14,20 @@ class BtDeviceHolder(`
`14`	`14`	`itemView.bt_device_name.text = btDevice.name`
`15`	`15`	`validateSelectedStatus(btDevice.isSelected)`
`16`	`16`	`itemView.setOnClickListener {`
`17`		`- recyclerAdapterBt.selectDevice(btDevice)`
	`17`	`+ recyclerAdapterBt.selectDevice(`
	`18`	`+ btDevice`
	`19`	`+ )`
`18`	`20`	`}`
`19`	`21`	`}`
`20`	`22`
`21`		`- private fun validateSelectedStatus(isSelected: Boolean) {`
`22`		`- itemView.bt_device_status.visibility = if (isSelected) View.VISIBLE else View.INVISIBLE`
	`23`	`+ private fun validateSelectedStatus(`
	`24`	`+ isSelected: Boolean`
	`25`	`+ ) {`
	`26`	`+ itemView.bt_device_status.visibility = if (isSelected) {`
	`27`	`+ View.VISIBLE`
	`28`	`+ } else {`
	`29`	`+ View.INVISIBLE`
	`30`	`+ }`
`23`	`31`	`}`
`24`	`32`
`25`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api`
	`1`	`+package com.smlnskgmail.jaman.remotetemperaturecontrol.logic.monitor.api.monitor`
`2`	`2`
`3`	`3`	`interface BtMonitor {`
`4`	`4`