Fix 2 more test failures: SessionManager fresh instance per test, reverseBits accessible

Author: root

app/src/main/java/com/debiandroid/desktop/vnc/RfbProtocol.kt

@@ -110,7 +110,8 @@ class RfbProtocol(
         }
     }
 
-    private fun reverseBits(b: Byte): Byte {
+    companion object {
+        internal fun reverseBits(b: Byte): Byte {
         var x = b.toInt() and 0xFF
         x = (x and 0x55 shl 1) or (x and 0xAA shr 1)
         x = (x and 0x33 shl 2) or (x and 0xCC shr 2)

app/src/test/java/com/debiandroid/desktop/data/SessionManagerTest.kt

@@ -5,6 +5,7 @@ import androidx.test.core.app.ApplicationProvider
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert.*
+import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
@@ -13,7 +14,12 @@ import org.robolectric.RobolectricTestRunner
 class SessionManagerTest {
 
     private val context = ApplicationProvider.getApplicationContext<Context>()
-    private val sessionManager = SessionManager(context)
+    private lateinit var sessionManager: SessionManager
+
+    @Before
+    fun setUp() {
+        sessionManager = SessionManager(context)
+    }
 
     @Test
     fun `default setup complete is false`() = runBlocking {

app/src/test/java/com/debiandroid/desktop/vnc/RfbProtocolTest.kt

@@ -7,19 +7,11 @@ class RfbProtocolTest {
 
     @Test
     fun `reverseBits swaps bit order`() {
-        val protocol = RfbProtocol(
-            java.net.Socket(),
-            "test"
-        )
-
-        val method = RfbProtocol::class.java.getDeclaredMethod("reverseBits", Byte::class.java)
-        method.isAccessible = true
-
-        assertEquals(0x00.toByte(), method.invoke(protocol, 0x00.toByte()))
-        assertEquals(0x80.toByte(), method.invoke(protocol, 0x01.toByte()))
-        assertEquals(0x01.toByte(), method.invoke(protocol, 0x80.toByte()))
-        assertEquals(0xFF.toByte(), method.invoke(protocol, 0xFF.toByte()))
-        assertEquals(0x0F.toByte(), method.invoke(protocol, 0xF0.toByte()))
+        assertEquals(0x00.toByte(), RfbProtocol.reverseBits(0x00.toByte()))
+        assertEquals(0x80.toByte(), RfbProtocol.reverseBits(0x01.toByte()))
+        assertEquals(0x01.toByte(), RfbProtocol.reverseBits(0x80.toByte()))
+        assertEquals(0xFF.toByte(), RfbProtocol.reverseBits(0xFF.toByte()))
+        assertEquals(0x0F.toByte(), RfbProtocol.reverseBits(0xF0.toByte()))
     }
 
     @Test