mirror of
https://github.com/kiwix/kiwix-android.git
synced 2025-08-03 10:46:53 -04:00
#2817 Migrated Barista from jcenter to maven, updated Barista version and refactored package name
This commit is contained in:
parent
24435389aa
commit
a6b6305762
@ -26,8 +26,8 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
|
||||
import androidx.test.filters.LargeTest;
|
||||
import androidx.test.rule.ActivityTestRule;
|
||||
import androidx.test.rule.GrantPermissionRule;
|
||||
import com.schibsted.spain.barista.interaction.BaristaMenuClickInteractions;
|
||||
import com.schibsted.spain.barista.interaction.BaristaSleepInteractions;
|
||||
import com.adevinta.android.barista.interaction.BaristaMenuClickInteractions;
|
||||
import com.adevinta.android.barista.interaction.BaristaSleepInteractions;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
@ -41,9 +41,9 @@ import org.kiwix.kiwixmobile.utils.KiwixIdlingResource;
|
||||
|
||||
import static androidx.test.espresso.Espresso.onData;
|
||||
import static androidx.test.espresso.matcher.ViewMatchers.withId;
|
||||
import static com.schibsted.spain.barista.assertion.BaristaVisibilityAssertions.assertDisplayed;
|
||||
import static com.schibsted.spain.barista.interaction.BaristaClickInteractions.clickOn;
|
||||
import static com.schibsted.spain.barista.interaction.BaristaSwipeRefreshInteractions.refresh;
|
||||
import static com.adevinta.android.barista.assertion.BaristaVisibilityAssertions.assertDisplayed;
|
||||
import static com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn;
|
||||
import static com.adevinta.android.barista.interaction.BaristaSwipeRefreshInteractions.refresh;
|
||||
import static junit.framework.Assert.fail;
|
||||
import static org.kiwix.kiwixmobile.testutils.TestUtils.TEST_PAUSE_MS;
|
||||
import static org.kiwix.kiwixmobile.testutils.TestUtils.allowPermissionsIfNeeded;
|
||||
|
@ -25,8 +25,8 @@ import androidx.test.espresso.IdlingRegistry;
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4;
|
||||
import androidx.test.rule.ActivityTestRule;
|
||||
import androidx.test.rule.GrantPermissionRule;
|
||||
import com.schibsted.spain.barista.interaction.BaristaMenuClickInteractions;
|
||||
import com.schibsted.spain.barista.interaction.BaristaSleepInteractions;
|
||||
import com.adevinta.android.barista.interaction.BaristaMenuClickInteractions;
|
||||
import com.adevinta.android.barista.interaction.BaristaSleepInteractions;
|
||||
import java.io.InputStream;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import org.junit.After;
|
||||
@ -49,10 +49,10 @@ import static androidx.test.espresso.Espresso.onView;
|
||||
import static androidx.test.espresso.action.ViewActions.click;
|
||||
import static androidx.test.espresso.action.ViewActions.longClick;
|
||||
import static androidx.test.espresso.matcher.ViewMatchers.withId;
|
||||
import static com.schibsted.spain.barista.interaction.BaristaClickInteractions.clickOn;
|
||||
import static com.schibsted.spain.barista.interaction.BaristaDialogInteractions.clickDialogPositiveButton;
|
||||
import static com.schibsted.spain.barista.interaction.BaristaMenuClickInteractions.clickMenu;
|
||||
import static com.schibsted.spain.barista.interaction.BaristaSwipeRefreshInteractions.refresh;
|
||||
import static com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn;
|
||||
import static com.adevinta.android.barista.interaction.BaristaDialogInteractions.clickDialogPositiveButton;
|
||||
import static com.adevinta.android.barista.interaction.BaristaMenuClickInteractions.clickMenu;
|
||||
import static com.adevinta.android.barista.interaction.BaristaSwipeRefreshInteractions.refresh;
|
||||
import static org.hamcrest.CoreMatchers.allOf;
|
||||
import static org.kiwix.kiwixmobile.testutils.TestUtils.TEST_PAUSE_MS;
|
||||
import static org.kiwix.kiwixmobile.testutils.TestUtils.getResourceString;
|
||||
|
@ -24,7 +24,7 @@ import androidx.test.espresso.intent.Intents;
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4;
|
||||
import androidx.test.rule.ActivityTestRule;
|
||||
import androidx.test.rule.GrantPermissionRule;
|
||||
import com.schibsted.spain.barista.interaction.BaristaSleepInteractions;
|
||||
import com.adevinta.android.barista.interaction.BaristaSleepInteractions;
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
import org.junit.Ignore;
|
||||
@ -44,7 +44,7 @@ import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
|
||||
import static androidx.test.espresso.matcher.ViewMatchers.withContentDescription;
|
||||
import static androidx.test.espresso.matcher.ViewMatchers.withId;
|
||||
import static androidx.test.espresso.matcher.ViewMatchers.withText;
|
||||
import static com.schibsted.spain.barista.interaction.BaristaClickInteractions.clickOn;
|
||||
import static com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn;
|
||||
import static org.hamcrest.CoreMatchers.not;
|
||||
import static org.hamcrest.Matchers.allOf;
|
||||
import static org.hamcrest.core.IsNull.notNullValue;
|
||||
|
@ -17,7 +17,7 @@
|
||||
*/
|
||||
package org.kiwix.kiwixmobile.main
|
||||
|
||||
import com.schibsted.spain.barista.interaction.BaristaSleepInteractions
|
||||
import com.adevinta.android.barista.interaction.BaristaSleepInteractions
|
||||
import applyWithViewHierarchyPrinting
|
||||
import org.kiwix.kiwixmobile.BaseRobot
|
||||
import org.kiwix.kiwixmobile.Findable.StringId.TextId
|
||||
|
@ -19,7 +19,7 @@
|
||||
package org.kiwix.kiwixmobile.page.bookmarks
|
||||
|
||||
import applyWithViewHierarchyPrinting
|
||||
import com.schibsted.spain.barista.assertion.BaristaVisibilityAssertions.assertDisplayed
|
||||
import com.adevinta.android.barista.assertion.BaristaVisibilityAssertions.assertDisplayed
|
||||
import org.kiwix.kiwixmobile.BaseRobot
|
||||
import org.kiwix.kiwixmobile.Findable.StringId.ContentDesc
|
||||
import org.kiwix.kiwixmobile.Findable.StringId.TextId
|
||||
|
@ -19,7 +19,7 @@
|
||||
package org.kiwix.kiwixmobile.page.history
|
||||
|
||||
import applyWithViewHierarchyPrinting
|
||||
import com.schibsted.spain.barista.assertion.BaristaVisibilityAssertions.assertDisplayed
|
||||
import com.adevinta.android.barista.assertion.BaristaVisibilityAssertions.assertDisplayed
|
||||
import org.kiwix.kiwixmobile.BaseRobot
|
||||
import org.kiwix.kiwixmobile.Findable.StringId.ContentDesc
|
||||
import org.kiwix.kiwixmobile.Findable.StringId.TextId
|
||||
|
@ -18,7 +18,7 @@
|
||||
package org.kiwix.kiwixmobile.search
|
||||
|
||||
import androidx.test.internal.runner.junit4.statement.UiThreadStatement
|
||||
import com.schibsted.spain.barista.assertion.BaristaVisibilityAssertions.assertDisplayed
|
||||
import com.adevinta.android.barista.assertion.BaristaVisibilityAssertions.assertDisplayed
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
import org.kiwix.kiwixmobile.BaseActivityTest
|
||||
|
@ -21,7 +21,7 @@ import android.Manifest
|
||||
import androidx.test.internal.runner.junit4.statement.UiThreadStatement
|
||||
import androidx.test.rule.ActivityTestRule
|
||||
import androidx.test.rule.GrantPermissionRule
|
||||
import com.schibsted.spain.barista.interaction.BaristaSleepInteractions
|
||||
import com.adevinta.android.barista.interaction.BaristaSleepInteractions
|
||||
import org.junit.Before
|
||||
import org.junit.Rule
|
||||
import org.junit.Test
|
||||
|
@ -27,7 +27,7 @@ import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
|
||||
import androidx.test.espresso.matcher.ViewMatchers.withResourceName
|
||||
import androidx.test.espresso.matcher.ViewMatchers.withText
|
||||
import applyWithViewHierarchyPrinting
|
||||
import com.schibsted.spain.barista.assertion.BaristaVisibilityAssertions.assertDisplayed
|
||||
import com.adevinta.android.barista.assertion.BaristaVisibilityAssertions.assertDisplayed
|
||||
import org.hamcrest.Matchers
|
||||
import org.kiwix.kiwixmobile.BaseRobot
|
||||
import org.kiwix.kiwixmobile.Findable.Text
|
||||
|
@ -28,7 +28,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
|
||||
import androidx.test.filters.LargeTest;
|
||||
import androidx.test.rule.ActivityTestRule;
|
||||
import androidx.test.rule.GrantPermissionRule;
|
||||
import com.schibsted.spain.barista.interaction.BaristaSleepInteractions;
|
||||
import com.adevinta.android.barista.interaction.BaristaSleepInteractions;
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
import org.junit.Rule;
|
||||
|
@ -18,15 +18,15 @@
|
||||
package org.kiwix.kiwixmobile.utils;
|
||||
|
||||
import android.util.Log;
|
||||
import com.schibsted.spain.barista.interaction.BaristaClickInteractions;
|
||||
import com.schibsted.spain.barista.interaction.BaristaDrawerInteractions;
|
||||
import com.schibsted.spain.barista.interaction.BaristaSleepInteractions;
|
||||
import com.adevinta.android.barista.interaction.BaristaClickInteractions;
|
||||
import com.adevinta.android.barista.interaction.BaristaDrawerInteractions;
|
||||
import com.adevinta.android.barista.interaction.BaristaSleepInteractions;
|
||||
import org.kiwix.kiwixmobile.R;
|
||||
|
||||
import static androidx.test.espresso.Espresso.onData;
|
||||
import static androidx.test.espresso.action.ViewActions.longClick;
|
||||
import static androidx.test.espresso.matcher.ViewMatchers.withId;
|
||||
import static com.schibsted.spain.barista.interaction.BaristaDialogInteractions.clickDialogPositiveButton;
|
||||
import static com.adevinta.android.barista.interaction.BaristaDialogInteractions.clickDialogPositiveButton;
|
||||
import static org.kiwix.kiwixmobile.testutils.TestUtils.TEST_PAUSE_MS;
|
||||
import static org.kiwix.kiwixmobile.testutils.TestUtils.getResourceString;
|
||||
import static org.kiwix.kiwixmobile.testutils.TestUtils.withContent;
|
||||
|
@ -405,7 +405,7 @@ object Libs {
|
||||
|
||||
const val multidex: String = "androidx.multidex:multidex:" + Versions.multidex
|
||||
|
||||
const val barista: String = "com.schibsted.spain:barista:" + Versions.barista
|
||||
const val barista: String = "com.adevinta.android:barista:" + Versions.barista
|
||||
|
||||
const val xfetch2: String = "androidx.tonyodev.fetch2:xfetch2:" + Versions.xfetch2
|
||||
|
||||
|
@ -94,7 +94,7 @@ object Versions {
|
||||
|
||||
const val multidex: String = "2.0.1"
|
||||
|
||||
const val barista: String = "2.7.1" // available: "3.7.0"
|
||||
const val barista: String = "4.0.0"
|
||||
|
||||
const val xfetch2: String = "3.1.6"
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user