Additional tests

aws-api/src/test/java/com/amplifyframework/api/aws/AppSyncGraphQLRequestFactoryTest.java

@@ -32,6 +32,9 @@
 import com.amplifyframework.datastore.DataStoreException;
 import com.amplifyframework.testmodels.ecommerce.Item;
 import com.amplifyframework.testmodels.ecommerce.Status;
+import com.amplifyframework.testmodels.lazy.Blog;
+import com.amplifyframework.testmodels.lazy.Post;
+import com.amplifyframework.testmodels.lazy.PostPath;
 import com.amplifyframework.testmodels.meeting.Meeting;
 import com.amplifyframework.testmodels.personcar.MaritalStatus;
 import com.amplifyframework.testmodels.personcar.Person;
@@ -49,6 +52,7 @@
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
+import static com.amplifyframework.core.model.ModelPropertyPathKt.includes;
 import static org.junit.Assert.assertEquals;
 
 /**
@@ -126,6 +130,98 @@ public void buildQueryFromClassAndPredicate() throws JSONException {
         );
     }
 
+    /**
+     * Validate construction of a GraphQL create mutation for a lazy model.
+     * @throws JSONException from JSONAssert.assertEquals
+     */
+    @Test
+    public void buildCreateMutationWithLazyModel() throws JSONException {
+        // Act: generate query
+        Blog blog = Blog.builder().name("My Blog").id("b1").build();
+        Post post = Post.builder().name("My Post").blog(blog).id("p1").build();
+
+        GraphQLRequest<Post> request =
+                AppSyncGraphQLRequestFactory.buildMutation(
+                        post,
+                        QueryPredicates.all(),
+                        MutationType.CREATE
+                );
+
+        // Validate request is expected request
+        JSONAssert.assertEquals(
+                Resources.readAsString("lazy_create_no_includes.txt"),
+                request.getContent(),
+                true
+        );
+    }
+
+    /**
+     * Validate construction of a GraphQL create mutation for a lazy model with includes.
+     * @throws JSONException from JSONAssert.assertEquals
+     */
+    @Test
+    public void buildCreateMutationWithLazyModelAndIncludes() throws JSONException {
+        // Act: generate query
+        Blog blog = Blog.builder().name("My Blog").id("b1").build();
+        Post post = Post.builder().name("My Post").blog(blog).id("p1").build();
+
+        GraphQLRequest<Post> request =
+                AppSyncGraphQLRequestFactory.<Post, Post, PostPath>buildMutation(
+                        post,
+                        QueryPredicates.all(),
+                        MutationType.CREATE,
+                        ((path) -> includes(path.getBlog(), path.getComments()))
+                );
+
+        // Validate request is expected request
+        JSONAssert.assertEquals(
+                Resources.readAsString("lazy_create_with_includes.txt"),
+                request.getContent(),
+                true
+        );
+    }
+
+    /**
+     * Validate construction of a GraphQL query for a lazy model.
+     * @throws JSONException from JSONAssert.assertEquals
+     */
+    @Test
+    public void buildQueryFromLazyModel() throws JSONException {
+        // Act: generate query
+        GraphQLRequest<Post> request =
+                AppSyncGraphQLRequestFactory.buildQuery(Post.class, "p1");
+
+        // Validate request is expected request
+        JSONAssert.assertEquals(
+                Resources.readAsString("lazy_query_no_includes.json"),
+                request.getContent(),
+                true
+        );
+    }
+
+    /**
+     * Validate construction of a GraphQL query for a lazy model with includes.
+     * @throws JSONException from JSONAssert.assertEquals
+     */
+    @Test
+    public void buildQueryFromLazyModelWithIncludes() throws JSONException {
+        // Act: generate query
+        GraphQLRequest<Post> request =
+                AppSyncGraphQLRequestFactory.<Post, Post, PostPath>buildQuery(
+                        Post.class,
+                        "p1",
+                        ((path) -> includes(path.getBlog(), path.getComments()))
+                );
+
+        // Validate request is expected request
+        JSONAssert.assertEquals(
+                Resources.readAsString("lazy_query_with_includes.json"),
+                request.getContent(),
+                true
+        );
+    }
+
+
     /**
      * Validates construction of a delete mutation query from a Person instance, a predicate.
      * @throws JSONException from JSONAssert.assertEquals

aws-api/src/test/resources/lazy_create_no_includes.txt

@@ -0,0 +1 @@
+{"query": "mutation CreatePost($input: CreatePostInput!) {\n  createPost(input: $input) {\n    blog {\n      id\n    }\n    createdAt\n    id\n    name\n    updatedAt\n  }\n}\n", "variables": {"input":{"blogPostsId":"b1","name":"My Post","id":"p1"}}}

aws-api/src/test/resources/lazy_create_with_includes.txt

@@ -0,0 +1 @@
+{"query": "mutation CreatePost($input: CreatePostInput!) {\n  createPost(input: $input) {\n    blog {\n      createdAt\n      id\n      name\n      updatedAt\n    }\n    comments {\n      items {\n        createdAt\n        id\n        post {\n          id\n        }\n        text\n        updatedAt\n      }\n    }\n    createdAt\n    id\n    name\n    updatedAt\n  }\n}\n", "variables": {"input":{"blogPostsId":"b1","name":"My Post","id":"p1"}}}

aws-api/src/test/resources/lazy_query_no_includes.json

@@ -0,0 +1 @@
+{"query": "query GetPost($id: ID!) {\n  getPost(id: $id) {\n    blog {\n      id\n    }\n    createdAt\n    id\n    name\n    updatedAt\n  }\n}\n", "variables": {"id":"p1"}}

aws-api/src/test/resources/lazy_query_with_includes.json

@@ -0,0 +1 @@
+{"query": "query GetPost($id: ID!) {\n  getPost(id: $id) {\n    blog {\n      createdAt\n      id\n      name\n      updatedAt\n    }\n    comments {\n      items {\n        createdAt\n        id\n        post {\n          id\n        }\n        text\n        updatedAt\n      }\n    }\n    createdAt\n    id\n    name\n    updatedAt\n  }\n}\n", "variables": {"id":"p1"}}