fix #199 count() overload with indices and types, does not append _co…

…unt suffix
elastic · Apr 1, 2013 · 9beab98 · 9beab98
1 parent dffc1d9
commit 9beab98
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/src/Nest.Tests.Integration/Search/CountTests.cs b/src/Nest.Tests.Integration/Search/CountTests.cs
@@ -2,6 +2,8 @@
 using Nest.Tests.MockData;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
+using FluentAssertions;
+using Nest.Resolvers;
 
 namespace Nest.Tests.Integration.Search
 {
@@ -42,9 +44,25 @@ public void SimpleQueryWithIndexAndTypeCount()
 					.Value(this._LookFor.ToLower())
 				)
 			);
-			Assert.True(countResults.Count > 0);
+			countResults.Count.Should().Be(3);
 		}
 
+		[Test]
+		public void SimpleQueryWithIndicesCount()
+		{
+			//does a match_all on the default specified index
+			var index = ElasticsearchConfiguration.DefaultIndex;
+			var indices = new[] { index, index + "_clone" };
+			var types = new[] { new TypeNameResolver().GetTypeNameFor<ElasticSearchProject>() };
+			var countResults = this._client.Count<ElasticSearchProject>(indices, types, q => q
+				.Fuzzy(fq => fq
+					.OnField(f => f.Followers.First().FirstName)
+					.Value(this._LookFor.ToLower())
+				)
+			);
+			countResults.IsValid.Should().Be(true);
+			countResults.Count.Should().Be(3);
+		}
 
 		[Test]
 		public void SimpleTypedCount()

diff --git a/src/Nest/Resolvers/PathResolver.cs b/src/Nest/Resolvers/PathResolver.cs
@@ -98,9 +98,9 @@ public string CreateIndexTypePath(string index, string type, string suffix = nul
 			type.ThrowIfNullOrEmpty("type");
 			index = Uri.EscapeDataString(index);
 			type = Uri.EscapeDataString(type);
-
 			if (suffix != null)
 				return "{0}/{1}/{2}".F(index, type, this.NormalizeSuffix(suffix));
+
 			return "{0}/{1}/".F(index, type);
 		}
 
@@ -109,7 +109,9 @@ public string CreateIndexTypePath(IEnumerable<string> indices, IEnumerable<strin
 			indices.ThrowIfEmpty("indices");
 			types.ThrowIfEmpty("types");
 			var index = string.Join(",", indices);
-			var type = string.Join(",", types);
+			var type = string.Join(",", types);
+			if (suffix != null)
+				return "{0}/{1}/{2}".F(Uri.EscapeDataString(index), Uri.EscapeDataString(type), this.NormalizeSuffix(suffix));
 
 			return "{0}/{1}/".F(Uri.EscapeDataString(index), Uri.EscapeDataString(type));
 		}