SecT0uch
/
Kore
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Migration Tests to AndroidX 

Fix import statements to AndroidX
This commit is contained in:
DoomMortal 2020-04-21 19:29:05 +02:00 committed by Martijn Brekhof
parent 145df0986e
commit 5299e8e607
23 changed files with 149 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
app/src/androidTest/java/org/xbmc/kore/testhelpers/EspressoTestUtils.java
View File

@ -19,40 +19,41 @@ package org.xbmc.kore.testhelpers;
import android.app.Activity; import android.app.Activity;
import android.content.pm.ActivityInfo; import android.content.pm.ActivityInfo;
import android.content.res.Configuration; 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.view.View;
import android.widget.AutoCompleteTextView; import android.widget.AutoCompleteTextView;
import android.widget.TextView; 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 com.sothree.slidinguppanel.SlidingUpPanelLayout;
import org.hamcrest.Matcher; import org.hamcrest.Matcher;
import org.xbmc.kore.R; import org.xbmc.kore.R;
import org.xbmc.kore.testhelpers.action.ViewActions; import org.xbmc.kore.testhelpers.action.ViewActions;
import static android.support.test.espresso.Espresso.onData; import static androidx.test.espresso.Espresso.onData;
import static android.support.test.espresso.Espresso.onView; import static androidx.test.espresso.Espresso.onView;
import static android.support.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu; import static androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu;
import static android.support.test.espresso.Espresso.pressBack; import static androidx.test.espresso.Espresso.pressBack;
import static android.support.test.espresso.action.ViewActions.clearText; import static androidx.test.espresso.action.ViewActions.clearText;
import static android.support.test.espresso.action.ViewActions.click; import static androidx.test.espresso.action.ViewActions.click;
import static android.support.test.espresso.action.ViewActions.closeSoftKeyboard; import static androidx.test.espresso.action.ViewActions.closeSoftKeyboard;
import static android.support.test.espresso.action.ViewActions.typeText; import static androidx.test.espresso.action.ViewActions.typeText;
import static android.support.test.espresso.assertion.ViewAssertions.doesNotExist; import static androidx.test.espresso.assertion.ViewAssertions.doesNotExist;
import static android.support.test.espresso.assertion.ViewAssertions.matches; import static androidx.test.espresso.assertion.ViewAssertions.matches;
import static android.support.test.espresso.matcher.ViewMatchers.hasDescendant; import static androidx.test.espresso.matcher.ViewMatchers.hasDescendant;
import static android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom; import static androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom;
import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
import static android.support.test.espresso.matcher.ViewMatchers.isRoot; import static androidx.test.espresso.matcher.ViewMatchers.isRoot;
import static android.support.test.espresso.matcher.ViewMatchers.withContentDescription; import static androidx.test.espresso.matcher.ViewMatchers.withContentDescription;
import static android.support.test.espresso.matcher.ViewMatchers.withId; import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static android.support.test.espresso.matcher.ViewMatchers.withParent; import static androidx.test.espresso.matcher.ViewMatchers.withParent;
import static android.support.test.espresso.matcher.ViewMatchers.withText; import static androidx.test.espresso.matcher.ViewMatchers.withText;
import static org.hamcrest.CoreMatchers.anything; import static org.hamcrest.CoreMatchers.anything;
import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.allOf;
import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.containsString;

4
app/src/androidTest/java/org/xbmc/kore/testhelpers/LoaderIdlingResource.java
View File

@ -16,8 +16,8 @@
package org.xbmc.kore.testhelpers; package org.xbmc.kore.testhelpers;
import android.support.test.espresso.IdlingResource; import androidx.loader.app.LoaderManager;
import androidx.core.app.LoaderManager; import androidx.test.espresso.IdlingResource;
public class LoaderIdlingResource implements IdlingResource { public class LoaderIdlingResource implements IdlingResource {

7
app/src/androidTest/java/org/xbmc/kore/testhelpers/Matchers.java
View File

@ -17,15 +17,16 @@
package org.xbmc.kore.testhelpers; package org.xbmc.kore.testhelpers;
import android.database.Cursor; 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.MenuItem;
import android.view.View; import android.view.View;
import android.widget.ListView; import android.widget.ListView;
import android.widget.SeekBar; import android.widget.SeekBar;
import android.widget.TextView; 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.BaseMatcher;
import org.hamcrest.Description; import org.hamcrest.Description;
import org.hamcrest.Matcher; import org.hamcrest.Matcher;

1
app/src/androidTest/java/org/xbmc/kore/testhelpers/TestUtils.java
View File

@ -16,7 +16,6 @@
package org.xbmc.kore.testhelpers; package org.xbmc.kore.testhelpers;
import org.xbmc.kore.testutils.tcpserver.handlers.InputHandler; import org.xbmc.kore.testutils.tcpserver.handlers.InputHandler;
import static junit.framework.Assert.assertTrue; import static junit.framework.Assert.assertTrue;

7
app/src/androidTest/java/org/xbmc/kore/testhelpers/Utils.java
View File

@ -21,12 +21,13 @@ import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.os.IBinder; 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.util.Log;
import android.view.Gravity; 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.R;
import org.xbmc.kore.host.HostInfo; import org.xbmc.kore.host.HostInfo;
import org.xbmc.kore.host.HostManager; import org.xbmc.kore.host.HostManager;

13
app/src/androidTest/java/org/xbmc/kore/testhelpers/action/ClearFocus.java
View File

@ -15,15 +15,16 @@
*/ */
package org.xbmc.kore.testhelpers.action; package org.xbmc.kore.testhelpers.action;
import android.support.test.espresso.UiController;
import android.support.test.espresso.ViewAction;
import android.view.View; import android.view.View;
import org.hamcrest.Matcher; import androidx.test.espresso.UiController;
import static org.hamcrest.Matchers.allOf; import androidx.test.espresso.ViewAction;
import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; import org.hamcrest.Matcher;
import static android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom;
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 { public class ClearFocus implements ViewAction {

24
app/src/androidTest/java/org/xbmc/kore/testhelpers/action/NestedScrollTo.java
View File

@ -17,35 +17,35 @@
package org.xbmc.kore.testhelpers.action; package org.xbmc.kore.testhelpers.action;
import android.graphics.Rect; 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.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 android.view.View;
import org.hamcrest.Matcher; import org.hamcrest.Matcher;
import org.xbmc.kore.utils.LogUtils; import org.xbmc.kore.utils.LogUtils;
import static android.support.test.espresso.matcher.ViewMatchers.isDisplayingAtLeast; import static androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom;
import static android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom; import static androidx.test.espresso.matcher.ViewMatchers.isDisplayingAtLeast;
import static android.support.test.espresso.matcher.ViewMatchers.isDescendantOfA; import static androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;
import static android.support.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;
import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.allOf;
import static org.hamcrest.CoreMatchers.anyOf; 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. * 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 { public class NestedScrollTo implements ViewAction {
private final static String TAG = LogUtils.makeLogTag(NestedScrollTo.class); private final static String TAG = LogUtils.makeLogTag(NestedScrollTo.class);
@Override @Override
public Matcher<View> getConstraints() { public Matcher<View> getConstraints() {
return allOf(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE), isDescendantOfA(anyOf( return allOf(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE), ViewMatchers.isDescendantOfA(anyOf(
isAssignableFrom(NestedScrollView.class)))); isAssignableFrom(NestedScrollView.class))));
} }

22
app/src/androidTest/java/org/xbmc/kore/testhelpers/action/ViewActions.java
View File

@ -16,16 +16,16 @@
package org.xbmc.kore.testhelpers.action; 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.view.View;
import android.widget.SeekBar; import android.widget.SeekBar;
@ -35,8 +35,8 @@ import org.hamcrest.TypeSafeMatcher;
import java.util.concurrent.TimeoutException; import java.util.concurrent.TimeoutException;
import static android.support.test.espresso.action.ViewActions.actionWithAssertions; import static androidx.test.espresso.action.ViewActions.actionWithAssertions;
import static android.support.test.espresso.matcher.ViewMatchers.isRoot; import static androidx.test.espresso.matcher.ViewMatchers.isRoot;
public final class ViewActions { public final class ViewActions {

11
app/src/androidTest/java/org/xbmc/kore/tests/ui/AbstractTestClass.java
View File

@ -19,11 +19,12 @@ package org.xbmc.kore.tests.ui;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.support.test.espresso.IdlingRegistry;
import android.support.test.rule.ActivityTestRule; import androidx.appcompat.app.AppCompatActivity;
import android.support.test.runner.AndroidJUnit4; import androidx.preference.PreferenceManager;
import android.support.v7.app.AppCompatActivity; import androidx.test.espresso.IdlingRegistry;
import android.support.v7.preference.PreferenceManager; import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.rule.ActivityTestRule;
import org.junit.After; import org.junit.After;
import org.junit.AfterClass; import org.junit.AfterClass;

24
app/src/androidTest/java/org/xbmc/kore/tests/ui/addons/AddonsActivityTests.java
View File

@ -17,11 +17,12 @@
package org.xbmc.kore.tests.ui.addons; package org.xbmc.kore.tests.ui.addons;
import android.content.Context; import android.content.Context;
import android.support.test.espresso.Espresso;
import android.support.test.rule.ActivityTestRule;
import android.view.View; import android.view.View;
import android.widget.TextView; import android.widget.TextView;
import androidx.test.espresso.Espresso;
import androidx.test.rule.ActivityTestRule;
import org.junit.Before; import org.junit.Before;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; 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.tests.ui.AbstractTestClass;
import org.xbmc.kore.ui.sections.addon.AddonsActivity; import org.xbmc.kore.ui.sections.addon.AddonsActivity;
import static android.support.test.espresso.Espresso.onView; import static androidx.test.espresso.Espresso.onView;
import static android.support.test.espresso.assertion.ViewAssertions.matches; import static androidx.test.espresso.assertion.ViewAssertions.matches;
import static android.support.test.espresso.matcher.ViewMatchers.isRoot; import static androidx.test.espresso.matcher.ViewMatchers.isRoot;
import static android.support.test.espresso.matcher.ViewMatchers.withId; import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static android.support.test.espresso.matcher.ViewMatchers.withParent; import static androidx.test.espresso.matcher.ViewMatchers.withParent;
import static android.support.test.espresso.matcher.ViewMatchers.withText; import static androidx.test.espresso.matcher.ViewMatchers.withText;
import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.allOf;
import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.instanceOf;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
@ -80,12 +81,7 @@ public class AddonsActivityTests extends AbstractTestClass<AddonsActivity> {
@Before @Before
public void setUp() throws Throwable { public void setUp() throws Throwable {
super.setUp(); super.setUp();
onView(isRoot()).perform(ViewActions.waitForView(R.id.list, new ViewActions.CheckStatus() { onView(isRoot()).perform(ViewActions.waitForView(R.id.list, v -> v.isShown(),10000));
@Override
public boolean check(View v) {
return v.isShown();
}
},10000));
} }
/** /**

16
app/src/androidTest/java/org/xbmc/kore/tests/ui/movies/MoviesActivityTests.java
View File

@ -17,23 +17,23 @@
package org.xbmc.kore.tests.ui.movies; package org.xbmc.kore.tests.ui.movies;
import android.content.Context; import android.content.Context;
import android.support.test.espresso.Espresso;
import android.support.test.rule.ActivityTestRule;
import android.widget.TextView; import android.widget.TextView;
import androidx.test.espresso.Espresso;
import androidx.test.rule.ActivityTestRule;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.xbmc.kore.R; import org.xbmc.kore.R;
import org.xbmc.kore.host.HostInfo;
import org.xbmc.kore.testhelpers.EspressoTestUtils; import org.xbmc.kore.testhelpers.EspressoTestUtils;
import org.xbmc.kore.tests.ui.AbstractTestClass; import org.xbmc.kore.tests.ui.AbstractTestClass;
import org.xbmc.kore.ui.sections.video.MoviesActivity; import org.xbmc.kore.ui.sections.video.MoviesActivity;
import static android.support.test.espresso.Espresso.onView; import static androidx.test.espresso.Espresso.onView;
import static android.support.test.espresso.assertion.ViewAssertions.matches; import static androidx.test.espresso.assertion.ViewAssertions.matches;
import static android.support.test.espresso.matcher.ViewMatchers.withId; import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static android.support.test.espresso.matcher.ViewMatchers.withParent; import static androidx.test.espresso.matcher.ViewMatchers.withParent;
import static android.support.test.espresso.matcher.ViewMatchers.withText; import static androidx.test.espresso.matcher.ViewMatchers.withText;
import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.allOf;
import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.instanceOf;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;

7
app/src/androidTest/java/org/xbmc/kore/tests/ui/movies/RestoreSearchQueryListFragmentTest.java
View File

@ -17,9 +17,10 @@
package org.xbmc.kore.tests.ui.movies; package org.xbmc.kore.tests.ui.movies;
import android.content.Context; import android.content.Context;
import android.support.test.espresso.Espresso;
import android.support.test.rule.ActivityTestRule; import androidx.test.espresso.Espresso;
import android.support.test.runner.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.rule.ActivityTestRule;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;

16
app/src/androidTest/java/org/xbmc/kore/tests/ui/music/MusicActivityTests.java
View File

@ -18,23 +18,23 @@ package org.xbmc.kore.tests.ui.music;
import android.content.Context; import android.content.Context;
import android.os.SystemClock; import android.os.SystemClock;
import android.support.test.espresso.Espresso;
import android.support.test.rule.ActivityTestRule;
import android.widget.TextView; import android.widget.TextView;
import androidx.test.espresso.Espresso;
import androidx.test.rule.ActivityTestRule;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.xbmc.kore.R; import org.xbmc.kore.R;
import org.xbmc.kore.host.HostInfo;
import org.xbmc.kore.testhelpers.EspressoTestUtils; import org.xbmc.kore.testhelpers.EspressoTestUtils;
import org.xbmc.kore.tests.ui.AbstractTestClass; import org.xbmc.kore.tests.ui.AbstractTestClass;
import org.xbmc.kore.ui.sections.audio.MusicActivity; import org.xbmc.kore.ui.sections.audio.MusicActivity;
import static android.support.test.espresso.Espresso.onView; import static androidx.test.espresso.Espresso.onView;
import static android.support.test.espresso.assertion.ViewAssertions.matches; import static androidx.test.espresso.assertion.ViewAssertions.matches;
import static android.support.test.espresso.matcher.ViewMatchers.withId; import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static android.support.test.espresso.matcher.ViewMatchers.withParent; import static androidx.test.espresso.matcher.ViewMatchers.withParent;
import static android.support.test.espresso.matcher.ViewMatchers.withText; import static androidx.test.espresso.matcher.ViewMatchers.withText;
import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.allOf;
import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.instanceOf;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;

7
app/src/androidTest/java/org/xbmc/kore/tests/ui/music/RestoreSearchQueryViewPagerTest.java
View File

@ -18,9 +18,10 @@ package org.xbmc.kore.tests.ui.music;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.support.test.espresso.Espresso;
import android.support.test.rule.ActivityTestRule; import androidx.test.espresso.Espresso;
import android.support.test.runner.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.rule.ActivityTestRule;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;

22
app/src/androidTest/java/org/xbmc/kore/tests/ui/music/SlideUpPanelTests.java
View File

@ -16,16 +16,16 @@
package org.xbmc.kore.tests.ui.music; package org.xbmc.kore.tests.ui.music;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.os.SystemClock; import android.os.SystemClock;
import android.support.test.rule.ActivityTestRule;
import android.support.v7.preference.PreferenceManager;
import android.view.View; import android.view.View;
import android.widget.SeekBar; import android.widget.SeekBar;
import android.widget.TextView; import android.widget.TextView;
import androidx.preference.PreferenceManager;
import androidx.test.rule.ActivityTestRule;
import com.sothree.slidinguppanel.SlidingUpPanelLayout; import com.sothree.slidinguppanel.SlidingUpPanelLayout;
import org.junit.Rule; import org.junit.Rule;
@ -45,14 +45,14 @@ import org.xbmc.kore.ui.widgets.RepeatModeButton;
import java.util.concurrent.TimeoutException; import java.util.concurrent.TimeoutException;
import static android.support.test.espresso.Espresso.onView; import static androidx.test.espresso.Espresso.onView;
import static android.support.test.espresso.Espresso.pressBack; import static androidx.test.espresso.Espresso.pressBack;
import static android.support.test.espresso.action.ViewActions.click; import static androidx.test.espresso.action.ViewActions.click;
import static android.support.test.espresso.assertion.ViewAssertions.matches; import static androidx.test.espresso.assertion.ViewAssertions.matches;
import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
import static android.support.test.espresso.matcher.ViewMatchers.isRoot; import static androidx.test.espresso.matcher.ViewMatchers.isRoot;
import static android.support.test.espresso.matcher.ViewMatchers.withId; import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static android.support.test.espresso.matcher.ViewMatchers.withText; import static androidx.test.espresso.matcher.ViewMatchers.withText;
import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.not;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame; import static org.junit.Assert.assertSame;

11
app/src/androidTest/java/org/xbmc/kore/tests/ui/remote/controlpad/eventserver/ButtonTests.java
View File

@ -17,7 +17,8 @@
package org.xbmc.kore.tests.ui.remote.controlpad.eventserver; package org.xbmc.kore.tests.ui.remote.controlpad.eventserver;
import android.content.Context; import android.content.Context;
import android.support.test.rule.ActivityTestRule;
import androidx.test.rule.ActivityTestRule;
import org.junit.After; import org.junit.After;
import org.junit.AfterClass; 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.testutils.eventserver.MockEventServer;
import org.xbmc.kore.ui.sections.remote.RemoteActivity; import org.xbmc.kore.ui.sections.remote.RemoteActivity;
import static android.support.test.espresso.Espresso.onView; import static androidx.test.espresso.Espresso.onView;
import static android.support.test.espresso.action.ViewActions.click; import static androidx.test.espresso.action.ViewActions.click;
import static android.support.test.espresso.action.ViewActions.longClick; import static androidx.test.espresso.action.ViewActions.longClick;
import static android.support.test.espresso.matcher.ViewMatchers.withId; import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static junit.framework.Assert.assertTrue; import static junit.framework.Assert.assertTrue;
public class ButtonTests extends AbstractTestClass<RemoteActivity> { public class ButtonTests extends AbstractTestClass<RemoteActivity> {

9
app/src/androidTest/java/org/xbmc/kore/tests/ui/remote/controlpad/eventserver/KodiPreV17Tests.java
View File

@ -17,7 +17,8 @@
package org.xbmc.kore.tests.ui.remote.controlpad.eventserver; package org.xbmc.kore.tests.ui.remote.controlpad.eventserver;
import android.content.Context; import android.content.Context;
import android.support.test.rule.ActivityTestRule;
import androidx.test.rule.ActivityTestRule;
import org.junit.After; import org.junit.After;
import org.junit.AfterClass; 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.testutils.eventserver.MockEventServer;
import org.xbmc.kore.ui.sections.remote.RemoteActivity; import org.xbmc.kore.ui.sections.remote.RemoteActivity;
import static android.support.test.espresso.Espresso.onView; import static androidx.test.espresso.Espresso.onView;
import static android.support.test.espresso.action.ViewActions.longClick; import static androidx.test.espresso.action.ViewActions.longClick;
import static android.support.test.espresso.matcher.ViewMatchers.withId; import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static junit.framework.Assert.assertTrue; import static junit.framework.Assert.assertTrue;
public class KodiPreV17Tests extends AbstractTestClass<RemoteActivity> { public class KodiPreV17Tests extends AbstractTestClass<RemoteActivity> {

12
app/src/androidTest/java/org/xbmc/kore/tests/ui/remote/controlpad/http/ButtonTests.java
View File

@ -17,7 +17,8 @@
package org.xbmc.kore.tests.ui.remote.controlpad.http; package org.xbmc.kore.tests.ui.remote.controlpad.http;
import android.content.Context; import android.content.Context;
import android.support.test.rule.ActivityTestRule;
import androidx.test.rule.ActivityTestRule;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; 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.tests.ui.AbstractTestClass;
import org.xbmc.kore.ui.sections.remote.RemoteActivity; import org.xbmc.kore.ui.sections.remote.RemoteActivity;
import static android.support.test.espresso.Espresso.onView; import static androidx.test.espresso.Espresso.onView;
import static android.support.test.espresso.action.ViewActions.click; import static androidx.test.espresso.action.ViewActions.click;
import static android.support.test.espresso.action.ViewActions.longClick; import static androidx.test.espresso.action.ViewActions.longClick;
import static android.support.test.espresso.matcher.ViewMatchers.withId; import static androidx.test.espresso.matcher.ViewMatchers.withId;
public class ButtonTests extends AbstractTestClass<RemoteActivity> { public class ButtonTests extends AbstractTestClass<RemoteActivity> {
@Rule @Rule

9
app/src/androidTest/java/org/xbmc/kore/tests/ui/remote/controlpad/http/KodiPreV17Tests.java
View File

@ -17,7 +17,8 @@
package org.xbmc.kore.tests.ui.remote.controlpad.http; package org.xbmc.kore.tests.ui.remote.controlpad.http;
import android.content.Context; import android.content.Context;
import android.support.test.rule.ActivityTestRule;
import androidx.test.rule.ActivityTestRule;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; 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.tests.ui.AbstractTestClass;
import org.xbmc.kore.ui.sections.remote.RemoteActivity; import org.xbmc.kore.ui.sections.remote.RemoteActivity;
import static android.support.test.espresso.Espresso.onView; import static androidx.test.espresso.Espresso.onView;
import static android.support.test.espresso.action.ViewActions.longClick; import static androidx.test.espresso.action.ViewActions.longClick;
import static android.support.test.espresso.matcher.ViewMatchers.withId; import static androidx.test.espresso.matcher.ViewMatchers.withId;
public class KodiPreV17Tests extends AbstractTestClass<RemoteActivity> { public class KodiPreV17Tests extends AbstractTestClass<RemoteActivity> {
@Rule @Rule

19
app/src/androidTest/java/org/xbmc/kore/tests/ui/remote/playlistfragment/TCP/PlaylistTests.java
View File

@ -17,10 +17,11 @@
package org.xbmc.kore.tests.ui.remote.playlistfragment.TCP; package org.xbmc.kore.tests.ui.remote.playlistfragment.TCP;
import android.content.Context; import android.content.Context;
import android.support.test.rule.ActivityTestRule;
import android.view.View; import android.view.View;
import android.widget.TextView; import android.widget.TextView;
import androidx.test.rule.ActivityTestRule;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.xbmc.kore.R; import org.xbmc.kore.R;
@ -35,14 +36,14 @@ import org.xbmc.kore.ui.sections.remote.RemoteActivity;
import java.util.List; import java.util.List;
import java.util.concurrent.TimeoutException; import java.util.concurrent.TimeoutException;
import static android.support.test.espresso.Espresso.onView; import static androidx.test.espresso.Espresso.onView;
import static android.support.test.espresso.action.ViewActions.swipeLeft; import static androidx.test.espresso.action.ViewActions.swipeLeft;
import static android.support.test.espresso.action.ViewActions.swipeRight; import static androidx.test.espresso.action.ViewActions.swipeRight;
import static android.support.test.espresso.assertion.ViewAssertions.matches; import static androidx.test.espresso.assertion.ViewAssertions.matches;
import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
import static android.support.test.espresso.matcher.ViewMatchers.isRoot; import static androidx.test.espresso.matcher.ViewMatchers.isRoot;
import static android.support.test.espresso.matcher.ViewMatchers.withId; import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static android.support.test.espresso.matcher.ViewMatchers.withText; import static androidx.test.espresso.matcher.ViewMatchers.withText;
import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.allOf;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame; import static org.junit.Assert.assertSame;

2
app/src/debug/java/org/xbmc/kore/testutils/tcpserver/MockTcpServer.java
View File

@ -38,8 +38,6 @@ import java.util.concurrent.TimeUnit;
import javax.net.ServerSocketFactory; import javax.net.ServerSocketFactory;
public class MockTcpServer { public class MockTcpServer {
public static final String TAG = LogUtils.makeLogTag(MockTcpServer.class); public static final String TAG = LogUtils.makeLogTag(MockTcpServer.class);

1
app/src/test/java/org/xbmc/kore/provider/mediaprovider/AbstractTestClass.java
View File

@ -16,7 +16,6 @@
package org.xbmc.kore.provider.mediaprovider; package org.xbmc.kore.provider.mediaprovider;
import android.content.ContentProviderClient; import android.content.ContentProviderClient;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.pm.ProviderInfo; import android.content.pm.ProviderInfo;

1
app/src/test/java/org/xbmc/kore/provider/mediaprovider/ArtistsTest.java
View File

@ -27,7 +27,6 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
public class ArtistsTest extends AbstractTestClass { public class ArtistsTest extends AbstractTestClass {
@Test @Test