1
0
Fork 0

Update Android Components version to 42.0.20200514130134

master
Simon Chae 2020-05-14 11:47:26 -04:00 committed by Emily Kager
parent ca9f99540a
commit cb307061ab
2 changed files with 9 additions and 2 deletions

View File

@ -14,8 +14,11 @@ import androidx.test.uiautomator.UiSelector
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import mozilla.components.browser.engine.gecko.fetch.GeckoViewFetchClient
import mozilla.components.concept.fetch.Client
import mozilla.components.service.glean.Glean import mozilla.components.service.glean.Glean
import mozilla.components.service.glean.config.Configuration import mozilla.components.service.glean.config.Configuration
import mozilla.components.service.glean.net.ConceptFetchHttpUploader
import mozilla.components.service.glean.testing.GleanTestLocalServer import mozilla.components.service.glean.testing.GleanTestLocalServer
import org.json.JSONObject import org.json.JSONObject
import org.junit.Assert.assertTrue import org.junit.Assert.assertTrue
@ -44,6 +47,10 @@ class BaselinePingTest {
@BeforeClass @BeforeClass
@JvmStatic @JvmStatic
fun setupOnce() { fun setupOnce() {
val httpClient = ConceptFetchHttpUploader(lazy {
GeckoViewFetchClient(ApplicationProvider.getApplicationContext()) as Client
})
// Fenix does not initialize the Glean SDK in tests/debug builds, but this test // Fenix does not initialize the Glean SDK in tests/debug builds, but this test
// requires Glean to be initialized so we need to do it manually. Additionally, // requires Glean to be initialized so we need to do it manually. Additionally,
// we need to do this on the main thread, as the Glean SDK requires it. // we need to do this on the main thread, as the Glean SDK requires it.
@ -51,7 +58,7 @@ class BaselinePingTest {
Glean.initialize( Glean.initialize(
ApplicationProvider.getApplicationContext(), ApplicationProvider.getApplicationContext(),
true, true,
Configuration() Configuration(httpClient = httpClient)
) )
} }
} }

View File

@ -3,5 +3,5 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
object AndroidComponents { object AndroidComponents {
const val VERSION = "42.0.20200513162226" const val VERSION = "42.0.20200514130134"
} }