chore: fix integration tests involving model comparison (#1260)

* chore: fix integration tests involving model comparison

* address PR comment

Author: raphkim

aws-api/src/androidTest/java/com/amplifyframework/api/aws/CodeGenerationInstrumentationTest.java

@@ -32,6 +32,7 @@
 import com.amplifyframework.testmodels.ratingsblog.User;
 import com.amplifyframework.testmodels.teamproject.Projectfields;
 import com.amplifyframework.testmodels.teamproject.Team;
+import com.amplifyframework.testutils.FieldValue;
 import com.amplifyframework.testutils.sync.SynchronousApi;
 
 import org.junit.BeforeClass;
@@ -87,10 +88,19 @@ public void queryMatchesMutationResult() throws ApiException, ParseException {
             .relationship(MaritalStatus.married)
             .build();
         Person createdPerson = api.create(PERSON_API_NAME, david);
+        try {
+            // API creates model with "createdAt" and "updatedAt" fields, which local models don't have.
+            // Manually write these in.
+            FieldValue.set(david, "createdAt", createdPerson.getCreatedAt());
+            FieldValue.set(david, "updatedAt", createdPerson.getUpdatedAt());
+        } catch (NoSuchFieldException | IllegalAccessException error) {
+            // Failure to override these fields will fail the assertion anyways
+        }
         assertEquals(david, createdPerson);
 
         // Query for that created person, expect him to be there
         Person queriedPerson = api.get(PERSON_API_NAME, Person.class, createdPerson.getId());
+        // Do NOT override createdAt/updatedAt fields here to confirm that synced items have same values.
         assertEquals(createdPerson, queriedPerson);
     }
 

aws-datastore/src/androidTest/java/com/amplifyframework/datastore/AppSyncClientInstrumentationTest.java

@@ -42,12 +42,12 @@
 import com.amplifyframework.testmodels.commentsblog.Post;
 import com.amplifyframework.testmodels.commentsblog.PostStatus;
 import com.amplifyframework.testutils.Await;
+import com.amplifyframework.testutils.FieldValue;
 import com.amplifyframework.testutils.Resources;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.lang.reflect.Field;
 import java.util.Date;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -110,8 +110,8 @@ public void testAllOperations() throws AmplifyException, NoSuchFieldException, I
 
         // The response from AppSync has createdAt and updatedAt fields.  We can't actually know what values to expect
         // for these, so just null them out.
-        setField(actual, "createdAt", null);
-        setField(actual, "updatedAt", null);
+        FieldValue.set(actual, "createdAt", null);
+        FieldValue.set(actual, "updatedAt", null);
 
         assertEquals(owner, actual);
         assertEquals(new Integer(1), blogOwnerCreateResult.getSyncMetadata().getVersion());
@@ -361,11 +361,4 @@ private <T extends Model> Observable<GraphQLResponse<ModelWithMetadata<T>>> onCr
             });
         });
     }
-
-    private <T extends Model> void setField(T instance, String fieldName, Object value)
-            throws NoSuchFieldException, IllegalAccessException {
-        Field privateField = instance.getClass().getDeclaredField(fieldName);
-        privateField.setAccessible(true);
-        privateField.set(instance, value);
-    }
 }

testutils/src/main/java/com/amplifyframework/testutils/FieldValue.java

@@ -0,0 +1,43 @@
+/*
+ * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amplifyframework.testutils;
+
+import com.amplifyframework.core.model.Model;
+
+import java.lang.reflect.Field;
+
+/**
+ * Helper class to manipulate model field data for testing purposes.
+ */
+public final class FieldValue {
+    private FieldValue() {}
+
+    /**
+     * Sets the field value of a model to new value.
+     * @param instance model instance
+     * @param fieldName name of the field being written to
+     * @param value new value to override field value with
+     * @param <T> type of model
+     * @throws NoSuchFieldException if fieldName is not a field of given instance
+     * @throws IllegalAccessException if object's field is not accessible
+     */
+    public static <T extends Model> void set(T instance, String fieldName, Object value)
+            throws NoSuchFieldException, IllegalAccessException {
+        Field privateField = instance.getClass().getDeclaredField(fieldName);
+        privateField.setAccessible(true);
+        privateField.set(instance, value);
+    }
+}