Use hover for tests

italankin · Dec 17, 2023 · 3cb5d73 · 3cb5d73
1 parent 2824ece
commit 3cb5d73
Showing 1 changed file with 7 additions and 15 deletions.
diff --git a/app/src/androidTest/java/com/italankin/fifteen/SolveGameTest.java b/app/src/androidTest/java/com/italankin/fifteen/SolveGameTest.java
@@ -1,23 +1,14 @@
 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 static com.italankin.fifteen.util.CustomViewActions.clickXy;
-
 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.game.SnakeGame;
 import com.italankin.fifteen.game.SpiralGame;
-import com.italankin.fifteen.util.Util;
-
+import com.italankin.fifteen.util.HoverSolveAction;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
@@ -27,6 +18,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 SolveGameTest {
@@ -111,11 +107,7 @@ private void setSavedGame(Game game) {
 
     private void solveAndAssert(List<Integer> solution) {
         Game game = GameState.get().game;
-        for (Integer move : solution) {
-            float[] coordinates = Util.tileCenterCoordinates(game, move);
-            onView(withId(R.id.game_view))
-                    .perform(clickXy(coordinates[0], coordinates[1]));
-        }
+        onView(withId(R.id.game_view)).perform(new HoverSolveAction(game, solution));
         Assert.assertTrue(game.isSolved());
     }
 }