diff --git a/app/src/androidTest/java/org/xbmc/kore/testhelpers/EspressoTestUtils.java b/app/src/androidTest/java/org/xbmc/kore/testhelpers/EspressoTestUtils.java index 2e05e50..8f521df 100644 --- a/app/src/androidTest/java/org/xbmc/kore/testhelpers/EspressoTestUtils.java +++ b/app/src/androidTest/java/org/xbmc/kore/testhelpers/EspressoTestUtils.java @@ -19,40 +19,41 @@ package org.xbmc.kore.testhelpers; import android.app.Activity; import android.content.pm.ActivityInfo; import android.content.res.Configuration; -import android.support.test.espresso.Espresso; -import android.support.test.espresso.NoMatchingViewException; -import android.support.test.espresso.UiController; -import android.support.test.espresso.ViewAction; -import android.support.test.espresso.ViewInteraction; -import android.support.test.espresso.contrib.RecyclerViewActions; import android.view.View; import android.widget.AutoCompleteTextView; import android.widget.TextView; +import androidx.test.espresso.Espresso; +import androidx.test.espresso.NoMatchingViewException; +import androidx.test.espresso.UiController; +import androidx.test.espresso.ViewAction; +import androidx.test.espresso.ViewInteraction; +import androidx.test.espresso.contrib.RecyclerViewActions; + import com.sothree.slidinguppanel.SlidingUpPanelLayout; import org.hamcrest.Matcher; import org.xbmc.kore.R; import org.xbmc.kore.testhelpers.action.ViewActions; -import static android.support.test.espresso.Espresso.onData; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu; -import static android.support.test.espresso.Espresso.pressBack; -import static android.support.test.espresso.action.ViewActions.clearText; -import static android.support.test.espresso.action.ViewActions.click; -import static android.support.test.espresso.action.ViewActions.closeSoftKeyboard; -import static android.support.test.espresso.action.ViewActions.typeText; -import static android.support.test.espresso.assertion.ViewAssertions.doesNotExist; -import static android.support.test.espresso.assertion.ViewAssertions.matches; -import static android.support.test.espresso.matcher.ViewMatchers.hasDescendant; -import static android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom; -import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; -import static android.support.test.espresso.matcher.ViewMatchers.isRoot; -import static android.support.test.espresso.matcher.ViewMatchers.withContentDescription; -import static android.support.test.espresso.matcher.ViewMatchers.withId; -import static android.support.test.espresso.matcher.ViewMatchers.withParent; -import static android.support.test.espresso.matcher.ViewMatchers.withText; +import static androidx.test.espresso.Espresso.onData; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu; +import static androidx.test.espresso.Espresso.pressBack; +import static androidx.test.espresso.action.ViewActions.clearText; +import static androidx.test.espresso.action.ViewActions.click; +import static androidx.test.espresso.action.ViewActions.closeSoftKeyboard; +import static androidx.test.espresso.action.ViewActions.typeText; +import static androidx.test.espresso.assertion.ViewAssertions.doesNotExist; +import static androidx.test.espresso.assertion.ViewAssertions.matches; +import static androidx.test.espresso.matcher.ViewMatchers.hasDescendant; +import static androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom; +import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed; +import static androidx.test.espresso.matcher.ViewMatchers.isRoot; +import static androidx.test.espresso.matcher.ViewMatchers.withContentDescription; +import static androidx.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.matcher.ViewMatchers.withParent; +import static androidx.test.espresso.matcher.ViewMatchers.withText; import static org.hamcrest.CoreMatchers.anything; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.containsString; diff --git a/app/src/androidTest/java/org/xbmc/kore/testhelpers/LoaderIdlingResource.java b/app/src/androidTest/java/org/xbmc/kore/testhelpers/LoaderIdlingResource.java index dcb6a67..4d1524f 100644 --- a/app/src/androidTest/java/org/xbmc/kore/testhelpers/LoaderIdlingResource.java +++ b/app/src/androidTest/java/org/xbmc/kore/testhelpers/LoaderIdlingResource.java @@ -16,8 +16,8 @@ package org.xbmc.kore.testhelpers; -import android.support.test.espresso.IdlingResource; -import androidx.core.app.LoaderManager; +import androidx.loader.app.LoaderManager; +import androidx.test.espresso.IdlingResource; public class LoaderIdlingResource implements IdlingResource { diff --git a/app/src/androidTest/java/org/xbmc/kore/testhelpers/Matchers.java b/app/src/androidTest/java/org/xbmc/kore/testhelpers/Matchers.java index b6ddfb0..49cced1 100644 --- a/app/src/androidTest/java/org/xbmc/kore/testhelpers/Matchers.java +++ b/app/src/androidTest/java/org/xbmc/kore/testhelpers/Matchers.java @@ -17,15 +17,16 @@ package org.xbmc.kore.testhelpers; import android.database.Cursor; -import android.support.test.espresso.matcher.BoundedMatcher; -import android.support.test.espresso.matcher.CursorMatchers; -import android.support.v7.widget.RecyclerView; import android.view.MenuItem; import android.view.View; import android.widget.ListView; import android.widget.SeekBar; import android.widget.TextView; +import androidx.recyclerview.widget.RecyclerView; +import androidx.test.espresso.matcher.BoundedMatcher; +import androidx.test.espresso.matcher.CursorMatchers; + import org.hamcrest.BaseMatcher; import org.hamcrest.Description; import org.hamcrest.Matcher; diff --git a/app/src/androidTest/java/org/xbmc/kore/testhelpers/TestUtils.java b/app/src/androidTest/java/org/xbmc/kore/testhelpers/TestUtils.java index 7944479..63940a6 100644 --- a/app/src/androidTest/java/org/xbmc/kore/testhelpers/TestUtils.java +++ b/app/src/androidTest/java/org/xbmc/kore/testhelpers/TestUtils.java @@ -16,7 +16,6 @@ package org.xbmc.kore.testhelpers; - import org.xbmc.kore.testutils.tcpserver.handlers.InputHandler; import static junit.framework.Assert.assertTrue; diff --git a/app/src/androidTest/java/org/xbmc/kore/testhelpers/Utils.java b/app/src/androidTest/java/org/xbmc/kore/testhelpers/Utils.java index 33f3431..5c4d767 100644 --- a/app/src/androidTest/java/org/xbmc/kore/testhelpers/Utils.java +++ b/app/src/androidTest/java/org/xbmc/kore/testhelpers/Utils.java @@ -21,12 +21,13 @@ import android.content.Context; import android.content.SharedPreferences; import android.content.pm.PackageManager; import android.os.IBinder; -import android.support.test.rule.ActivityTestRule; -import androidx.core.widget.DrawerLayout; -import android.support.v7.preference.PreferenceManager; import android.util.Log; import android.view.Gravity; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.preference.PreferenceManager; +import androidx.test.rule.ActivityTestRule; + import org.xbmc.kore.R; import org.xbmc.kore.host.HostInfo; import org.xbmc.kore.host.HostManager; diff --git a/app/src/androidTest/java/org/xbmc/kore/testhelpers/action/ClearFocus.java b/app/src/androidTest/java/org/xbmc/kore/testhelpers/action/ClearFocus.java index 12bd8dc..20be28b 100644 --- a/app/src/androidTest/java/org/xbmc/kore/testhelpers/action/ClearFocus.java +++ b/app/src/androidTest/java/org/xbmc/kore/testhelpers/action/ClearFocus.java @@ -15,15 +15,16 @@ */ package org.xbmc.kore.testhelpers.action; -import android.support.test.espresso.UiController; -import android.support.test.espresso.ViewAction; import android.view.View; -import org.hamcrest.Matcher; -import static org.hamcrest.Matchers.allOf; +import androidx.test.espresso.UiController; +import androidx.test.espresso.ViewAction; -import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; -import static android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom; +import org.hamcrest.Matcher; + +import static androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom; +import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed; +import static org.hamcrest.Matchers.allOf; public class ClearFocus implements ViewAction { diff --git a/app/src/androidTest/java/org/xbmc/kore/testhelpers/action/NestedScrollTo.java b/app/src/androidTest/java/org/xbmc/kore/testhelpers/action/NestedScrollTo.java index ae2d8c3..e4b6ff6 100644 --- a/app/src/androidTest/java/org/xbmc/kore/testhelpers/action/NestedScrollTo.java +++ b/app/src/androidTest/java/org/xbmc/kore/testhelpers/action/NestedScrollTo.java @@ -17,35 +17,35 @@ package org.xbmc.kore.testhelpers.action; import android.graphics.Rect; -import android.support.test.espresso.PerformException; -import android.support.test.espresso.UiController; -import android.support.test.espresso.ViewAction; -import android.support.test.espresso.matcher.ViewMatchers; -import android.support.test.espresso.util.HumanReadables; import androidx.core.widget.NestedScrollView; +import androidx.test.espresso.PerformException; +import androidx.test.espresso.UiController; +import androidx.test.espresso.ViewAction; +import androidx.test.espresso.matcher.ViewMatchers; +import androidx.test.espresso.util.HumanReadables; + import android.view.View; import org.hamcrest.Matcher; import org.xbmc.kore.utils.LogUtils; -import static android.support.test.espresso.matcher.ViewMatchers.isDisplayingAtLeast; -import static android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom; -import static android.support.test.espresso.matcher.ViewMatchers.isDescendantOfA; -import static android.support.test.espresso.matcher.ViewMatchers.withEffectiveVisibility; +import static androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom; +import static androidx.test.espresso.matcher.ViewMatchers.isDisplayingAtLeast; +import static androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.anyOf; /** - * Modified version of {@link android.support.test.espresso.action.ScrollToAction} to support + * Modified version of {@link androidx.test.espresso.action.ScrollToAction} to support * NestedScrollView. - * TODO Check future versions of {@link android.support.test.espresso.action.ScrollToAction} to see if support for NestedScrollView has been added + * TODO Check future versions of {@link androidx.test.espresso.action.ScrollToAction} to see if support for NestedScrollView has been added */ public class NestedScrollTo implements ViewAction { private final static String TAG = LogUtils.makeLogTag(NestedScrollTo.class); @Override public Matcher getConstraints() { - return allOf(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE), isDescendantOfA(anyOf( + return allOf(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE), ViewMatchers.isDescendantOfA(anyOf( isAssignableFrom(NestedScrollView.class)))); } diff --git a/app/src/androidTest/java/org/xbmc/kore/testhelpers/action/ViewActions.java b/app/src/androidTest/java/org/xbmc/kore/testhelpers/action/ViewActions.java index ecb6829..e2461a9 100644 --- a/app/src/androidTest/java/org/xbmc/kore/testhelpers/action/ViewActions.java +++ b/app/src/androidTest/java/org/xbmc/kore/testhelpers/action/ViewActions.java @@ -16,16 +16,16 @@ package org.xbmc.kore.testhelpers.action; +import androidx.test.espresso.PerformException; +import androidx.test.espresso.UiController; +import androidx.test.espresso.ViewAction; +import androidx.test.espresso.action.MotionEvents; +import androidx.test.espresso.action.Press; +import androidx.test.espresso.util.HumanReadables; +import androidx.test.espresso.util.TreeIterables; +import androidx.viewpager.widget.PagerAdapter; +import androidx.viewpager.widget.ViewPager; -import android.support.test.espresso.PerformException; -import android.support.test.espresso.UiController; -import android.support.test.espresso.ViewAction; -import android.support.test.espresso.action.MotionEvents; -import android.support.test.espresso.action.Press; -import android.support.test.espresso.util.HumanReadables; -import android.support.test.espresso.util.TreeIterables; -import androidx.core.view.PagerAdapter; -import androidx.core.view.ViewPager; import android.view.View; import android.widget.SeekBar; @@ -35,8 +35,8 @@ import org.hamcrest.TypeSafeMatcher; import java.util.concurrent.TimeoutException; -import static android.support.test.espresso.action.ViewActions.actionWithAssertions; -import static android.support.test.espresso.matcher.ViewMatchers.isRoot; +import static androidx.test.espresso.action.ViewActions.actionWithAssertions; +import static androidx.test.espresso.matcher.ViewMatchers.isRoot; public final class ViewActions { diff --git a/app/src/androidTest/java/org/xbmc/kore/tests/ui/AbstractTestClass.java b/app/src/androidTest/java/org/xbmc/kore/tests/ui/AbstractTestClass.java index 43acae2..36e0022 100644 --- a/app/src/androidTest/java/org/xbmc/kore/tests/ui/AbstractTestClass.java +++ b/app/src/androidTest/java/org/xbmc/kore/tests/ui/AbstractTestClass.java @@ -19,11 +19,12 @@ package org.xbmc.kore.tests.ui; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; -import android.support.test.espresso.IdlingRegistry; -import android.support.test.rule.ActivityTestRule; -import android.support.test.runner.AndroidJUnit4; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.preference.PreferenceManager; + +import androidx.appcompat.app.AppCompatActivity; +import androidx.preference.PreferenceManager; +import androidx.test.espresso.IdlingRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.rule.ActivityTestRule; import org.junit.After; import org.junit.AfterClass; diff --git a/app/src/androidTest/java/org/xbmc/kore/tests/ui/addons/AddonsActivityTests.java b/app/src/androidTest/java/org/xbmc/kore/tests/ui/addons/AddonsActivityTests.java index df97107..bf18c7d 100644 --- a/app/src/androidTest/java/org/xbmc/kore/tests/ui/addons/AddonsActivityTests.java +++ b/app/src/androidTest/java/org/xbmc/kore/tests/ui/addons/AddonsActivityTests.java @@ -17,11 +17,12 @@ package org.xbmc.kore.tests.ui.addons; import android.content.Context; -import android.support.test.espresso.Espresso; -import android.support.test.rule.ActivityTestRule; import android.view.View; import android.widget.TextView; +import androidx.test.espresso.Espresso; +import androidx.test.rule.ActivityTestRule; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -31,12 +32,12 @@ import org.xbmc.kore.testhelpers.action.ViewActions; import org.xbmc.kore.tests.ui.AbstractTestClass; import org.xbmc.kore.ui.sections.addon.AddonsActivity; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.assertion.ViewAssertions.matches; -import static android.support.test.espresso.matcher.ViewMatchers.isRoot; -import static android.support.test.espresso.matcher.ViewMatchers.withId; -import static android.support.test.espresso.matcher.ViewMatchers.withParent; -import static android.support.test.espresso.matcher.ViewMatchers.withText; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.assertion.ViewAssertions.matches; +import static androidx.test.espresso.matcher.ViewMatchers.isRoot; +import static androidx.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.matcher.ViewMatchers.withParent; +import static androidx.test.espresso.matcher.ViewMatchers.withText; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.instanceOf; import static org.junit.Assert.assertFalse; @@ -80,12 +81,7 @@ public class AddonsActivityTests extends AbstractTestClass { @Before public void setUp() throws Throwable { super.setUp(); - onView(isRoot()).perform(ViewActions.waitForView(R.id.list, new ViewActions.CheckStatus() { - @Override - public boolean check(View v) { - return v.isShown(); - } - },10000)); + onView(isRoot()).perform(ViewActions.waitForView(R.id.list, v -> v.isShown(),10000)); } /** diff --git a/app/src/androidTest/java/org/xbmc/kore/tests/ui/movies/MoviesActivityTests.java b/app/src/androidTest/java/org/xbmc/kore/tests/ui/movies/MoviesActivityTests.java index 9d065f0..148a149 100644 --- a/app/src/androidTest/java/org/xbmc/kore/tests/ui/movies/MoviesActivityTests.java +++ b/app/src/androidTest/java/org/xbmc/kore/tests/ui/movies/MoviesActivityTests.java @@ -17,23 +17,23 @@ package org.xbmc.kore.tests.ui.movies; import android.content.Context; -import android.support.test.espresso.Espresso; -import android.support.test.rule.ActivityTestRule; import android.widget.TextView; +import androidx.test.espresso.Espresso; +import androidx.test.rule.ActivityTestRule; + import org.junit.Rule; import org.junit.Test; import org.xbmc.kore.R; -import org.xbmc.kore.host.HostInfo; import org.xbmc.kore.testhelpers.EspressoTestUtils; import org.xbmc.kore.tests.ui.AbstractTestClass; import org.xbmc.kore.ui.sections.video.MoviesActivity; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.assertion.ViewAssertions.matches; -import static android.support.test.espresso.matcher.ViewMatchers.withId; -import static android.support.test.espresso.matcher.ViewMatchers.withParent; -import static android.support.test.espresso.matcher.ViewMatchers.withText; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.assertion.ViewAssertions.matches; +import static androidx.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.matcher.ViewMatchers.withParent; +import static androidx.test.espresso.matcher.ViewMatchers.withText; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.instanceOf; import static org.junit.Assert.assertFalse; diff --git a/app/src/androidTest/java/org/xbmc/kore/tests/ui/movies/RestoreSearchQueryListFragmentTest.java b/app/src/androidTest/java/org/xbmc/kore/tests/ui/movies/RestoreSearchQueryListFragmentTest.java index 0bbbbbc..aaa3b4d 100644 --- a/app/src/androidTest/java/org/xbmc/kore/tests/ui/movies/RestoreSearchQueryListFragmentTest.java +++ b/app/src/androidTest/java/org/xbmc/kore/tests/ui/movies/RestoreSearchQueryListFragmentTest.java @@ -17,9 +17,10 @@ package org.xbmc.kore.tests.ui.movies; import android.content.Context; -import android.support.test.espresso.Espresso; -import android.support.test.rule.ActivityTestRule; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.espresso.Espresso; +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.rule.ActivityTestRule; import org.junit.Rule; import org.junit.Test; diff --git a/app/src/androidTest/java/org/xbmc/kore/tests/ui/music/MusicActivityTests.java b/app/src/androidTest/java/org/xbmc/kore/tests/ui/music/MusicActivityTests.java index 2d04326..d014c14 100644 --- a/app/src/androidTest/java/org/xbmc/kore/tests/ui/music/MusicActivityTests.java +++ b/app/src/androidTest/java/org/xbmc/kore/tests/ui/music/MusicActivityTests.java @@ -18,23 +18,23 @@ package org.xbmc.kore.tests.ui.music; import android.content.Context; import android.os.SystemClock; -import android.support.test.espresso.Espresso; -import android.support.test.rule.ActivityTestRule; import android.widget.TextView; +import androidx.test.espresso.Espresso; +import androidx.test.rule.ActivityTestRule; + import org.junit.Rule; import org.junit.Test; import org.xbmc.kore.R; -import org.xbmc.kore.host.HostInfo; import org.xbmc.kore.testhelpers.EspressoTestUtils; import org.xbmc.kore.tests.ui.AbstractTestClass; import org.xbmc.kore.ui.sections.audio.MusicActivity; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.assertion.ViewAssertions.matches; -import static android.support.test.espresso.matcher.ViewMatchers.withId; -import static android.support.test.espresso.matcher.ViewMatchers.withParent; -import static android.support.test.espresso.matcher.ViewMatchers.withText; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.assertion.ViewAssertions.matches; +import static androidx.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.matcher.ViewMatchers.withParent; +import static androidx.test.espresso.matcher.ViewMatchers.withText; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.instanceOf; import static org.junit.Assert.assertFalse; diff --git a/app/src/androidTest/java/org/xbmc/kore/tests/ui/music/RestoreSearchQueryViewPagerTest.java b/app/src/androidTest/java/org/xbmc/kore/tests/ui/music/RestoreSearchQueryViewPagerTest.java index b0af3eb..bdce021 100644 --- a/app/src/androidTest/java/org/xbmc/kore/tests/ui/music/RestoreSearchQueryViewPagerTest.java +++ b/app/src/androidTest/java/org/xbmc/kore/tests/ui/music/RestoreSearchQueryViewPagerTest.java @@ -18,9 +18,10 @@ package org.xbmc.kore.tests.ui.music; import android.app.Activity; import android.content.Context; -import android.support.test.espresso.Espresso; -import android.support.test.rule.ActivityTestRule; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.espresso.Espresso; +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.rule.ActivityTestRule; import org.junit.Rule; import org.junit.Test; diff --git a/app/src/androidTest/java/org/xbmc/kore/tests/ui/music/SlideUpPanelTests.java b/app/src/androidTest/java/org/xbmc/kore/tests/ui/music/SlideUpPanelTests.java index c070b14..5b9de03 100644 --- a/app/src/androidTest/java/org/xbmc/kore/tests/ui/music/SlideUpPanelTests.java +++ b/app/src/androidTest/java/org/xbmc/kore/tests/ui/music/SlideUpPanelTests.java @@ -16,16 +16,16 @@ package org.xbmc.kore.tests.ui.music; - import android.content.Context; import android.content.SharedPreferences; import android.os.SystemClock; -import android.support.test.rule.ActivityTestRule; -import android.support.v7.preference.PreferenceManager; import android.view.View; import android.widget.SeekBar; import android.widget.TextView; +import androidx.preference.PreferenceManager; +import androidx.test.rule.ActivityTestRule; + import com.sothree.slidinguppanel.SlidingUpPanelLayout; import org.junit.Rule; @@ -45,14 +45,14 @@ import org.xbmc.kore.ui.widgets.RepeatModeButton; import java.util.concurrent.TimeoutException; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.Espresso.pressBack; -import static android.support.test.espresso.action.ViewActions.click; -import static android.support.test.espresso.assertion.ViewAssertions.matches; -import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; -import static android.support.test.espresso.matcher.ViewMatchers.isRoot; -import static android.support.test.espresso.matcher.ViewMatchers.withId; -import static android.support.test.espresso.matcher.ViewMatchers.withText; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.Espresso.pressBack; +import static androidx.test.espresso.action.ViewActions.click; +import static androidx.test.espresso.assertion.ViewAssertions.matches; +import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed; +import static androidx.test.espresso.matcher.ViewMatchers.isRoot; +import static androidx.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.matcher.ViewMatchers.withText; import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertSame; diff --git a/app/src/androidTest/java/org/xbmc/kore/tests/ui/remote/controlpad/eventserver/ButtonTests.java b/app/src/androidTest/java/org/xbmc/kore/tests/ui/remote/controlpad/eventserver/ButtonTests.java index 0265aca..01464e5 100644 --- a/app/src/androidTest/java/org/xbmc/kore/tests/ui/remote/controlpad/eventserver/ButtonTests.java +++ b/app/src/androidTest/java/org/xbmc/kore/tests/ui/remote/controlpad/eventserver/ButtonTests.java @@ -17,7 +17,8 @@ package org.xbmc.kore.tests.ui.remote.controlpad.eventserver; import android.content.Context; -import android.support.test.rule.ActivityTestRule; + +import androidx.test.rule.ActivityTestRule; import org.junit.After; import org.junit.AfterClass; @@ -37,10 +38,10 @@ import org.xbmc.kore.testutils.eventserver.EventPacketBUTTON; import org.xbmc.kore.testutils.eventserver.MockEventServer; import org.xbmc.kore.ui.sections.remote.RemoteActivity; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.action.ViewActions.click; -import static android.support.test.espresso.action.ViewActions.longClick; -import static android.support.test.espresso.matcher.ViewMatchers.withId; +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 junit.framework.Assert.assertTrue; public class ButtonTests extends AbstractTestClass { diff --git a/app/src/androidTest/java/org/xbmc/kore/tests/ui/remote/controlpad/eventserver/KodiPreV17Tests.java b/app/src/androidTest/java/org/xbmc/kore/tests/ui/remote/controlpad/eventserver/KodiPreV17Tests.java index c525227..6012e21 100644 --- a/app/src/androidTest/java/org/xbmc/kore/tests/ui/remote/controlpad/eventserver/KodiPreV17Tests.java +++ b/app/src/androidTest/java/org/xbmc/kore/tests/ui/remote/controlpad/eventserver/KodiPreV17Tests.java @@ -17,7 +17,8 @@ package org.xbmc.kore.tests.ui.remote.controlpad.eventserver; import android.content.Context; -import android.support.test.rule.ActivityTestRule; + +import androidx.test.rule.ActivityTestRule; import org.junit.After; import org.junit.AfterClass; @@ -32,9 +33,9 @@ import org.xbmc.kore.tests.ui.AbstractTestClass; import org.xbmc.kore.testutils.eventserver.MockEventServer; import org.xbmc.kore.ui.sections.remote.RemoteActivity; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.action.ViewActions.longClick; -import static android.support.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.action.ViewActions.longClick; +import static androidx.test.espresso.matcher.ViewMatchers.withId; import static junit.framework.Assert.assertTrue; public class KodiPreV17Tests extends AbstractTestClass { diff --git a/app/src/androidTest/java/org/xbmc/kore/tests/ui/remote/controlpad/http/ButtonTests.java b/app/src/androidTest/java/org/xbmc/kore/tests/ui/remote/controlpad/http/ButtonTests.java index ad5430a..b0c358f 100644 --- a/app/src/androidTest/java/org/xbmc/kore/tests/ui/remote/controlpad/http/ButtonTests.java +++ b/app/src/androidTest/java/org/xbmc/kore/tests/ui/remote/controlpad/http/ButtonTests.java @@ -17,7 +17,8 @@ package org.xbmc.kore.tests.ui.remote.controlpad.http; import android.content.Context; -import android.support.test.rule.ActivityTestRule; + +import androidx.test.rule.ActivityTestRule; import org.junit.Rule; import org.junit.Test; @@ -30,10 +31,11 @@ import org.xbmc.kore.testhelpers.Utils; import org.xbmc.kore.tests.ui.AbstractTestClass; import org.xbmc.kore.ui.sections.remote.RemoteActivity; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.action.ViewActions.click; -import static android.support.test.espresso.action.ViewActions.longClick; -import static android.support.test.espresso.matcher.ViewMatchers.withId; +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; + public class ButtonTests extends AbstractTestClass { @Rule diff --git a/app/src/androidTest/java/org/xbmc/kore/tests/ui/remote/controlpad/http/KodiPreV17Tests.java b/app/src/androidTest/java/org/xbmc/kore/tests/ui/remote/controlpad/http/KodiPreV17Tests.java index 4d635e9..680a43e 100644 --- a/app/src/androidTest/java/org/xbmc/kore/tests/ui/remote/controlpad/http/KodiPreV17Tests.java +++ b/app/src/androidTest/java/org/xbmc/kore/tests/ui/remote/controlpad/http/KodiPreV17Tests.java @@ -17,7 +17,8 @@ package org.xbmc.kore.tests.ui.remote.controlpad.http; import android.content.Context; -import android.support.test.rule.ActivityTestRule; + +import androidx.test.rule.ActivityTestRule; import org.junit.Rule; import org.junit.Test; @@ -29,9 +30,9 @@ import org.xbmc.kore.testhelpers.Utils; import org.xbmc.kore.tests.ui.AbstractTestClass; import org.xbmc.kore.ui.sections.remote.RemoteActivity; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.action.ViewActions.longClick; -import static android.support.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.action.ViewActions.longClick; +import static androidx.test.espresso.matcher.ViewMatchers.withId; public class KodiPreV17Tests extends AbstractTestClass { @Rule diff --git a/app/src/androidTest/java/org/xbmc/kore/tests/ui/remote/playlistfragment/TCP/PlaylistTests.java b/app/src/androidTest/java/org/xbmc/kore/tests/ui/remote/playlistfragment/TCP/PlaylistTests.java index 06e2625..73adb42 100644 --- a/app/src/androidTest/java/org/xbmc/kore/tests/ui/remote/playlistfragment/TCP/PlaylistTests.java +++ b/app/src/androidTest/java/org/xbmc/kore/tests/ui/remote/playlistfragment/TCP/PlaylistTests.java @@ -17,10 +17,11 @@ package org.xbmc.kore.tests.ui.remote.playlistfragment.TCP; import android.content.Context; -import android.support.test.rule.ActivityTestRule; import android.view.View; import android.widget.TextView; +import androidx.test.rule.ActivityTestRule; + import org.junit.Rule; import org.junit.Test; import org.xbmc.kore.R; @@ -35,14 +36,14 @@ import org.xbmc.kore.ui.sections.remote.RemoteActivity; import java.util.List; import java.util.concurrent.TimeoutException; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.action.ViewActions.swipeLeft; -import static android.support.test.espresso.action.ViewActions.swipeRight; -import static android.support.test.espresso.assertion.ViewAssertions.matches; -import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; -import static android.support.test.espresso.matcher.ViewMatchers.isRoot; -import static android.support.test.espresso.matcher.ViewMatchers.withId; -import static android.support.test.espresso.matcher.ViewMatchers.withText; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.action.ViewActions.swipeLeft; +import static androidx.test.espresso.action.ViewActions.swipeRight; +import static androidx.test.espresso.assertion.ViewAssertions.matches; +import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed; +import static androidx.test.espresso.matcher.ViewMatchers.isRoot; +import static androidx.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.matcher.ViewMatchers.withText; import static org.hamcrest.Matchers.allOf; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertSame; diff --git a/app/src/debug/java/org/xbmc/kore/testutils/tcpserver/MockTcpServer.java b/app/src/debug/java/org/xbmc/kore/testutils/tcpserver/MockTcpServer.java index d636003..fafc7bd 100644 --- a/app/src/debug/java/org/xbmc/kore/testutils/tcpserver/MockTcpServer.java +++ b/app/src/debug/java/org/xbmc/kore/testutils/tcpserver/MockTcpServer.java @@ -38,8 +38,6 @@ import java.util.concurrent.TimeUnit; import javax.net.ServerSocketFactory; - - public class MockTcpServer { public static final String TAG = LogUtils.makeLogTag(MockTcpServer.class); diff --git a/app/src/test/java/org/xbmc/kore/provider/mediaprovider/AbstractTestClass.java b/app/src/test/java/org/xbmc/kore/provider/mediaprovider/AbstractTestClass.java index 5a2d186..5fc20a9 100644 --- a/app/src/test/java/org/xbmc/kore/provider/mediaprovider/AbstractTestClass.java +++ b/app/src/test/java/org/xbmc/kore/provider/mediaprovider/AbstractTestClass.java @@ -16,7 +16,6 @@ package org.xbmc.kore.provider.mediaprovider; - import android.content.ContentProviderClient; import android.content.ContentResolver; import android.content.pm.ProviderInfo; diff --git a/app/src/test/java/org/xbmc/kore/provider/mediaprovider/ArtistsTest.java b/app/src/test/java/org/xbmc/kore/provider/mediaprovider/ArtistsTest.java index e4c1a3c..63cc4be 100644 --- a/app/src/test/java/org/xbmc/kore/provider/mediaprovider/ArtistsTest.java +++ b/app/src/test/java/org/xbmc/kore/provider/mediaprovider/ArtistsTest.java @@ -27,7 +27,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; - public class ArtistsTest extends AbstractTestClass { @Test