Merge branch 'master' into lambda

Author: mwunderl

README.md

@@ -72,10 +72,12 @@ Other branches extend the application's functionality and show the use of other
 - [`cognito`](https://github.com/awslabs/eb-java-scorekeep/tree/cognito) - Support login and store users in an [Amazon Cognito](http://aws.amazon.com/cognito) user pool. Get AWS SDK credentials and make service calls with a Cognito identity pool.
 - [`cognito-basic`](https://github.com/awslabs/eb-java-scorekeep/tree/cognito-basic) - Use Cognito for user ID storage. User pool only, no identity pool.
 - [`lambda`](https://github.com/awslabs/eb-java-scorekeep/tree/lambda) - Call an [AWS Lambda](http://aws.amazon.com/lambda) function to generate random names.
+- [`lambda-worker`](https://github.com/awslabs/eb-java-scorekeep/tree/lambda-worker) - Run a Lambda function periodically to process game records and store the output in Amazon S3.
 - [`sql`](https://github.com/awslabs/eb-java-scorekeep/tree/sql) - Use JDBC to store game histories in an attached PostgreSQL database instance.
 - [`xray`](https://github.com/awslabs/eb-java-scorekeep/tree/xray) - Use the [AWS X-Ray SDK for Java](http://docs.aws.amazon.com/xray-sdk-for-java/latest/javadoc/) to instrument incoming requests, functions, SDK clients, SQL queries, HTTP clients, startup code, and AWS Lambda functions.
 - [`xray-cognito`](https://github.com/awslabs/eb-java-scorekeep/tree/xray-cognito) - Use AWS credentials obtained with Amazon Cognito to upload trace data to X-Ray from the browser.
 - [`xray-gettingstarted`](https://github.com/awslabs/eb-java-scorekeep/tree/xray-gettingstarted) ([tutorial](https://docs.aws.amazon.com/xray/latest/devguide/xray-gettingstarted.html)) - Use the AWS X-Ray SDK for Java to instrument incoming requests and SDK clients (no additional configuration required).
+- [`xray-worker`](https://github.com/awslabs/eb-java-scorekeep/tree/xray-worker) - Instrumented Python Lambda worker function from the `lambda-worker` branch.
 
 Use the procedures in the following sections to run the project on Elastic Beanstalk and configure it for local testing and development.
 

build.gradle

@@ -5,6 +5,7 @@ buildscript {
     dependencies {
         classpath("org.springframework.boot:spring-boot-gradle-plugin:1.4.0.RELEASE")
         classpath("io.spring.gradle:dependency-management-plugin:0.5.4.RELEASE")
+        classpath 'org.junit.platform:junit-platform-gradle-plugin:1.0.0'
     }
 }
 
@@ -13,6 +14,7 @@ apply plugin: 'eclipse'
 apply plugin: 'idea'
 apply plugin: 'spring-boot'
 apply plugin: 'io.spring.dependency-management'
+apply plugin: 'org.junit.platform.gradle.plugin'
 
 jar {
     baseName = 'scorekeep-api'
@@ -32,8 +34,9 @@ dependencies {
     compile("com.amazonaws:aws-java-sdk-dynamodb")
     compile("com.amazonaws:aws-java-sdk-lambda")
     compile("com.amazonaws:aws-java-sdk-sns")
-    testCompile("junit:junit:4.11")
     compile("com.fasterxml.jackson.core:jackson-databind:2.8.4")
+    testCompile("org.junit.jupiter:junit-jupiter-api:5.0.0")
+    testRuntime("org.junit.jupiter:junit-jupiter-engine:5.0.0")
 }
 
 dependencyManagement {

src/main/java/scorekeep/Game.java

@@ -21,8 +21,8 @@ public class Game {
   private String rules;
   private Date startTime;
   private Date endTime;
-  private ArrayList<String> states;
-  private ArrayList<String> moves;
+  private List<String> states;
+  private List<String> moves;
 
   public Game() {
   }
@@ -95,10 +95,10 @@ public void setEndTime(Date endTime) {
   }
 
   @DynamoDBAttribute(attributeName="states")
-  public ArrayList<String> getStates() {
+  public List<String> getStates() {
     return states;
   }
-  public void setStates(ArrayList<String> states) {
+  public void setStates(List<String> states) {
     this.states = states;
   }
   public void setState(String state) {
@@ -109,10 +109,10 @@ public void setState(String state) {
   }
 
   @DynamoDBAttribute(attributeName="moves")
-  public ArrayList<String> getMoves() {
+  public List<String> getMoves() {
     return moves;
   }
-  public void setMoves(ArrayList<String> moves) {
+  public void setMoves(List<String> moves) {
     this.moves = moves;
   }
   public void setMove(String move) {

src/test/java/scorekeep/TicTacToeTest.java

@@ -0,0 +1,32 @@
+package scorekeep;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.junit.jupiter.api.Test;
+
+class TicTacToeTest {
+  private static final Logger logger = LoggerFactory.getLogger(TicTacToe.class);
+
+  @Test
+  void gameplayTest() {
+    Rules rules = TicTacToe.getRules();
+    String state = rules.getInitialState();
+    List<String> moves = new ArrayList<String>(Arrays.asList("X1", "O3", "X4", "O6", "X7"));
+    for (String move : moves) {
+      state = TicTacToe.move(state, move);
+    }
+    assertTrue(TicTacToe.checkWin(TicTacToe.toInt(state.toCharArray(), 'X')));
+  }
+  @Test
+  void checkWinTest() {
+    String state = "OX O XO  X";
+    assertTrue(TicTacToe.checkWin(TicTacToe.toInt(state.toCharArray(), 'X')));
+  }
+
+}