Skip to content

Commit bda327b

Browse files
schmidt-sebastianschmidt-sebastian
authored
Drop FieldValue from tests (#1216)
1 parent 7b0925f commit bda327b

File tree

13 files changed

+418
-499
lines changed

13 files changed

+418
-499
lines changed

‎firebase-firestore/ktx/src/test/java/com/google/firebase/firestore/model/value/FieldValue.java

Lines changed: 0 additions & 61 deletions
This file was deleted.

‎firebase-firestore/ktx/src/test/java/com/google/firebase/firestore/testutil/TestUtil.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,25 +23,25 @@
2323
import com.google.firebase.firestore.model.DocumentSet;
2424
import com.google.firebase.firestore.model.ResourcePath;
2525
import com.google.firebase.firestore.model.SnapshotVersion;
26-
import com.google.firebase.firestore.model.value.FieldValue;
2726
import com.google.firebase.firestore.model.value.ObjectValue;
27+
import com.google.firestore.v1.Value;
2828
import java.util.Comparator;
2929
import java.util.Map;
3030

3131
/** A set of utilities for tests */
3232
public class TestUtil {
3333

34-
public static FieldValue wrap(Object value) {
34+
public static Value wrap(Object value) {
3535
DatabaseId databaseId = DatabaseId.forProject("project");
3636
UserDataReader dataReader = new UserDataReader(databaseId);
3737
// HACK: We use parseQueryValue() since it accepts scalars as well as arrays / objects, and
3838
// our tests currently use wrap() pretty generically so we don't know the intent.
39-
return new FieldValue(dataReader.parseQueryValue(value));
39+
return dataReader.parseQueryValue(value);
4040
}
4141

4242
public static ObjectValue wrapObject(Map<String, Object> value) {
4343
// Cast is safe here because value passed in is a map
44-
return new ObjectValue(wrap(value).getProto());
44+
return new ObjectValue(wrap(value));
4545
}
4646

4747
public static DocumentKey key(String key) {

‎firebase-firestore/ktx/src/test/kotlin/com/google/firebase/firestore/ktx/FirestoreTests.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ class QuerySnapshotTests {
171171
val qs = TestUtil.querySnapshot(
172172
"rooms",
173173
mapOf(),
174-
mapOf("id" to ObjectValue.fromMap(mapOf("a" to wrap(1).proto, "b" to wrap(2).proto))),
174+
mapOf("id" to ObjectValue.fromMap(mapOf("a" to wrap(1), "b" to wrap(2)))),
175175
false,
176176
false)
177177

‎firebase-firestore/src/test/java/com/google/firebase/firestore/UserDataWriterTest.java

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,18 @@
1818
import static com.google.firebase.firestore.testutil.TestUtil.field;
1919
import static com.google.firebase.firestore.testutil.TestUtil.map;
2020
import static com.google.firebase.firestore.testutil.TestUtil.ref;
21-
import static com.google.firebase.firestore.testutil.TestUtil.valueOf;
2221
import static com.google.firebase.firestore.testutil.TestUtil.wrap;
2322
import static com.google.firebase.firestore.testutil.TestUtil.wrapObject;
2423
import static java.util.Arrays.asList;
2524
import static org.junit.Assert.assertEquals;
2625
import static org.junit.Assert.assertNotEquals;
26+
import static org.junit.Assert.assertNull;
2727
import static org.junit.Assert.assertTrue;
2828
import static org.junit.Assert.fail;
2929

3030
import com.google.firebase.Timestamp;
3131
import com.google.firebase.firestore.model.DatabaseId;
3232
import com.google.firebase.firestore.model.DocumentKey;
33-
import com.google.firebase.firestore.model.value.FieldValue;
3433
import com.google.firebase.firestore.model.value.ObjectValue;
3534
import com.google.firebase.firestore.model.value.ProtoValues;
3635
import com.google.firestore.v1.ArrayValue;
@@ -54,15 +53,16 @@ public class UserDataWriterTest {
5453

5554
@Test
5655
public void testConvertsNullValue() {
57-
FieldValue value = wrap(null);
58-
assertEquals(value, new FieldValue(ProtoValues.NULL_VALUE));
56+
Value value = wrap(null);
57+
Object convertedValue = convertValue(value);
58+
assertNull(convertedValue);
5959
}
6060

6161
@Test
6262
public void testConvertsBooleanValue() {
6363
List<Boolean> testCases = asList(true, false);
6464
for (Boolean b : testCases) {
65-
FieldValue value = wrap(b);
65+
Value value = wrap(b);
6666
assertValueType(Value.ValueTypeCase.BOOLEAN_VALUE, value);
6767
Object convertedValue = convertValue(value);
6868
assertEquals(b, convertedValue);
@@ -73,7 +73,7 @@ public void testConvertsBooleanValue() {
7373
public void testConvertsIntegerValue() {
7474
List<Integer> testCases = asList(Integer.MIN_VALUE, -1, 0, 1, Integer.MAX_VALUE);
7575
for (Integer i : testCases) {
76-
FieldValue value = wrap(i);
76+
Value value = wrap(i);
7777
assertValueType(Value.ValueTypeCase.INTEGER_VALUE, value);
7878
Object convertedValue = convertValue(value);
7979
assertEquals(i.longValue(), convertedValue);
@@ -93,7 +93,7 @@ public void testConvertsLongValue() {
9393
Long.valueOf(Integer.MAX_VALUE),
9494
Long.MAX_VALUE);
9595
for (Long l : testCases) {
96-
FieldValue value = wrap(l);
96+
Value value = wrap(l);
9797
assertValueType(Value.ValueTypeCase.INTEGER_VALUE, value);
9898
Object convertedValue = convertValue(value);
9999
assertEquals(l, convertedValue);
@@ -115,7 +115,7 @@ public void testConvertsFloatValue() {
115115
Long.MAX_VALUE * 1.0f,
116116
Float.MAX_VALUE);
117117
for (Float f : testCases) {
118-
FieldValue value = wrap(f);
118+
Value value = wrap(f);
119119
assertValueType(Value.ValueTypeCase.DOUBLE_VALUE, value);
120120
Object convertedValue = convertValue(value);
121121
assertEquals(f.doubleValue(), convertedValue);
@@ -146,7 +146,7 @@ public void testConvertsDoubleValue() {
146146
Double.POSITIVE_INFINITY,
147147
Double.NaN);
148148
for (Double d : testCases) {
149-
FieldValue value = wrap(d);
149+
Value value = wrap(d);
150150
assertValueType(Value.ValueTypeCase.DOUBLE_VALUE, value);
151151
Object convertedValue = convertValue(value);
152152
assertEquals(d, convertedValue);
@@ -162,9 +162,9 @@ public void testConvertsDateValue() {
162162
DocumentSnapshot.ServerTimestampBehavior.DEFAULT);
163163
List<Date> testCases = asList(new Date(0), new Date(1356048000000L));
164164
for (Date d : testCases) {
165-
FieldValue value = wrap(d);
165+
Value value = wrap(d);
166166
assertValueType(Value.ValueTypeCase.TIMESTAMP_VALUE, value);
167-
Object convertedValue = dateWriter.convertValue(value.getProto());
167+
Object convertedValue = dateWriter.convertValue(value);
168168
assertEquals(d, convertedValue);
169169
}
170170
}
@@ -173,7 +173,7 @@ public void testConvertsDateValue() {
173173
public void testConvertsTimestampValue() {
174174
List<Timestamp> testCases = asList(new Timestamp(0, 0), new Timestamp(1356048000L, 0));
175175
for (Timestamp t : testCases) {
176-
FieldValue value = wrap(t);
176+
Value value = wrap(t);
177177
assertValueType(Value.ValueTypeCase.TIMESTAMP_VALUE, value);
178178
Object convertedValue = convertValue(value);
179179
assertEquals(t, convertedValue);
@@ -184,7 +184,7 @@ public void testConvertsTimestampValue() {
184184
public void testConvertsStringValue() {
185185
List<String> testCases = asList("", "foo");
186186
for (String s : testCases) {
187-
FieldValue value = wrap(s);
187+
Value value = wrap(s);
188188
Object convertedValue = convertValue(value);
189189
assertEquals(s, convertedValue);
190190
}
@@ -194,7 +194,7 @@ public void testConvertsStringValue() {
194194
public void testConvertsBlobValue() {
195195
List<Blob> testCases = asList(blob(1, 2, 3), blob(1, 2));
196196
for (Blob b : testCases) {
197-
FieldValue value = wrap(b);
197+
Value value = wrap(b);
198198
Object convertedValue = convertValue(value);
199199
assertEquals(b, convertedValue);
200200
}
@@ -205,7 +205,7 @@ public void testConvertsResourceName() {
205205
DatabaseId id = DatabaseId.forProject("project");
206206
List<DocumentReference> testCases = asList(ref("foo/bar"), ref("foo/baz"));
207207
for (DocumentReference docRef : testCases) {
208-
Value value = valueOf(docRef);
208+
Value value = wrap(docRef);
209209
assertTrue(ProtoValues.isReferenceValue(value));
210210
assertEquals(
211211
TestAccessHelper.referenceKey(docRef), DocumentKey.fromName(value.getReferenceValue()));
@@ -217,7 +217,7 @@ public void testConvertsResourceName() {
217217
public void testConvertsGeoPointValue() {
218218
List<GeoPoint> testCases = asList(new GeoPoint(1.24, 4.56), new GeoPoint(-20, 100));
219219
for (GeoPoint p : testCases) {
220-
FieldValue value = wrap(p);
220+
Value value = wrap(p);
221221
Object convertedValue = convertValue(value);
222222
assertEquals(p, convertedValue);
223223
}
@@ -248,7 +248,7 @@ public void testConvertsSimpleObjects() {
248248
private static ObjectValue fromMap(Object... entries) {
249249
Map<String, Value> res = new HashMap<>();
250250
for (int i = 0; i < entries.length; i += 2) {
251-
res.put((String) entries[i], ((FieldValue) entries[i + 1]).getProto());
251+
res.put((String) entries[i], (Value) entries[i + 1]);
252252
}
253253
return ObjectValue.fromMap(res);
254254
}
@@ -257,19 +257,17 @@ private static ObjectValue fromMap(Object... entries) {
257257
public void testConvertsNestedObjects() {
258258
ObjectValue actual = wrapObject("a", map("b", map("c", "foo"), "d", true));
259259
ObjectValue.Builder expected = ObjectValue.newBuilder();
260-
expected.set(field("a.b.c"), valueOf("foo"));
261-
expected.set(field("a.d"), valueOf(true));
260+
expected.set(field("a.b.c"), wrap("foo"));
261+
expected.set(field("a.d"), wrap(true));
262262
assertEquals(expected.build(), actual);
263263
}
264264

265265
@Test
266266
public void testConvertsLists() {
267267
ArrayValue.Builder expectedArray =
268-
ArrayValue.newBuilder().addValues(valueOf("value")).addValues(valueOf(true));
269-
FieldValue actual = wrap(asList("value", true));
270-
assertTrue(
271-
ProtoValues.equals(
272-
Value.newBuilder().setArrayValue(expectedArray).build(), actual.getProto()));
268+
ArrayValue.newBuilder().addValues(wrap("value")).addValues(wrap(true));
269+
Value actual = wrap(asList("value", true));
270+
assertTrue(ProtoValues.equals(Value.newBuilder().setArrayValue(expectedArray).build(), actual));
273271
}
274272

275273
@Test
@@ -283,11 +281,11 @@ public void testRejectsJavaArrays() {
283281
}
284282
}
285283

286-
private Object convertValue(FieldValue value) {
287-
return writer.convertValue(value.getProto());
284+
private Object convertValue(Value value) {
285+
return writer.convertValue(value);
288286
}
289287

290-
private void assertValueType(Value.ValueTypeCase booleanValue, FieldValue value) {
291-
assertEquals(booleanValue, value.getProto().getValueTypeCase());
288+
private void assertValueType(Value.ValueTypeCase booleanValue, Value value) {
289+
assertEquals(booleanValue, value.getValueTypeCase());
292290
}
293291
}

‎firebase-firestore/src/test/java/com/google/firebase/firestore/core/QueryTest.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import static com.google.firebase.firestore.testutil.TestUtil.path;
2424
import static com.google.firebase.firestore.testutil.TestUtil.ref;
2525
import static com.google.firebase.firestore.testutil.TestUtil.testEquality;
26-
import static com.google.firebase.firestore.testutil.TestUtil.valueOf;
2726
import static java.util.Arrays.asList;
2827
import static org.junit.Assert.assertEquals;
2928
import static org.junit.Assert.assertFalse;
@@ -35,6 +34,7 @@
3534
import com.google.firebase.firestore.model.Document;
3635
import com.google.firebase.firestore.model.ResourcePath;
3736
import com.google.firebase.firestore.testutil.ComparatorTester;
37+
import com.google.firebase.firestore.testutil.TestUtil;
3838
import java.util.Arrays;
3939
import java.util.Collections;
4040
import java.util.List;
@@ -603,13 +603,17 @@ public void testCanonicalIdsAreStable() {
603603
baseQuery
604604
.orderBy(orderBy("a"))
605605
.startAt(
606-
new Bound(Arrays.asList(valueOf("foo"), valueOf(Arrays.asList(1, 2, 3))), true)),
606+
new Bound(
607+
Arrays.asList(TestUtil.wrap("foo"), TestUtil.wrap(Arrays.asList(1, 2, 3))),
608+
true)),
607609
"collection|f:|ob:aasc__name__asc|lb:b:foo,[1,2,3]");
608610
assertCanonicalId(
609611
baseQuery
610612
.orderBy(orderBy("a"))
611613
.endAt(
612-
new Bound(Arrays.asList(valueOf("foo"), valueOf(Arrays.asList(1, 2, 3))), false)),
614+
new Bound(
615+
Arrays.asList(TestUtil.wrap("foo"), TestUtil.wrap(Arrays.asList(1, 2, 3))),
616+
false)),
613617
"collection|f:|ob:aasc__name__asc|ub:a:foo,[1,2,3]");
614618
assertCanonicalId(baseQuery.limitToFirst(5), "collection|f:|ob:__name__asc|l:5");
615619
assertCanonicalId(baseQuery.limitToLast(5), "collection|f:|ob:__name__desc|l:5");

‎firebase-firestore/src/test/java/com/google/firebase/firestore/local/LocalStoreTestCase.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import static com.google.firebase.firestore.testutil.TestUtil.transformMutation;
3131
import static com.google.firebase.firestore.testutil.TestUtil.unknownDoc;
3232
import static com.google.firebase.firestore.testutil.TestUtil.updateRemoteEvent;
33-
import static com.google.firebase.firestore.testutil.TestUtil.valueOf;
3433
import static com.google.firebase.firestore.testutil.TestUtil.values;
3534
import static com.google.firebase.firestore.testutil.TestUtil.version;
3635
import static com.google.firebase.firestore.testutil.TestUtil.viewChanges;
@@ -154,7 +153,9 @@ private void acknowledgeMutation(long documentVersion, @Nullable Object transfor
154153
MutationResult mutationResult =
155154
new MutationResult(
156155
version,
157-
transformResult != null ? Collections.singletonList(valueOf(transformResult)) : null);
156+
transformResult != null
157+
? Collections.singletonList(TestUtil.wrap(transformResult))
158+
: null);
158159
MutationBatchResult result =
159160
MutationBatchResult.create(
160161
batch, version, singletonList(mutationResult), WriteStream.EMPTY_STREAM_TOKEN);

0 commit comments

Comments
 (0)