Skip to content

Commit

Permalink
Merge pull request #500 from thomas-anu/master
Browse files Browse the repository at this point in the history 
490-Fixes issue with item requested not found when calling endpoint
  • Loading branch information
@manishT72
manishT72 authored Jan 29, 2024
2 parents d41816d + 94a2363 commit af948bb
Show file tree
Hide file tree
Showing 50 changed files with 124 additions and 22 deletions.
2 changes: 1 addition & 1 deletion Xero.NetStandard.OAuth2.Test/Helpers/JsonDoc.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public static void Assert<TModel, TProperty>(IJsonValue input, Func<TModel, TPro
""{input.PropertyName}"": {input.GetJsonRepresentation()}
}}";
}

response.StatusCode = System.Net.HttpStatusCode.OK;
var deserializer = new CustomJsonCodec(new Configuration());
var output = deserializer.Deserialize<TModel>(response);
Xunit.Assert.Equal(shouldBe, toProperty(output));
Expand Down
3 changes: 2 additions & 1 deletion Xero.NetStandard.OAuth2.Test/Model/Accounting/InvoiceTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,8 @@ public void CISDeduction_IsNumber_DeserializesCorrectly(string number)
response.Content = $@"{{
""CISDeduction"": {number}
}}";

response.StatusCode = System.Net.HttpStatusCode.OK;

var deserializer = new CustomJsonCodec(new Configuration());
var invoices = deserializer.Deserialize<Invoice>(response);

Expand Down
2 changes: 2 additions & 0 deletions Xero.NetStandard.OAuth2.Test/Model/Bankfeeds/CountryCodeTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ public void CountryCode_ValidInput_Deserialises(string input, CountryCode expect
{
var response = new RestResponse();
response.Content = $@"""{input}""";
response.StatusCode = System.Net.HttpStatusCode.OK;

var deserializer = new CustomJsonCodec(new Configuration());
var actual = deserializer.Deserialize<CountryCode>(response);
Expand All @@ -69,6 +70,7 @@ public void CountryCode_NullInput_Deserialises()
{
var response = new RestResponse();
response.Content = "null";
response.StatusCode = System.Net.HttpStatusCode.OK;

var deserializer = new CustomJsonCodec(new Configuration());
var actual = deserializer.Deserialize<CountryCode>(response);
Expand Down
2 changes: 2 additions & 0 deletions Xero.NetStandard.OAuth2.Test/Model/Bankfeeds/CreditDebitIndicatorTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ public void CreditDebitIndicator_ValidInput_Deserialises(string input, CreditDeb
{
var response = new RestResponse();
response.Content = $@"""{input}""";
response.StatusCode = System.Net.HttpStatusCode.OK;

var deserializer = new CustomJsonCodec(new Configuration());
var actual = deserializer.Deserialize<CreditDebitIndicator>(response);
Expand All @@ -69,6 +70,7 @@ public void CreditDebitIndicator_NullInput_Deserialises()
{
var response = new RestResponse();
response.Content = "null";
response.StatusCode = System.Net.HttpStatusCode.OK;

var deserializer = new CustomJsonCodec(new Configuration());
var actual = deserializer.Deserialize<CreditDebitIndicator>(response);
Expand Down
2 changes: 2 additions & 0 deletions Xero.NetStandard.OAuth2.Test/Model/Bankfeeds/CurrencyCodeTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ public void CurrencyCode_ValidInput_Deserialises(string input, CurrencyCode expe
{
var response = new RestResponse();
response.Content = $@"""{input}""";
response.StatusCode = System.Net.HttpStatusCode.OK;

var deserializer = new CustomJsonCodec(new Configuration());
var actual = deserializer.Deserialize<CurrencyCode>(response);
Expand All @@ -69,6 +70,7 @@ public void CurrencyCode_NullInput_Deserialises()
{
var response = new RestResponse();
response.Content = "null";
response.StatusCode = System.Net.HttpStatusCode.OK;

var deserializer = new CustomJsonCodec(new Configuration());
var actual = deserializer.Deserialize<CurrencyCode>(response);
Expand Down
2 changes: 2 additions & 0 deletions Xero.NetStandard.OAuth2.Test/Model/Bankfeeds/EndBalanceTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ public void Amount_GivenValidInputs_Deserialises(string input)
response.Content = $@"{{
""Amount"": {input}
}}";
response.StatusCode = System.Net.HttpStatusCode.OK;

var deserializer = new CustomJsonCodec(new Configuration());
var actual = deserializer.Deserialize<EndBalance>(response);
Expand All @@ -70,6 +71,7 @@ public void CreditDebitIndicator_NotPresent_DeserialisesTo0()
{
var response = new RestResponse();
response.Content = "{}";
response.StatusCode = System.Net.HttpStatusCode.OK;

var deserializer = new CustomJsonCodec(new Configuration());
var actual = deserializer.Deserialize<EndBalance>(response);
Expand Down
3 changes: 3 additions & 0 deletions Xero.NetStandard.OAuth2.Test/Model/Bankfeeds/ErrorTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ public void Type_ValidInput_Deserialises(string input, Error.TypeEnum expected)
response.Content = $@"{{
""Type"": ""{input}""
}}";
response.StatusCode = System.Net.HttpStatusCode.OK;

var deserializer = new CustomJsonCodec(new Configuration());
var actual = deserializer.Deserialize<Error>(response);
Expand All @@ -91,6 +92,7 @@ public void Type_NullInput_DeserialisesTo0()
response.Content = $@"{{
""Type"": null
}}";
response.StatusCode = System.Net.HttpStatusCode.OK;

var deserializer = new CustomJsonCodec(new Configuration());
var actual = deserializer.Deserialize<Error>(response);
Expand All @@ -106,6 +108,7 @@ public void Type_NotPresentInInput_DeserialisesTo0()
{
var response = new RestResponse();
response.Content = "{}";
response.StatusCode = System.Net.HttpStatusCode.OK;

var deserializer = new CustomJsonCodec(new Configuration());
var actual = deserializer.Deserialize<Error>(response);
Expand Down
3 changes: 2 additions & 1 deletion Xero.NetStandard.OAuth2.Test/Model/Bankfeeds/FeedConnectionTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public void AccountType_ValidInputs_Deserialises(string input, FeedConnection.Ac
toProperty: (x) => x.AccountType,
shouldBe: expected
);
}
}

/// <summary>
/// Test the property 'Status'
Expand Down Expand Up @@ -88,6 +88,7 @@ public void Error_GivenValidInput_Deserialises()
""detail"": ""Detail""
}}
}}";
response.StatusCode = System.Net.HttpStatusCode.OK;

var deserializer = new CustomJsonCodec(new Configuration());
var actual = deserializer.Deserialize<FeedConnection>(response);
Expand Down
2 changes: 2 additions & 0 deletions Xero.NetStandard.OAuth2.Test/Model/Bankfeeds/StartBalanceTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ public void Amount_GivenValidInputs_Deserialises(string input)
response.Content = $@"{{
""Amount"": {input}
}}";
response.StatusCode = System.Net.HttpStatusCode.OK;

var deserializer = new CustomJsonCodec(new Configuration());
var actual = deserializer.Deserialize<EndBalance>(response);
Expand All @@ -70,6 +71,7 @@ public void CreditDebitIndicator_NotPresent_DeserialisesTo0()
{
var response = new RestResponse();
response.Content = "{}";
response.StatusCode = System.Net.HttpStatusCode.OK;

var deserializer = new CustomJsonCodec(new Configuration());
var actual = deserializer.Deserialize<EndBalance>(response);
Expand Down
4 changes: 4 additions & 0 deletions Xero.NetStandard.OAuth2.Test/Model/Bankfeeds/StatementTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ public void Status_ValidInput_Deserialises(string input, Statement.StatusEnum ex
response.Content = $@"{{
""Status"": ""{input}""
}}";
response.StatusCode = System.Net.HttpStatusCode.OK;

var deserializer = new CustomJsonCodec(new Configuration());
var actual = deserializer.Deserialize<Statement>(response);
Expand All @@ -73,6 +74,7 @@ public void Status_NullInput_DeserialisesTo0()
response.Content = $@"{{
""Status"": null
}}";
response.StatusCode = System.Net.HttpStatusCode.OK;

var deserializer = new CustomJsonCodec(new Configuration());
var actual = deserializer.Deserialize<Statement>(response);
Expand All @@ -87,6 +89,7 @@ public void Status_NotPresentInInput_DeserialisesTo0()
{
var response = new RestResponse();
response.Content = "{}";
response.StatusCode = System.Net.HttpStatusCode.OK;

var deserializer = new CustomJsonCodec(new Configuration());
var actual = deserializer.Deserialize<Statement>(response);
Expand All @@ -110,6 +113,7 @@ public void Errors_GivenValidInput_Deserialises()
}}
]
}}";
response.StatusCode = System.Net.HttpStatusCode.OK;

var deserializer = new CustomJsonCodec(new Configuration());
var actual = deserializer.Deserialize<Statement>(response);
Expand Down
5 changes: 5 additions & 0 deletions Xero.NetStandard.OAuth2.Test/Model/PayrollAu/AccountTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ public void AccountID_ValidInput_Deserialises()
response.Content = @"{
""AccountID"": ""12345678-abcd-abcd-abcd-1234567890ab""
}";
response.StatusCode = System.Net.HttpStatusCode.OK;

var deserializer = new CustomJsonCodec(new Configuration());
var actual = deserializer.Deserialize<Account>(response);
Expand All @@ -64,6 +65,7 @@ public void AccountID_InvalidInput_ThrowsApiException()
response.Content = @"{
""AccountID"": ""12345678-abcd-abcd-abcd-invalidvalue""
}";
response.StatusCode = System.Net.HttpStatusCode.OK;

var deserializer = new CustomJsonCodec(new Configuration());
Assert.Throws<ApiException>(() => deserializer.Deserialize<Account>(response));
Expand Down Expand Up @@ -101,6 +103,7 @@ public void Type_ValidInput_Deserialises(string input, AccountType expected)
response.Content = $@"{{
""Type"": ""{input}""
}}";
response.StatusCode = System.Net.HttpStatusCode.OK;

var deserializer = new CustomJsonCodec(new Configuration());
var actual = deserializer.Deserialize<Account>(response);
Expand All @@ -117,6 +120,7 @@ public void Type_NullInput_DeserialisesTo0()
response.Content = @"{
""Type"": null
}";
response.StatusCode = System.Net.HttpStatusCode.OK;

var deserializer = new CustomJsonCodec(new Configuration());
var actual = deserializer.Deserialize<Account>(response);
Expand All @@ -131,6 +135,7 @@ public void Type_NotPresentInInput_DeserialisesTo0()
{
var response = new RestResponse();
response.Content = "{}";
response.StatusCode = System.Net.HttpStatusCode.OK;

var deserializer = new CustomJsonCodec(new Configuration());
var actual = deserializer.Deserialize<Account>(response);
Expand Down
2 changes: 2 additions & 0 deletions Xero.NetStandard.OAuth2.Test/Model/PayrollAu/BankAccountTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ public void RemainderTest(string input, bool? expected)
response.Content = $@"{{
""Remainder"": {input}
}}";
response.StatusCode = System.Net.HttpStatusCode.OK;

var deserializer = new CustomJsonCodec(new Configuration());
var actual = deserializer.Deserialize<BankAccount>(response);
Expand All @@ -69,6 +70,7 @@ public void AmountTest(string input)
response.Content = $@"{{
""Amount"": {input}
}}";
response.StatusCode = System.Net.HttpStatusCode.OK;

var deserializer = new CustomJsonCodec(new Configuration());
var actual = deserializer.Deserialize<BankAccount>(response);
Expand Down
6 changes: 6 additions & 0 deletions Xero.NetStandard.OAuth2.Test/Model/PayrollAu/DeductionLineTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ public void CalculationType_ValidInputs_Deserialises(string input, DeductionType
response.Content = $@"{{
""CalculationType"": ""{input}""
}}";
response.StatusCode = System.Net.HttpStatusCode.OK;

var deserializer = new CustomJsonCodec(new Configuration());
var actual = deserializer.Deserialize<DeductionLine>(response);
Expand All @@ -67,6 +68,7 @@ public void CalculationType_NullInput_DeserialisesTo0()
response.Content = @"{
""CalculationType"": null
}";
response.StatusCode = System.Net.HttpStatusCode.OK;

var deserializer = new CustomJsonCodec(new Configuration());
var actual = deserializer.Deserialize<DeductionLine>(response);
Expand All @@ -81,6 +83,7 @@ public void CalculationType_NotPresentInInput_DeserialisesTo0()
{
var response = new RestResponse();
response.Content = "{}";
response.StatusCode = System.Net.HttpStatusCode.OK;

var deserializer = new CustomJsonCodec(new Configuration());
var actual = deserializer.Deserialize<DeductionLine>(response);
Expand All @@ -99,6 +102,7 @@ public void Amount_ValidInputs_Deserialises(string input)
response.Content = $@"{{
""Amount"": {input}
}}";
response.StatusCode = System.Net.HttpStatusCode.OK;

var deserializer = new CustomJsonCodec(new Configuration());
var actual = deserializer.Deserialize<DeductionLine>(response);
Expand All @@ -117,6 +121,7 @@ public void Percentage_ValidInputs_Deserialises(string input)
response.Content = $@"{{
""Percentage"": {input}
}}";
response.StatusCode = System.Net.HttpStatusCode.OK;

var deserializer = new CustomJsonCodec(new Configuration());
var actual = deserializer.Deserialize<DeductionLine>(response);
Expand All @@ -135,6 +140,7 @@ public void NumberOfUnits_ValidInputs_Deserialises(string input)
response.Content = $@"{{
""NumberOfUnits"": {input}
}}";
response.StatusCode = System.Net.HttpStatusCode.OK;

var deserializer = new CustomJsonCodec(new Configuration());
var actual = deserializer.Deserialize<DeductionLine>(response);
Expand Down
6 changes: 5 additions & 1 deletion Xero.NetStandard.OAuth2.Test/Model/PayrollAu/EmployeeTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ public void Gender_ValidInput_Deserialises(string input, Employee.GenderEnum exp
response.Content = $@"{{
""Gender"": ""{input}""
}}";

response.StatusCode = System.Net.HttpStatusCode.OK;

var deserializer = new CustomJsonCodec(new Configuration());
var actual = deserializer.Deserialize<Employee>(response);

Expand All @@ -71,6 +72,7 @@ public void Gender_NullInput_DeserialisesTo0()
response.Content = @"{
""Gender"": null
}";
response.StatusCode = System.Net.HttpStatusCode.OK;

var deserializer = new CustomJsonCodec(new Configuration());
var actual = deserializer.Deserialize<Employee>(response);
Expand All @@ -82,6 +84,7 @@ public void Gender_NotPresentInInput_DeserialisesTo0()
{
var response = new RestResponse();
response.Content = "{}";
response.StatusCode = System.Net.HttpStatusCode.OK;

var deserializer = new CustomJsonCodec(new Configuration());
var actual = deserializer.Deserialize<Employee>(response);
Expand Down Expand Up @@ -119,6 +122,7 @@ public void ValidationErrorsTest()
}}
]
}}";
response.StatusCode = System.Net.HttpStatusCode.OK;

var deserializer = new CustomJsonCodec(new Configuration());
var actual = deserializer.Deserialize<Employee>(response);
Expand Down
1 change: 1 addition & 0 deletions Xero.NetStandard.OAuth2.Test/Model/PayrollAu/TimesheetLineTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ public void NumberOfUnitsTest()
123.123123
]
}}";
response.StatusCode = System.Net.HttpStatusCode.OK;

var deserializer = new CustomJsonCodec(new Configuration());
var actual = deserializer.Deserialize<TimesheetLine>(response);
Expand Down
2 changes: 2 additions & 0 deletions Xero.NetStandard.OAuth2.Test/Model/PayrollNz/AccountTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ public void TypeEnum_ValidInput_Deserialises(string input, Account.TypeEnum expe
{
var response = new RestResponse();
response.Content = $@"""{input}""";
response.StatusCode = System.Net.HttpStatusCode.OK;

var deserializer = new CustomJsonCodec(new Configuration());
var actual = deserializer.Deserialize<Account.TypeEnum>(response);
Expand All @@ -89,6 +90,7 @@ public void TypeEnum_ValidInput_Deserialises(string input, Account.TypeEnum expe
public void TypeEnum_NullInput_Deserialises(){
var response = new RestResponse();
response.Content = "null";
response.StatusCode = System.Net.HttpStatusCode.OK;

var deserializer = new CustomJsonCodec(new Configuration());
var actual = deserializer.Deserialize<Account.TypeEnum>(response);
Expand Down
2 changes: 2 additions & 0 deletions Xero.NetStandard.OAuth2.Test/Model/PayrollNz/BankAccountTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ public void CalculationType_ValidInput_Deserialises(string input, BankAccount.Ca
{
var response = new RestResponse();
response.Content = $@"""{input}""";
response.StatusCode = System.Net.HttpStatusCode.OK;

var deserializer = new CustomJsonCodec(new Configuration());
var actual = deserializer.Deserialize<BankAccount.CalculationTypeEnum>(response);
Expand All @@ -136,6 +137,7 @@ public void CalculationType_NullInput_Deserialises()
{
var response = new RestResponse();
response.Content = "null";
response.StatusCode = System.Net.HttpStatusCode.OK;

var deserializer = new CustomJsonCodec(new Configuration());
var actual = deserializer.Deserialize<BankAccount.CalculationTypeEnum>(response);
Expand Down
4 changes: 4 additions & 0 deletions Xero.NetStandard.OAuth2.Test/Model/PayrollNz/BenefitTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ public void CategoryEnum_ValidInput_Deserialises(string input, Benefit.CategoryE
{
var response = new RestResponse();
response.Content = $@"""{input}""";
response.StatusCode = System.Net.HttpStatusCode.OK;

var deserializer = new CustomJsonCodec(new Configuration());
var actual = deserializer.Deserialize<Benefit.CategoryEnum>(response);
Expand All @@ -97,6 +98,7 @@ public void CategoryEnumr_NullInput_Deserialises()
{
var response = new RestResponse();
response.Content = "null";
response.StatusCode = System.Net.HttpStatusCode.OK;

var deserializer = new CustomJsonCodec(new Configuration());
var actual = deserializer.Deserialize<Benefit.CategoryEnum>(response);
Expand Down Expand Up @@ -129,6 +131,7 @@ public void CalculationTypeNZEnum_ValidInput_Deserialises(string input, Benefit.
{
var response = new RestResponse();
response.Content = $@"""{input}""";
response.StatusCode = System.Net.HttpStatusCode.OK;

var deserializer = new CustomJsonCodec(new Configuration());
var actual = deserializer.Deserialize<Benefit.CalculationTypeNZEnum>(response);
Expand All @@ -141,6 +144,7 @@ public void CalculationTypeNZEnum_NullInput_Deserialises()
{
var response = new RestResponse();
response.Content = "null";
response.StatusCode = System.Net.HttpStatusCode.OK;

var deserializer = new CustomJsonCodec(new Configuration());
var actual = deserializer.Deserialize<Benefit.CalculationTypeNZEnum>(response);
Expand Down
2 changes: 2 additions & 0 deletions Xero.NetStandard.OAuth2.Test/Model/PayrollNz/CalendarTypeTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ public void CalendarType_ValidInput_Deserialises(string input, CalendarType expe
{
var response = new RestResponse();
response.Content = $@"""{input}""";
response.StatusCode = System.Net.HttpStatusCode.OK;

var deserializer = new CustomJsonCodec(new Configuration());
var actual = deserializer.Deserialize<CalendarType>(response);
Expand All @@ -73,6 +74,7 @@ public void CalendarType_ValidInput_Deserialises(string input, CalendarType expe
public void CalendarType_NullInput_Deserialises(){
var response = new RestResponse();
response.Content = "null";
response.StatusCode = System.Net.HttpStatusCode.OK;

var deserializer = new CustomJsonCodec(new Configuration());
var actual = deserializer.Deserialize<CalendarType>(response);
Expand Down
Loading

0 comments on commit af948bb

Please sign in to comment.