Merge remote-tracking branch 'origin/master'

mroczis · Nov 27, 2022 · 8a556e6 · 8a556e6
2 parents 8a126bd + bf87bb4
commit 8a556e6
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 3 deletions.
diff --git a/...java/cz/mroczis/netmonster/core/feature/postprocess/InvalidSecondaryCellsPostprocessor.kt b/...java/cz/mroczis/netmonster/core/feature/postprocess/InvalidSecondaryCellsPostprocessor.kt
@@ -26,7 +26,7 @@ class InvalidSecondaryCellsPostprocessor : ICellPostprocessor {
                     }
                 }
             } else {
-                list
+                cells
             }
         }
 

diff --git a/library/src/main/java/cz/mroczis/netmonster/core/model/signal/SignalNr.kt b/library/src/main/java/cz/mroczis/netmonster/core/model/signal/SignalNr.kt
@@ -58,7 +58,7 @@ data class SignalNr(
     internal constructor() : this(null, null, null, null, null, null)
 
     override val dbm: Int?
-        get() = csiRsrp
+        get() = ssRsrp
 
     /**
      * Same as [csiRsrp] just different unit.

diff --git a/library/src/test/java/cz/mroczis/netmonster/core/feature/ComplexPostprocessingTests.kt b/library/src/test/java/cz/mroczis/netmonster/core/feature/ComplexPostprocessingTests.kt
@@ -57,6 +57,7 @@ class ComplexPostprocessingTests : SdkTest(Build.VERSION_CODES.P) {
             val postprocessors = listOf(
                 MocnNetworkPostprocessor(subManager, networkOperatorSimulation, serviceStateSimulation),
                 InvalidCellsPostprocessor(),
+                InvalidSecondaryCellsPostprocessor(),
                 PrimaryCellPostprocessor(),
                 SubDuplicitiesPostprocessor(subManager, networkOperatorSimulation),
                 PlmnPostprocessor()
@@ -258,6 +259,7 @@ class ComplexPostprocessingTests : SdkTest(Build.VERSION_CODES.P) {
             val postprocessors = listOf(
                 MocnNetworkPostprocessor(subManager, networkOperatorSimulation, serviceStateSimulation),
                 InvalidCellsPostprocessor(),
+                InvalidSecondaryCellsPostprocessor(),
                 PrimaryCellPostprocessor(),
                 SubDuplicitiesPostprocessor(subManager, networkOperatorSimulation),
                 PlmnPostprocessor()

diff --git a/library/src/test/java/cz/mroczis/netmonster/core/feature/ComplexPostprocessingTests29.kt b/library/src/test/java/cz/mroczis/netmonster/core/feature/ComplexPostprocessingTests29.kt
@@ -149,6 +149,7 @@ class ComplexPostprocessingTests29 : SdkTest(Build.VERSION_CODES.Q) {
             val postprocessors = listOf(
                 MocnNetworkPostprocessor(subManager, networkOperatorSimulation, serviceStateSimulation),
                 InvalidCellsPostprocessor(),
+                InvalidSecondaryCellsPostprocessor(),
                 PrimaryCellPostprocessor(),
                 SubDuplicitiesPostprocessor(subManager, networkOperatorSimulation),
                 PlmnPostprocessor()

diff --git a/library/src/test/java/cz/mroczis/netmonster/core/mapper/CellMapperNrTest29.kt b/library/src/test/java/cz/mroczis/netmonster/core/mapper/CellMapperNrTest29.kt
@@ -57,7 +57,7 @@ class CellMapperNrTest29 : SdkTest(Build.VERSION_CODES.Q) {
                 }
 
                 signal.apply {
-                    dbm shouldBe CSI_RSRP
+                    dbm shouldBe SS_RSRP
                     csiRsrp shouldBe CSI_RSRP
                     csiRsrq shouldBe CSI_RSRQ
                     csiSinr shouldBe CSI_SINR