Skip to content

Commit 1de7a74

Browse files
fix(client): use JsonElement in more places
1 parent 54eb187 commit 1de7a74

39 files changed

+2360
-8339
lines changed

src/Orb.Tests/Models/Beta/BetaCreatePlanVersionParamsTest.cs

Lines changed: 36 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ public void FieldRoundtrip_Works()
267267
};
268268
ApiEnum<string, Cadence> expectedCadence = Cadence.Annual;
269269
string expectedItemID = "item_id";
270-
ModelType expectedModelType = JsonSerializer.Deserialize<JsonElement>(
270+
JsonElement expectedModelType = JsonSerializer.Deserialize<JsonElement>(
271271
"\"bulk_with_filters\""
272272
);
273273
string expectedName = "Annual fee";
@@ -306,7 +306,7 @@ public void FieldRoundtrip_Works()
306306
Assert.Equal(expectedBulkWithFiltersConfig, model.BulkWithFiltersConfig);
307307
Assert.Equal(expectedCadence, model.Cadence);
308308
Assert.Equal(expectedItemID, model.ItemID);
309-
Assert.Equal(expectedModelType, model.ModelType);
309+
Assert.True(JsonElement.DeepEquals(expectedModelType, model.ModelType));
310310
Assert.Equal(expectedName, model.Name);
311311
Assert.Equal(expectedBillableMetricID, model.BillableMetricID);
312312
Assert.Equal(expectedBilledInAdvance, model.BilledInAdvance);
@@ -444,7 +444,7 @@ public void FieldRoundtrip_Works()
444444
ApiEnum<string, TieredWithProrationCadence> expectedCadence =
445445
TieredWithProrationCadence.Annual;
446446
string expectedItemID = "item_id";
447-
TieredWithProrationModelType expectedModelType = JsonSerializer.Deserialize<JsonElement>(
447+
JsonElement expectedModelType = JsonSerializer.Deserialize<JsonElement>(
448448
"\"tiered_with_proration\""
449449
);
450450
string expectedName = "Annual fee";
@@ -485,7 +485,7 @@ public void FieldRoundtrip_Works()
485485

486486
Assert.Equal(expectedCadence, model.Cadence);
487487
Assert.Equal(expectedItemID, model.ItemID);
488-
Assert.Equal(expectedModelType, model.ModelType);
488+
Assert.True(JsonElement.DeepEquals(expectedModelType, model.ModelType));
489489
Assert.Equal(expectedName, model.Name);
490490
Assert.Equal(expectedTieredWithProrationConfig, model.TieredWithProrationConfig);
491491
Assert.Equal(expectedBillableMetricID, model.BillableMetricID);
@@ -614,8 +614,9 @@ public void FieldRoundtrip_Works()
614614
PerUnitRate = "per_unit_rate",
615615
};
616616
string expectedItemID = "item_id";
617-
GroupedWithMinMaxThresholdsModelType expectedModelType =
618-
JsonSerializer.Deserialize<JsonElement>("\"grouped_with_min_max_thresholds\"");
617+
JsonElement expectedModelType = JsonSerializer.Deserialize<JsonElement>(
618+
"\"grouped_with_min_max_thresholds\""
619+
);
619620
string expectedName = "Annual fee";
620621
string expectedBillableMetricID = "billable_metric_id";
621622
bool expectedBilledInAdvance = true;
@@ -655,7 +656,7 @@ public void FieldRoundtrip_Works()
655656
model.GroupedWithMinMaxThresholdsConfig
656657
);
657658
Assert.Equal(expectedItemID, model.ItemID);
658-
Assert.Equal(expectedModelType, model.ModelType);
659+
Assert.True(JsonElement.DeepEquals(expectedModelType, model.ModelType));
659660
Assert.Equal(expectedName, model.Name);
660661
Assert.Equal(expectedBillableMetricID, model.BillableMetricID);
661662
Assert.Equal(expectedBilledInAdvance, model.BilledInAdvance);
@@ -766,8 +767,9 @@ public void FieldRoundtrip_Works()
766767
UnitAmount = "unit_amount",
767768
};
768769
string expectedItemID = "item_id";
769-
CumulativeGroupedAllocationModelType expectedModelType =
770-
JsonSerializer.Deserialize<JsonElement>("\"cumulative_grouped_allocation\"");
770+
JsonElement expectedModelType = JsonSerializer.Deserialize<JsonElement>(
771+
"\"cumulative_grouped_allocation\""
772+
);
771773
string expectedName = "Annual fee";
772774
string expectedBillableMetricID = "billable_metric_id";
773775
bool expectedBilledInAdvance = true;
@@ -807,7 +809,7 @@ public void FieldRoundtrip_Works()
807809
model.CumulativeGroupedAllocationConfig
808810
);
809811
Assert.Equal(expectedItemID, model.ItemID);
810-
Assert.Equal(expectedModelType, model.ModelType);
812+
Assert.True(JsonElement.DeepEquals(expectedModelType, model.ModelType));
811813
Assert.Equal(expectedName, model.Name);
812814
Assert.Equal(expectedBillableMetricID, model.BillableMetricID);
813815
Assert.Equal(expectedBilledInAdvance, model.BilledInAdvance);
@@ -902,7 +904,7 @@ public void FieldRoundtrip_Works()
902904

903905
ApiEnum<string, PercentCadence> expectedCadence = PercentCadence.Annual;
904906
string expectedItemID = "item_id";
905-
PercentModelType expectedModelType = JsonSerializer.Deserialize<JsonElement>("\"percent\"");
907+
JsonElement expectedModelType = JsonSerializer.Deserialize<JsonElement>("\"percent\"");
906908
string expectedName = "Annual fee";
907909
PercentConfig expectedPercentConfig = new(0);
908910
string expectedBillableMetricID = "billable_metric_id";
@@ -939,7 +941,7 @@ public void FieldRoundtrip_Works()
939941

940942
Assert.Equal(expectedCadence, model.Cadence);
941943
Assert.Equal(expectedItemID, model.ItemID);
942-
Assert.Equal(expectedModelType, model.ModelType);
944+
Assert.True(JsonElement.DeepEquals(expectedModelType, model.ModelType));
943945
Assert.Equal(expectedName, model.Name);
944946
Assert.Equal(expectedPercentConfig, model.PercentConfig);
945947
Assert.Equal(expectedBillableMetricID, model.BillableMetricID);
@@ -1034,9 +1036,7 @@ public void FieldRoundtrip_Works()
10341036
GroupingKey = "grouping_key",
10351037
};
10361038
string expectedItemID = "item_id";
1037-
EventOutputModelType expectedModelType = JsonSerializer.Deserialize<JsonElement>(
1038-
"\"event_output\""
1039-
);
1039+
JsonElement expectedModelType = JsonSerializer.Deserialize<JsonElement>("\"event_output\"");
10401040
string expectedName = "Annual fee";
10411041
string expectedBillableMetricID = "billable_metric_id";
10421042
bool expectedBilledInAdvance = true;
@@ -1073,7 +1073,7 @@ public void FieldRoundtrip_Works()
10731073
Assert.Equal(expectedCadence, model.Cadence);
10741074
Assert.Equal(expectedEventOutputConfig, model.EventOutputConfig);
10751075
Assert.Equal(expectedItemID, model.ItemID);
1076-
Assert.Equal(expectedModelType, model.ModelType);
1076+
Assert.True(JsonElement.DeepEquals(expectedModelType, model.ModelType));
10771077
Assert.Equal(expectedName, model.Name);
10781078
Assert.Equal(expectedBillableMetricID, model.BillableMetricID);
10791079
Assert.Equal(expectedBilledInAdvance, model.BilledInAdvance);
@@ -1417,8 +1417,9 @@ public void FieldRoundtrip_Works()
14171417
ApiEnum<string, ReplacePricePriceBulkWithFiltersCadence> expectedCadence =
14181418
ReplacePricePriceBulkWithFiltersCadence.Annual;
14191419
string expectedItemID = "item_id";
1420-
ReplacePricePriceBulkWithFiltersModelType expectedModelType =
1421-
JsonSerializer.Deserialize<JsonElement>("\"bulk_with_filters\"");
1420+
JsonElement expectedModelType = JsonSerializer.Deserialize<JsonElement>(
1421+
"\"bulk_with_filters\""
1422+
);
14221423
string expectedName = "Annual fee";
14231424
string expectedBillableMetricID = "billable_metric_id";
14241425
bool expectedBilledInAdvance = true;
@@ -1455,7 +1456,7 @@ public void FieldRoundtrip_Works()
14551456
Assert.Equal(expectedBulkWithFiltersConfig, model.BulkWithFiltersConfig);
14561457
Assert.Equal(expectedCadence, model.Cadence);
14571458
Assert.Equal(expectedItemID, model.ItemID);
1458-
Assert.Equal(expectedModelType, model.ModelType);
1459+
Assert.True(JsonElement.DeepEquals(expectedModelType, model.ModelType));
14591460
Assert.Equal(expectedName, model.Name);
14601461
Assert.Equal(expectedBillableMetricID, model.BillableMetricID);
14611462
Assert.Equal(expectedBilledInAdvance, model.BilledInAdvance);
@@ -1593,8 +1594,9 @@ public void FieldRoundtrip_Works()
15931594
ApiEnum<string, ReplacePricePriceTieredWithProrationCadence> expectedCadence =
15941595
ReplacePricePriceTieredWithProrationCadence.Annual;
15951596
string expectedItemID = "item_id";
1596-
ReplacePricePriceTieredWithProrationModelType expectedModelType =
1597-
JsonSerializer.Deserialize<JsonElement>("\"tiered_with_proration\"");
1597+
JsonElement expectedModelType = JsonSerializer.Deserialize<JsonElement>(
1598+
"\"tiered_with_proration\""
1599+
);
15981600
string expectedName = "Annual fee";
15991601
ReplacePricePriceTieredWithProrationTieredWithProrationConfig expectedTieredWithProrationConfig =
16001602
new([new() { TierLowerBound = "tier_lower_bound", UnitAmount = "unit_amount" }]);
@@ -1632,7 +1634,7 @@ public void FieldRoundtrip_Works()
16321634

16331635
Assert.Equal(expectedCadence, model.Cadence);
16341636
Assert.Equal(expectedItemID, model.ItemID);
1635-
Assert.Equal(expectedModelType, model.ModelType);
1637+
Assert.True(JsonElement.DeepEquals(expectedModelType, model.ModelType));
16361638
Assert.Equal(expectedName, model.Name);
16371639
Assert.Equal(expectedTieredWithProrationConfig, model.TieredWithProrationConfig);
16381640
Assert.Equal(expectedBillableMetricID, model.BillableMetricID);
@@ -1758,8 +1760,9 @@ public void FieldRoundtrip_Works()
17581760
PerUnitRate = "per_unit_rate",
17591761
};
17601762
string expectedItemID = "item_id";
1761-
ReplacePricePriceGroupedWithMinMaxThresholdsModelType expectedModelType =
1762-
JsonSerializer.Deserialize<JsonElement>("\"grouped_with_min_max_thresholds\"");
1763+
JsonElement expectedModelType = JsonSerializer.Deserialize<JsonElement>(
1764+
"\"grouped_with_min_max_thresholds\""
1765+
);
17631766
string expectedName = "Annual fee";
17641767
string expectedBillableMetricID = "billable_metric_id";
17651768
bool expectedBilledInAdvance = true;
@@ -1799,7 +1802,7 @@ public void FieldRoundtrip_Works()
17991802
model.GroupedWithMinMaxThresholdsConfig
18001803
);
18011804
Assert.Equal(expectedItemID, model.ItemID);
1802-
Assert.Equal(expectedModelType, model.ModelType);
1805+
Assert.True(JsonElement.DeepEquals(expectedModelType, model.ModelType));
18031806
Assert.Equal(expectedName, model.Name);
18041807
Assert.Equal(expectedBillableMetricID, model.BillableMetricID);
18051808
Assert.Equal(expectedBilledInAdvance, model.BilledInAdvance);
@@ -1913,8 +1916,9 @@ public void FieldRoundtrip_Works()
19131916
UnitAmount = "unit_amount",
19141917
};
19151918
string expectedItemID = "item_id";
1916-
ReplacePricePriceCumulativeGroupedAllocationModelType expectedModelType =
1917-
JsonSerializer.Deserialize<JsonElement>("\"cumulative_grouped_allocation\"");
1919+
JsonElement expectedModelType = JsonSerializer.Deserialize<JsonElement>(
1920+
"\"cumulative_grouped_allocation\""
1921+
);
19181922
string expectedName = "Annual fee";
19191923
string expectedBillableMetricID = "billable_metric_id";
19201924
bool expectedBilledInAdvance = true;
@@ -1954,7 +1958,7 @@ public void FieldRoundtrip_Works()
19541958
model.CumulativeGroupedAllocationConfig
19551959
);
19561960
Assert.Equal(expectedItemID, model.ItemID);
1957-
Assert.Equal(expectedModelType, model.ModelType);
1961+
Assert.True(JsonElement.DeepEquals(expectedModelType, model.ModelType));
19581962
Assert.Equal(expectedName, model.Name);
19591963
Assert.Equal(expectedBillableMetricID, model.BillableMetricID);
19601964
Assert.Equal(expectedBilledInAdvance, model.BilledInAdvance);
@@ -2052,8 +2056,7 @@ public void FieldRoundtrip_Works()
20522056
ApiEnum<string, ReplacePricePricePercentCadence> expectedCadence =
20532057
ReplacePricePricePercentCadence.Annual;
20542058
string expectedItemID = "item_id";
2055-
ReplacePricePricePercentModelType expectedModelType =
2056-
JsonSerializer.Deserialize<JsonElement>("\"percent\"");
2059+
JsonElement expectedModelType = JsonSerializer.Deserialize<JsonElement>("\"percent\"");
20572060
string expectedName = "Annual fee";
20582061
ReplacePricePricePercentPercentConfig expectedPercentConfig = new(0);
20592062
string expectedBillableMetricID = "billable_metric_id";
@@ -2090,7 +2093,7 @@ public void FieldRoundtrip_Works()
20902093

20912094
Assert.Equal(expectedCadence, model.Cadence);
20922095
Assert.Equal(expectedItemID, model.ItemID);
2093-
Assert.Equal(expectedModelType, model.ModelType);
2096+
Assert.True(JsonElement.DeepEquals(expectedModelType, model.ModelType));
20942097
Assert.Equal(expectedName, model.Name);
20952098
Assert.Equal(expectedPercentConfig, model.PercentConfig);
20962099
Assert.Equal(expectedBillableMetricID, model.BillableMetricID);
@@ -2186,8 +2189,7 @@ public void FieldRoundtrip_Works()
21862189
GroupingKey = "grouping_key",
21872190
};
21882191
string expectedItemID = "item_id";
2189-
ReplacePricePriceEventOutputModelType expectedModelType =
2190-
JsonSerializer.Deserialize<JsonElement>("\"event_output\"");
2192+
JsonElement expectedModelType = JsonSerializer.Deserialize<JsonElement>("\"event_output\"");
21912193
string expectedName = "Annual fee";
21922194
string expectedBillableMetricID = "billable_metric_id";
21932195
bool expectedBilledInAdvance = true;
@@ -2224,7 +2226,7 @@ public void FieldRoundtrip_Works()
22242226
Assert.Equal(expectedCadence, model.Cadence);
22252227
Assert.Equal(expectedEventOutputConfig, model.EventOutputConfig);
22262228
Assert.Equal(expectedItemID, model.ItemID);
2227-
Assert.Equal(expectedModelType, model.ModelType);
2229+
Assert.True(JsonElement.DeepEquals(expectedModelType, model.ModelType));
22282230
Assert.Equal(expectedName, model.Name);
22292231
Assert.Equal(expectedBillableMetricID, model.BillableMetricID);
22302232
Assert.Equal(expectedBilledInAdvance, model.BilledInAdvance);

0 commit comments

Comments
 (0)