THRIFT-5591 Add uuid type to IDL and implement reference code (+ improved self-tests)
Client: compiler general, netstd, Delphi
Patch: Jens Geyer
diff --git a/lib/netstd/Tests/Thrift.PublicInterfaces.Compile.Tests/optional_required_default.thrift b/lib/netstd/Tests/Thrift.PublicInterfaces.Compile.Tests/optional_required_default.thrift
index 4a38205..bf5a379 100644
--- a/lib/netstd/Tests/Thrift.PublicInterfaces.Compile.Tests/optional_required_default.thrift
+++ b/lib/netstd/Tests/Thrift.PublicInterfaces.Compile.Tests/optional_required_default.thrift
@@ -36,57 +36,63 @@
2: optional double opt_two
3: optional i16 opt_three
4: optional string opt_four
- 5: optional binary opt_five
+ 5: optional uuid opt_five
6: optional list<i32> opt_six
7: optional set<i64> opt_seven
8: optional map<i8,i16> opt_eight
+ 9: optional binary opt_nine
11: required Distance req_one
12: required double req_two
13: required i16 req_three
14: required string req_four
- 15: required binary req_five
+ 15: required uuid req_five
16: required list<i32> req_six
17: required set<i64> req_seven
18: required map<i8,i16> req_eight
+ 19: required binary req_nine
21: Distance def_one
22: double def_two
23: i16 def_three
24: string def_four
- 25: binary def_five
+ 25: uuid def_five
26: list<i32> def_six
27: set<i64> def_seven
28: map<i8,i16> def_eight
-
+ 29: binary def_nine
+
// having default values
31: optional Distance opt_one_with_value = Distance.bar
32: optional double opt_two_with_value = 2.22
33: optional i16 opt_three_with_value = 3
34: optional string opt_four_with_value = "four"
- 35: optional binary opt_five_with_value = "five\t"
+ 35: optional uuid opt_five_with_value = "55555555-5555-5555-5555-000000000000"
36: optional list<i32> opt_six_with_value = [6]
37: optional set<i64> opt_seven_with_value = [7]
38: optional map<i8,i16> opt_eight_with_value = { 8 : 8 }
-
+ 39: optional binary opt_nine_with_value = "nine\t"
+
41: required Distance req_one_with_value = Distance.bar
42: required double req_two_with_value = 2.22
43: required i16 req_three_with_value = 3
44: required string req_four_with_value = "four"
- 45: required binary req_five_with_value = "five"
+ 45: required uuid req_five_with_value = "55555555-5555-5555-5555-000000000000"
46: required list<i32> req_six_with_value = [6]
47: required set<i64> req_seven_with_value = [7]
48: required map<i8,i16> req_eight_with_value = { 8 : 8 }
+ 49: required binary req_nine_with_value = "nine"
51: Distance def_one_with_value = Distance.bar
52: double def_two_with_value = 2.22
53: i16 def_three_with_value = 3
54: string def_four_with_value = "four"
- 55: binary def_five_with_value = "five"
+ 55: uuid def_five_with_value = "55555555-5555-5555-5555-000000000000"
56: list<i32> def_six_with_value = [6]
57: set<i64> def_seven_with_value = [7]
58: map<i8,i16> def_eight_with_value = { 8 : 8 }
+ 59: binary def_nine_with_value = "nine"
90: optional bool last_of_the_mohicans
@@ -124,10 +130,11 @@
402: optional double opt_two
403: optional i16 opt_three
404: optional string opt_four
- 405: optional binary opt_five
+ 405: optional uuid opt_five
406: optional list<i32> opt_six
407: optional set<i64> opt_seven
408: optional map<i8,i16> opt_eight
+ 409: optional binary opt_nine
}
typedef RaceDetails RaceDetails2
diff --git a/lib/netstd/Tests/Thrift.Tests/DataModel/DeepCopy.cs b/lib/netstd/Tests/Thrift.Tests/DataModel/DeepCopy.cs
index afffed5..11b5af4 100644
--- a/lib/netstd/Tests/Thrift.Tests/DataModel/DeepCopy.cs
+++ b/lib/netstd/Tests/Thrift.Tests/DataModel/DeepCopy.cs
@@ -81,16 +81,18 @@
Assert.IsFalse(instance.__isset.opt_six);
Assert.IsFalse(instance.__isset.opt_seven);
Assert.IsFalse(instance.__isset.opt_eight);
+ Assert.IsFalse(instance.__isset.opt_nine);
// set all required to null/default
instance.Req_one = default;
instance.Req_two = default;
instance.Req_three = default;
Assert.IsNotNull(instance.Req_four);
- Assert.IsNotNull(instance.Req_five);
- instance.Req_six = default;
- instance.Req_seven = default;;
+ instance.Req_five = default;
+ instance.Req_six = default;
+ instance.Req_seven = default;
instance.Req_eight = default;
+ Assert.IsNotNull(instance.Req_nine);
// leave non-required fields unset again
Assert.IsFalse(instance.__isset.def_one);
@@ -101,6 +103,7 @@
Assert.IsFalse(instance.__isset.def_six);
Assert.IsFalse(instance.__isset.def_seven);
Assert.IsFalse(instance.__isset.def_eight);
+ Assert.IsFalse(instance.__isset.def_nine);
// these should have IDL defaults set
@@ -112,12 +115,13 @@
Assert.IsTrue(instance.__isset.opt_six_with_value);
Assert.IsTrue(instance.__isset.opt_seven_with_value);
Assert.IsTrue(instance.__isset.opt_eight_with_value);
+ Assert.IsTrue(instance.__isset.opt_nine_with_value);
Assert.AreEqual(instance.Req_one_with_value, (Distance)1);
Assert.AreEqual(instance.Req_two_with_value, 2.22);
Assert.AreEqual(instance.Req_three_with_value, 3);
Assert.AreEqual(instance.Req_four_with_value, "four");
- Assert.AreEqual("five", Encoding.UTF8.GetString(instance.Req_five_with_value!));
+ Assert.AreEqual(new Guid("55555555-5555-5555-5555-000000000000"), instance.Req_five_with_value);
Assert.IsTrue(instance.Req_six_with_value!.Count == 1);
Assert.AreEqual(instance.Req_six_with_value[0], 6 );
@@ -128,6 +132,8 @@
Assert.IsTrue(instance.Req_eight_with_value!.Count == 1);
Assert.IsTrue(instance.Req_eight_with_value[8] == 8);
+ Assert.AreEqual("nine", Encoding.UTF8.GetString(instance.Req_nine_with_value!));
+
Assert.IsTrue(instance.__isset.def_one_with_value);
Assert.IsTrue(instance.__isset.def_two_with_value);
Assert.IsTrue(instance.__isset.def_three_with_value);
@@ -136,6 +142,7 @@
Assert.IsTrue(instance.__isset.def_six_with_value);
Assert.IsTrue(instance.__isset.def_seven_with_value);
Assert.IsTrue(instance.__isset.def_eight_with_value);
+ Assert.IsTrue(instance.__isset.def_nine_with_value);
instance.Last_of_the_mohicans = true;
@@ -180,6 +187,7 @@
instance.Opt_six = ModifyValue(instance.Opt_six);
instance.Opt_seven = ModifyValue(instance.Opt_seven);
instance.Opt_eight = ModifyValue(instance.Opt_eight);
+ instance.Opt_nine = ModifyValue(instance.Opt_nine);
instance.Req_one = ModifyValue(instance.Req_one);
instance.Req_two = ModifyValue(instance.Req_two);
@@ -189,6 +197,7 @@
instance.Req_six = ModifyValue(instance.Req_six);
instance.Req_seven = ModifyValue(instance.Req_seven);
instance.Req_eight = ModifyValue(instance.Req_eight);
+ instance.Req_nine = ModifyValue(instance.Req_nine);
instance.Def_one = ModifyValue(instance.Def_one);
instance.Def_two = ModifyValue(instance.Def_two);
@@ -198,6 +207,7 @@
instance.Def_six = ModifyValue(instance.Def_six);
instance.Def_seven = ModifyValue(instance.Def_seven);
instance.Def_eight = ModifyValue(instance.Def_eight);
+ instance.Def_nine = ModifyValue(instance.Def_nine);
instance.Opt_one_with_value = ModifyValue(instance.Opt_one_with_value);
instance.Opt_two_with_value = ModifyValue(instance.Opt_two_with_value);
@@ -207,6 +217,7 @@
instance.Opt_six_with_value = ModifyValue(instance.Opt_six_with_value);
instance.Opt_seven_with_value = ModifyValue(instance.Opt_seven_with_value);
instance.Opt_eight_with_value = ModifyValue(instance.Opt_eight_with_value);
+ instance.Opt_nine_with_value = ModifyValue(instance.Opt_nine_with_value);
instance.Req_one_with_value = ModifyValue(instance.Req_one_with_value);
instance.Req_two_with_value = ModifyValue(instance.Req_two_with_value);
@@ -216,6 +227,7 @@
instance.Req_six_with_value = ModifyValue(instance.Req_six_with_value);
instance.Req_seven_with_value = ModifyValue(instance.Req_seven_with_value);
instance.Req_eight_with_value = ModifyValue(instance.Req_eight_with_value);
+ instance.Req_nine_with_value = ModifyValue(instance.Req_nine_with_value);
instance.Def_one_with_value = ModifyValue(instance.Def_one_with_value);
instance.Def_two_with_value = ModifyValue(instance.Def_two_with_value);
@@ -225,6 +237,7 @@
instance.Def_six_with_value = ModifyValue(instance.Def_six_with_value);
instance.Def_seven_with_value = ModifyValue(instance.Def_seven_with_value);
instance.Def_eight_with_value = ModifyValue(instance.Def_eight_with_value);
+ instance.Def_nine_with_value = ModifyValue(instance.Def_nine_with_value);
instance.Last_of_the_mohicans = ModifyValue(instance.Last_of_the_mohicans);
@@ -435,6 +448,11 @@
return value + "1";
}
+ private static Guid ModifyValue(Guid value)
+ {
+ return new Guid( ModifyValue(value.ToByteArray()));
+ }
+
private static double ModifyValue(double value)
{
return value + 1.1;
@@ -461,6 +479,7 @@
Assert.IsFalse(TCollections.Equals(first.Opt_six, second.Opt_six));
Assert.IsFalse(TCollections.Equals(first.Opt_seven, second.Opt_seven));
Assert.IsFalse(TCollections.Equals(first.Opt_eight, second.Opt_eight));
+ Assert.IsFalse(TCollections.Equals(first.Opt_nine, second.Opt_nine));
Assert.AreNotEqual(first.Req_one, second.Req_one);
Assert.AreNotEqual(first.Req_two, second.Req_two);
@@ -470,6 +489,7 @@
Assert.IsFalse(TCollections.Equals(first.Req_six, second.Req_six));
Assert.IsFalse(TCollections.Equals(first.Req_seven, second.Req_seven));
Assert.IsFalse(TCollections.Equals(first.Req_eight, second.Req_eight));
+ Assert.IsFalse(TCollections.Equals(first.Req_nine, second.Req_nine));
Assert.AreNotEqual(first.Def_one, second.Def_one);
Assert.AreNotEqual(first.Def_two, second.Def_two);
@@ -479,6 +499,7 @@
Assert.IsFalse(TCollections.Equals(first.Def_six, second.Def_six));
Assert.IsFalse(TCollections.Equals(first.Def_seven, second.Def_seven));
Assert.IsFalse(TCollections.Equals(first.Def_eight, second.Def_eight));
+ Assert.IsFalse(TCollections.Equals(first.Def_nine, second.Def_nine));
Assert.AreNotEqual(first.Opt_one_with_value, second.Opt_one_with_value);
Assert.AreNotEqual(first.Opt_two_with_value, second.Opt_two_with_value);
@@ -488,6 +509,7 @@
Assert.IsFalse(TCollections.Equals(first.Opt_six_with_value, second.Opt_six_with_value));
Assert.IsFalse(TCollections.Equals(first.Opt_seven_with_value, second.Opt_seven_with_value));
Assert.IsFalse(TCollections.Equals(first.Opt_eight_with_value, second.Opt_eight_with_value));
+ Assert.IsFalse(TCollections.Equals(first.Opt_nine_with_value, second.Opt_nine_with_value));
Assert.AreNotEqual(first.Req_one_with_value, second.Req_one_with_value);
Assert.AreNotEqual(first.Req_two_with_value, second.Req_two_with_value);
@@ -497,6 +519,7 @@
Assert.IsFalse(TCollections.Equals(first.Req_six_with_value, second.Req_six_with_value));
Assert.IsFalse(TCollections.Equals(first.Req_seven_with_value, second.Req_seven_with_value));
Assert.IsFalse(TCollections.Equals(first.Req_eight_with_value, second.Req_eight_with_value));
+ Assert.IsFalse(TCollections.Equals(first.Req_nine_with_value, second.Req_nine_with_value));
Assert.AreNotEqual(first.Def_one_with_value, second.Def_one_with_value);
Assert.AreNotEqual(first.Def_two_with_value, second.Def_two_with_value);
@@ -506,6 +529,7 @@
Assert.IsFalse(TCollections.Equals(first.Def_six_with_value, second.Def_six_with_value));
Assert.IsFalse(TCollections.Equals(first.Def_seven_with_value, second.Def_seven_with_value));
Assert.IsFalse(TCollections.Equals(first.Def_eight_with_value, second.Def_eight_with_value));
+ Assert.IsFalse(TCollections.Equals(first.Def_nine_with_value, second.Def_nine_with_value));
Assert.AreNotEqual(first.Last_of_the_mohicans, second.Last_of_the_mohicans);
@@ -539,6 +563,7 @@
Assert.IsTrue(TCollections.Equals(first.Opt_six, second.Opt_six));
Assert.IsTrue(TCollections.Equals(first.Opt_seven, second.Opt_seven));
Assert.IsTrue(TCollections.Equals(first.Opt_eight, second.Opt_eight));
+ Assert.IsTrue(TCollections.Equals(first.Opt_nine, second.Opt_nine));
Assert.AreEqual(first.Req_one, second.Req_one);
Assert.AreEqual(first.Req_two, second.Req_two);
@@ -548,6 +573,7 @@
Assert.IsTrue(TCollections.Equals(first.Req_six, second.Req_six));
Assert.IsTrue(TCollections.Equals(first.Req_seven, second.Req_seven));
Assert.IsTrue(TCollections.Equals(first.Req_eight, second.Req_eight));
+ Assert.IsTrue(TCollections.Equals(first.Req_nine, second.Req_nine));
Assert.AreEqual(first.Def_one, second.Def_one);
Assert.AreEqual(first.Def_two, second.Def_two);
@@ -557,6 +583,7 @@
Assert.IsTrue(TCollections.Equals(first.Def_six, second.Def_six));
Assert.IsTrue(TCollections.Equals(first.Def_seven, second.Def_seven));
Assert.IsTrue(TCollections.Equals(first.Def_eight, second.Def_eight));
+ Assert.IsTrue(TCollections.Equals(first.Def_nine, second.Def_nine));
Assert.AreEqual(first.Opt_one_with_value, second.Opt_one_with_value);
Assert.AreEqual(first.Opt_two_with_value, second.Opt_two_with_value);
@@ -566,6 +593,7 @@
Assert.IsTrue(TCollections.Equals(first.Opt_six_with_value, second.Opt_six_with_value));
Assert.IsTrue(TCollections.Equals(first.Opt_seven_with_value, second.Opt_seven_with_value));
Assert.IsTrue(TCollections.Equals(first.Opt_eight_with_value, second.Opt_eight_with_value));
+ Assert.IsTrue(TCollections.Equals(first.Opt_nine_with_value, second.Opt_nine_with_value));
Assert.AreEqual(first.Req_one_with_value, second.Req_one_with_value);
Assert.AreEqual(first.Req_two_with_value, second.Req_two_with_value);
@@ -575,6 +603,7 @@
Assert.IsTrue(TCollections.Equals(first.Req_six_with_value, second.Req_six_with_value));
Assert.IsTrue(TCollections.Equals(first.Req_seven_with_value, second.Req_seven_with_value));
Assert.IsTrue(TCollections.Equals(first.Req_eight_with_value, second.Req_eight_with_value));
+ Assert.IsTrue(TCollections.Equals(first.Req_nine_with_value, second.Req_nine_with_value));
Assert.AreEqual(first.Def_one_with_value, second.Def_one_with_value);
Assert.AreEqual(first.Def_two_with_value, second.Def_two_with_value);
@@ -584,6 +613,7 @@
Assert.IsTrue(TCollections.Equals(first.Def_six_with_value, second.Def_six_with_value));
Assert.IsTrue(TCollections.Equals(first.Def_seven_with_value, second.Def_seven_with_value));
Assert.IsTrue(TCollections.Equals(first.Def_eight_with_value, second.Def_eight_with_value));
+ Assert.IsTrue(TCollections.Equals(first.Def_nine_with_value, second.Def_nine_with_value));
Assert.AreEqual(first.Last_of_the_mohicans, second.Last_of_the_mohicans);
diff --git a/lib/netstd/Tests/Thrift.Tests/DataModel/NullValuesSet.cs b/lib/netstd/Tests/Thrift.Tests/DataModel/NullValuesSet.cs
index ebc1717..80eacc2 100644
--- a/lib/netstd/Tests/Thrift.Tests/DataModel/NullValuesSet.cs
+++ b/lib/netstd/Tests/Thrift.Tests/DataModel/NullValuesSet.cs
@@ -48,19 +48,19 @@
Assert.IsNull(instance.Def_four);
Assert.IsNull(instance.Opt_four);
- // byte[]
- Assert.IsTrue(instance.__isset.def_five);
- Assert.IsTrue(instance.__isset.opt_five);
- Assert.IsTrue((instance.Req_five == null) || (instance.Req_five.Length == 0));
- Assert.IsNull(instance.Def_five);
- Assert.IsNull(instance.Opt_five);
-
// list<>
Assert.IsTrue(instance.__isset.def_six);
Assert.IsTrue(instance.__isset.opt_six);
Assert.IsNull(instance.Req_six);
Assert.IsNull(instance.Opt_six);
Assert.IsNull(instance.Def_six);
+
+ // byte[]
+ Assert.IsTrue(instance.__isset.def_nine);
+ Assert.IsTrue(instance.__isset.opt_nine);
+ Assert.IsTrue((instance.Req_nine == null) || (instance.Req_nine.Length == 0));
+ Assert.IsNull(instance.Def_nine);
+ Assert.IsNull(instance.Opt_nine);
}
[TestMethod]
@@ -80,27 +80,27 @@
instance.Def_four = null;
instance.Opt_four = null;
- // byte[]
- instance.Req_five = null;
- instance.Def_five = null;
- instance.Opt_five = null;
-
// list<>
instance.Req_six = null;
instance.Opt_six = null;
instance.Def_six = null;
+ // byte[]
+ instance.Req_nine = null;
+ instance.Def_nine = null;
+ instance.Opt_nine = null;
+
// back to normal
#pragma warning restore CS8625
// test the setup
CheckInstance(instance);
- // validate proper null checks , any of these throws if not
+ // validate proper null checks, any of these throws if not
instance.ToString();
instance.GetHashCode();
- // validate proper null checks , any of these throws if not
+ // validate proper null checks, any of these throws if not
var copy = instance.DeepCopy();
CheckInstance(copy);
}