From 32ae2adbd9c6b21acd1dc71dfd542d41c4af6d57 Mon Sep 17 00:00:00 2001 From: Gidon Date: Wed, 24 Jan 2018 17:09:09 +0200 Subject: [PATCH] Update test according to tips from xUnit Analyzers --- .../CommonServiceLocatorTests.cs | 2 +- .../ServiceLocatorTestCase.cs | 4 +- .../MicrosoftDependencyFixture.cs | 4 +- SolrNet.Cloud.Tests/CollectionsAdminTests.cs | 3 +- .../SolrCloudOperationsTests.cs | 2 +- .../SolrClusterStateParserTests.cs | 8 +- .../IntegrationFixture.cs | 20 ++-- .../IntegrationFixtureAsync.cs | 20 ++-- .../SolrCoreAdminFixture.cs | 14 +-- .../CollapseExpandResponseParserTests.cs | 6 +- .../CollectionFieldSerializerTests.cs | 2 +- SolrNet.Tests/DebugResponseParserTests.cs | 6 +- SolrNet.Tests/DefaultFieldParserTests.cs | 4 +- SolrNet.Tests/DefaultResponseParserTests.cs | 4 +- SolrNet.Tests/ExceptionTests.cs | 2 +- SolrNet.Tests/FieldParserTests.cs | 6 +- .../GenericDictionaryFieldSerializerTests.cs | 2 +- ...MappedPropertiesIsInSolrSchemaRuleTests.cs | 10 +- ...ypesAreCompatibleWithSolrTypesRuleTests.cs | 4 +- SolrNet.Tests/MappingValidatorTests.cs | 2 +- .../MultivaluedMappedToCollectionRuleTests.cs | 6 +- .../RequiredFieldsAreMappedRuleTests.cs | 2 +- .../SolrDictionarySerializerTests.cs | 12 +- SolrNet.Tests/SolrOperationsTests.cs | 2 +- SolrNet.Tests/SolrQueryExecuterTests.cs | 12 +- SolrNet.Tests/SolrQueryResultsParserTests.cs | 104 +++++++++--------- SolrNet.Tests/SolrSchemaParserTests.cs | 8 +- SolrNet.Tests/SolrServerTests.cs | 2 +- .../SolrStatusResponseParserTests.cs | 2 +- SolrNet.Tests/SortOrderTests.cs | 6 +- .../UniqueKeyMatchesMappingRuleTests.cs | 10 +- SolrNet.Tests/Utils/ProfilerTests.cs | 4 +- 32 files changed, 147 insertions(+), 148 deletions(-) diff --git a/CommonServiceLocator.SolrNet.Tests/CommonServiceLocatorTests.cs b/CommonServiceLocator.SolrNet.Tests/CommonServiceLocatorTests.cs index 4101f0a65..86e038f7f 100644 --- a/CommonServiceLocator.SolrNet.Tests/CommonServiceLocatorTests.cs +++ b/CommonServiceLocator.SolrNet.Tests/CommonServiceLocatorTests.cs @@ -282,7 +282,7 @@ public void Clear() { var inst2 = new ServiceImpl(); container.Register(c => inst2); container.Clear(); - Assert.Equal(0, container.GetAllInstances().ToArray().Length); + Assert.Empty(container.GetAllInstances().ToArray()); } protected override IServiceLocator CreateServiceLocator() { diff --git a/CommonServiceLocator.SolrNet.Tests/ServiceLocatorTestCase.cs b/CommonServiceLocator.SolrNet.Tests/ServiceLocatorTestCase.cs index c4ff40154..e91294e1f 100644 --- a/CommonServiceLocator.SolrNet.Tests/ServiceLocatorTestCase.cs +++ b/CommonServiceLocator.SolrNet.Tests/ServiceLocatorTestCase.cs @@ -52,13 +52,13 @@ public void AskingForInvalidComponentShouldRaiseActivationException() { [Fact] public void GetNamedInstance() { var instance = locator.GetInstance(typeof (AdvancedLogger).FullName); - Assert.IsType(typeof (AdvancedLogger), instance); + Assert.IsType(instance); } [Fact] public void GetNamedInstance2() { var instance = locator.GetInstance(typeof (SimpleLogger).FullName); - Assert.IsType(typeof (SimpleLogger), instance); + Assert.IsType(instance); } [Fact] diff --git a/Microsoft.DependencyInjection.SolrNet.Tests/MicrosoftDependencyFixture.cs b/Microsoft.DependencyInjection.SolrNet.Tests/MicrosoftDependencyFixture.cs index 275155b5e..f6e3ca2c0 100644 --- a/Microsoft.DependencyInjection.SolrNet.Tests/MicrosoftDependencyFixture.cs +++ b/Microsoft.DependencyInjection.SolrNet.Tests/MicrosoftDependencyFixture.cs @@ -87,7 +87,7 @@ public void ResolveSolrAbstractResponseParsersViaEnumerable() //MS Dependency injection doesn't support var result = DefaultServiceProvider.GetRequiredService>>(); Assert.NotNull(result); - Assert.Equal(result.Count(), 1); + Assert.Single(result); } @@ -109,4 +109,4 @@ public void ResolveSolrOperations() public class Entity { } } -} \ No newline at end of file +} diff --git a/SolrNet.Cloud.Tests/CollectionsAdminTests.cs b/SolrNet.Cloud.Tests/CollectionsAdminTests.cs index ebd2ec43f..d75fbb92c 100644 --- a/SolrNet.Cloud.Tests/CollectionsAdminTests.cs +++ b/SolrNet.Cloud.Tests/CollectionsAdminTests.cs @@ -160,8 +160,7 @@ public async Task ModifyCollection() Assert.True(response.Status == 0); } - //[Fact] - // causes internal server error (one shard, two shards - doesn't matter) + [Fact(Skip = "causes internal server error (one shard, two shards - doesn't matter)")] public async Task SplitShard() { RemoveCollectionIfExists(collections, COLLECTION_NAME); diff --git a/SolrNet.Cloud.Tests/SolrCloudOperationsTests.cs b/SolrNet.Cloud.Tests/SolrCloudOperationsTests.cs index 9ff7f597c..856601842 100644 --- a/SolrNet.Cloud.Tests/SolrCloudOperationsTests.cs +++ b/SolrNet.Cloud.Tests/SolrCloudOperationsTests.cs @@ -13,7 +13,7 @@ public void ShouldRedirectToProvidedOperations() { var provider = new FakeProvider(); var operations = new SolrCloudOperations(provider, provider); operations.Commit(); - Assert.Equal(provider.LastOperation , "Commit"); + Assert.Equal("Commit", provider.LastOperation ); } [Fact] diff --git a/SolrNet.Cloud.Tests/SolrClusterStateParserTests.cs b/SolrNet.Cloud.Tests/SolrClusterStateParserTests.cs index df1b10866..f986a0689 100644 --- a/SolrNet.Cloud.Tests/SolrClusterStateParserTests.cs +++ b/SolrNet.Cloud.Tests/SolrClusterStateParserTests.cs @@ -36,11 +36,11 @@ public void ShouldProduceNotEmptyStateFromNotEmptyJson() { Assert.True(collections.Any()); var shards = collections.SelectMany(collection => collection.Shards.Values).ToList(); Assert.True(shards.Any()); - Assert.True(shards.Any(shard => shard.IsActive)); + Assert.Contains(shards, shard => shard.IsActive); var replicas = shards.SelectMany(shard => shard.Replicas.Values).ToList(); Assert.True(replicas.Any()); - Assert.True(replicas.Any(replica => replica.IsActive)); - Assert.True(replicas.Any(replica => replica.IsLeader)); + Assert.Contains(replicas, replica => replica.IsActive); + Assert.Contains(replicas, replica => replica.IsLeader); } [Fact] @@ -55,4 +55,4 @@ public void ShouldProduceMergedStateFromSeveralJson() { Assert.Equal(zkState.Collections.Count, totalCollectionsCount); } } -} \ No newline at end of file +} diff --git a/SolrNet.Tests.Integration/IntegrationFixture.cs b/SolrNet.Tests.Integration/IntegrationFixture.cs index 2ce22ae8a..46ac9f949 100644 --- a/SolrNet.Tests.Integration/IntegrationFixture.cs +++ b/SolrNet.Tests.Integration/IntegrationFixture.cs @@ -92,7 +92,7 @@ public void Add_then_query() { solr.Query(new SolrQueryByField("name", @"3;Furniture")); var products = solr.Query(new SolrQueryByRange("price", 10m, 100m).Boost(2)); - Assert.Equal(1, products.Count); + Assert.Single(products); Assert.Equal(name, products[0].Name); Assert.Equal("SP2514N", products[0].Id); Assert.Equal(guid, products[0].Guid); @@ -192,7 +192,7 @@ public void DeleteByIdAndOrQuery() { solr.Commit(); var productsAfterDelete = solr.Query(SolrQuery.All); - Assert.Equal(0, productsAfterDelete.Count); + Assert.Empty(productsAfterDelete); } @@ -391,7 +391,7 @@ public void LocalParams() { Add_then_query(); var solr = ServiceLocator.Current.GetInstance>(); var results = solr.Query(new LocalParams {{"q.op", "AND"}} + "solr ipod"); - Assert.Equal(0, results.Count); + Assert.Empty(results); } [Fact] @@ -477,7 +477,7 @@ public void FieldGrouping() Console.WriteLine("Group.Count {0}", results.Grouping.Count); Assert.Equal(1, results.Grouping.Count); - Assert.Equal(true, results.Grouping.ContainsKey("manu_exact")); + Assert.True(results.Grouping.ContainsKey("manu_exact")); Assert.True(results.Grouping["manu_exact"].Groups.Count>=1); } @@ -497,8 +497,8 @@ public void QueryGrouping() Console.WriteLine("Group.Count {0}", results.Grouping.Count); Assert.Equal(2, results.Grouping.Count); - Assert.Equal(true, results.Grouping.ContainsKey("manu_exact")); - Assert.Equal(true, results.Grouping.ContainsKey("name")); + Assert.True(results.Grouping.ContainsKey("manu_exact")); + Assert.True(results.Grouping.ContainsKey("name")); Assert.True (results.Grouping["manu_exact"].Groups.Count >= 1); Assert.True(results.Grouping["name"].Groups.Count >= 1); } @@ -515,7 +515,7 @@ public void SemiLooseMapping() { var _ = initLoose.Value; var solr = ServiceLocator.Current.GetInstance>(); var products = solr.Query(SolrQuery.All, new QueryOptions {Fields = new[] {"*", "score"}}); - Assert.Equal(1, products.Count); + Assert.Single(products); var product = products[0]; Assert.Equal("SP2514N", product.Id); Assert.True(product.Score.HasValue); @@ -526,9 +526,9 @@ public void SemiLooseMapping() { Console.WriteLine(product.OtherFields.Count); foreach (var field in product.OtherFields) Console.WriteLine("{0}: {1} ({2})", field.Key, field.Value, TypeOrNull(field.Value)); - Assert.IsType(typeof(DateTime), product.OtherFields["timestamp"]); + Assert.IsType(product.OtherFields["timestamp"]); Assert.Equal(new DateTime(1,1,1), product.OtherFields["timestamp"]); - Assert.IsAssignableFrom(typeof(ICollection), product.OtherFields["features"]); + Assert.IsAssignableFrom(product.OtherFields["features"]); product.OtherFields["timestamp"] = new DateTime(2010, 1, 1); product.OtherFields["features"] = new[] {"a", "b", "c"}; product.OtherFields.Remove("_version_"); // avoid optimistic locking for now https://issues.apache.org/jira/browse/SOLR-3178 @@ -610,4 +610,4 @@ public void AtomicUpdate() Assert.False(productAfterUpdate.Features.Contains("hard drive")); } } -} \ No newline at end of file +} diff --git a/SolrNet.Tests.Integration/IntegrationFixtureAsync.cs b/SolrNet.Tests.Integration/IntegrationFixtureAsync.cs index 4530a9d6f..cf232ef21 100644 --- a/SolrNet.Tests.Integration/IntegrationFixtureAsync.cs +++ b/SolrNet.Tests.Integration/IntegrationFixtureAsync.cs @@ -98,7 +98,7 @@ public async Task Add_then_queryAsync() await solr.QueryAsync(new SolrQueryByField("name", @"3;Furniture")); var products = await solr.QueryAsync(new SolrQueryByRange("price", 10m, 100m).Boost(2)); - Assert.Equal(1, products.Count); + Assert.Single(products); Assert.Equal(name, products[0].Name); Assert.Equal("SP2514N", products[0].Id); Assert.Equal(guid, products[0].Guid); @@ -200,7 +200,7 @@ public async Task DeleteByIdAndOrQueryAsync() await solr.CommitAsync(); var productsAfterDelete = await solr.QueryAsync(SolrQuery.All); - Assert.Equal(0, productsAfterDelete.Count); + Assert.Empty(productsAfterDelete); } @@ -435,7 +435,7 @@ public async Task LocalParamsAsync() await Add_then_queryAsync(); var solr = ServiceLocator.Current.GetInstance>(); var results = await solr.QueryAsync(new LocalParams { { "q.op", "AND" } } + "solr ipod"); - Assert.Equal(0, results.Count); + Assert.Empty(results); } [Fact] @@ -531,7 +531,7 @@ public async Task FieldGroupingAsync() Console.WriteLine("Group.Count {0}", results.Grouping.Count); Assert.Equal(1, results.Grouping.Count); - Assert.Equal(true, results.Grouping.ContainsKey("manu_exact")); + Assert.True(results.Grouping.ContainsKey("manu_exact")); Assert.True(results.Grouping["manu_exact"].Groups.Count >= 1); } @@ -551,8 +551,8 @@ public async Task QueryGroupingAsync() Console.WriteLine("Group.Count {0}", results.Grouping.Count); Assert.Equal(2, results.Grouping.Count); - Assert.Equal(true, results.Grouping.ContainsKey("manu_exact")); - Assert.Equal(true, results.Grouping.ContainsKey("name")); + Assert.True(results.Grouping.ContainsKey("manu_exact")); + Assert.True(results.Grouping.ContainsKey("name")); Assert.True(results.Grouping["manu_exact"].Groups.Count >= 1); Assert.True(results.Grouping["name"].Groups.Count >= 1); } @@ -571,7 +571,7 @@ public async Task SemiLooseMappingAsync() var _ = initLoose.Value; var solr = ServiceLocator.Current.GetInstance>(); var products = await solr.QueryAsync(SolrQuery.All, new QueryOptions { Fields = new[] { "*", "score" } }); - Assert.Equal(1, products.Count); + Assert.Single(products); var product = products[0]; Assert.Equal("SP2514N", product.Id); Assert.True(product.Score.HasValue); @@ -582,9 +582,9 @@ public async Task SemiLooseMappingAsync() Console.WriteLine(product.OtherFields.Count); foreach (var field in product.OtherFields) Console.WriteLine("{0}: {1} ({2})", field.Key, field.Value, TypeOrNull(field.Value)); - Assert.IsType(typeof(DateTime), product.OtherFields["timestamp"]); + Assert.IsType(product.OtherFields["timestamp"]); Assert.Equal(new DateTime(1, 1, 1), product.OtherFields["timestamp"]); - Assert.IsAssignableFrom(typeof(ICollection), product.OtherFields["features"]); + Assert.IsAssignableFrom(product.OtherFields["features"]); product.OtherFields["timestamp"] = new DateTime(2010, 1, 1); product.OtherFields["features"] = new[] { "a", "b", "c" }; product.OtherFields.Remove("_version_"); // avoid optimistic locking for now https://issues.apache.org/jira/browse/SOLR-3178 @@ -647,4 +647,4 @@ public async Task MoreLikeThisHandlerAsync() } } -} \ No newline at end of file +} diff --git a/SolrNet.Tests.Integration/SolrCoreAdminFixture.cs b/SolrNet.Tests.Integration/SolrCoreAdminFixture.cs index c5fef6295..56eab111e 100644 --- a/SolrNet.Tests.Integration/SolrCoreAdminFixture.cs +++ b/SolrNet.Tests.Integration/SolrCoreAdminFixture.cs @@ -60,7 +60,7 @@ public void Create() { } catch (ArgumentException) { // Should get an Exception here because instance directory was not specified. var createResponseHeader = solrCoreAdmin.Create(coreName, instanceDir); - Assert.Equal(createResponseHeader.Status, 0); + Assert.Equal(0, createResponseHeader.Status); } var result = solrCoreAdmin.Status(coreName); @@ -85,7 +85,7 @@ public void ReloadCore() { var solrCoreAdmin = new SolrCoreAdmin( new SolrConnection( solrUrl ), GetHeaderParser(), GetStatusResponseParser() ); var reloadResponseHeader = solrCoreAdmin.Reload(coreName); - Assert.Equal(reloadResponseHeader.Status, 0); + Assert.Equal(0, reloadResponseHeader.Status); } [Fact(Skip = "Our version of solr doesn't support this") ] @@ -94,7 +94,7 @@ public void Alias() { var solrCoreAdmin = new SolrCoreAdmin( new SolrConnection( solrUrl ), GetHeaderParser(), GetStatusResponseParser() ); var aliasResponseHeader = solrCoreAdmin.Alias(coreName, "corefoo"); - Assert.Equal(aliasResponseHeader.Status, 0); + Assert.Equal(0, aliasResponseHeader.Status); } [Fact] @@ -103,7 +103,7 @@ public void CreateSwapCore() { var solrCoreAdmin = new SolrCoreAdmin( new SolrConnection( solrUrl ), GetHeaderParser(), GetStatusResponseParser() ); var createResponseHeader = solrCoreAdmin.Create(coreName, instanceDir); - Assert.Equal(createResponseHeader.Status, 0); + Assert.Equal(0, createResponseHeader.Status); var result = solrCoreAdmin.Status(coreName); Assert.NotNull(result); Assert.NotEmpty(result.Name); @@ -115,7 +115,7 @@ public void SwapCores() { var solrCoreAdmin = new SolrCoreAdmin( new SolrConnection( solrUrl ), GetHeaderParser(), GetStatusResponseParser() ); var swapResponseHeader = solrCoreAdmin.Swap("core-new", "core-swap"); - Assert.Equal(swapResponseHeader.Status, 0); + Assert.Equal(0, swapResponseHeader.Status); } [Fact] @@ -126,7 +126,7 @@ public void Unload() { //Assert.Equal(swapUnloadResponseHeader.Status, 0); var newUnloadResponseHeader = solrCoreAdmin.Unload("core-new", UnloadCommand.Delete.Index); - Assert.Equal(newUnloadResponseHeader.Status, 0); + Assert.Equal(0, newUnloadResponseHeader.Status); } } -} \ No newline at end of file +} diff --git a/SolrNet.Tests/CollapseExpandResponseParserTests.cs b/SolrNet.Tests/CollapseExpandResponseParserTests.cs index c9fa5326a..a67e84f36 100644 --- a/SolrNet.Tests/CollapseExpandResponseParserTests.cs +++ b/SolrNet.Tests/CollapseExpandResponseParserTests.cs @@ -35,9 +35,9 @@ public void Parse2() Assert.Equal(4, results.CollapseExpand.Groups.Count); var group = results.CollapseExpand.Groups.ElementAt(0); - Assert.Equal(group.Documents.Count, 2); - Assert.Equal(group.GroupValue, "First"); - Assert.Equal(group.NumFound, 2); + Assert.Equal(2, group.Documents.Count); + Assert.Equal("First", group.GroupValue); + Assert.Equal(2, group.NumFound); } class Doc {} diff --git a/SolrNet.Tests/CollectionFieldSerializerTests.cs b/SolrNet.Tests/CollectionFieldSerializerTests.cs index 9759ed0af..594d4b4d4 100644 --- a/SolrNet.Tests/CollectionFieldSerializerTests.cs +++ b/SolrNet.Tests/CollectionFieldSerializerTests.cs @@ -26,7 +26,7 @@ public class CollectionFieldSerializerTests { public void Serialize_null_returns_empty() { var s = new CollectionFieldSerializer(new DefaultFieldSerializer()); var p = s.Serialize(null).ToList(); - Assert.Equal(0, p.Count); + Assert.Empty(p); } [Fact] diff --git a/SolrNet.Tests/DebugResponseParserTests.cs b/SolrNet.Tests/DebugResponseParserTests.cs index 03f0dab62..19f3c3762 100644 --- a/SolrNet.Tests/DebugResponseParserTests.cs +++ b/SolrNet.Tests/DebugResponseParserTests.cs @@ -16,7 +16,7 @@ public void ParseDebugResponse() var results = new SolrQueryResults(); parser.Parse(xml, results); - Assert.Equal(0, results.Count); + Assert.Empty(results); Assert.True(results.Debug is DebugResults.PlainDebugResults); Assert.NotNull(results.Debug.Timing); Assert.Equal(15, results.Debug.Timing.TotalTime); @@ -32,7 +32,7 @@ public void ParseResponseWithSimpleDebugExplanation() var results = new SolrQueryResults(); parser.Parse(xml, results); - Assert.Equal(0, results.Count); + Assert.Empty(results); Assert.True(results.Debug is DebugResults.PlainDebugResults); Assert.NotNull(results.Debug.Explanation); Assert.Equal(2, results.Debug.Explanation.Count); @@ -47,7 +47,7 @@ public void ParseResponseWithStructuredDebugExplanation() parser.Parse(xml, results); var debugData = results.Debug; - Assert.Equal(0, results.Count); + Assert.Empty(results); Assert.NotNull(results.Debug.Explanation); Assert.True(results.Debug is DebugResults.StructuredDebugResults); diff --git a/SolrNet.Tests/DefaultFieldParserTests.cs b/SolrNet.Tests/DefaultFieldParserTests.cs index 3778fc209..313108e1c 100644 --- a/SolrNet.Tests/DefaultFieldParserTests.cs +++ b/SolrNet.Tests/DefaultFieldParserTests.cs @@ -57,8 +57,8 @@ public void ParseNullableInt() { doc.Add(new XElement("int", "31")); var p = new DefaultFieldParser(); var i = p.Parse(doc.Root, typeof (int?)); - Assert.IsAssignableFrom(typeof(int?), i); - Assert.IsType(typeof(int), i); + Assert.IsAssignableFrom(i); + Assert.IsType(i); var ii = (int?) i; Assert.True(ii.HasValue); Assert.Equal(31, ii.Value); diff --git a/SolrNet.Tests/DefaultResponseParserTests.cs b/SolrNet.Tests/DefaultResponseParserTests.cs index 22276b00b..29ebba92f 100644 --- a/SolrNet.Tests/DefaultResponseParserTests.cs +++ b/SolrNet.Tests/DefaultResponseParserTests.cs @@ -19,7 +19,7 @@ public void ParseResponseWithLocation() { var xml = EmbeddedResource.GetEmbeddedXml(GetType(), "Resources.response.xml"); var results = new SolrQueryResults(); parser.Parse(xml, results); - Assert.Equal(1, results.Count); + Assert.Single(results); Assert.Equal(new Location(51.5171, -0.1062), results[0].Loc); } @@ -31,7 +31,7 @@ public void Parse_If_Both_Result_And_Groups_Are_Present() var xml = EmbeddedResource.GetEmbeddedXml(GetType(), "Resources.responseWithResultAndGroup.xml"); var results = new SolrQueryResults(); parser.Parse(xml, results); - Assert.Equal(1, results.Count); + Assert.Single(results); Assert.Equal(1, results.Grouping["titleId"].Ngroups); } } diff --git a/SolrNet.Tests/ExceptionTests.cs b/SolrNet.Tests/ExceptionTests.cs index 3520a6578..f6c38d57f 100644 --- a/SolrNet.Tests/ExceptionTests.cs +++ b/SolrNet.Tests/ExceptionTests.cs @@ -25,7 +25,7 @@ public class ExceptionTests { public void All_exceptions_are_serializable() { var allExceptions = typeof (SolrNetException).Assembly.GetTypes().Where(t => typeof (SolrNetException).IsAssignableFrom(t)); foreach (var e in allExceptions) { - Assert.IsAssignableFrom(typeof(System.Runtime.Serialization.ISerializable), e); + Assert.IsAssignableFrom(e); } } } diff --git a/SolrNet.Tests/FieldParserTests.cs b/SolrNet.Tests/FieldParserTests.cs index 844a08933..5f90ed67f 100644 --- a/SolrNet.Tests/FieldParserTests.cs +++ b/SolrNet.Tests/FieldParserTests.cs @@ -30,7 +30,7 @@ public void FloatFieldParser_Parse() { var xml = new XDocument(); xml.Add(new XElement("int", "31")); var v = p.Parse(xml.Root, null); - Assert.IsType(typeof(float), v); + Assert.IsType(v); Assert.Equal(31f, v); } @@ -103,7 +103,7 @@ public void DefaultFieldParser_EnumAsString() { var xml = new XDocument(); xml.Add(new XElement("str", "One")); var r = p.Parse(xml.Root, typeof(Numbers)); - Assert.IsType(typeof(Numbers), r); + Assert.IsType(r); } [Fact] @@ -112,7 +112,7 @@ public void EnumAsString() { var xml = new XDocument(); xml.Add(new XElement("str", "One")); var r = p.Parse(xml.Root, typeof(Numbers)); - Assert.IsType(typeof(Numbers), r); + Assert.IsType(r); } private enum Numbers { diff --git a/SolrNet.Tests/GenericDictionaryFieldSerializerTests.cs b/SolrNet.Tests/GenericDictionaryFieldSerializerTests.cs index 78ea79151..4dade99f3 100644 --- a/SolrNet.Tests/GenericDictionaryFieldSerializerTests.cs +++ b/SolrNet.Tests/GenericDictionaryFieldSerializerTests.cs @@ -28,7 +28,7 @@ public class GenericDictionaryFieldSerializerTests { public void Serialize_null_returns_empty() { var s = new GenericDictionaryFieldSerializer(new DefaultFieldSerializer()); var l = s.Serialize(null).ToList(); - Assert.Equal(0, l.Count); + Assert.Empty(l); } [Fact] diff --git a/SolrNet.Tests/MappedPropertiesIsInSolrSchemaRuleTests.cs b/SolrNet.Tests/MappedPropertiesIsInSolrSchemaRuleTests.cs index 7466ada6b..a768f9ef6 100644 --- a/SolrNet.Tests/MappedPropertiesIsInSolrSchemaRuleTests.cs +++ b/SolrNet.Tests/MappedPropertiesIsInSolrSchemaRuleTests.cs @@ -42,7 +42,7 @@ public void MappedPropertyForWhichSolrFieldExistsInSchemaShouldNotReturnError() var schema = solrSchemaParser.Parse(schemaXmlDocument); var validationResults = schemaManager.EnumerateValidationResults(typeof (SchemaMappingTestDocument), schema).ToList(); - Assert.Equal(0, validationResults.Count); + Assert.Empty(validationResults); } [Fact] @@ -60,7 +60,7 @@ public void MappedPropertyForWhichDynamicFieldExistsInSchemaShouldNotReturnError var schema = solrSchemaParser.Parse(schemaXmlDocument); var validationResults = schemaManager.EnumerateValidationResults(typeof (SchemaMappingTestDocument), schema).ToList(); - Assert.Equal(0, validationResults.Count); + Assert.Empty(validationResults); } [Fact] @@ -78,7 +78,7 @@ public void MappedPropertyForWhichNoSolrFieldOrDynamicFieldExistsShouldReturnErr var schema = solrSchemaParser.Parse(schemaXmlDocument); var validationResults = schemaManager.EnumerateValidationResults(typeof (SchemaMappingTestDocument), schema).ToList(); - Assert.Equal(1, validationResults.Count); + Assert.Single(validationResults); } [Fact] @@ -88,7 +88,7 @@ public void MappedPropertiesIsInSolrSchemaRule_ignores_score() { mapper.Add(typeof (SchemaMappingTestDocument).GetProperty("Score"), "score"); var results = rule.Validate(typeof (SchemaMappingTestDocument), new SolrSchema(), mapper).ToList(); Assert.NotNull(results); - Assert.Equal(0, results.Count); + Assert.Empty(results); } [Fact] @@ -100,7 +100,7 @@ public void DictionaryFields_are_ignored() { var fieldType = new SolrFieldType("string", "solr.StrField"); schema.SolrFields.Add(new SolrField("ma_uaua", fieldType)); var results = rule.Validate(typeof(SchemaMappingTestDocument), new SolrSchema(), mapper).ToList(); - Assert.Equal(0, results.Count); + Assert.Empty(results); } } } \ No newline at end of file diff --git a/SolrNet.Tests/MappingTypesAreCompatibleWithSolrTypesRuleTests.cs b/SolrNet.Tests/MappingTypesAreCompatibleWithSolrTypesRuleTests.cs index d8b52e24b..a011698cd 100644 --- a/SolrNet.Tests/MappingTypesAreCompatibleWithSolrTypesRuleTests.cs +++ b/SolrNet.Tests/MappingTypesAreCompatibleWithSolrTypesRuleTests.cs @@ -41,7 +41,7 @@ public void StringMappedToIntShouldReturnError() { var schema = solrSchemaParser.Parse(schemaXmlDocument); var validationResults = schemaManager.EnumerateValidationResults(typeof (SchemaMappingTestDocument), schema).ToList(); - Assert.Equal(1, validationResults.Count); + Assert.Single(validationResults); } [Fact] @@ -56,7 +56,7 @@ public void StringMappedToStringShouldNotReturnError() { var schema = solrSchemaParser.Parse(schemaXmlDocument); var validationResults = schemaManager.EnumerateValidationResults(typeof (SchemaMappingTestDocument), schema).ToList(); - Assert.Equal(0, validationResults.Count); + Assert.Empty(validationResults); } [Fact] diff --git a/SolrNet.Tests/MappingValidatorTests.cs b/SolrNet.Tests/MappingValidatorTests.cs index 999fb1f88..dda7a7b73 100644 --- a/SolrNet.Tests/MappingValidatorTests.cs +++ b/SolrNet.Tests/MappingValidatorTests.cs @@ -35,7 +35,7 @@ public void ValidatingRuleSetReturnsValidationResults() { var validationResults = mappingValidationManager.EnumerateValidationResults(typeof(SchemaMappingTestDocument), new SolrSchema()).ToList(); - Assert.Equal(1, validationResults.Count); + Assert.Single(validationResults); } } diff --git a/SolrNet.Tests/MultivaluedMappedToCollectionRuleTests.cs b/SolrNet.Tests/MultivaluedMappedToCollectionRuleTests.cs index ceae6c923..673eb19e3 100644 --- a/SolrNet.Tests/MultivaluedMappedToCollectionRuleTests.cs +++ b/SolrNet.Tests/MultivaluedMappedToCollectionRuleTests.cs @@ -40,7 +40,7 @@ public void MutivaluedSolrFieldNotMappedToCollectionShouldReturnError() { var schema = solrSchemaParser.Parse(schemaXmlDocument); var validationResults = schemaManager.EnumerateValidationResults(typeof (SchemaMappingTestDocument), schema).ToList(); - Assert.Equal(1, validationResults.Count); + Assert.Single(validationResults); Console.WriteLine(validationResults[0].Message); } @@ -56,7 +56,7 @@ public void MultivaluedSolrFieldMappedToCollectionShouldNotReturnError() { var schema = solrSchemaParser.Parse(schemaXmlDocument); var validationResults = schemaManager.EnumerateValidationResults(typeof (SchemaMappingTestDocument), schema).ToList(); - Assert.Equal(0, validationResults.Count); + Assert.Empty(validationResults); } [Fact] @@ -71,7 +71,7 @@ public void CollectionMappedToNonMultiValuedFolrFieldShouldReturnError() { var schema = solrSchemaParser.Parse(schemaXmlDocument); var validationResults = schemaManager.EnumerateValidationResults(typeof (SchemaMappingTestDocument), schema).ToList(); - Assert.Equal(1, validationResults.Count); + Assert.Single(validationResults); Console.WriteLine(validationResults[0].Message); } } diff --git a/SolrNet.Tests/RequiredFieldsAreMappedRuleTests.cs b/SolrNet.Tests/RequiredFieldsAreMappedRuleTests.cs index bd4ec956d..ac51d62b6 100644 --- a/SolrNet.Tests/RequiredFieldsAreMappedRuleTests.cs +++ b/SolrNet.Tests/RequiredFieldsAreMappedRuleTests.cs @@ -40,7 +40,7 @@ public void RequiredSolrFieldForWhichNoCopyFieldExistsShouldReturnError() { var schema = solrSchemaParser.Parse(schemaXmlDocument); var validationResults = schemaManager.EnumerateValidationResults(typeof (SchemaMappingTestDocument), schema).ToList(); - Assert.Equal(1, validationResults.Count); + Assert.Single(validationResults); } } } \ No newline at end of file diff --git a/SolrNet.Tests/SolrDictionarySerializerTests.cs b/SolrNet.Tests/SolrDictionarySerializerTests.cs index 5b392aa20..2895388cd 100644 --- a/SolrNet.Tests/SolrDictionarySerializerTests.cs +++ b/SolrNet.Tests/SolrDictionarySerializerTests.cs @@ -39,7 +39,7 @@ public void Serialize_empty() { var serializer = GetSerializer(); var xml = serializer.Serialize(new Dictionary(), null); - Assert.Equal(xml.Nodes().Count(), 0); + Assert.Equal(0, xml.Nodes().Count()); } [Fact] @@ -54,7 +54,7 @@ public void Serialize_string() private static void AssertSerializedField(XElement docNode, string value) { - Assert.Equal(docNode.Nodes().Count(), 1); + Assert.Single(docNode.Nodes()); var fieldNode = docNode.Element("field"); Assert.NotNull(fieldNode); Assert.Equal("one", fieldNode.Attribute("name").Value); @@ -118,7 +118,7 @@ public void Serialize_Array() var docNode = serializer.Serialize(new Dictionary { {"one", new[] {1,2,3}} }, null); - Assert.Equal(docNode.Nodes().Count(), 3); + Assert.Equal(3, docNode.Nodes().Count()); var fieldNodes = docNode.Elements("field").ToList(); Assert.Equal("1", fieldNodes[0].Value); Assert.Equal("2", fieldNodes[1].Value); @@ -132,7 +132,7 @@ public void Serialize_List() var docNode = serializer.Serialize(new Dictionary { {"one", new List {"a", "b", "c"}} }, null); - Assert.Equal(docNode.Nodes().Count(), 3); + Assert.Equal(3, docNode.Nodes().Count()); var fieldNodes = docNode.Elements("field").ToList(); Assert.Equal("a", fieldNodes[0].Value); Assert.Equal("b", fieldNodes[1].Value); @@ -146,7 +146,7 @@ public void Serialize_SparseList() var docNode = serializer.Serialize(new Dictionary { {"one", new List {"a", null, "b", "c"}} }, null); - Assert.Equal(docNode.Nodes().Count(), 3); + Assert.Equal(3, docNode.Nodes().Count()); var fieldNodes = docNode.Elements("field").ToList(); Assert.Equal("a", fieldNodes[0].Value); Assert.Equal("b", fieldNodes[1].Value); @@ -160,7 +160,7 @@ public void Serialize_EmptyList() var docNode = serializer.Serialize(new Dictionary { {"one", new List {null, null}} }, null); - Assert.Equal(docNode.Nodes().Count(), 0); + Assert.Equal(0, docNode.Nodes().Count()); } [Fact] diff --git a/SolrNet.Tests/SolrOperationsTests.cs b/SolrNet.Tests/SolrOperationsTests.cs index 377b96039..472ea79b0 100644 --- a/SolrNet.Tests/SolrOperationsTests.cs +++ b/SolrNet.Tests/SolrOperationsTests.cs @@ -528,7 +528,7 @@ public void FacetField() { [Fact] public void SearchResults_ShouldBeIterable() { var results = new SolrQueryResults(); - Assert.IsAssignableFrom(typeof(IEnumerable), results); + Assert.IsAssignableFrom>(results); } [Fact] diff --git a/SolrNet.Tests/SolrQueryExecuterTests.cs b/SolrNet.Tests/SolrQueryExecuterTests.cs index 6832dfcc5..6cd81f856 100644 --- a/SolrNet.Tests/SolrQueryExecuterTests.cs +++ b/SolrNet.Tests/SolrQueryExecuterTests.cs @@ -415,7 +415,7 @@ public void TermsMultipleFields() { [Fact] public void GetTermVectorParameterOptions_All() { var r = SolrQueryExecuter.GetTermVectorParameterOptions(TermVectorParameterOptions.All).ToList(); - Assert.Equal(1, r.Count); + Assert.Single(r); Assert.Equal("tv.all", r[0]); } @@ -428,28 +428,28 @@ public void GetTermVectorParameterOptions_All_indirect() { | TermVectorParameterOptions.Offsets | TermVectorParameterOptions.TermFrequency_InverseDocumentFrequency; var r = SolrQueryExecuter.GetTermVectorParameterOptions(o).ToList(); - Assert.Equal(1, r.Count); + Assert.Single(r); Assert.Equal("tv.all", r[0]); } [Fact] public void GetTermVectorParameterOptions_Tf() { var r = SolrQueryExecuter.GetTermVectorParameterOptions(TermVectorParameterOptions.TermFrequency).ToList(); - Assert.Equal(1, r.Count); + Assert.Single(r); Assert.Equal("tv.tf", r[0]); } [Fact] public void GetTermVectorParameterOptions_Df() { var r = SolrQueryExecuter.GetTermVectorParameterOptions(TermVectorParameterOptions.DocumentFrequency).ToList(); - Assert.Equal(1, r.Count); + Assert.Single(r); Assert.Equal("tv.df", r[0]); } [Fact] public void GetTermVectorParameterOptions_default() { var r = SolrQueryExecuter.GetTermVectorParameterOptions(TermVectorParameterOptions.Default).ToList(); - Assert.Equal(0, r.Count); + Assert.Empty(r); } [Fact] @@ -466,7 +466,7 @@ public void GetTermVectorParameterOptions_TfDf() { [Fact] public void GetTermVectorParameterOptions_offsets() { var r = SolrQueryExecuter.GetTermVectorParameterOptions(TermVectorParameterOptions.Offsets).ToList(); - Assert.Equal(1, r.Count); + Assert.Single(r); Assert.Equal("tv.offsets", r[0]); } diff --git a/SolrNet.Tests/SolrQueryResultsParserTests.cs b/SolrNet.Tests/SolrQueryResultsParserTests.cs index 788e75ba6..49700e238 100644 --- a/SolrNet.Tests/SolrQueryResultsParserTests.cs +++ b/SolrNet.Tests/SolrQueryResultsParserTests.cs @@ -100,7 +100,7 @@ public void CanParseNextCursormark() public void Parse() { var results = ParseFromResource("Resources.response.xml"); - Assert.Equal(1, results.Count); + Assert.Single(results); var doc = results[0]; Assert.Equal(123456, doc.Id); } @@ -193,7 +193,7 @@ public void SetPropertyWithArrayOfIntsToIntArray() public void ParseResultsWithArrays() { var results = ParseFromResource("Resources.responseWithArrays.xml"); - Assert.Equal(1, results.Count); + Assert.Single(results); var doc = results[0]; Assert.Equal("SP2514N", doc.Id); } @@ -202,7 +202,7 @@ public void ParseResultsWithArrays() public void SupportsDateTime() { var results = ParseFromResource("Resources.responseWithDate.xml"); - Assert.Equal(1, results.Count); + Assert.Single(results); var doc = results[0]; Assert.Equal(new DateTime(2001, 1, 2, 3, 4, 5), doc.Fecha); } @@ -225,7 +225,7 @@ public void ParseDate_with_milliseconds() public void SupportsNullableDateTime() { var results = ParseFromResource("Resources.responseWithDate.xml"); - Assert.Equal(1, results.Count); + Assert.Single(results); var doc = results[0]; Assert.Equal(new DateTime(2001, 1, 2, 3, 4, 5), doc.Fecha); } @@ -234,7 +234,7 @@ public void SupportsNullableDateTime() public void SupportsIEnumerable() { var results = ParseFromResource("Resources.responseWithArraysSimple.xml"); - Assert.Equal(1, results.Count); + Assert.Single(results); var doc = results[0]; Assert.Equal(2, new List(doc.Features).Count); } @@ -243,7 +243,7 @@ public void SupportsIEnumerable() public void SupportsGuid() { var results = ParseFromResource("Resources.responseWithGuid.xml"); - Assert.Equal(1, results.Count); + Assert.Single(results); var doc = results[0]; //Console.WriteLine(doc.Key); } @@ -252,7 +252,7 @@ public void SupportsGuid() public void SupportsEnumAsInteger() { var results = ParseFromResource("Resources.responseWithEnumAsInt.xml"); - Assert.Equal(1, results.Count); + Assert.Single(results); var doc = results[0]; //Console.WriteLine(doc.En); } @@ -261,7 +261,7 @@ public void SupportsEnumAsInteger() public void SupportsEnumAsString() { var results = ParseFromResource("Resources.responseWithEnumAsString.xml"); - Assert.Equal(1, results.Count); + Assert.Single(results); var doc = results[0]; //Console.WriteLine(doc.En); } @@ -282,7 +282,7 @@ public void EmptyEnumThrows() public void SupportsNullableGuidWithEmptyField() { var results = ParseFromResource("Resources.response.xml"); - Assert.Equal(1, results.Count); + Assert.Single(results); Assert.False(results[0].BasicView.HasValue); } @@ -290,7 +290,7 @@ public void SupportsNullableGuidWithEmptyField() public void GenericDictionary_string_string() { var results = ParseFromResource("Resources.responseWithDict.xml"); - Assert.Equal(1, results.Count); + Assert.Single(results); var doc = results[0]; Assert.NotNull(doc.Dict); Assert.Equal(2, doc.Dict.Count); @@ -302,7 +302,7 @@ public void GenericDictionary_string_string() public void GenericDictionary_string_int() { var results = ParseFromResource("Resources.responseWithDict.xml"); - Assert.Equal(1, results.Count); + Assert.Single(results); var doc = results[0]; Assert.NotNull(doc.Dict); Assert.Equal(2, doc.Dict.Count); @@ -314,7 +314,7 @@ public void GenericDictionary_string_int() public void GenericDictionary_string_float() { var results = ParseFromResource("Resources.responseWithDictFloat.xml"); - Assert.Equal(1, results.Count); + Assert.Single(results); var doc = results[0]; Assert.NotNull(doc.Dict); Assert.Equal(2, doc.Dict.Count); @@ -326,7 +326,7 @@ public void GenericDictionary_string_float() public void GenericDictionary_string_decimal() { var results = ParseFromResource("Resources.responseWithDictFloat.xml"); - Assert.Equal(1, results.Count); + Assert.Single(results); var doc = results[0]; Assert.NotNull(doc.Dict); Assert.Equal(2, doc.Dict.Count); @@ -344,14 +344,14 @@ public void GenericDictionary_rest_of_fields() Assert.Equal("2.234", results[0].Dict["DictTwo"]); Assert.Equal(new DateTime(1, 1, 1), results[0].Dict["timestamp"]); Assert.Equal(92.0f, results[0].Dict["price"]); - Assert.IsAssignableFrom(typeof(ICollection), results[0].Dict["features"]); + Assert.IsAssignableFrom(results[0].Dict["features"]); } [Fact] public void WrongFieldDoesntThrow() { var results = ParseFromResource("Resources.responseWithArraysSimple.xml"); - Assert.Equal(1, results.Count); + Assert.Single(results); var doc = results[0]; } @@ -426,45 +426,45 @@ public void ParseFacetResults() //Facet Ranges Assert.NotNull(r.FacetRanges); - Assert.Equal(r.FacetRanges.Count, 2); - Assert.Equal(r.FacetRanges.First().Key , "date-timestamp"); - Assert.Equal(r.FacetRanges.First().Value.Start, "2017-07-30T00:00:00Z"); - Assert.Equal(r.FacetRanges.First().Value.End, "2017-08-30T00:00:00Z"); - Assert.Equal(r.FacetRanges.First().Value.Gap, "+1DAY"); - Assert.Equal(r.FacetRanges.First().Value.OtherResults[FacetRangeOther.Before], 41622120); - Assert.Equal(r.FacetRanges.First().Value.OtherResults[FacetRangeOther.After], 47336); - Assert.Equal(r.FacetRanges.First().Value.OtherResults[FacetRangeOther.Between], 75812); - Assert.Equal(r.FacetRanges.First().Value.RangeResults.Count,31); - Assert.Equal(r.FacetRanges.First().Value.RangeResults.First().Key, "2017-07-30T00:00:00Z"); - Assert.Equal(r.FacetRanges.First().Value.RangeResults.First().Value, 222); - Assert.Equal(r.FacetRanges.First().Value.RangeResults.Last().Key, "2017-08-29T00:00:00Z"); - Assert.Equal(r.FacetRanges.First().Value.RangeResults.Last().Value, 20); - - Assert.Equal(r.FacetRanges.Last().Key, "version"); - Assert.Equal(r.FacetRanges.Last().Value.Gap, "1000"); - Assert.Equal(r.FacetRanges.Last().Value.RangeResults.First().Key, "1531035549990449850"); - Assert.Equal(r.FacetRanges.Last().Value.RangeResults.First().Value, 20); - Assert.Equal(r.FacetRanges.Last().Value.RangeResults.Last().Key, "1531035549990659850"); - Assert.Equal(r.FacetRanges.Last().Value.RangeResults.Last().Value, 0); + Assert.Equal(2, r.FacetRanges.Count); + Assert.Equal("date-timestamp", r.FacetRanges.First().Key ); + Assert.Equal("2017-07-30T00:00:00Z", r.FacetRanges.First().Value.Start); + Assert.Equal("2017-08-30T00:00:00Z", r.FacetRanges.First().Value.End); + Assert.Equal("+1DAY", r.FacetRanges.First().Value.Gap); + Assert.Equal(41622120, r.FacetRanges.First().Value.OtherResults[FacetRangeOther.Before]); + Assert.Equal(47336, r.FacetRanges.First().Value.OtherResults[FacetRangeOther.After]); + Assert.Equal(75812, r.FacetRanges.First().Value.OtherResults[FacetRangeOther.Between]); + Assert.Equal(31, r.FacetRanges.First().Value.RangeResults.Count); + Assert.Equal("2017-07-30T00:00:00Z", r.FacetRanges.First().Value.RangeResults.First().Key); + Assert.Equal(222, r.FacetRanges.First().Value.RangeResults.First().Value); + Assert.Equal("2017-08-29T00:00:00Z", r.FacetRanges.First().Value.RangeResults.Last().Key); + Assert.Equal(20, r.FacetRanges.First().Value.RangeResults.Last().Value); + + Assert.Equal("version", r.FacetRanges.Last().Key); + Assert.Equal("1000", r.FacetRanges.Last().Value.Gap); + Assert.Equal("1531035549990449850", r.FacetRanges.Last().Value.RangeResults.First().Key); + Assert.Equal(20, r.FacetRanges.Last().Value.RangeResults.First().Value); + Assert.Equal("1531035549990659850", r.FacetRanges.Last().Value.RangeResults.Last().Key); + Assert.Equal(0, r.FacetRanges.Last().Value.RangeResults.Last().Value); //Facet Intervals Assert.NotNull(r.FacetIntervals); - Assert.Equal(r.FacetIntervals.Count, 2); - Assert.Equal(r.FacetIntervals.First().Key, "letters"); - Assert.Equal(r.FacetIntervals.First().Value.Count, 3); - Assert.Equal(r.FacetIntervals.First().Value.First().Key , "[*,b]"); - Assert.Equal(r.FacetIntervals.First().Value.First().Value , 5); - Assert.Equal(r.FacetIntervals.First().Value.Last().Key, "bar"); - Assert.Equal(r.FacetIntervals.First().Value.Last().Value, 4544341); + Assert.Equal(2, r.FacetIntervals.Count); + Assert.Equal("letters", r.FacetIntervals.First().Key); + Assert.Equal(3, r.FacetIntervals.First().Value.Count); + Assert.Equal("[*,b]", r.FacetIntervals.First().Value.First().Key ); + Assert.Equal(5, r.FacetIntervals.First().Value.First().Value ); + Assert.Equal("bar", r.FacetIntervals.First().Value.Last().Key); + Assert.Equal(4544341, r.FacetIntervals.First().Value.Last().Value); - Assert.Equal(r.FacetIntervals.Last().Key, "number"); - Assert.Equal(r.FacetIntervals.Last().Value.Count, 2); - Assert.Equal(r.FacetIntervals.Last().Value.First().Key, "[0,500]"); - Assert.Equal(r.FacetIntervals.Last().Value.First().Value, 9); - Assert.Equal(r.FacetIntervals.Last().Value.Last().Key, "[500,1000]"); - Assert.Equal(r.FacetIntervals.Last().Value.Last().Value, 123); + Assert.Equal("number", r.FacetIntervals.Last().Key); + Assert.Equal(2, r.FacetIntervals.Last().Value.Count); + Assert.Equal("[0,500]", r.FacetIntervals.Last().Value.First().Key); + Assert.Equal(9, r.FacetIntervals.Last().Value.First().Value); + Assert.Equal("[500,1000]", r.FacetIntervals.Last().Value.Last().Key); + Assert.Equal(123, r.FacetIntervals.Last().Value.Last().Value); @@ -512,7 +512,7 @@ public void ParseHighlighting() var highlights = ParseHighlightingResults(EmbeddedResource.GetEmbeddedString(GetType(), "Resources.responseWithHighlighting.xml")); Assert.Equal(1, highlights.Count); var kv = highlights.First().Value; - Assert.Equal(1, kv.Count); + Assert.Single(kv); Assert.Equal("features", kv.First().Key); Assert.Equal(1, kv.First().Value.Count); //Console.WriteLine(kv.First().Value.First()); @@ -560,8 +560,8 @@ public void ParseHighlighting2WrappedWithClass() public void ParseHighlighting3() { var highlights = ParseHighlightingResults(EmbeddedResource.GetEmbeddedString(GetType(), "Resources.responseWithHighlighting3.xml")); - Assert.Equal(0, highlights["e4420cc2"].Count); - Assert.Equal(1, highlights["e442c4cd"].Count); + Assert.Empty(highlights["e4420cc2"]); + Assert.Single(highlights["e442c4cd"]); Assert.Equal(1, highlights["e442c4cd"]["bodytext"].Count); Assert.Contains("Garia lancerer", highlights["e442c4cd"]["bodytext"].First()); } @@ -782,7 +782,7 @@ public void ParseTermVector2() var docNode = xml.XPathSelectElement("response/lst[@name='termVectors']"); var docs = parser.ParseDocuments(docNode).ToList(); Assert.NotNull(docs); - Assert.Equal(1, docs.Count); + Assert.Single(docs); Assert.Equal("20", docs[0].UniqueKey); var vectors = docs[0].TermVector.ToList(); Assert.Equal(15, vectors.Count); diff --git a/SolrNet.Tests/SolrSchemaParserTests.cs b/SolrNet.Tests/SolrSchemaParserTests.cs index 3cf8e4efe..db6dc8a89 100644 --- a/SolrNet.Tests/SolrSchemaParserTests.cs +++ b/SolrNet.Tests/SolrSchemaParserTests.cs @@ -75,7 +75,7 @@ public void SolrDynamicFieldParsing() var xml = EmbeddedResource.GetEmbeddedXml(GetType(), "Resources.solrSchemaBasic.xml"); SolrSchema schemaDoc = schemaParser.Parse(xml); - Assert.Equal(1, schemaDoc.SolrDynamicFields.Count); + Assert.Single(schemaDoc.SolrDynamicFields); Assert.Equal("*_s", schemaDoc.SolrDynamicFields[0].Name); } @@ -86,7 +86,7 @@ public void SolrCopyFieldParsing() var xml = EmbeddedResource.GetEmbeddedXml(GetType(), "Resources.solrSchemaBasic.xml"); SolrSchema schemaDoc = schemaParser.Parse(xml); - Assert.Equal(1, schemaDoc.SolrCopyFields.Count); + Assert.Single(schemaDoc.SolrCopyFields); Assert.Equal("name", schemaDoc.SolrCopyFields[0].Source); Assert.Equal("nameSort", schemaDoc.SolrCopyFields[0].Destination); } @@ -169,7 +169,7 @@ public void SolrDynamicFieldParsingManagedSchema() var xml = EmbeddedResource.GetEmbeddedXml(GetType(), "Resources.solrManagedSchemaBasic.xml"); SolrSchema schemaDoc = schemaParser.Parse(xml); - Assert.Equal(1, schemaDoc.SolrDynamicFields.Count); + Assert.Single(schemaDoc.SolrDynamicFields); Assert.Equal("*_s", schemaDoc.SolrDynamicFields[0].Name); } @@ -180,7 +180,7 @@ public void SolrCopyFieldParsingManagedSchema() var xml = EmbeddedResource.GetEmbeddedXml(GetType(), "Resources.solrManagedSchemaBasic.xml"); SolrSchema schemaDoc = schemaParser.Parse(xml); - Assert.Equal(1, schemaDoc.SolrCopyFields.Count); + Assert.Single(schemaDoc.SolrCopyFields); Assert.Equal("name", schemaDoc.SolrCopyFields[0].Source); Assert.Equal("nameSort", schemaDoc.SolrCopyFields[0].Destination); } diff --git a/SolrNet.Tests/SolrServerTests.cs b/SolrNet.Tests/SolrServerTests.cs index 75c59e0f1..3d5dfb984 100644 --- a/SolrNet.Tests/SolrServerTests.cs +++ b/SolrNet.Tests/SolrServerTests.cs @@ -92,7 +92,7 @@ public void AddWithBoost_single_doc_with_add_parameters_calls_operations_with_sa basicServer.addWithBoost += (docs, p) => { Assert.Same(parameters, p); var ldocs = docs.ToList(); - Assert.Equal(1, ldocs.Count); + Assert.Single(ldocs); var doc = ldocs[0]; Assert.Equal(2.1, doc.Value); Assert.Same(t, doc.Key); diff --git a/SolrNet.Tests/SolrStatusResponseParserTests.cs b/SolrNet.Tests/SolrStatusResponseParserTests.cs index e25fbf10d..693c9b2cd 100644 --- a/SolrNet.Tests/SolrStatusResponseParserTests.cs +++ b/SolrNet.Tests/SolrStatusResponseParserTests.cs @@ -110,7 +110,7 @@ public void Core0IndexExists() { [Fact] public void IsDefaultCore() { var r = ParseFromResults("Resources.responseWithStatus2.xml"); - Assert.Equal(1, r.Count); + Assert.Single(r); var core = r[0]; Assert.True(core.IsDefaultCore); } diff --git a/SolrNet.Tests/SortOrderTests.cs b/SolrNet.Tests/SortOrderTests.cs index 9ecb7fa45..1cf176d9a 100644 --- a/SolrNet.Tests/SortOrderTests.cs +++ b/SolrNet.Tests/SortOrderTests.cs @@ -53,19 +53,19 @@ public void Parse() { [Fact] public void ParseAsc() { var o = SortOrder.Parse("pepe asc"); - Assert.Equal(o.ToString(), "pepe asc",true,true,true); + Assert.Equal("pepe asc", o.ToString(),true,true,true); } [Fact] public void ParseDesc() { var o = SortOrder.Parse("pepe desc"); - Assert.Equal(o.ToString(), "pepe desc", true, true, true); + Assert.Equal("pepe desc", o.ToString(), true, true, true); } [Fact] public void ParseDescWithSpaces() { var o = SortOrder.Parse("pepe desc"); - Assert.Equal(o.ToString(), "pepe desc", true, true, true); + Assert.Equal("pepe desc", o.ToString(), true, true, true); } [Fact] diff --git a/SolrNet.Tests/UniqueKeyMatchesMappingRuleTests.cs b/SolrNet.Tests/UniqueKeyMatchesMappingRuleTests.cs index 05a1bd398..3a168c85c 100644 --- a/SolrNet.Tests/UniqueKeyMatchesMappingRuleTests.cs +++ b/SolrNet.Tests/UniqueKeyMatchesMappingRuleTests.cs @@ -41,7 +41,7 @@ public void NonMatchingUniqueKeyMappingShouldReturnError() { var schema = solrSchemaParser.Parse(schemaXmlDocument); var validationResults = schemaManager.EnumerateValidationResults(typeof (SchemaMappingTestDocument), schema).ToList(); - Assert.Equal(1, validationResults.Count); + Assert.Single(validationResults); } [Fact] @@ -57,7 +57,7 @@ public void MatchingUniqueKeyMappingShouldNotReturnError() { var schema = solrSchemaParser.Parse(schemaXmlDocument); var validationResults = schemaManager.EnumerateValidationResults(typeof (SchemaMappingTestDocument), schema).ToList(); - Assert.Equal(0, validationResults.Count); + Assert.Empty(validationResults); } [Fact] @@ -69,7 +69,7 @@ public void SchemaNull_MappingNotNull_generates_error() { mapper.SetUniqueKey(idProperty); var validations = rule.Validate(typeof (SchemaMappingTestDocument), new SolrSchema(), mapper).ToList(); Assert.NotNull(validations); - Assert.Equal(1, validations.Count); + Assert.Single(validations); foreach (var v in validations) Console.WriteLine("{0}: {1}", v.GetType(), v.Message); Assert.IsType(validations[0]); @@ -81,7 +81,7 @@ public void SchemaNotNull_MappingNull_generates_warning() { var schema = new SolrSchema {UniqueKey = "id"}; var validations = rule.Validate(typeof (SchemaMappingTestDocument), schema, new MappingManager()).ToList(); Assert.NotNull(validations); - Assert.Equal(1, validations.Count); + Assert.Single(validations); foreach (var v in validations) Console.WriteLine("{0}: {1}", v.GetType(), v.Message); Assert.IsType(validations[0]); @@ -93,7 +93,7 @@ public void SchemaNull_MappingNull_no_errors() { var schema = new SolrSchema(); var validations = rule.Validate(typeof (SchemaMappingTestDocument), schema, new MappingManager()).ToList(); Assert.NotNull(validations); - Assert.Equal(0, validations.Count); + Assert.Empty(validations); } } } \ No newline at end of file diff --git a/SolrNet.Tests/Utils/ProfilerTests.cs b/SolrNet.Tests/Utils/ProfilerTests.cs index 70a0541eb..507d62926 100644 --- a/SolrNet.Tests/Utils/ProfilerTests.cs +++ b/SolrNet.Tests/Utils/ProfilerTests.cs @@ -43,7 +43,7 @@ public void NonProxyableComponent() { container.Register(Component.For()); container.Resolve().LongOperation(); var profile = container.GetProfile(); - Assert.Equal(0, profile.Children.Count); + Assert.Empty(profile.Children); } // Y-combinator @@ -66,7 +66,7 @@ public void ProxyableComponent() { container.Register(Component.For()); container.Resolve().LongOperation(); var profile = container.GetProfile(); - Assert.Equal(1, profile.Children.Count); + Assert.Single(profile.Children); Console.WriteLine("{0}: {1}", profile.Children[0].Value.Key, profile.Children[0].Value.Value); var fProfile = Flatten(profile); var q = from n in fProfile