Android Configure Player Types and Markers

app/src/androidTest/java/me/damonkelley/tictactoe_app/UITest.java

@@ -1,10 +1,10 @@
 package me.damonkelley.tictactoe_app;
 
-import android.preference.Preference;
 import android.preference.PreferenceManager;
 import android.support.test.filters.LargeTest;
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
+import me.damonkelley.tictactoe_app.activity.MainActivity;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -14,10 +14,9 @@
 import static android.support.test.espresso.Espresso.onView;
 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.PreferenceMatchers.withKey;
-import static android.support.test.espresso.matcher.PreferenceMatchers.withSummaryText;
 import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
 import static android.support.test.espresso.matcher.ViewMatchers.withId;
+import static android.support.test.espresso.matcher.ViewMatchers.withSpinnerText;
 import static android.support.test.espresso.matcher.ViewMatchers.withText;
 import static org.hamcrest.CoreMatchers.anything;
 import static org.hamcrest.Matchers.allOf;
@@ -101,7 +100,6 @@ private void clickSpace(int position) {
                 .inAdapterView(withId(R.id.game))
                 .atPosition(position)
                 .perform(click());
-
     }
 
     private void clickAndCheck(int position, String marker) {
@@ -114,21 +112,60 @@ private void clickAndCheck(int position, String marker) {
 
     @Test
     public void playAHumanVsComputerGame() {
-        onData(allOf(is(instanceOf(Preference.class)), withKey("game_type")))
-                .check(matches(isDisplayed()))
-                .perform(click());
+        choosePlayerType(R.id.player_one_type, "Human");
+        choosePlayerType(R.id.player_two_type, "Computer");
+
+        onView(withId(R.id.start_button)).perform(click());
+
+        clickSpace(0);
+        clickSpace(3);
+        clickSpace(1);
 
-        onView(withText("Human vs. Computer")).perform(click());
+        onView(withId(R.id.game_message)).check(matches(withText("O wins!")));
+    }
 
-        onData(allOf(is(instanceOf(Preference.class)), withKey("game_type"), withSummaryText("Human vs. Computer")))
-                .check(matches(isDisplayed()));
+    @Test
+    public void playAComputerVsHumanGame() {
+        choosePlayerType(R.id.player_one_type, "Computer");
+        choosePlayerType(R.id.player_two_type, "Human");
+
+        onView(withId(R.id.start_button)).perform(click());
+
+        clickSpace(0);
+        clickSpace(1);
+
+        onView(withId(R.id.game_message)).check(matches(withText("X wins!")));
+    }
+
+    @Test
+    public void playAComputerVsHumanGameWithOAsFirstMarker() {
+        choosePlayerType(R.id.player_one_type, "Computer");
+        choosePlayerType(R.id.player_two_type, "Human");
+
+        onView(withId(R.id.player_one_marker)).perform(click());
 
         onView(withId(R.id.start_button)).perform(click());
 
         clickSpace(0);
-        clickSpace(3);
         clickSpace(1);
 
         onView(withId(R.id.game_message)).check(matches(withText("O wins!")));
     }
+
+    @Test
+    public void attemptingAComputerVsComputerGameIsNotAllowed() {
+        choosePlayerType(R.id.player_one_type, "Computer");
+        choosePlayerType(R.id.player_two_type, "Computer");
+
+        onView(withText("OK")).check(matches(isDisplayed())).perform(click());
+
+        onView(withId(R.id.player_one_type)).check(matches(withSpinnerText(R.string.human)));
+        onView(withId(R.id.player_two_type)).check(matches(withSpinnerText(R.string.human)));
+    }
+
+
+    private void choosePlayerType(int player_type, String option) {
+        onView(withId(player_type)).perform(click());
+        onData(allOf(is(instanceOf(String.class)), is(option))).perform(click());
+    }
 }

app/src/androidTest/java/me/damonkelley/tictactoe_app/BoardAdapterTest.java → app/src/androidTest/java/me/damonkelley/tictactoe_app/adapter/BoardAdapterTest.java

@@ -1,4 +1,4 @@
-package me.damonkelley.tictactoe_app;
+package me.damonkelley.tictactoe_app.adapter;
 
 import android.support.test.filters.SmallTest;
 import android.support.test.rule.ActivityTestRule;
@@ -7,27 +7,31 @@
 import me.damonkelley.tictactoe.Board;
 import me.damonkelley.tictactoe.Marker;
 import me.damonkelley.tictactoe.Space;
+import me.damonkelley.tictactoe_app.activity.GameActivity;
+import me.damonkelley.tictactoe_app.rule.GameActivityTestRule;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
 
 @SmallTest
 @RunWith(AndroidJUnit4.class)
 public class BoardAdapterTest {
 
+    @Rule
+    public ActivityTestRule<GameActivity> mActivityRule = new GameActivityTestRule();
+
     private Board board;
     private BoardAdapter adapter;
-
-    @Rule
-    public ActivityTestRule<GameActivity> mActivityRule = new ActivityTestRule(GameActivity.class);
+    private GameActivity mActivity;
 
     @Before
     public void setUp() throws Exception {
         board = new Board();
-        adapter = new BoardAdapter(mActivityRule.getActivity(), board);
+        mActivity = mActivityRule.getActivity();
+        adapter = new BoardAdapter(mActivity, board);
     }
 
     @Test
@@ -41,7 +45,7 @@ public void itGetsAViewAtThePosition() {
     @Test
     public void itGetsAViewAtThePositionForA4By4Board() {
         Board board = new Board(4);
-        BoardAdapter adapter = new BoardAdapter(mActivityRule.getActivity(), board);
+        BoardAdapter adapter = new BoardAdapter(mActivity, board);
 
         board.put(new Space(3, 3), Marker.X);
 
@@ -51,8 +55,8 @@ public void itGetsAViewAtThePositionForA4By4Board() {
 
     @Test
     public void theCount() {
-        assertEquals(9, new BoardAdapter(mActivityRule.getActivity(), new Board()).getCount());
-        assertEquals(16, new BoardAdapter(mActivityRule.getActivity(), new Board(4)).getCount());
+        assertEquals(9, new BoardAdapter(mActivity, new Board()).getCount());
+        assertEquals(16, new BoardAdapter(mActivity, new Board(4)).getCount());
     }
 
     @Test

app/src/androidTest/java/me/damonkelley/tictactoe_app/fragment/GameOptionsTest.java

@@ -0,0 +1,99 @@
+package me.damonkelley.tictactoe_app.fragment;
+
+import android.support.test.espresso.ViewInteraction;
+import android.support.test.rule.ActivityTestRule;
+import me.damonkelley.tictactoe.Marker;
+import me.damonkelley.tictactoe_app.R;
+import me.damonkelley.tictactoe_app.activity.MainActivity;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import static android.support.test.espresso.Espresso.onData;
+import static android.support.test.espresso.Espresso.onView;
+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.withId;
+import static android.support.test.espresso.matcher.ViewMatchers.withText;
+import static junit.framework.Assert.assertEquals;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.core.AllOf.allOf;
+
+public class GameOptionsTest {
+
+    @Rule
+    public ActivityTestRule<MainActivity> mActivityRule = new ActivityTestRule(MainActivity.class);
+
+    private GameOptions fragment;
+    private ViewInteraction playerOneMarkerToggle;
+    private ViewInteraction playerTwoMarkerToggle;
+
+    @Before
+    public void setUp() {
+        fragment = (GameOptions) mActivityRule.getActivity()
+                .getFragmentManager()
+                .findFragmentById(R.id.options);
+
+        playerOneMarkerToggle = onView(withId(R.id.player_one_marker));
+        playerTwoMarkerToggle = onView(withId(R.id.player_two_marker));
+    }
+
+    @Test
+    public void choosingHumanAndHuman() {
+        choosePlayerType(R.id.player_one_type, "Human");
+        choosePlayerType(R.id.player_two_type, "Human");
+
+        assertEquals("human-vs-human", fragment.getPreset());
+    }
+
+    @Test
+    public void choosingComputerAndHuman() {
+        choosePlayerType(R.id.player_one_type, "Computer");
+        choosePlayerType(R.id.player_two_type, "Human");
+
+        assertEquals("computer-vs-human", fragment.getPreset());
+    }
+
+    @Test
+    public void choosingHumanAndComputer() {
+        choosePlayerType(R.id.player_one_type, "Human");
+        choosePlayerType(R.id.player_two_type, "Computer");
+
+        assertEquals("human-vs-computer", fragment.getPreset());
+    }
+
+    @Test
+    public void togglingThePlayerOneMarkerTogglesThePlayerTwoMarker() {
+        playerTwoMarkerToggle.check(matches(withText("O")));
+
+        playerOneMarkerToggle.check(matches(withText("X")))
+                .perform(click())
+                .check(matches(withText("O")));
+
+        playerTwoMarkerToggle.check(matches(withText("X")));
+    }
+
+    @Test
+    public void togglingThePlayerTwoMarkerTogglesThePlayerOneMarker() {
+        playerOneMarkerToggle.check(matches(withText("X")));
+
+        playerTwoMarkerToggle.check(matches(withText("O")))
+                .perform(click())
+                .check(matches(withText("X")));
+
+        playerOneMarkerToggle.check(matches(withText("O")));
+    }
+
+    @Test
+    public void getFirstMarker() {
+        assertEquals(Marker.X.toString(), fragment.getFirstMarker());
+        playerOneMarkerToggle.perform(click());
+        assertEquals(Marker.O.toString(), fragment.getFirstMarker());
+    }
+
+    private void choosePlayerType(int player_type, String option) {
+        onView(withId(player_type)).perform(click());
+        onData(allOf(is(instanceOf(String.class)), is(option))).perform(click());
+    }
+}

app/src/androidTest/java/me/damonkelley/tictactoe_app/rule/GameActivityTestRule.java

@@ -0,0 +1,18 @@
+package me.damonkelley.tictactoe_app.rule;
+
+import android.content.Intent;
+import android.support.test.rule.ActivityTestRule;
+import me.damonkelley.tictactoe_app.activity.GameActivity;
+
+public class GameActivityTestRule extends ActivityTestRule<GameActivity> {
+    public GameActivityTestRule() {
+        super(GameActivity.class);
+    }
+
+    @Override
+    protected Intent getActivityIntent() {
+        return new Intent()
+                .putExtra("preset", "human-vs-human")
+                .putExtra("first-marker", "X");
+    }
+}

app/src/androidTest/java/me/damonkelley/tictactoe_app/MessageViewWrapperTest.java → app/src/androidTest/java/me/damonkelley/tictactoe_app/wrapper/MessageViewWrapperTest.java

@@ -1,10 +1,12 @@
-package me.damonkelley.tictactoe_app;
+package me.damonkelley.tictactoe_app.wrapper;
 
 import android.support.test.rule.ActivityTestRule;
 import android.widget.TextView;
 import me.damonkelley.tictactoe.Game;
 import me.damonkelley.tictactoe.Marker;
 import me.damonkelley.tictactoe.Space;
+import me.damonkelley.tictactoe_app.activity.GameActivity;
+import me.damonkelley.tictactoe_app.rule.GameActivityTestRule;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -13,12 +15,12 @@
 
 public class MessageViewWrapperTest {
 
+    @Rule
+    public ActivityTestRule<GameActivity> mActivityRule = new GameActivityTestRule();
+
     private Game game;
     private TextView view;
 
-    @Rule
-    public ActivityTestRule<GameActivity> mActivityRule = new ActivityTestRule(GameActivity.class);
-
     @Before
     public void setUp() throws Exception {
         game = new Game(Marker.X);

app/src/main/AndroidManifest.xml

@@ -8,14 +8,14 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        <activity android:name=".activity.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".GameActivity"></activity>
+        <activity android:name=".activity.GameActivity"></activity>
     </application>
 
 </manifest>