Skip to content

Commit ff66186

Browse files
committed
added warmer tests back in to the project
1 parent f9828d5 commit ff66186

File tree

4 files changed

+5
-149
lines changed

4 files changed

+5
-149
lines changed

src/Nest.Tests.Integration/BaseTests.cs

Lines changed: 0 additions & 146 deletions
This file was deleted.

src/Nest.Tests.Integration/Warmers/WarmersTests.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using Nest.Tests.MockData.Domain;
44
using NUnit.Framework;
55
using System.Net;
6+
using System.Linq;
67

78
namespace Nest.Tests.Integration.Warmers
89
{
@@ -36,7 +37,8 @@ public void SimplePutAndGet()
3637
warmerResponse.Indices[_settings.DefaultIndex].Should().ContainKey("warmer_simpleputandget");
3738
var warmerMapping = warmerResponse.Indices[_settings.DefaultIndex]["warmer_simpleputandget"];
3839
warmerMapping.Name.Should().Be("warmer_simpleputandget");
39-
warmerMapping.Types.Should().Contain(typeNameResolver.GetTypeNameFor<ElasticSearchProject>());
40+
var typeName = typeNameResolver.GetTypeNameFor<ElasticSearchProject>().Resolve(_client.Settings);
41+
warmerMapping.Types.Select(s => s.Resolve(_client.Settings)).Contains(typeName).Should().Be(true);
4042
warmerMapping.Source.Should().Contain("\"strange-value\"");
4143
}
4244

src/Nest/DSL/CreateWarmerDescriptor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public CreateWarmerDescriptor Types(params Type[] types)
5757

5858
public CreateWarmerDescriptor Types(IEnumerable<Type> types)
5959
{
60-
this._Types = types.Cast<TypeNameMarker>();
60+
this._Types = types.Select(t => (TypeNameMarker)t);
6161
return this;
6262
}
6363

src/Nest/Resolvers/Converters/WarmerMappingConverter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
2727
{
2828
var jObject = JObject.Load(reader);
2929
var types = ((JArray)jObject.Property("types").Value).Values<string>().ToArray()
30-
.Cast<TypeNameMarker>();
30+
.Select(s=>(TypeNameMarker)s);
3131
var source = jObject.Property("source").Value.ToString();
3232

3333
return new WarmerMapping { Types = types, Source = source };

0 commit comments

Comments
 (0)