Firebase-enabled Tic Tac Toe
- Waiting for another player to join.
- Send them this link to play:
+ Send the other player this link to play, and click link below to wait on the other player:
Your move! Click a square to place your piece.
diff --git a/appengine/firebase-tictactoe/src/test/java/com/example/appengine/firetactoe/DeleteServletTest.java b/appengine/firebase-tictactoe/src/test/java/com/example/appengine/firetactoe/DeleteServletTest.java
index 0df68aaaefc..c466695c841 100644
--- a/appengine/firebase-tictactoe/src/test/java/com/example/appengine/firetactoe/DeleteServletTest.java
+++ b/appengine/firebase-tictactoe/src/test/java/com/example/appengine/firetactoe/DeleteServletTest.java
@@ -16,7 +16,7 @@
package com.example.appengine.firetactoe;
-import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.spy;
@@ -38,6 +38,11 @@
import com.googlecode.objectify.ObjectifyFactory;
import com.googlecode.objectify.ObjectifyService;
import com.googlecode.objectify.util.Closeable;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.util.HashMap;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -46,14 +51,9 @@
import org.junit.runners.JUnit4;
import org.mockito.Matchers;
import org.mockito.Mock;
+import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.util.HashMap;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
/**
* Unit tests for {@link DeleteServlet}.
*/
@@ -98,11 +98,11 @@ public void setUp() throws Exception {
helper.setUp();
dbSession = ObjectifyService.begin();
- servletUnderTest = new DeleteServlet();
+ servletUnderTest = spy(new DeleteServlet());
helper.setEnvIsLoggedIn(true);
// Make sure there are no firebase requests if we don't expect it
- FirebaseChannel.getInstance().httpTransport = null;
+ FirebaseChannel.getInstance(null).httpTransport = null;
}
@After
@@ -117,7 +117,7 @@ public void doPost_noGameKey() throws Exception {
servletUnderTest.doPost(mockRequest, mockResponse);
fail("Should not succeed with no gameKey specified.");
} catch (IllegalArgumentException e) {
- assertThat(e.getMessage()).startsWith("id 'null'");
+ assertTrue(e.getMessage().startsWith("id 'null'"));
}
}
@@ -145,8 +145,8 @@ public LowLevelHttpResponse execute() throws IOException {
};
}
});
- FirebaseChannel.getInstance().httpTransport = mockHttpTransport;
-
+ FirebaseChannel.getInstance(null).httpTransport = mockHttpTransport;
+ Mockito.doReturn(null).when(servletUnderTest).getServletContext();
servletUnderTest.doPost(mockRequest, mockResponse);
verify(mockHttpTransport, times(1)).buildRequest(
diff --git a/appengine/firebase-tictactoe/src/test/java/com/example/appengine/firetactoe/FirebaseChannelTest.java b/appengine/firebase-tictactoe/src/test/java/com/example/appengine/firetactoe/FirebaseChannelTest.java
index 0c92863f77e..5f54243240c 100644
--- a/appengine/firebase-tictactoe/src/test/java/com/example/appengine/firetactoe/FirebaseChannelTest.java
+++ b/appengine/firebase-tictactoe/src/test/java/com/example/appengine/firetactoe/FirebaseChannelTest.java
@@ -16,7 +16,7 @@
package com.example.appengine.firetactoe;
-import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@@ -28,6 +28,8 @@
import com.google.api.client.testing.http.MockLowLevelHttpResponse;
import com.google.appengine.tools.development.testing.LocalAppIdentityServiceTestConfig;
import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -36,9 +38,6 @@
import org.junit.runners.JUnit4;
import org.mockito.MockitoAnnotations;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-
/**
* Unit tests for {@link FirebaseChannel}.
*/
@@ -56,7 +55,7 @@ public static void setUpBeforeClass() {
FirebaseChannel.firebaseConfigStream = new ByteArrayInputStream(
String.format("databaseURL: \"%s\"", FIREBASE_DB_URL).getBytes());
- firebaseChannel = FirebaseChannel.getInstance();
+ firebaseChannel = FirebaseChannel.getInstance(null);
}
@Before
@@ -87,7 +86,7 @@ public LowLevelHttpResponse execute() throws IOException {
};
}
});
- FirebaseChannel.getInstance().httpTransport = mockHttpTransport;
+ FirebaseChannel.getInstance(null).httpTransport = mockHttpTransport;
firebaseChannel.sendFirebaseMessage("my_key", new Game());
@@ -112,7 +111,7 @@ public LowLevelHttpResponse execute() throws IOException {
};
}
});
- FirebaseChannel.getInstance().httpTransport = mockHttpTransport;
+ FirebaseChannel.getInstance(null).httpTransport = mockHttpTransport;
firebaseChannel.sendFirebaseMessage("my_key", null);
@@ -126,7 +125,7 @@ public void createFirebaseToken() throws Exception {
String jwt = firebaseChannel.createFirebaseToken(game, "userId");
- assertThat(jwt).matches("^([\\w+/=-]+\\.){2}[\\w+/=-]+$");
+ assertTrue(jwt.matches("^([\\w+/=-]+\\.){2}[\\w+/=-]+$"));
}
@Test
@@ -146,7 +145,7 @@ public LowLevelHttpResponse execute() throws IOException {
};
}
});
- FirebaseChannel.getInstance().httpTransport = mockHttpTransport;
+ FirebaseChannel.getInstance(null).httpTransport = mockHttpTransport;
Game game = new Game();
firebaseChannel.firebasePut(FIREBASE_DB_URL + "/my/path", game);
@@ -171,7 +170,7 @@ public LowLevelHttpResponse execute() throws IOException {
};
}
});
- FirebaseChannel.getInstance().httpTransport = mockHttpTransport;
+ FirebaseChannel.getInstance(null).httpTransport = mockHttpTransport;
Game game = new Game();
firebaseChannel.firebasePatch(FIREBASE_DB_URL + "/my/path", game);
@@ -196,7 +195,7 @@ public LowLevelHttpResponse execute() throws IOException {
};
}
});
- FirebaseChannel.getInstance().httpTransport = mockHttpTransport;
+ FirebaseChannel.getInstance(null).httpTransport = mockHttpTransport;
Game game = new Game();
firebaseChannel.firebasePost(FIREBASE_DB_URL + "/my/path", game);
@@ -221,7 +220,7 @@ public LowLevelHttpResponse execute() throws IOException {
};
}
});
- FirebaseChannel.getInstance().httpTransport = mockHttpTransport;
+ FirebaseChannel.getInstance(null).httpTransport = mockHttpTransport;
firebaseChannel.firebaseGet(FIREBASE_DB_URL + "/my/path");
@@ -245,7 +244,7 @@ public LowLevelHttpResponse execute() throws IOException {
};
}
});
- FirebaseChannel.getInstance().httpTransport = mockHttpTransport;
+ FirebaseChannel.getInstance(null).httpTransport = mockHttpTransport;
firebaseChannel.firebaseDelete(FIREBASE_DB_URL + "/my/path");
diff --git a/appengine/firebase-tictactoe/src/test/java/com/example/appengine/firetactoe/MoveServletTest.java b/appengine/firebase-tictactoe/src/test/java/com/example/appengine/firetactoe/MoveServletTest.java
index ac07a251028..814d7a6fc8e 100644
--- a/appengine/firebase-tictactoe/src/test/java/com/example/appengine/firetactoe/MoveServletTest.java
+++ b/appengine/firebase-tictactoe/src/test/java/com/example/appengine/firetactoe/MoveServletTest.java
@@ -16,7 +16,7 @@
package com.example.appengine.firetactoe;
-import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
@@ -37,6 +37,11 @@
import com.googlecode.objectify.ObjectifyFactory;
import com.googlecode.objectify.ObjectifyService;
import com.googlecode.objectify.util.Closeable;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.util.HashMap;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -45,14 +50,9 @@
import org.junit.runners.JUnit4;
import org.mockito.Matchers;
import org.mockito.Mock;
+import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.util.HashMap;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
/**
* Unit tests for {@link MoveServlet}.
*/
@@ -97,11 +97,11 @@ public void setUp() throws Exception {
helper.setUp();
dbSession = ObjectifyService.begin();
- servletUnderTest = new MoveServlet();
+ servletUnderTest = spy(new MoveServlet());
helper.setEnvIsLoggedIn(true);
// Make sure there are no firebase requests if we don't expect it
- FirebaseChannel.getInstance().httpTransport = null;
+ FirebaseChannel.getInstance(null).httpTransport = null;
}
@After
@@ -136,12 +136,13 @@ public LowLevelHttpResponse execute() throws IOException {
};
}
});
- FirebaseChannel.getInstance().httpTransport = mockHttpTransport;
+ FirebaseChannel.getInstance(null).httpTransport = mockHttpTransport;
+ Mockito.doReturn(null).when(servletUnderTest).getServletContext();
servletUnderTest.doPost(mockRequest, mockResponse);
game = ofy.load().type(Game.class).id(gameKey).safe();
- assertThat(game.board).isEqualTo(" X ");
+ assertEquals(game.board, " X ");
verify(mockHttpTransport, times(2)).buildRequest(
eq("PATCH"), Matchers.matches(FIREBASE_DB_URL + "/channels/[\\w-]+.json$"));
diff --git a/appengine/firebase-tictactoe/src/test/java/com/example/appengine/firetactoe/OpenedServletTest.java b/appengine/firebase-tictactoe/src/test/java/com/example/appengine/firetactoe/OpenedServletTest.java
index 9b2990196f6..d3a97eded0c 100644
--- a/appengine/firebase-tictactoe/src/test/java/com/example/appengine/firetactoe/OpenedServletTest.java
+++ b/appengine/firebase-tictactoe/src/test/java/com/example/appengine/firetactoe/OpenedServletTest.java
@@ -36,6 +36,11 @@
import com.googlecode.objectify.ObjectifyFactory;
import com.googlecode.objectify.ObjectifyService;
import com.googlecode.objectify.util.Closeable;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.util.HashMap;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -44,14 +49,9 @@
import org.junit.runners.JUnit4;
import org.mockito.Matchers;
import org.mockito.Mock;
+import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.util.HashMap;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
/**
* Unit tests for {@link OpenedServlet}.
*/
@@ -96,11 +96,11 @@ public void setUp() throws Exception {
helper.setUp();
dbSession = ObjectifyService.begin();
- servletUnderTest = new OpenedServlet();
+ servletUnderTest = spy(new OpenedServlet());
helper.setEnvIsLoggedIn(true);
// Make sure there are no firebase requests if we don't expect it
- FirebaseChannel.getInstance().httpTransport = null;
+ FirebaseChannel.getInstance(null).httpTransport = null;
}
@After
@@ -134,8 +134,8 @@ public LowLevelHttpResponse execute() throws IOException {
};
}
});
- FirebaseChannel.getInstance().httpTransport = mockHttpTransport;
-
+ FirebaseChannel.getInstance(null).httpTransport = mockHttpTransport;
+ Mockito.doReturn(null).when(servletUnderTest).getServletContext();
servletUnderTest.doPost(mockRequest, mockResponse);
verify(mockHttpTransport, times(2)).buildRequest(
diff --git a/appengine/firebase-tictactoe/src/test/java/com/example/appengine/firetactoe/TicTacToeServletTest.java b/appengine/firebase-tictactoe/src/test/java/com/example/appengine/firetactoe/TicTacToeServletTest.java
index 7f5fdf90150..de180b2d8e8 100644
--- a/appengine/firebase-tictactoe/src/test/java/com/example/appengine/firetactoe/TicTacToeServletTest.java
+++ b/appengine/firebase-tictactoe/src/test/java/com/example/appengine/firetactoe/TicTacToeServletTest.java
@@ -16,7 +16,7 @@
package com.example.appengine.firetactoe;
-import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.anyString;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.spy;
@@ -38,6 +38,13 @@
import com.googlecode.objectify.ObjectifyFactory;
import com.googlecode.objectify.ObjectifyService;
import com.googlecode.objectify.util.Closeable;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.lang.StringBuffer;
+import java.util.HashMap;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -46,16 +53,9 @@
import org.junit.runners.JUnit4;
import org.mockito.Matchers;
import org.mockito.Mock;
+import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.lang.StringBuffer;
-import java.util.HashMap;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
/**
* Unit tests for {@link TicTacToeServlet}.
*/
@@ -105,7 +105,7 @@ public void setUp() throws Exception {
when(mockRequest.getRequestURL()).thenReturn(new StringBuffer("https://timbre/"));
when(mockRequest.getRequestDispatcher("/WEB-INF/view/index.jsp")).thenReturn(requestDispatcher);
- servletUnderTest = new TicTacToeServlet();
+ servletUnderTest = spy(new TicTacToeServlet());
helper.setEnvIsLoggedIn(true);
}
@@ -133,14 +133,16 @@ public LowLevelHttpResponse execute() throws IOException {
};
}
});
- FirebaseChannel.getInstance().httpTransport = mockHttpTransport;
+ FirebaseChannel.getInstance(null).httpTransport = mockHttpTransport;
+
+ Mockito.doReturn(null).when(servletUnderTest).getServletContext();
servletUnderTest.doGet(mockRequest, mockResponse);
// Make sure the game object was created for a new game
Objectify ofy = ObjectifyService.ofy();
Game game = ofy.load().type(Game.class).first().safe();
- assertThat(game.userX).isEqualTo(USER_ID);
+ assertEquals(game.userX, USER_ID);
verify(mockHttpTransport, times(1)).buildRequest(
eq("PATCH"), Matchers.matches(FIREBASE_DB_URL + "/channels/[\\w-]+.json$"));
@@ -170,7 +172,7 @@ public LowLevelHttpResponse execute() throws IOException {
};
}
});
- FirebaseChannel.getInstance().httpTransport = mockHttpTransport;
+ FirebaseChannel.getInstance(null).httpTransport = mockHttpTransport;
// Insert a game
Objectify ofy = ObjectifyService.ofy();
@@ -180,12 +182,14 @@ public LowLevelHttpResponse execute() throws IOException {
when(mockRequest.getParameter("gameKey")).thenReturn(gameKey);
+ Mockito.doReturn(null).when(servletUnderTest).getServletContext();
+
servletUnderTest.doGet(mockRequest, mockResponse);
// Make sure the game object was updated with the other player
game = ofy.load().type(Game.class).first().safe();
- assertThat(game.userX).isEqualTo("some-other-user-id");
- assertThat(game.userO).isEqualTo(USER_ID);
+ assertEquals(game.userX, "some-other-user-id");
+ assertEquals(game.userO, USER_ID);
verify(mockHttpTransport, times(2)).buildRequest(
eq("PATCH"), Matchers.matches(FIREBASE_DB_URL + "/channels/[\\w-]+.json$"));