[go: nahoru, domu]
Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into ghm
Browse files Browse the repository at this point in the history
  • Loading branch information
@a-maurice
a-maurice committed Jun 8, 2020
2 parents 74621d5 + dab9375 commit 0ea48ae
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 47 deletions.
1 change: 0 additions & 1 deletion auth/testapp/readme.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,6 @@ If any of these options fail please ensure that you have:
Settings**. Select your **Custom Keystore** from the dropdown list and
enter its password. Then, select your **Project Key** alias and enter
your key's password.
enabled in your project, you'll see compile errors from some types in the
- Please see the
[Known Issues](https://firebase.google.com/docs/unity/setup#known-issues)
section of the
Expand Down
105 changes: 59 additions & 46 deletions firestore/testapp/Assets/Firebase/Sample/Firestore/SerializationTestData.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ internal static class SerializationTestData {
private static DateTimeOffset dateTimeOffset = new DateTimeOffset(1990, 1, 2, 3, 4, 5, TimeSpan.FromHours(1));

public static IEnumerable<object[]> TestData(FirebaseFirestore database) {
// TODO(b/153551034): Refactor this using structs or classes.
return new List<object[]>
{
// Simple types
Expand Down Expand Up @@ -91,10 +92,8 @@ internal static class SerializationTestData {
// We don't cover the whole range of ulong
{ new object[] { UInt64Enum.MinValue, (long) 0 } },
{ new object[] { UInt64Enum.MaxRepresentableValue, (long) long.MaxValue } },
#if !UNITY_IOS // TODO(b/141830498): Fix iOS issues.
{ new object[] { CustomConversionEnum.Foo, "Foo" } },
{ new object[] { CustomConversionEnum.Bar, "Bar" } },
#endif

// Timestamps
{ new object[] { Timestamp.FromDateTime(dateTime),
Expand All @@ -116,36 +115,43 @@ internal static class SerializationTestData {
// Array values
{ new object[] { new string[] { "x", "y" }, new List<object> { "x", "y" } } },
{ new object[] { new List<string> { "x", "y" }, new List<object> { "x", "y" } } },
{ new object[] { new int[] { 3, 4 }, new List<object> { 3L, 4L } } },
// Deliberately DateTime rather than Timestamp here - we need to be able to detect the element type to perform the
// per-element deserialization correctly
{ new object[] { new List<DateTime> { dateTime, dateTime },
new List<object> { Timestamp.FromDateTime(dateTime), Timestamp.FromDateTime(dateTime) } } },

// Map values (that can be deserialized again): dictionaries, attributed types, expandos (which are just dictionaries), custom serialized map-like values
// Map values (that can be deserialized again): dictionaries, attributed types, expandos (which are
// just dictionaries), custom serialized map-like values

// Dictionaries
{ new object[] { new Dictionary<string, object> { { "name", "Jon" }, { "score", 10L } },
new Dictionary<string, object> { { "name", "Jon" }, { "score", 10L } } } },
#if !UNITY_IOS // TODO(b/141830498): Fix iOS issues.
{ new object[] { new Dictionary<string, byte> { { "A", 10 }, { "B", 20 } },
new Dictionary<string, object> { { "A", 10L }, { "B", 20L } } } },
{ new object[] { new Dictionary<string, int> { { "A", 10 }, { "B", 20 } },
new Dictionary<string, object> { { "A", 10L }, { "B", 20L } } } },
#endif
{ new object[] { new Dictionary<string, object> { { "name", "Jon" }, { "score", 10L } },
new Dictionary<string, object> { { "name", "Jon" }, { "score", 10L } } } },
// Attributed type (each property has an attribute)
{ new object[] { new GameResult { Name = "Jon", Score = 10 },
new Dictionary<string, object> { { "name", "Jon" }, { "Score", 10L } } } },
// Attributed type contained in a dictionary
{ new object[] {
new Dictionary<string, GameResult>
{ { "result", new GameResult { Name = "Jon", Score = 10 } } },
new Dictionary<string, object>
{ {"result",
new Dictionary<string, object>
{ { "name", "Jon" }, { "Score", 10L } } } } }},
// Attributed type containing a dictionary
#if !UNITY_IOS // TODO(b/141830498): Fix iOS issues.
{ new object[] { new DictionaryInterfaceContainer { Integers = new Dictionary<string, int> { { "A", 10 }, { "B", 20 } } },
new Dictionary<string, object> {
{ "Integers", new Dictionary<string, object> { { "A", 10L }, { "B", 20L } } }
} } },
// Attributed type serialized and deserialized by CustomPlayerConverter
{ new object[] { new CustomPlayer { Name = "Amanda", Score = 15 },
new Dictionary<string, object> { { "PlayerName", "Amanda" }, { "PlayerScore", 15L } } } },
#endif

// Attributed value type serialized and deserialized by CustomValueTypeConverter
#if !UNITY_IOS // TODO(b/141830498): Fix iOS issues.
{ new object[] { new CustomValueType("xyz", 10),
new Dictionary<string, object> { { "Name", "xyz" }, { "Value", 10L } } } },

Expand All @@ -156,29 +162,35 @@ internal static class SerializationTestData {
{ "EnumAttributedByName", "MinValue" },
{ "EnumByNumber", (long)int.MaxValue }
} } },
#endif

// Attributed struct
{ new object[] { new StructModel { Name = "xyz", Value = 10 },
new Dictionary<string, object> { { "Name", "xyz" }, { "Value", 10L } } } },

// Nullable type handling
#if !UNITY_IOS // TODO(b/141830498): Fix iOS issues.
{ new object[] { new NullableContainer { NullableValue = null },
new Dictionary<string, object> { { "NullableValue", null } } } },
{ new object[] { new NullableContainer { NullableValue = 10 },
new Dictionary<string, object> { { "NullableValue", 10L } } } },
{ new object[] { new NullableEnumContainer { NullableValue = null },
new Dictionary<string, object> { { "NullableValue", null } } } },
{ new object[] { new NullableEnumContainer { NullableValue = (Int32Enum) 10 },
new Dictionary<string, object> { { "NullableValue", 10L } } } },
#endif

// Document references
{ new object[] { database.Document("a/b"), database.Document("a/b") } },
};
}


public static IEnumerable<object[]> UnsupportedTestData() {
return new List<object[]>
{
// Nullable type handling
{ new object[] { new NullableContainer { NullableValue = 10 },
new Dictionary<string, object> { { "NullableValue", 10L } } } },
{ new object[] { new NullableEnumContainer { NullableValue = (Int32Enum) 10 },
new Dictionary<string, object> { { "NullableValue", 10L } } } },
// This one fails because the `NullableContainer` it gets back has a random value
// while it should be null.
{ new object[] { new NullableContainer { NullableValue = null },
new Dictionary<string, object> { { "NullableValue", null } } } },
{ new object[] { new NullableEnumContainer { NullableValue = null },
new Dictionary<string, object> { { "NullableValue", null } } } },
};

}

// Only equatable for the sake of testing; that's not a requirement of the serialization code.
[FirestoreData]
internal class GameResult : IEquatable<GameResult> {
Expand All @@ -197,21 +209,22 @@ internal class GameResult : IEquatable<GameResult> {
[FirestoreData]
internal class NullableContainer : IEquatable<NullableContainer> {
[FirestoreProperty]
public int? NullableValue { get; set; }
public long? NullableValue { get; set; }

public override int GetHashCode() { return NullableValue.GetValueOrDefault(); }
public override int GetHashCode() { return (int)NullableValue.GetValueOrDefault().GetHashCode(); }

public override bool Equals(object obj) { return Equals(obj as NullableContainer); }

public bool Equals(NullableContainer other) { return other != null && other.NullableValue == NullableValue; }
public override string ToString() { return String.Format("NullableContainer: {0}", NullableValue.GetValueOrDefault()); }
}

[FirestoreData]
internal class NullableEnumContainer : IEquatable<NullableEnumContainer> {
[FirestoreProperty]
public Int32Enum? NullableValue { get; set; }

public override int GetHashCode() { return (int)NullableValue.GetValueOrDefault(); }
public override int GetHashCode() { return (int)NullableValue.GetValueOrDefault().GetHashCode(); }

public override bool Equals(object obj) { return Equals(obj as NullableEnumContainer); }

Expand Down Expand Up @@ -331,8 +344,8 @@ public sealed class Email {
public Email(string address) { Address = address; }
}

public class EmailConverter : IFirestoreConverter<Email> {
public Email FromFirestore(object value) {
public class EmailConverter : FirestoreConverter<Email> {
public override Email FromFirestore(object value) {
if (value == null) {
throw new ArgumentNullException("value"); // Shouldn't happen
} else if (value is string) {
Expand All @@ -341,7 +354,7 @@ public class EmailConverter : IFirestoreConverter<Email> {
throw new ArgumentException(String.Format("Unexpected data: {}", value.GetType()));
}
}
public object ToFirestore(Email value) { return value == null ? null : value.Address; }
public override object ToFirestore(Email value) { return value == null ? null : value.Address; }
}

[FirestoreData]
Expand Down Expand Up @@ -370,8 +383,8 @@ public class GuidPair2 {
public Guid? GuidOrNull { get; set; }
}

public class GuidConverter : IFirestoreConverter<Guid> {
public Guid FromFirestore(object value) {
public class GuidConverter : FirestoreConverter<Guid> {
public override Guid FromFirestore(object value) {
if (value == null) {
throw new ArgumentNullException("value"); // Shouldn't happen
} else if (value is string) {
Expand All @@ -380,7 +393,7 @@ public class GuidConverter : IFirestoreConverter<Guid> {
throw new ArgumentException(String.Format("Unexpected data: {0}", value.GetType()));
}
}
public object ToFirestore(Guid value) { return value.ToString("N"); }
public override object ToFirestore(Guid value) { return value.ToString("N"); }
}

// Only equatable for the sake of testing; that's not a requirement of the serialization code.
Expand All @@ -394,17 +407,17 @@ public class CustomPlayer : IEquatable<CustomPlayer> {
public bool Equals(CustomPlayer other) { return other != null && other.Name == Name && other.Score == Score; }
}

public class CustomPlayerConverter : IFirestoreConverter<CustomPlayer> {
public CustomPlayer FromFirestore(object value) {
var map = (IDictionary<string, object>)value;
public class CustomPlayerConverter : FirestoreConverter<CustomPlayer> {
public override CustomPlayer FromFirestore(object value) {
var map = (IDictionary<string, object>) value;
return new CustomPlayer {
Name = (string)map["PlayerName"],
Name = (string) map["PlayerName"],
// Unbox to long, then convert to int.
Score = (int)(long)map["PlayerScore"]
Score = (int) (long) map["PlayerScore"]
};
}

public object ToFirestore(CustomPlayer value) {
public override object ToFirestore(CustomPlayer value) {
return new Dictionary<string, object>
{
{ "PlayerName", value.Name },
Expand All @@ -424,21 +437,21 @@ internal struct CustomValueType : IEquatable<CustomValueType> {
}

public override int GetHashCode() { return Name.GetHashCode() + Value; }
public override bool Equals(object obj) { return obj is CustomValueType && Equals((CustomValueType)obj); }
public override bool Equals(object obj) { return obj is CustomValueType && Equals((CustomValueType) obj); }
public bool Equals(CustomValueType other) { return Name == other.Name && Value == other.Value; }
public override string ToString() { return String.Format("CustomValueType: {0}", new { Name, Value }); }
}

internal class CustomValueTypeConverter : IFirestoreConverter<CustomValueType> {
public CustomValueType FromFirestore(object value) {
var dictionary = (IDictionary<string, object>)value;
internal class CustomValueTypeConverter : FirestoreConverter<CustomValueType> {
public override CustomValueType FromFirestore(object value) {
var dictionary = (IDictionary<string, object>) value;
return new CustomValueType(
(string)dictionary["Name"],
(int)(long)dictionary["Value"]
(string) dictionary["Name"],
(int) (long) dictionary["Value"]
);
}

public object ToFirestore(CustomValueType value) {
public override object ToFirestore(CustomValueType value) {
return new Dictionary<string, object>
{
{ "Name", value.Name },
Expand All @@ -455,7 +468,7 @@ internal struct StructModel : IEquatable<StructModel> {
public int Value { get; set; }

public override int GetHashCode() { return Name.GetHashCode() + Value; }
public override bool Equals(object obj) { return obj is StructModel && Equals((StructModel)obj); }
public override bool Equals(object obj) { return obj is StructModel && Equals((StructModel) obj); }
public bool Equals(StructModel other) { return Name == other.Name && Value == other.Value; }

public override string ToString() { return String.Format("StructModel: {0}", new { Name, Value }); }
Expand Down

0 comments on commit 0ea48ae

Please sign in to comment.