Fix tests

Author: italankin

.github/workflows/tests.yml

@@ -59,7 +59,7 @@ jobs:
       - name: run ui tests
         uses: reactivecircus/android-emulator-runner@v2.32.0
         with:
-          api-level: 29
+          api-level: 35
           script: ./gradlew :app:connectedDebugAndroidTest
 
       - name: upload ui tests report

app/build.gradle

@@ -10,7 +10,7 @@ android {
         applicationId 'com.italankin.fifteen'
         versionCode 47
         versionName "1.15.5"
-        minSdkVersion 19
+        minSdkVersion 21
         targetSdkVersion 35
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -65,8 +65,8 @@ android {
 dependencies {
     testImplementation 'junit:junit:4.12'
 
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test:runner:1.4.0'
-    androidTestImplementation 'androidx.test:rules:1.4.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.3.0'
+    androidTestImplementation 'androidx.test:runner:1.7.0'
+    androidTestImplementation 'androidx.test:rules:1.7.0'
 }

app/src/androidTest/java/com/italankin/fifteen/HoverTest.java

@@ -1,20 +1,13 @@
 package com.italankin.fifteen;
 
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.assertion.ViewAssertions.matches;
-import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static androidx.test.espresso.matcher.ViewMatchers.withId;
-
 import android.content.SharedPreferences;
-
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
-
 import com.italankin.fifteen.game.ClassicGame;
 import com.italankin.fifteen.game.Game;
+import com.italankin.fifteen.util.CreateNewGameAction;
 import com.italankin.fifteen.util.HoverSolveAction;
-
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
@@ -24,6 +17,11 @@
 import java.util.Arrays;
 import java.util.List;
 
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+
 @RunWith(AndroidJUnit4.class)
 @LargeTest
 public class HoverTest {
@@ -56,6 +54,9 @@ public void test() {
                 9, 13, 2, 10, 1, 5, 11, 7, 3, 1,
                 5, 2, 10, 9, 13, 14, 15, 11, 7, 6,
                 4, 7, 6, 3, 2, 6, 7, 8, 12);
+
+        onView(withId(R.id.game_view)).perform(new CreateNewGameAction());
+
         Game game = GameState.get().game;
 
         onView(withId(R.id.game_view)).perform(new HoverSolveAction(game, solution));

app/src/androidTest/java/com/italankin/fifteen/SolveGameTest.java

@@ -8,6 +8,7 @@
 import com.italankin.fifteen.game.Game;
 import com.italankin.fifteen.game.SnakeGame;
 import com.italankin.fifteen.game.SpiralGame;
+import com.italankin.fifteen.util.CreateNewGameAction;
 import com.italankin.fifteen.util.HoverSolveAction;
 import org.junit.Assert;
 import org.junit.Before;
@@ -47,6 +48,7 @@ public void classic() {
         )));
 
         onView(withId(R.id.game_view)).check(matches(isDisplayed()));
+        onView(withId(R.id.game_view)).perform(new CreateNewGameAction());
 
         List<Integer> solution = Arrays.asList(
                 2, 15, 9, 12, 1, 5, 12, 8, 4, 9,
@@ -69,6 +71,7 @@ public void snake() {
         )));
 
         onView(withId(R.id.game_view)).check(matches(isDisplayed()));
+        onView(withId(R.id.game_view)).perform(new CreateNewGameAction());
 
         List<Integer> solution = Arrays.asList(
                 4, 1, 6, 12, 9, 4, 1, 6, 7, 5, 12, 3,
@@ -89,6 +92,7 @@ public void spiral() {
         )));
 
         onView(withId(R.id.game_view)).check(matches(isDisplayed()));
+        onView(withId(R.id.game_view)).perform(new CreateNewGameAction());
 
         List<Integer> solution = Arrays.asList(
                 5, 2, 3, 5, 7, 12, 4, 1, 10, 14, 12, 4,

app/src/androidTest/java/com/italankin/fifteen/util/CreateNewGameAction.java

@@ -0,0 +1,26 @@
+package com.italankin.fifteen.util;
+
+import android.view.View;
+import androidx.test.espresso.UiController;
+import androidx.test.espresso.ViewAction;
+import androidx.test.espresso.matcher.ViewMatchers;
+import com.italankin.fifteen.GameSurface;
+import org.hamcrest.Matcher;
+
+public class CreateNewGameAction implements ViewAction {
+
+    @Override
+    public Matcher<View> getConstraints() {
+        return ViewMatchers.isAssignableFrom(GameSurface.class);
+    }
+
+    @Override
+    public String getDescription() {
+        return "Create new game";
+    }
+
+    @Override
+    public void perform(UiController uiController, View view) {
+        ((GameSurface) view).createNewGame(false);
+    }
+}

app/src/main/java/com/italankin/fifteen/GameSurface.java

@@ -446,7 +446,7 @@ public void updateViews() {
         mHardModeView.update();
     }
 
-    private void createNewGame(boolean isUser) {
+    public void createNewGame(boolean isUser) {
         if (Settings.newGameDelay && ((System.currentTimeMillis() - lastSolvedTimestamp) < Constants.NEW_GAME_DELAY)) {
             return;
         }

gradle.properties

@@ -1,3 +1,3 @@
 android.nonFinalResIds=false
 android.nonTransitiveRClass=false
-android.useAndroidX=false
+android.useAndroidX=true