Skip to content

Commit 160f61a

Browse files
author
Andrew Omondi
committed
Merge remote-tracking branch 'origin/main' into andrueastman/generationTypingPython
2 parents 70d5483 + 514770a commit 160f61a

12 files changed

+78
-78
lines changed

‎it/typescript/package-lock.json

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎it/typescript/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"@typescript-eslint/eslint-plugin": "^8.6.0",
2525
"@typescript-eslint/parser": "^8.6.0",
2626
"esbuild": "^0.24.0",
27-
"eslint": "^9.10.0",
27+
"eslint": "^9.11.0",
2828
"eslint-config-prettier": "^9.1.0",
2929
"minimist": "^1.2.8",
3030
"prettier": "^3.3.3",

‎tests/Kiota.Builder.IntegrationTests/Kiota.Builder.IntegrationTests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
1818
<PackageReference Include="Microsoft.NET.Test.SDK" Version="17.11.1" />
1919
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
20-
<PackageReference Include="xunit" Version="2.9.0" />
20+
<PackageReference Include="xunit" Version="2.9.1" />
2121
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
2222
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2323
<PrivateAssets>all</PrivateAssets>

‎tests/Kiota.Builder.Tests/CodeDOM/CodeBlockTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,6 @@ public void ReplacesImplementsByName()
254254
});
255255
model.StartBlock.ReplaceImplementByName("IParsable", "Parsable");
256256
Assert.DoesNotContain(model.StartBlock.Implements, x => x.Name == "IParsable");
257-
Assert.Single(model.StartBlock.Implements.Where(x => x.Name == "Parsable"));
257+
Assert.Single(model.StartBlock.Implements, x => x.Name == "Parsable");
258258
}
259259
}

‎tests/Kiota.Builder.Tests/Kiota.Builder.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<PackageReference Include="DotNet.Glob" Version="3.1.3" />
2020
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
2121
<PackageReference Include="moq" Version="4.20.72" />
22-
<PackageReference Include="xunit" Version="2.9.0" />
22+
<PackageReference Include="xunit" Version="2.9.1" />
2323
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
2424
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2525
<PrivateAssets>all</PrivateAssets>

‎tests/Kiota.Builder.Tests/KiotaBuilderTests.cs

Lines changed: 41 additions & 41 deletions
Large diffs are not rendered by default.

‎tests/Kiota.Builder.Tests/Refiners/GoLanguageRefinerTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -901,7 +901,7 @@ public async Task ReplacesRequestBuilderPropertiesByMethodsAsync()
901901
};
902902
await ILanguageRefiner.RefineAsync(new GenerationConfiguration { Language = GenerationLanguage.Go }, root);
903903
Assert.Empty(model.Properties);
904-
Assert.Single(model.Methods.Where(x => x.IsOfKind(CodeMethodKind.RequestBuilderBackwardCompatibility)));
904+
Assert.Single(model.Methods, x => x.IsOfKind(CodeMethodKind.RequestBuilderBackwardCompatibility));
905905
}
906906
[Fact]
907907
public async Task AddsErrorImportForEnumsForMultiValueEnumAsync()
@@ -913,7 +913,7 @@ public async Task AddsErrorImportForEnumsForMultiValueEnumAsync()
913913
}).First();
914914
await ILanguageRefiner.RefineAsync(new GenerationConfiguration { Language = GenerationLanguage.Go }, root);
915915
Assert.DoesNotContain(testEnum.Usings, static x => "errors".Equals(x.Name, StringComparison.Ordinal));
916-
Assert.Single(testEnum.Usings.Where(static x => "strings".Equals(x.Name, StringComparison.Ordinal)));
916+
Assert.Single(testEnum.Usings, static x => "strings".Equals(x.Name, StringComparison.Ordinal));
917917
}
918918
[Fact]
919919
public async Task AddsErrorImportForEnumsForSingleValueEnumAsync()

‎tests/Kiota.Builder.Tests/Refiners/JavaLanguageRefinerTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ public async Task ReplacesIndexersByMethodsWithParameterAsync()
369369
await ILanguageRefiner.RefineAsync(new GenerationConfiguration { Language = GenerationLanguage.Java }, root);
370370
Assert.Single(requestBuilder.Properties);
371371
Assert.Empty(requestBuilder.GetChildElements(true).OfType<CodeIndexer>());
372-
Assert.Single(requestBuilder.Methods.Where(static x => x.IsOfKind(CodeMethodKind.IndexerBackwardCompatibility)));
372+
Assert.Single(requestBuilder.Methods, static x => x.IsOfKind(CodeMethodKind.IndexerBackwardCompatibility));
373373
Assert.Single(collectionRequestBuilder.Properties);
374374
}
375375
[Fact]
@@ -496,7 +496,7 @@ public async Task AddsEnumSetImportAsync()
496496
}
497497
});
498498
await ILanguageRefiner.RefineAsync(new GenerationConfiguration { Language = GenerationLanguage.Java }, root);
499-
Assert.NotEmpty(model.StartBlock.Usings.Where(x => "EnumSet".Equals(x.Name)));
499+
Assert.Contains(model.StartBlock.Usings, x => "EnumSet".Equals(x.Name));
500500
}
501501
[Fact]
502502
public async Task CorrectsCoreTypeAsync()

‎tests/Kiota.Builder.Tests/Refiners/PythonLanguageRefinerTests.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public async Task AddsQueryParameterMapperMethodAsync()
6161
Assert.Empty(model.Methods);
6262

6363
await ILanguageRefiner.RefineAsync(new GenerationConfiguration { Language = GenerationLanguage.Python }, graphNS);
64-
Assert.Single(model.Methods.Where(x => x.IsOfKind(CodeMethodKind.QueryParametersMapper)));
64+
Assert.Single(model.Methods, x => x.IsOfKind(CodeMethodKind.QueryParametersMapper));
6565
}
6666
[Fact]
6767
public async Task AddsQueryParameterMapperMethodAfterManglingAsync()
@@ -85,9 +85,9 @@ public async Task AddsQueryParameterMapperMethodAfterManglingAsync()
8585
Assert.Empty(model.Methods);
8686

8787
await ILanguageRefiner.RefineAsync(new GenerationConfiguration { Language = GenerationLanguage.Python }, graphNS);
88-
Assert.Single(model.Properties.Where(x => x.Name.Equals("if_exists")));
89-
Assert.Single(model.Properties.Where(x => x.IsNameEscaped));
90-
Assert.Single(model.Methods.Where(x => x.IsOfKind(CodeMethodKind.QueryParametersMapper)));
88+
Assert.Single(model.Properties, x => x.Name.Equals("if_exists"));
89+
Assert.Single(model.Properties, x => x.IsNameEscaped);
90+
Assert.Single(model.Methods, x => x.IsOfKind(CodeMethodKind.QueryParametersMapper));
9191
}
9292
[Theory]
9393
[InlineData("None")]
@@ -429,7 +429,7 @@ public async Task CorrectsCoreTypeAsync()
429429
Assert.DoesNotContain(model.Properties, x => PathParametersDefaultValue.Equals(x.DefaultValue));
430430
Assert.DoesNotContain(model.Methods, x => DeserializeDefaultName.Equals(x.ReturnType.Name));
431431
Assert.DoesNotContain(model.Methods.SelectMany(x => x.Parameters), x => serializerDefaultName.Equals(x.Type.Name));
432-
Assert.Single(constructorMethod.Parameters.Where(x => x.Type is CodeTypeBase));
432+
Assert.Single(constructorMethod.Parameters, x => x.Type is CodeTypeBase);
433433
}
434434
[Fact]
435435
public async Task ReplacesDateTimeOffsetByNativeTypeAsync()
@@ -581,7 +581,7 @@ public async Task AddsPropertiesAndMethodTypesImportsPythonAsync()
581581
Assert.Empty(model.Methods);
582582
var declaration = model.StartBlock;
583583
await ILanguageRefiner.RefineAsync(new GenerationConfiguration { Language = GenerationLanguage.Python }, graphNS);
584-
Assert.Single(requestBuilder.Methods.Where(x => x.IsOfKind(CodeMethodKind.RequestExecutor)));
584+
Assert.Single(requestBuilder.Methods, x => x.IsOfKind(CodeMethodKind.RequestExecutor));
585585
Assert.DoesNotContain("QueryParameters", declaration.Usings.Select(x => x.Name));
586586
}
587587
#endregion

‎tests/Kiota.Builder.Tests/Refiners/RubyLanguageRefinerTests.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,8 @@ public async Task AddNamespaceModuleImportsAsync()
232232
}
233233
});
234234
await ILanguageRefiner.RefineAsync(new GenerationConfiguration { Language = GenerationLanguage.Ruby, ClientNamespaceName = graphNS.Name }, root);
235-
Assert.Single(declaration.Usings.Where(static x => "Message".Equals(x.Declaration.Name, StringComparison.OrdinalIgnoreCase)));
236-
Assert.Single(declaration.Usings.Where(static x => "graph".Equals(x.Declaration.Name, StringComparison.OrdinalIgnoreCase)));
235+
Assert.Single(declaration.Usings, static x => "Message".Equals(x.Declaration.Name, StringComparison.OrdinalIgnoreCase));
236+
Assert.Single(declaration.Usings, static x => "graph".Equals(x.Declaration.Name, StringComparison.OrdinalIgnoreCase));
237237
}
238238
[Fact]
239239
public async Task ShortensLongNamespaceNamesAsync()
@@ -271,7 +271,7 @@ public async Task AddsQueryParameterMapperMethodAsync()
271271
Assert.Empty(model.Methods);
272272

273273
await ILanguageRefiner.RefineAsync(new GenerationConfiguration { Language = GenerationLanguage.Ruby }, graphNS);
274-
Assert.Single(model.Methods.Where(x => x.IsOfKind(CodeMethodKind.QueryParametersMapper)));
274+
Assert.Single(model.Methods, x => x.IsOfKind(CodeMethodKind.QueryParametersMapper));
275275
}
276276
[Fact]
277277
public async Task AddsQueryParameterMapperMethodAfterManglingAsync()
@@ -295,9 +295,9 @@ public async Task AddsQueryParameterMapperMethodAfterManglingAsync()
295295
Assert.Empty(model.Methods);
296296

297297
await ILanguageRefiner.RefineAsync(new GenerationConfiguration { Language = GenerationLanguage.Ruby }, graphNS);
298-
Assert.Single(model.Properties.Where(x => x.Name.Equals("if_exists")));
299-
Assert.Single(model.Properties.Where(x => x.IsNameEscaped));
300-
Assert.Single(model.Methods.Where(x => x.IsOfKind(CodeMethodKind.QueryParametersMapper)));
298+
Assert.Single(model.Properties, x => x.Name.Equals("if_exists"));
299+
Assert.Single(model.Properties, x => x.IsNameEscaped);
300+
Assert.Single(model.Methods, x => x.IsOfKind(CodeMethodKind.QueryParametersMapper));
301301
}
302302
[Fact]
303303
public async Task FlattensModelsNamespaceAsync()
@@ -339,8 +339,8 @@ public async Task DoesNotCorrectNamesWhenCollisionOccursAsync()
339339
Name = "some_model",
340340
});
341341
await ILanguageRefiner.RefineAsync(config, root);
342-
Assert.Single(modelsNS.Classes.Where(x => x.Name.Equals("SomeModel")));
343-
Assert.Single(modelsNS.Enums.Where(x => x.Name.Equals("some_model")));
342+
Assert.Single(modelsNS.Classes, x => x.Name.Equals("SomeModel"));
343+
Assert.Single(modelsNS.Enums, x => x.Name.Equals("some_model"));
344344
}
345345
#endregion
346346
}

0 commit comments

Comments
 (0)