From 7954a99bb2b07f99284cf407e5e2fad948e3a4b9 Mon Sep 17 00:00:00 2001 From: TimLovellSmith Date: Wed, 25 May 2016 13:22:04 -0700 Subject: [PATCH] Turn off CA1822 for test projects, warnings about performance of non-static unit test methods are a waste of time! --- .../Azure.CSharp.Tests/GlobalSuppressions.cs | 7 ----- .../CSharp/CSharp.Tests/GlobalSuppressions.cs | 18 ------------- .../GlobalSuppressions.cs | 26 ------------------- .../Extensions.Tests/GlobalSuppressions.cs | 10 ------- .../GlobalSuppressions.cs | 11 +------- .../Swagger.Tests/GlobalSuppressions.cs | 24 ----------------- .../Swagger.Tests/SwaggerModelerTests.cs | 11 ++++---- Tools/TestRules.ruleset | 4 ++- 8 files changed, 9 insertions(+), 102 deletions(-) diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/GlobalSuppressions.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/GlobalSuppressions.cs index 725603fb1c..113846cb0d 100644 --- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/GlobalSuppressions.cs +++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/GlobalSuppressions.cs @@ -8,10 +8,6 @@ // "In Suppression File". // You do not need to add suppressions to this file manually. -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", -Scope = "member", Target = "Microsoft.Rest.Generator.CSharp.Azure.Tests.AcceptanceTests.#ResourceFlatteningGenerationTest()", Justification="Non-static test classes allow fixtures")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", -Scope = "member", Target = "Microsoft.Rest.Generator.CSharp.Azure.Tests.AcceptanceTests.#EnsureStatusCode`1(System.Net.HttpStatusCode,System.Func`1>>)", Justification="Non-static test classes allow fixtures")] [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity", Scope = "member", Target = "Microsoft.Rest.Generator.CSharp.Azure.Tests.AcceptanceTests.#LroSadPathTests()", Justification="Test code is straighforward")] [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", @@ -24,10 +20,7 @@ Target = "Fixtures.Azure.AcceptanceTestsLro.Models.SubProduct.#ProvisioningStateValues", Justification="Necessary for read-only properties in serialization types")] [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Scope = "member", Target = "Microsoft.Rest.Generator.CSharp.Azure.Tests.AcceptanceTests.#XmsRequestClientIdTest()")] [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Scope = "member", Target = "Microsoft.Rest.Generator.CSharp.Azure.Tests.AcceptanceTests.#AzureODataTests()")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Generator.CSharp.Azure.Tests.CSharpAzureCodeNamingFrameworkTests.#ConvertsPageResultsToPageTypeTest()")] [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1710:IdentifiersShouldHaveCorrectSuffix", Scope = "type", Target = "Fixtures.Azure.AcceptanceTestsPaging.Models.Page`1")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Generator.CSharp.Azure.Tests.PageJsonTest.#TestNullPageDeSerialization()")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Generator.CSharp.Azure.Tests.PageJsonTest.#TestNextLinkDeSerialization()")] [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Scope = "member", Target = "Fixtures.Azure.AcceptanceTestsLro.Models.Resource.#Id")] [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Scope = "member", Target = "Fixtures.Azure.AcceptanceTestsLro.Models.Resource.#Type")] [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Scope = "member", Target = "Fixtures.Azure.AcceptanceTestsLro.Models.Resource.#Name")] diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/GlobalSuppressions.cs b/AutoRest/Generators/CSharp/CSharp.Tests/GlobalSuppressions.cs index dd1260862d..85ac07db86 100644 --- a/AutoRest/Generators/CSharp/CSharp.Tests/GlobalSuppressions.cs +++ b/AutoRest/Generators/CSharp/CSharp.Tests/GlobalSuppressions.cs @@ -16,23 +16,6 @@ [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1809:AvoidExcessiveLocals", Scope = "member", Target = "Microsoft.Rest.Generator.CSharp.Tests.AcceptanceTests.#ArrayTests()", Justification = "Fixture values for serialization")] [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1809:AvoidExcessiveLocals", Scope = "member", Target = "Microsoft.Rest.Generator.CSharp.Tests.AcceptanceTests.#DictionaryTests()", Justification = "Fixture values for serialization")] [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1809:AvoidExcessiveLocals", Scope = "member", Target = "Microsoft.Rest.Generator.CSharp.Tests.AcceptanceTests.#ComplexTests()", Justification = "Fixture values for serialization")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Generator.CSharp.Tests.CSharpCodeNamingFrameworkTests.#TypeNormalizationTest()", Justification = "Test classes must be non-static to allow fixtures")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Generator.CSharp.Tests.CSharpCodeNamingFrameworkTests.#TypeNormalizationWithComplexTypesTest()", Justification = "Test classes must be non-static to allow fixtures")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Generator.CSharp.Tests.CSharpCodeNamingFrameworkTests.#VerifyMethodRenaming()", Justification = "Test classes must be non-static to allow fixtures")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Generator.CSharp.Tests.CSharpCodeNamingFrameworkTests.#NameCollisionTestWithoutNamespace()", Justification = "Test classes must be non-static to allow fixtures")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Generator.CSharp.Tests.CSharpCodeNamingFrameworkTests.#NameCollisionTestWithNamespace()", Justification = "Test classes must be non-static to allow fixtures")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Generator.CSharp.Tests.CSharpCodeNamingFrameworkTests.#SequenceWithRenamedComplexType()", Justification = "Test classes must be non-static to allow fixtures")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Generator.CSharp.Tests.AcceptanceTests.#EnsureStatusCode`1(System.Net.HttpStatusCode,System.Func`1>>)", Justification = "Test classes must be non-static to allow fixtures")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Generator.CSharp.Tests.MirrorTests.#CanRoundTripSequences()", Justification = "Test classes must be non-static to allow fixtures")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Generator.CSharp.Tests.MirrorTests.#CanRoundtripPolymorphicTypes()", Justification = "Test classes must be non-static to allow fixtures")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Generator.CSharp.Tests.MirrorTests.#CanRoundtripFilledOutNestedTypesWithoutRecursion()", Justification = "Test classes must be non-static to allow fixtures")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Generator.CSharp.Tests.MirrorTests.#CanRoundtripFilledOutNestedTypesWithoutRecursion2()", Justification = "Test classes must be non-static to allow fixtures")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Generator.CSharp.Tests.ProcessOutputListener.#ScrubAndWriteValue(System.String,System.String)", Justification = "Test classes must be non-static to allow fixtures")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Generator.CSharp.Tests.MirrorTests.#CanSerializeAndDeserializePrimitiveTypes()", Justification = "Test classes must be non-static to allow fixtures")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Generator.CSharp.Tests.MirrorTests.#UrlIsCorrectWhenBaseUriContainsSegment()", Justification = "Test classes must be non-static to allow fixtures")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Generator.CSharp.Tests.CSharpCodeNamingFrameworkTests.#VerifyInputMappingsForFlattening()", Justification = "Test classes must be non-static to allow fixtures")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Generator.CSharp.Tests.CSharpCodeNamingFrameworkTests.#VerifyInputMappingsForGrouping()", Justification = "Test classes must be non-static to allow fixtures")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Generator.CSharp.Tests.CSharpCodeNamingFrameworkTests.#VerifyInputMappingsForResources()", Justification = "Test classes must be non-static to allow fixtures")] [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2208:InstantiateArgumentExceptionsCorrectly", Scope = "member", Target = "Fixtures.AcceptanceTestsRequiredOptional.Models.ArrayWrapper.#Validate()", Justification="Validation exceptions types are being changed")] [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2208:InstantiateArgumentExceptionsCorrectly", Scope = "member", Target = "Fixtures.AcceptanceTestsRequiredOptional.Models.ClassWrapper.#Validate()", Justification="Validation exceptions types are being changed")] [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2208:InstantiateArgumentExceptionsCorrectly", Scope = "member", Target = "Fixtures.MirrorSequences.Models.ErrorModel.#Validate()", Justification="Validation exceptions types are being changed")] @@ -50,4 +33,3 @@ [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly", MessageId = "npm", Scope = "member", Target = "Microsoft.Rest.Generator.CSharp.Tests.ServiceController.#StartServiceProcess()")] [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1057:StringUriOverloadsCallSystemUriOverloads", Scope = "member", Target = "Fixtures.AcceptanceTestsUrl.AutoRestUrlTestService.#.ctor(System.String,System.Net.Http.DelegatingHandler[])", Justification = "Invalid in the current context.")] [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1809:AvoidExcessiveLocals", Scope = "member", Target = "Microsoft.Rest.Generator.CSharp.Tests.AcceptanceTests.#TestDictionaryPrimitiveTypes(Fixtures.AcceptanceTestsBodyDictionary.AutoRestSwaggerBATdictionaryService)")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Generator.CSharp.Tests.AcceptanceTests.#EnsureStatusCode`2(System.Net.HttpStatusCode,System.Func`1>>)")] diff --git a/AutoRest/Generators/Extensions/Azure.Extensions.Tests/GlobalSuppressions.cs b/AutoRest/Generators/Extensions/Azure.Extensions.Tests/GlobalSuppressions.cs index 314fda5322..91b9c621e2 100644 --- a/AutoRest/Generators/Extensions/Azure.Extensions.Tests/GlobalSuppressions.cs +++ b/AutoRest/Generators/Extensions/Azure.Extensions.Tests/GlobalSuppressions.cs @@ -8,31 +8,5 @@ // "In Suppression File". // You do not need to add suppressions to this file manually. -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", - Target = "Microsoft.Rest.Generator.Azure.Extensions.Tests.AzureServiceClientNormalizerTests.#ResourceIsFlattenedForSimpleResource()", - Justification = "Test methods must not be static to allow suite-level fixtures")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", - Target = "Microsoft.Rest.Generator.Azure.Extensions.Tests.AzureServiceClientNormalizerTests.#ResourceIsFlattenedForComplexResource()", - Justification = "Test methods must not be static to allow suite-level fixtures")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", - Target = "Microsoft.Rest.Generator.Azure.Extensions.Tests.AzureServiceClientNormalizerTests.#SwaggerODataSpecParsingTest()", - Justification = "Test methods must not be static to allow suite-level fixtures")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", - Target = "Microsoft.Rest.Generator.Azure.Extensions.Tests.AzureServiceClientNormalizerTests.#SwaggerResourceExternalFalseTest()", - Justification = "Test methods must not be static to allow suite-level fixtures")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", - Target = "Microsoft.Rest.Generator.Azure.Extensions.Tests.AzureServiceClientNormalizerTests.#AzureParameterTest()", - Justification = "Test methods must not be static to allow suite-level fixtures")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", - Target = "Microsoft.Rest.Generator.Azure.Extensions.Tests.AzureServiceClientNormalizerTests.#PageableTest()", - Justification = "Test methods must not be static to allow suite-level fixtures")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", - Target = "Microsoft.Rest.Generator.Azure.Extensions.Tests.AzureServiceClientNormalizerTests.#ExternalResourceTypeIsNullSafe()", - Justification = "Test methods must not be static to allow suite-level fixtures")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", - Target = "Microsoft.Rest.Generator.Azure.Extensions.Tests.AzureServiceClientNormalizerTests.#ResourceIsFlattenedForConflictingResource()", - Justification = "Test methods must not be static to allow suite-level fixtures")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Generator.Azure.Extensions.Tests.AzureServiceClientNormalizerTests.#FlatteningTest()")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Generator.CSharp.Azure.Tests.CSharpAzureCodeNamingFrameworkTests.#ConvertsPageResultsToPageTypeTest()")] [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase", Scope = "member", Target = "Microsoft.Rest.Generator.CSharp.Azure.Tests.CSharpAzureCodeNamingFrameworkTests.#ConvertsPageResultsToPageTypeTest()")] diff --git a/AutoRest/Generators/Extensions/Extensions.Tests/GlobalSuppressions.cs b/AutoRest/Generators/Extensions/Extensions.Tests/GlobalSuppressions.cs index a628d38cbf..46ddf02686 100644 --- a/AutoRest/Generators/Extensions/Extensions.Tests/GlobalSuppressions.cs +++ b/AutoRest/Generators/Extensions/Extensions.Tests/GlobalSuppressions.cs @@ -1,14 +1,4 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Generator.Tests.ExtensionsTests.#TestClientModelWithPayloadFlattening()")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Generator.Tests.MappingExtensionsTests.#TestInputMapping()")] [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity", Scope = "member", Target = "Microsoft.Rest.Generator.Tests.ExtensionsTests.#TestClientModelWithPayloadFlatteningViaXMSClientFlatten()")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Generator.Tests.ExtensionsTests.#TestClientModelWithPayloadFlatteningViaXMSClientFlatten()")] - -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Generator.Tests.ExtensionsTests.#TestClientModelClientName()")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Generator.Tests.ExtensionsTests.#TestClientNameCSharpNormalization()")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Generator.Tests.ExtensionsTests.#TestClientNameJavaNormalization()")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Generator.Tests.ExtensionsTests.#TestClientNameNodeJSNormalization()")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Generator.Tests.ExtensionsTests.#TestClientNamePythonNormalization()")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Generator.Tests.ExtensionsTests.#TestClientNameRubyNormalization()")] diff --git a/AutoRest/Modelers/CompositeSwagger.Tests/GlobalSuppressions.cs b/AutoRest/Modelers/CompositeSwagger.Tests/GlobalSuppressions.cs index fbc8ea7cbd..5f282702bb 100644 --- a/AutoRest/Modelers/CompositeSwagger.Tests/GlobalSuppressions.cs +++ b/AutoRest/Modelers/CompositeSwagger.Tests/GlobalSuppressions.cs @@ -1,10 +1 @@ -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Modeler.CompositeSwagger.Tests.CompositeSwaggerModelerTests.#CompositeSwaggerWithTwoModels()")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Modeler.CompositeSwagger.Tests.CompositeSwaggerModelerTests.#CompositeSwaggerWithOneModel()")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Modeler.CompositeSwagger.Tests.CompositeSwaggerModelerTests.#CompositeModelWithEmptyInfo()")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Modeler.CompositeSwagger.Tests.CompositeSwaggerModelerTests.#CompositeModelWithEmptyDocuments()")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Modeler.CompositeSwagger.Tests.CompositeSwaggerModelerTests.#CompositeModelWithConflictInSettings()")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Modeler.CompositeSwagger.Tests.CompositeSwaggerModelerTests.#CompositeModelWithConflictInModel()")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Modeler.CompositeSwagger.Tests.CompositeSwaggerModelerTests.#CompositeModelWithConflictInMethod()")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Modeler.CompositeSwagger.Tests.CompositeSwaggerModelerTests.#CompositeModelWithConflictInGlobalParam()")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Modeler.CompositeSwagger.Tests.CompositeSwaggerModelerTests.#CompositeSwaggerWithSameModels()")] - + \ No newline at end of file diff --git a/AutoRest/Modelers/Swagger.Tests/GlobalSuppressions.cs b/AutoRest/Modelers/Swagger.Tests/GlobalSuppressions.cs index 003d12bb4d..d7540fb6b4 100644 --- a/AutoRest/Modelers/Swagger.Tests/GlobalSuppressions.cs +++ b/AutoRest/Modelers/Swagger.Tests/GlobalSuppressions.cs @@ -11,28 +11,4 @@ [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Scope = "member", Target = "Microsoft.Rest.Modeler.Swagger.Tests.SwaggerSpecHelper.#RunTests`1(System.String,System.String,System.String,Microsoft.Rest.Generator.Settings)")] [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Scope = "member", Target = "Microsoft.Rest.Modeler.Swagger.Tests.SwaggerSpecHelper.#RunTests`1(Microsoft.Rest.Generator.Settings,System.String)")] [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity", Scope = "member", Target = "Microsoft.Rest.Modeler.Swagger.Tests.SwaggerModelerTests.#TestDataTypes()")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Modeler.Swagger.Tests.SwaggerModelerTests.#TestClientModelFromSimpleSwagger()")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Modeler.Swagger.Tests.SwaggerModelerTests.#TestExternalReferences()")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Modeler.Swagger.Tests.SwaggerModelerTests.#TestExternalReferencesWithAllOf()")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Modeler.Swagger.Tests.SwaggerModelerTests.#TestExternalReferencesWithReferencesInProperties()")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Modeler.Swagger.Tests.SwaggerModelerTests.#TestExternalReferencesWithExtension()")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Modeler.Swagger.Tests.SwaggerModelerTests.#TestClientModelWithInheritance()")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Modeler.Swagger.Tests.SwaggerModelerTests.#TestClientModelPolymorhism()")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Modeler.Swagger.Tests.SwaggerModelerTests.#ClientModelWithCircularDependencyThrowsError()")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Modeler.Swagger.Tests.SwaggerModelerTests.#TestClientModelWithRecursiveTypes()")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Modeler.Swagger.Tests.SwaggerModelerTests.#TestClientModelWithNoContent()")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Modeler.Swagger.Tests.SwaggerModelerTests.#TestClientModelWithDifferentReturnsTypesBasedOnStatusCode()")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Modeler.Swagger.Tests.SwaggerModelerTests.#DefaultReturnsCorrectType()")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Modeler.Swagger.Tests.SwaggerModelerTests.#GlobalResponsesReference()")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Modeler.Swagger.Tests.SwaggerModelerTests.#TestClientModelWithStreamAndByteArray()")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Modeler.Swagger.Tests.SwaggerModelerTests.#TestClientModelWithMethodGroups()")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Modeler.Swagger.Tests.SwaggerModelerTests.#TestDataTypes()")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Modeler.Swagger.Tests.SwaggerModelerTests.#TestClientWithValidation()")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Modeler.Swagger.Tests.SwaggerModelerTests.#TestClientModelWithPayloadFlattening()")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Modeler.Swagger.Tests.SwaggerModelerTests.#TestClientModelWithResponseHeaders()")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Modeler.Swagger.Tests.SwaggerModelerTests.#TestCustomPaths()")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Modeler.Swagger.Tests.SwaggerModelerTests.#TestSettingsFromSwagger()")] [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1804:RemoveUnusedLocals", MessageId = "client", Scope = "member", Target = "Microsoft.Rest.Modeler.Swagger.Tests.SwaggerModelerTests.#TestSettingsFromSwagger()")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Modeler.Swagger.Tests.SwaggerModelerTests.#TestConstants()")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.Rest.Modeler.Swagger.Tests.SwaggerModelerTests.#TestCompositeConstants()")] - diff --git a/AutoRest/Modelers/Swagger.Tests/SwaggerModelerTests.cs b/AutoRest/Modelers/Swagger.Tests/SwaggerModelerTests.cs index 42e20619bf..6083741a77 100644 --- a/AutoRest/Modelers/Swagger.Tests/SwaggerModelerTests.cs +++ b/AutoRest/Modelers/Swagger.Tests/SwaggerModelerTests.cs @@ -186,8 +186,8 @@ public void ClientModelWithCircularDependencyThrowsError() Input = Path.Combine("Swagger", "swagger-allOf-circular.json") }); var ex = Assert.Throws(() => modeler.Build()); - Assert.Contains("circular", ex.Message, StringComparison.InvariantCultureIgnoreCase); - Assert.Contains("siamese", ex.Message, StringComparison.InvariantCultureIgnoreCase); + Assert.Contains("circular", ex.Message, StringComparison.OrdinalIgnoreCase); + Assert.Contains("siamese", ex.Message, StringComparison.OrdinalIgnoreCase); } [Fact] @@ -207,16 +207,16 @@ public void TestClientModelWithRecursiveTypes() } [Fact] - public void TestClientModel_AliasedAndInheritedTypes_SuccessfullyResolveIntoBaseModelRelationships() + public void TestClientModelWithManyAllOfRelationships() { - Generator.Modeler modeler = new SwaggerModeler(new Settings + var modeler = new SwaggerModeler(new Settings { Namespace = "Test", Input = Path.Combine("Swagger", "swagger-ref-allOf-inheritance.json") }); var clientModel = modeler.Build(); - // This model has a few base type relationships which should be observed: + // the model has a few base type relationships which should be observed: // RedisResource is a Resource var resourceModel = clientModel.ModelTypes.Single(x => x.Name == "Resource"); var redisResourceModel = clientModel.ModelTypes.Single(x => x.Name == "RedisResource"); @@ -596,7 +596,6 @@ public void TestSettingsFromSwagger() Assert.Equal(true, codeGenerator.InternalConstructors); } - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic")] [Fact] public void TestParameterizedHostFromSwagger() { diff --git a/Tools/TestRules.ruleset b/Tools/TestRules.ruleset index 6c0755dd13..15f831c090 100644 --- a/Tools/TestRules.ruleset +++ b/Tools/TestRules.ruleset @@ -1,4 +1,4 @@ - + @@ -35,6 +35,8 @@ + +