From d63c3ff0cf725abff0e03939c113ff6e6ea7f490 Mon Sep 17 00:00:00 2001 From: Norbel Ambanumben Date: Wed, 22 Oct 2025 18:04:56 +0100 Subject: [PATCH 1/3] fix: remove unused test factory method and fix cast --- .../ooni/probe/ui/navigation/BottomNavigationBar.kt | 1 + .../ooni/testing/factories/ResultModelFactory.kt | 13 ------------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/composeApp/src/commonMain/kotlin/org/ooni/probe/ui/navigation/BottomNavigationBar.kt b/composeApp/src/commonMain/kotlin/org/ooni/probe/ui/navigation/BottomNavigationBar.kt index 6950f33ae..c32c47f3e 100644 --- a/composeApp/src/commonMain/kotlin/org/ooni/probe/ui/navigation/BottomNavigationBar.kt +++ b/composeApp/src/commonMain/kotlin/org/ooni/probe/ui/navigation/BottomNavigationBar.kt @@ -51,6 +51,7 @@ fun BottomNavigationBar( ) { MAIN_NAVIGATION_SCREENS.forEach { screen -> val isCurrentScreen = entry?.destination?.hasRoute(screen::class) == true + val screen = screen as Screen NavigationBarItem( icon = { NavigationBadgeBox( diff --git a/composeApp/src/commonTest/kotlin/org/ooni/testing/factories/ResultModelFactory.kt b/composeApp/src/commonTest/kotlin/org/ooni/testing/factories/ResultModelFactory.kt index 5e0babb90..e960797ce 100644 --- a/composeApp/src/commonTest/kotlin/org/ooni/testing/factories/ResultModelFactory.kt +++ b/composeApp/src/commonTest/kotlin/org/ooni/testing/factories/ResultModelFactory.kt @@ -40,19 +40,6 @@ object ResultModelFactory { descriptorKey = descriptorKey, ) - fun buildWithNetworkAndAggregates( - result: ResultModel = build(), - network: NetworkModel = NetworkModelFactory.build(), - measurementCounts: MeasurementCounts = MeasurementCounts(0, 0, 0), - allMeasurementsUploaded: Boolean = false, - anyMeasurementUploadFailed: Boolean = false, - ) = ResultWithNetworkAndAggregates( - result = result, - network = network, - measurementCounts = measurementCounts, - allMeasurementsUploaded = allMeasurementsUploaded, - anyMeasurementUploadFailed = anyMeasurementUploadFailed, - ) } private fun LocalDateTime.Companion.nowWithoutNanoseconds(): LocalDateTime { From b41600b5f2aba0baebc6ef4c1bff36d9f1f29dd5 Mon Sep 17 00:00:00 2001 From: Norbel Ambanumben Date: Fri, 24 Oct 2025 11:31:05 +0100 Subject: [PATCH 2/3] chore: revert change to tests --- .../ooni/testing/factories/ResultModelFactory.kt | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/composeApp/src/commonTest/kotlin/org/ooni/testing/factories/ResultModelFactory.kt b/composeApp/src/commonTest/kotlin/org/ooni/testing/factories/ResultModelFactory.kt index e960797ce..5e0babb90 100644 --- a/composeApp/src/commonTest/kotlin/org/ooni/testing/factories/ResultModelFactory.kt +++ b/composeApp/src/commonTest/kotlin/org/ooni/testing/factories/ResultModelFactory.kt @@ -40,6 +40,19 @@ object ResultModelFactory { descriptorKey = descriptorKey, ) + fun buildWithNetworkAndAggregates( + result: ResultModel = build(), + network: NetworkModel = NetworkModelFactory.build(), + measurementCounts: MeasurementCounts = MeasurementCounts(0, 0, 0), + allMeasurementsUploaded: Boolean = false, + anyMeasurementUploadFailed: Boolean = false, + ) = ResultWithNetworkAndAggregates( + result = result, + network = network, + measurementCounts = measurementCounts, + allMeasurementsUploaded = allMeasurementsUploaded, + anyMeasurementUploadFailed = anyMeasurementUploadFailed, + ) } private fun LocalDateTime.Companion.nowWithoutNanoseconds(): LocalDateTime { From c33a3774db55d0735eeebbc7e7254c28e82eea02 Mon Sep 17 00:00:00 2001 From: Norbel Ambanumben Date: Mon, 27 Oct 2025 07:11:31 +0300 Subject: [PATCH 3/3] chore: link `NetworkModelFactory` --- .../kotlin/org/ooni/testing/factories/NetworkModelFactory.kt | 1 + 1 file changed, 1 insertion(+) create mode 120000 composeApp/src/iosMain/kotlin/org/ooni/testing/factories/NetworkModelFactory.kt diff --git a/composeApp/src/iosMain/kotlin/org/ooni/testing/factories/NetworkModelFactory.kt b/composeApp/src/iosMain/kotlin/org/ooni/testing/factories/NetworkModelFactory.kt new file mode 120000 index 000000000..358c96a09 --- /dev/null +++ b/composeApp/src/iosMain/kotlin/org/ooni/testing/factories/NetworkModelFactory.kt @@ -0,0 +1 @@ +../../../../../../commonTest/kotlin/org/ooni/testing/factories/NetworkModelFactory.kt \ No newline at end of file