Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88c0fc62 authored by Bo Majewski's avatar Bo Majewski
Browse files

[DocsUI, Search]: Run tests only when search v2 flags are enabled. 

Due to the way libraries are compiled, it is possible for
FolderLoaderTest and SearchLoaderTest to be run without QueryOption
class being compiled in. For now, we are limiting these tests to be run
only when the flag is enabled.

Test: m DocumentsUIGoogle
Bug: 397339113
Flag: com.android.documentsui.flags.use_search_v2_rw
Change-Id: I86820b0e3e3b9381ebc5d9fcfe0ce279b5738424
parent fc93ee6f

tests/unit/com/android/documentsui/loaders/FolderLoaderTest.kt

+9 −0
Original line number Original line Diff line number Diff line
@@ -16,13 +16,18 @@ 
package com.android.documentsui.loaders

package com.android.documentsui.loaders





import android.os.Bundle

import android.os.Bundle

import android.platform.test.annotations.RequiresFlagsEnabled

import android.platform.test.flag.junit.CheckFlagsRule

import android.platform.test.flag.junit.DeviceFlagsValueProvider

import androidx.test.filters.SmallTest

import androidx.test.filters.SmallTest

import com.android.documentsui.ContentLock

import com.android.documentsui.ContentLock

import com.android.documentsui.base.DocumentInfo

import com.android.documentsui.base.DocumentInfo

import com.android.documentsui.flags.Flags.FLAG_USE_SEARCH_V2_RW

import com.android.documentsui.testing.TestFileTypeLookup

import com.android.documentsui.testing.TestFileTypeLookup

import com.android.documentsui.testing.TestProvidersAccess

import com.android.documentsui.testing.TestProvidersAccess

import java.time.Duration

import java.time.Duration

import junit.framework.Assert.assertEquals

import junit.framework.Assert.assertEquals

import org.junit.Rule

import org.junit.Test

import org.junit.Test

import org.junit.runner.RunWith

import org.junit.runner.RunWith

import org.junit.runners.Parameterized

import org.junit.runners.Parameterized
@@ -50,7 +55,11 @@ class FolderLoaderTest(private val testParams: LoaderTestParams) : BaseLoaderTes 
        )

        )

    }

    }





    @get:Rule

    val checkFlagsRule: CheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule()



    @Test

    @Test

    @RequiresFlagsEnabled(FLAG_USE_SEARCH_V2_RW)

    fun testLoadInBackground() {

    fun testLoadInBackground() {

        val mockProvider = mEnv.mockProviders[TestProvidersAccess.DOWNLOADS.authority]

        val mockProvider = mEnv.mockProviders[TestProvidersAccess.DOWNLOADS.authority]

        val docs = createDocuments(TOTAL_FILE_COUNT)

        val docs = createDocuments(TOTAL_FILE_COUNT)

tests/unit/com/android/documentsui/loaders/SearchLoaderTest.kt

+10 −0
Original line number Original line Diff line number Diff line
@@ -16,11 +16,15 @@ 
package com.android.documentsui.loaders

package com.android.documentsui.loaders





import android.os.Bundle

import android.os.Bundle

import android.platform.test.annotations.RequiresFlagsEnabled

import android.platform.test.flag.junit.CheckFlagsRule

import android.platform.test.flag.junit.DeviceFlagsValueProvider

import android.provider.DocumentsContract

import android.provider.DocumentsContract

import androidx.test.filters.SmallTest

import androidx.test.filters.SmallTest

import com.android.documentsui.ContentLock

import com.android.documentsui.ContentLock

import com.android.documentsui.LockingContentObserver

import com.android.documentsui.LockingContentObserver

import com.android.documentsui.base.DocumentInfo

import com.android.documentsui.base.DocumentInfo

import com.android.documentsui.flags.Flags.FLAG_USE_SEARCH_V2_RW

import com.android.documentsui.testing.TestFileTypeLookup

import com.android.documentsui.testing.TestFileTypeLookup

import com.android.documentsui.testing.TestProvidersAccess

import com.android.documentsui.testing.TestProvidersAccess

import java.time.Duration

import java.time.Duration
@@ -29,6 +33,7 @@ import java.util.concurrent.Executors 
import junit.framework.Assert.assertEquals

import junit.framework.Assert.assertEquals

import org.junit.Assert.assertThrows

import org.junit.Assert.assertThrows

import org.junit.Before

import org.junit.Before

import org.junit.Rule

import org.junit.Test

import org.junit.Test

import org.junit.runner.RunWith

import org.junit.runner.RunWith

import org.junit.runners.Parameterized

import org.junit.runners.Parameterized
@@ -64,6 +69,9 @@ class SearchLoaderTest(private val testParams: LoaderTestParams) : BaseLoaderTes 
        )

        )

    }

    }





    @get:Rule

    val checkFlagsRule: CheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule()



    @Before

    @Before

    override fun setUp() {

    override fun setUp() {

        super.setUp()

        super.setUp()
@@ -71,6 +79,7 @@ class SearchLoaderTest(private val testParams: LoaderTestParams) : BaseLoaderTes 
    }

    }





    @Test

    @Test

    @RequiresFlagsEnabled(FLAG_USE_SEARCH_V2_RW)

    fun testLoadInBackground() {

    fun testLoadInBackground() {

        val mockProvider = mEnv.mockProviders[TestProvidersAccess.DOWNLOADS.authority]

        val mockProvider = mEnv.mockProviders[TestProvidersAccess.DOWNLOADS.authority]

        val docs = createDocuments(TOTAL_FILE_COUNT)

        val docs = createDocuments(TOTAL_FILE_COUNT)
@@ -109,6 +118,7 @@ class SearchLoaderTest(private val testParams: LoaderTestParams) : BaseLoaderTes 
    }

    }





    @Test

    @Test

    @RequiresFlagsEnabled(FLAG_USE_SEARCH_V2_RW)

    fun testBlankQueryAndRecency() {

    fun testBlankQueryAndRecency() {

        val userIds = listOf(TestProvidersAccess.DOWNLOADS.userId)

        val userIds = listOf(TestProvidersAccess.DOWNLOADS.userId)

        val rootIds = listOf(TestProvidersAccess.DOWNLOADS)

        val rootIds = listOf(TestProvidersAccess.DOWNLOADS)