From bfc1c4ebfabffa9f850a08c76c265b62f5006e7f Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Mon, 8 Jun 2026 11:04:36 -0400 Subject: [PATCH] Removed unnecessary Robolectric annotation from some tests. --- .../securesms/conversation/ConversationDataTest.kt | 6 ------ .../securesms/profiles/ProfileNameTest.java | 7 ------- .../securesms/storage/GroupV2RecordProcessorTest.kt | 6 ------ .../securesms/util/NameUtil_getAbbreviation.kt | 9 +++------ .../securesms/util/cjkv/CJKVUtilTest.java | 7 ------- .../org/signal/core/util/StringUtilTest_endsWith.kt | 11 ++++------- .../org/signal/core/util/StringUtilTest_startsWith.kt | 11 ++++------- .../org/signal/donations/StripePaymentIntentTest.kt | 6 ------ .../org/signal/donations/StripeSetupIntentTest.kt | 6 ------ 9 files changed, 11 insertions(+), 58 deletions(-) diff --git a/app/src/test/java/org/thoughtcrime/securesms/conversation/ConversationDataTest.kt b/app/src/test/java/org/thoughtcrime/securesms/conversation/ConversationDataTest.kt index cb992dd3ff..244c12b13e 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/conversation/ConversationDataTest.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/conversation/ConversationDataTest.kt @@ -5,19 +5,13 @@ package org.thoughtcrime.securesms.conversation -import android.app.Application import assertk.assertThat import assertk.assertions.isEqualTo import assertk.assertions.isFalse import assertk.assertions.isTrue import io.mockk.mockk import org.junit.Test -import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config -@RunWith(RobolectricTestRunner::class) -@Config(manifest = Config.NONE, application = Application::class) class ConversationDataTest { private fun build( diff --git a/app/src/test/java/org/thoughtcrime/securesms/profiles/ProfileNameTest.java b/app/src/test/java/org/thoughtcrime/securesms/profiles/ProfileNameTest.java index 37d2139a4f..30d08da6e0 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/profiles/ProfileNameTest.java +++ b/app/src/test/java/org/thoughtcrime/securesms/profiles/ProfileNameTest.java @@ -1,11 +1,6 @@ package org.thoughtcrime.securesms.profiles; -import android.app.Application; - import org.junit.Test; -import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; -import org.robolectric.annotation.Config; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -13,8 +8,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = Config.NONE, application = Application.class) public final class ProfileNameTest { @Test diff --git a/app/src/test/java/org/thoughtcrime/securesms/storage/GroupV2RecordProcessorTest.kt b/app/src/test/java/org/thoughtcrime/securesms/storage/GroupV2RecordProcessorTest.kt index bff43b8705..696e5c0ff0 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/storage/GroupV2RecordProcessorTest.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/storage/GroupV2RecordProcessorTest.kt @@ -1,6 +1,5 @@ package org.thoughtcrime.securesms.storage -import android.app.Application import io.mockk.every import io.mockk.mockk import okio.ByteString @@ -11,9 +10,6 @@ import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Rule import org.junit.Test -import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config import org.signal.core.util.Hex.fromStringCondensed import org.signal.libsignal.zkgroup.groups.GroupMasterKey import org.thoughtcrime.securesms.database.GroupTable @@ -25,8 +21,6 @@ import org.whispersystems.signalservice.api.storage.StorageId import org.whispersystems.signalservice.internal.storage.protos.GroupV2Record import java.util.Random -@RunWith(RobolectricTestRunner::class) -@Config(application = Application::class) class GroupV2RecordProcessorTest { companion object { diff --git a/app/src/test/java/org/thoughtcrime/securesms/util/NameUtil_getAbbreviation.kt b/app/src/test/java/org/thoughtcrime/securesms/util/NameUtil_getAbbreviation.kt index 0efbfe4b3e..599e7a94ac 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/util/NameUtil_getAbbreviation.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/util/NameUtil_getAbbreviation.kt @@ -1,15 +1,12 @@ package org.thoughtcrime.securesms.util -import android.app.Application import org.junit.Assert.assertEquals import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.ParameterizedRobolectricTestRunner -import org.robolectric.annotation.Config +import org.junit.runners.Parameterized @Suppress("ClassName") -@RunWith(value = ParameterizedRobolectricTestRunner::class) -@Config(manifest = Config.NONE, application = Application::class) +@RunWith(value = Parameterized::class) class NameUtil_getAbbreviation( private val name: String, private val expected: String? @@ -23,7 +20,7 @@ class NameUtil_getAbbreviation( companion object { @JvmStatic - @ParameterizedRobolectricTestRunner.Parameters(name = "{index}: getAbbreviation({0})={1}") + @Parameterized.Parameters(name = "{index}: getAbbreviation({0})={1}") fun params() = listOf( arrayOf("Gwen Stacy", "GS"), arrayOf("Gwen", "G"), diff --git a/app/src/test/java/org/thoughtcrime/securesms/util/cjkv/CJKVUtilTest.java b/app/src/test/java/org/thoughtcrime/securesms/util/cjkv/CJKVUtilTest.java index c778f5702e..b19a4c70f2 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/util/cjkv/CJKVUtilTest.java +++ b/app/src/test/java/org/thoughtcrime/securesms/util/cjkv/CJKVUtilTest.java @@ -1,17 +1,10 @@ package org.thoughtcrime.securesms.util.cjkv; -import android.app.Application; - import org.junit.Test; -import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; -import org.robolectric.annotation.Config; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = Config.NONE, application = Application.class) public class CJKVUtilTest { private static final String CJKV_CHARS = "统码"; diff --git a/core/util/src/test/java/org/signal/core/util/StringUtilTest_endsWith.kt b/core/util/src/test/java/org/signal/core/util/StringUtilTest_endsWith.kt index f5a4d69b8e..6cf1a61db6 100644 --- a/core/util/src/test/java/org/signal/core/util/StringUtilTest_endsWith.kt +++ b/core/util/src/test/java/org/signal/core/util/StringUtilTest_endsWith.kt @@ -2,19 +2,16 @@ package org.signal.core.util -import android.app.Application import org.junit.Assert.assertEquals import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.ParameterizedRobolectricTestRunner -import org.robolectric.ParameterizedRobolectricTestRunner.Parameter -import org.robolectric.ParameterizedRobolectricTestRunner.Parameters -import org.robolectric.annotation.Config +import org.junit.runners.Parameterized +import org.junit.runners.Parameterized.Parameter +import org.junit.runners.Parameterized.Parameters import java.lang.Boolean as JavaBoolean @Suppress("ClassName") -@RunWith(value = ParameterizedRobolectricTestRunner::class) -@Config(manifest = Config.NONE, application = Application::class) +@RunWith(value = Parameterized::class) class StringUtilTest_endsWith { @Parameter(0) diff --git a/core/util/src/test/java/org/signal/core/util/StringUtilTest_startsWith.kt b/core/util/src/test/java/org/signal/core/util/StringUtilTest_startsWith.kt index 83daa460ef..34db636531 100644 --- a/core/util/src/test/java/org/signal/core/util/StringUtilTest_startsWith.kt +++ b/core/util/src/test/java/org/signal/core/util/StringUtilTest_startsWith.kt @@ -2,19 +2,16 @@ package org.signal.core.util -import android.app.Application import org.junit.Assert.assertEquals import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.ParameterizedRobolectricTestRunner -import org.robolectric.ParameterizedRobolectricTestRunner.Parameter -import org.robolectric.ParameterizedRobolectricTestRunner.Parameters -import org.robolectric.annotation.Config +import org.junit.runners.Parameterized +import org.junit.runners.Parameterized.Parameter +import org.junit.runners.Parameterized.Parameters import java.lang.Boolean as JavaBoolean @Suppress("ClassName") -@RunWith(value = ParameterizedRobolectricTestRunner::class) -@Config(manifest = Config.NONE, application = Application::class) +@RunWith(value = Parameterized::class) class StringUtilTest_startsWith { @Parameter(0) diff --git a/lib/donations/src/test/java/org/signal/donations/StripePaymentIntentTest.kt b/lib/donations/src/test/java/org/signal/donations/StripePaymentIntentTest.kt index 40b052cb2a..100da205c0 100644 --- a/lib/donations/src/test/java/org/signal/donations/StripePaymentIntentTest.kt +++ b/lib/donations/src/test/java/org/signal/donations/StripePaymentIntentTest.kt @@ -1,19 +1,13 @@ package org.signal.donations -import android.app.Application import com.fasterxml.jackson.module.kotlin.jsonMapper import com.fasterxml.jackson.module.kotlin.kotlinModule import com.fasterxml.jackson.module.kotlin.readValue import org.junit.Assert.assertEquals import org.junit.Test -import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config import org.signal.donations.json.StripeIntentStatus import org.signal.donations.json.StripePaymentIntent -@RunWith(RobolectricTestRunner::class) -@Config(application = Application::class, manifest = Config.NONE) class StripePaymentIntentTest { companion object { private const val TEST_JSON = """ diff --git a/lib/donations/src/test/java/org/signal/donations/StripeSetupIntentTest.kt b/lib/donations/src/test/java/org/signal/donations/StripeSetupIntentTest.kt index 30a2ec3852..2ec3996eb7 100644 --- a/lib/donations/src/test/java/org/signal/donations/StripeSetupIntentTest.kt +++ b/lib/donations/src/test/java/org/signal/donations/StripeSetupIntentTest.kt @@ -1,19 +1,13 @@ package org.signal.donations -import android.app.Application import com.fasterxml.jackson.module.kotlin.jsonMapper import com.fasterxml.jackson.module.kotlin.kotlinModule import com.fasterxml.jackson.module.kotlin.readValue import org.junit.Assert.assertEquals import org.junit.Test -import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config import org.signal.donations.json.StripeIntentStatus import org.signal.donations.json.StripeSetupIntent -@RunWith(RobolectricTestRunner::class) -@Config(application = Application::class, manifest = Config.NONE) class StripeSetupIntentTest { companion object { private const val TEST_JSON = """